wasp-lang/wasp
1
1
Fork 0
mirror of https://github.com/wasp-lang/wasp.git synced 2024-11-30 18:23:19 +03:00
Code Issues Projects Releases Wiki Activity

Move react-error-overlay into dependencies (#626)

Browse Source 
* Move react-error-overlay to dependencies

* fix e2e

Co-authored-by: shayneczyzewski <shayne.czyzewski@gmail.com>
This commit is contained in:
Shayne Czyzewski 2022-06-07 12:35:52 -04:00 committed by GitHub
parent 1e73936704
commit 4d57213e18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums
View File

@ -221,7 +221,7 @@
"file", "file",
"web-app/package.json" "web-app/package.json"
], ],
"030c281274efa8584a183936f3962ba647eb5f90c4a97995c7570753bd37dfde" "1c8677831516081acee6696e3553d36b887332ccfeaad6c84fa758dcba88031e"
], ],
[ [
[ [

2
waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/installedFullStackNpmDependencies.json
View File

@ -1 +1 @@
{"npmDepsForServer":{"dependencies":[{"name":"cookie-parser","version":"~1.4.4"},{"name":"cors","version":"^2.8.5"},{"name":"debug","version":"~2.6.9"},{"name":"express","version":"~4.16.1"},{"name":"morgan","version":"~1.9.1"},{"name":"@prisma/client","version":"3.9.1"},{"name":"jsonwebtoken","version":"^8.5.1"},{"name":"secure-password","version":"^4.0.0"},{"name":"dotenv","version":"8.2.0"},{"name":"helmet","version":"^4.6.0"}],"devDependencies":[{"name":"nodemon","version":"^2.0.4"},{"name":"standard","version":"^14.3.4"},{"name":"prisma","version":"3.9.1"}]},"npmDepsForWebApp":{"dependencies":[{"name":"axios","version":"^0.21.1"},{"name":"lodash","version":"^4.17.15"},{"name":"react","version":"^16.12.0"},{"name":"react-dom","version":"^16.12.0"},{"name":"react-query","version":"^3.34.19"},{"name":"react-router-dom","version":"^5.1.2"},{"name":"react-scripts","version":"4.0.3"},{"name":"uuid","version":"^3.4.0"}],"devDependencies":[{"name":"react-error-overlay","version":"6.0.9"}]}} {"npmDepsForServer":{"dependencies":[{"name":"cookie-parser","version":"~1.4.4"},{"name":"cors","version":"^2.8.5"},{"name":"debug","version":"~2.6.9"},{"name":"express","version":"~4.16.1"},{"name":"morgan","version":"~1.9.1"},{"name":"@prisma/client","version":"3.9.1"},{"name":"jsonwebtoken","version":"^8.5.1"},{"name":"secure-password","version":"^4.0.0"},{"name":"dotenv","version":"8.2.0"},{"name":"helmet","version":"^4.6.0"}],"devDependencies":[{"name":"nodemon","version":"^2.0.4"},{"name":"standard","version":"^14.3.4"},{"name":"prisma","version":"3.9.1"}]},"npmDepsForWebApp":{"dependencies":[{"name":"axios","version":"^0.21.1"},{"name":"lodash","version":"^4.17.15"},{"name":"react","version":"^16.12.0"},{"name":"react-dom","version":"^16.12.0"},{"name":"react-query","version":"^3.34.19"},{"name":"react-router-dom","version":"^5.1.2"},{"name":"react-scripts","version":"4.0.3"},{"name":"uuid","version":"^3.4.0"},{"name":"react-error-overlay","version":"6.0.9"}],"devDependencies":[]}}

5
waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/package.json
View File

@ -16,14 +16,13 @@
"lodash": "^4.17.15", "lodash": "^4.17.15",
"react": "^16.12.0", "react": "^16.12.0",
"react-dom": "^16.12.0", "react-dom": "^16.12.0",
"react-error-overlay": "6.0.9",
"react-query": "^3.34.19", "react-query": "^3.34.19",
"react-router-dom": "^5.1.2", "react-router-dom": "^5.1.2",
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
"uuid": "^3.4.0" "uuid": "^3.4.0"
}, },
"devDependencies": { "devDependencies": {},
"react-error-overlay": "6.0.9"
},
"engines": { "engines": {
"node": "^16.0.0", "node": "^16.0.0",
"npm": "^8.0.0" "npm": "^8.0.0"

2
waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums
View File

@ -221,7 +221,7 @@
"file", "file",
"web-app/package.json" "web-app/package.json"
], ],
"15d10baf06d0f313d6575e3bde2d853b67a63d9257b57588e6b0d465140a9d10" "386f6add035afddc94aacd930bd52a1b184cb41063ece66c5a83aba3ef1246d9"
], ],
[ [
[ [

2
waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/installedFullStackNpmDependencies.json
View File

@ -1 +1 @@
{"npmDepsForServer":{"dependencies":[{"name":"cookie-parser","version":"~1.4.4"},{"name":"cors","version":"^2.8.5"},{"name":"debug","version":"~2.6.9"},{"name":"express","version":"~4.16.1"},{"name":"morgan","version":"~1.9.1"},{"name":"@prisma/client","version":"3.9.1"},{"name":"jsonwebtoken","version":"^8.5.1"},{"name":"secure-password","version":"^4.0.0"},{"name":"dotenv","version":"8.2.0"},{"name":"helmet","version":"^4.6.0"}],"devDependencies":[{"name":"nodemon","version":"^2.0.4"},{"name":"standard","version":"^14.3.4"},{"name":"prisma","version":"3.9.1"}]},"npmDepsForWebApp":{"dependencies":[{"name":"axios","version":"^0.21.1"},{"name":"lodash","version":"^4.17.15"},{"name":"react","version":"^16.12.0"},{"name":"react-dom","version":"^16.12.0"},{"name":"react-query","version":"^3.34.19"},{"name":"react-router-dom","version":"^5.1.2"},{"name":"react-scripts","version":"4.0.3"},{"name":"uuid","version":"^3.4.0"}],"devDependencies":[{"name":"react-error-overlay","version":"6.0.9"}]}} {"npmDepsForServer":{"dependencies":[{"name":"cookie-parser","version":"~1.4.4"},{"name":"cors","version":"^2.8.5"},{"name":"debug","version":"~2.6.9"},{"name":"express","version":"~4.16.1"},{"name":"morgan","version":"~1.9.1"},{"name":"@prisma/client","version":"3.9.1"},{"name":"jsonwebtoken","version":"^8.5.1"},{"name":"secure-password","version":"^4.0.0"},{"name":"dotenv","version":"8.2.0"},{"name":"helmet","version":"^4.6.0"}],"devDependencies":[{"name":"nodemon","version":"^2.0.4"},{"name":"standard","version":"^14.3.4"},{"name":"prisma","version":"3.9.1"}]},"npmDepsForWebApp":{"dependencies":[{"name":"axios","version":"^0.21.1"},{"name":"lodash","version":"^4.17.15"},{"name":"react","version":"^16.12.0"},{"name":"react-dom","version":"^16.12.0"},{"name":"react-query","version":"^3.34.19"},{"name":"react-router-dom","version":"^5.1.2"},{"name":"react-scripts","version":"4.0.3"},{"name":"uuid","version":"^3.4.0"},{"name":"react-error-overlay","version":"6.0.9"}],"devDependencies":[]}}

5
waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/package.json
View File

@ -16,14 +16,13 @@
"lodash": "^4.17.15", "lodash": "^4.17.15",
"react": "^16.12.0", "react": "^16.12.0",
"react-dom": "^16.12.0", "react-dom": "^16.12.0",
"react-error-overlay": "6.0.9",
"react-query": "^3.34.19", "react-query": "^3.34.19",
"react-router-dom": "^5.1.2", "react-router-dom": "^5.1.2",
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
"uuid": "^3.4.0" "uuid": "^3.4.0"
}, },
"devDependencies": { "devDependencies": {},
"react-error-overlay": "6.0.9"
},
"engines": { "engines": {
"node": "^16.0.0", "node": "^16.0.0",
"npm": "^8.0.0" "npm": "^8.0.0"

2
waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums
View File

@ -235,7 +235,7 @@
"file", "file",
"web-app/package.json" "web-app/package.json"
], ],
"12aeea45e6637a9b0a3e77dcf7b6a8998a84809c792dbd740e9b0ec4ce4ac9c8" "67e7b3c15c7f0316d4988c50e0d03d3103759b369662ceca6cdc6217fe2b5632"
], ],
[ [
[ [

2
waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/installedFullStackNpmDependencies.json
View File

@ -1 +1 @@
{"npmDepsForServer":{"dependencies":[{"name":"cookie-parser","version":"~1.4.4"},{"name":"cors","version":"^2.8.5"},{"name":"debug","version":"~2.6.9"},{"name":"express","version":"~4.16.1"},{"name":"morgan","version":"~1.9.1"},{"name":"@prisma/client","version":"3.9.1"},{"name":"jsonwebtoken","version":"^8.5.1"},{"name":"secure-password","version":"^4.0.0"},{"name":"dotenv","version":"8.2.0"},{"name":"helmet","version":"^4.6.0"},{"name":"pg-boss","version":"^7.2.1"}],"devDependencies":[{"name":"nodemon","version":"^2.0.4"},{"name":"standard","version":"^14.3.4"},{"name":"prisma","version":"3.9.1"}]},"npmDepsForWebApp":{"dependencies":[{"name":"axios","version":"^0.21.1"},{"name":"lodash","version":"^4.17.15"},{"name":"react","version":"^16.12.0"},{"name":"react-dom","version":"^16.12.0"},{"name":"react-query","version":"^3.34.19"},{"name":"react-router-dom","version":"^5.1.2"},{"name":"react-scripts","version":"4.0.3"},{"name":"uuid","version":"^3.4.0"}],"devDependencies":[{"name":"react-error-overlay","version":"6.0.9"}]}} {"npmDepsForServer":{"dependencies":[{"name":"cookie-parser","version":"~1.4.4"},{"name":"cors","version":"^2.8.5"},{"name":"debug","version":"~2.6.9"},{"name":"express","version":"~4.16.1"},{"name":"morgan","version":"~1.9.1"},{"name":"@prisma/client","version":"3.9.1"},{"name":"jsonwebtoken","version":"^8.5.1"},{"name":"secure-password","version":"^4.0.0"},{"name":"dotenv","version":"8.2.0"},{"name":"helmet","version":"^4.6.0"},{"name":"pg-boss","version":"^7.2.1"}],"devDependencies":[{"name":"nodemon","version":"^2.0.4"},{"name":"standard","version":"^14.3.4"},{"name":"prisma","version":"3.9.1"}]},"npmDepsForWebApp":{"dependencies":[{"name":"axios","version":"^0.21.1"},{"name":"lodash","version":"^4.17.15"},{"name":"react","version":"^16.12.0"},{"name":"react-dom","version":"^16.12.0"},{"name":"react-query","version":"^3.34.19"},{"name":"react-router-dom","version":"^5.1.2"},{"name":"react-scripts","version":"4.0.3"},{"name":"uuid","version":"^3.4.0"},{"name":"react-error-overlay","version":"6.0.9"}],"devDependencies":[]}}

5
waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/package.json
View File

@ -16,14 +16,13 @@
"lodash": "^4.17.15", "lodash": "^4.17.15",
"react": "^16.12.0", "react": "^16.12.0",
"react-dom": "^16.12.0", "react-dom": "^16.12.0",
"react-error-overlay": "6.0.9",
"react-query": "^3.34.19", "react-query": "^3.34.19",
"react-router-dom": "^5.1.2", "react-router-dom": "^5.1.2",
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
"uuid": "^3.4.0" "uuid": "^3.4.0"
}, },
"devDependencies": { "devDependencies": {},
"react-error-overlay": "6.0.9"
},
"engines": { "engines": {
"node": "^16.0.0", "node": "^16.0.0",
"npm": "^8.0.0" "npm": "^8.0.0"

2
waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums
View File

@ -221,7 +221,7 @@
"file", "file",
"web-app/package.json" "web-app/package.json"
], ],
"e434b47fa7c1250d14dee16ab572394c59243046f132d6b60a72984a3f467a85" "b8135251bd0b41b4e0460a700d21d0433ef4690b8bda65f919967532f4fd43f4"
], ],
[ [
[ [

2
waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/installedFullStackNpmDependencies.json
View File

@ -1 +1 @@
{"npmDepsForServer":{"dependencies":[{"name":"cookie-parser","version":"~1.4.4"},{"name":"cors","version":"^2.8.5"},{"name":"debug","version":"~2.6.9"},{"name":"express","version":"~4.16.1"},{"name":"morgan","version":"~1.9.1"},{"name":"@prisma/client","version":"3.9.1"},{"name":"jsonwebtoken","version":"^8.5.1"},{"name":"secure-password","version":"^4.0.0"},{"name":"dotenv","version":"8.2.0"},{"name":"helmet","version":"^4.6.0"}],"devDependencies":[{"name":"nodemon","version":"^2.0.4"},{"name":"standard","version":"^14.3.4"},{"name":"prisma","version":"3.9.1"}]},"npmDepsForWebApp":{"dependencies":[{"name":"axios","version":"^0.21.1"},{"name":"lodash","version":"^4.17.15"},{"name":"react","version":"^16.12.0"},{"name":"react-dom","version":"^16.12.0"},{"name":"react-query","version":"^3.34.19"},{"name":"react-router-dom","version":"^5.1.2"},{"name":"react-scripts","version":"4.0.3"},{"name":"uuid","version":"^3.4.0"}],"devDependencies":[{"name":"react-error-overlay","version":"6.0.9"}]}} {"npmDepsForServer":{"dependencies":[{"name":"cookie-parser","version":"~1.4.4"},{"name":"cors","version":"^2.8.5"},{"name":"debug","version":"~2.6.9"},{"name":"express","version":"~4.16.1"},{"name":"morgan","version":"~1.9.1"},{"name":"@prisma/client","version":"3.9.1"},{"name":"jsonwebtoken","version":"^8.5.1"},{"name":"secure-password","version":"^4.0.0"},{"name":"dotenv","version":"8.2.0"},{"name":"helmet","version":"^4.6.0"}],"devDependencies":[{"name":"nodemon","version":"^2.0.4"},{"name":"standard","version":"^14.3.4"},{"name":"prisma","version":"3.9.1"}]},"npmDepsForWebApp":{"dependencies":[{"name":"axios","version":"^0.21.1"},{"name":"lodash","version":"^4.17.15"},{"name":"react","version":"^16.12.0"},{"name":"react-dom","version":"^16.12.0"},{"name":"react-query","version":"^3.34.19"},{"name":"react-router-dom","version":"^5.1.2"},{"name":"react-scripts","version":"4.0.3"},{"name":"uuid","version":"^3.4.0"},{"name":"react-error-overlay","version":"6.0.9"}],"devDependencies":[]}}

5
waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/web-app/package.json
View File

@ -16,14 +16,13 @@
"lodash": "^4.17.15", "lodash": "^4.17.15",
"react": "^16.12.0", "react": "^16.12.0",
"react-dom": "^16.12.0", "react-dom": "^16.12.0",
"react-error-overlay": "6.0.9",
"react-query": "^3.34.19", "react-query": "^3.34.19",
"react-router-dom": "^5.1.2", "react-router-dom": "^5.1.2",
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
"uuid": "^3.4.0" "uuid": "^3.4.0"
}, },
"devDependencies": { "devDependencies": {},
"react-error-overlay": "6.0.9"
},
"engines": { "engines": {
"node": "^16.0.0", "node": "^16.0.0",
"npm": "^8.0.0" "npm": "^8.0.0"

14
waspc/src/Wasp/Generator/WebAppGenerator.hs
View File

@ -101,14 +101,16 @@ npmDepsForWasp _spec =
("react-query", "^3.34.19"), ("react-query", "^3.34.19"),
("react-router-dom", "^5.1.2"), ("react-router-dom", "^5.1.2"),
("react-scripts", "4.0.3"), ("react-scripts", "4.0.3"),
("uuid", "^3.4.0") ("uuid", "^3.4.0"),
], -- NOTE: We need to specify this exact version of `react-error-overlay` for use with
N.waspDevDependencies =
AS.Dependency.fromList
[ -- NOTE: We need to specify this exact version of `react-error-overlay` for use with
-- `react-scripts` v4 due to this issue: https://github.com/facebook/create-react-app/issues/11773 -- `react-scripts` v4 due to this issue: https://github.com/facebook/create-react-app/issues/11773
("react-error-overlay", "6.0.9") ("react-error-overlay", "6.0.9")
] ],
-- NOTE: In order to follow Create React App conventions, do not place any dependencies under devDependencies.
-- See discussion here for more: https://github.com/wasp-lang/wasp/pull/621
N.waspDevDependencies =
AS.Dependency.fromList
[]
} }
genGitignore :: Generator FileDraft genGitignore :: Generator FileDraft