Skip to content
This repository has been archived by the owner on May 4, 2023. It is now read-only.

fix(netlify): get interaction testing working in netlfiy #32

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions .yarn/patches/@redwoodjs-testing-npm-1.0.2-ee03e8a498.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
diff --git a/config/storybook/main.js b/config/storybook/main.js
index bc381eee10cc122e74d999b616784f228388d53a..26191b6e5d70bd5ae14822e61794d61874329534 100644
--- a/config/storybook/main.js
+++ b/config/storybook/main.js
@@ -1,3 +1,4 @@
+//@ts-check
const fs = require('fs')
const path = require('path')

@@ -14,7 +15,6 @@ const config = getConfig()

const rwjsPaths = getPaths()

-const staticAssetsFolder = path.join(getPaths().web.base, 'public')

function isPackageInstalled(alias) {
try {
@@ -57,10 +57,9 @@ const baseConfig = {

return sbConfig
},
- webpackFinal: (sbConfig, { configType }) => {
- // configType is 'PRODUCTION' or 'DEVELOPMENT', why shout?
- const isEnvProduction =
- configType && configType.toLowerCase() === 'production'
+ webpackFinal: (sbConfig) => {
+ // hardcoding `isEnvProduction = true` hack to get building on netlify to work
+ const isEnvProduction = true

const rwConfig = isEnvProduction
? require('@redwoodjs/core/config/webpack.production')
@@ -131,11 +130,7 @@ const baseConfig = {
sbConfig = withEmotionVersionFallback(sbConfig)

return sbConfig
- },
- // only set staticDirs when running Storybook process; will fail if set for SB --build
- ...(process.env.NODE_ENV !== 'production' && {
- staticDirs: [`${staticAssetsFolder}`],
- }),
+ }
}

const mergeUserStorybookConfig = (baseConfig) => {
3 changes: 3 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ command = "yarn rw sb --build --no-open && yarn rw deploy netlify --no-prisma --
publish = "web/dist"
functions = "api/dist/functions"

[build.environment]
NODE_ENV = "development"

[dev]
# To use [Netlify Dev](https://www.netlify.com/products/dev/),
# install netlify-cli from https://docs.netlify.com/cli/get-started/#installation
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"@storybook/addon-a11y": "6.4.22",
"@storybook/builder-webpack5": "6.4.22",
"@storybook/manager-webpack5": "6.4.22",
"@storybook/react": "6.4.22"
"@storybook/react": "6.4.22",
"@redwoodjs/[email protected]": "patch:@redwoodjs/testing@npm:1.0.2#.yarn/patches/@redwoodjs-testing-npm-1.0.2-ee03e8a498.patch"
},
"packageManager": "[email protected]"
}
34 changes: 34 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4007,6 +4007,40 @@ __metadata:
languageName: node
linkType: hard

"@redwoodjs/testing@patch:@redwoodjs/testing@npm:1.0.2#.yarn/patches/@redwoodjs-testing-npm-1.0.2-ee03e8a498.patch::locator=root-workspace-0b6124%40workspace%3A.":
version: 1.0.2
resolution: "@redwoodjs/testing@patch:@redwoodjs/testing@npm%3A1.0.2#.yarn/patches/@redwoodjs-testing-npm-1.0.2-ee03e8a498.patch::version=1.0.2&hash=ae5c5e&locator=root-workspace-0b6124%40workspace%3A."
dependencies:
"@redwoodjs/auth": 1.0.2
"@redwoodjs/graphql-server": 1.0.2
"@redwoodjs/internal": 1.0.2
"@redwoodjs/router": 1.0.2
"@redwoodjs/web": 1.0.2
"@storybook/addon-a11y": 6.4.19
"@storybook/builder-webpack5": 6.4.19
"@storybook/manager-webpack5": 6.4.19
"@storybook/react": 6.4.19
"@testing-library/jest-dom": 5.16.2
"@testing-library/react": 12.1.4
"@testing-library/user-event": 13.5.0
"@types/aws-lambda": 8.10.93
"@types/babel-core": 6.25.7
"@types/jest": 27.4.1
"@types/node": 16.11.26
"@types/react": 17.0.44
"@types/react-dom": 17.0.15
"@types/webpack": 5.28.0
babel-jest: 27.5.1
babel-plugin-inline-react-svg: 2.0.1
jest: 27.5.1
jest-watch-typeahead: 1.0.0
msw: 0.39.2
ts-toolbelt: 9.6.0
whatwg-fetch: 3.6.2
checksum: c178e5becba5c81b448ffc7dc711dc1de44e44742f127195e25758dd3aa63339f3e2a4713a3ea756f3c866c7f83075aae5d6063c50f1081c529cfe083a4409ff
languageName: node
linkType: hard

"@redwoodjs/web@npm:1.0.2":
version: 1.0.2
resolution: "@redwoodjs/web@npm:1.0.2"
Expand Down