Limited Wasp version to ^16.0.0 && <=16.15.0 (#634)

* Limited Wasp node version to ^16.0.0 && <=16.15.0. In the process, I removed .nvmrc files from generated code and refactored SemanticVersion to follow npm spec. I also updated CI to use node 16.15.0, and not any 16. I also updated docs.
wasp-lang · Jun 17, 2022 · 62f0a76 · 62f0a76
1 parent fdd8e47
commit 62f0a76
Show file tree

Hide file tree

Showing 39 changed files with 308 additions and 226 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -90,7 +90,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15.0'
 
       - name: Run tests
         run: cabal test

diff --git a/waspc/data/Generator/templates/react-app/nvmrc b/waspc/data/Generator/templates/react-app/nvmrc
diff --git a/waspc/data/Generator/templates/react-app/package.json b/waspc/data/Generator/templates/react-app/package.json
@@ -14,9 +14,10 @@
   "eslintConfig": {
     "extends": "react-app"
   },
+  "engineStrict": true,
   "engines": {
-      "node": "{= nodeVersionBounds =}",
-      "npm": "{= npmVersionBounds =}"
+      "node": "{=& nodeVersionRange =}",
+      "npm": "{=& npmVersionRange =}"
   },
   "browserslist": {
     "production": [

diff --git a/waspc/data/Generator/templates/server/nvmrc b/waspc/data/Generator/templates/server/nvmrc
diff --git a/waspc/data/Generator/templates/server/package.json b/waspc/data/Generator/templates/server/package.json
@@ -15,9 +15,10 @@
   "nodemonConfig": {
     "delay": "1000"
   },
+  "engineStrict": true,
   "engines": {
-    "node": "{= nodeVersionBounds =}",
-    "npm": "{= npmVersionBounds =}"
+    "node": "{=& nodeVersionRange =}",
+    "npm": "{=& npmVersionRange =}"
   },
   {=& depsChunk =},
   {=& devDepsChunk =}

diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/files.manifest b/waspc/e2e-test/test-outputs/waspBuild-golden/files.manifest
@@ -4,7 +4,6 @@ waspBuild/.wasp/build/Dockerfile
 waspBuild/.wasp/build/db/schema.prisma
 waspBuild/.wasp/build/installedFullStackNpmDependencies.json
 waspBuild/.wasp/build/server/.npmrc
-waspBuild/.wasp/build/server/.nvmrc
 waspBuild/.wasp/build/server/README.md
 waspBuild/.wasp/build/server/package.json
 waspBuild/.wasp/build/server/src/app.js
@@ -26,7 +25,6 @@ waspBuild/.wasp/build/server/src/routes/operations/index.js
 waspBuild/.wasp/build/server/src/server.js
 waspBuild/.wasp/build/server/src/utils.js
 waspBuild/.wasp/build/web-app/.npmrc
-waspBuild/.wasp/build/web-app/.nvmrc
 waspBuild/.wasp/build/web-app/README.md
 waspBuild/.wasp/build/web-app/netlify.toml
 waspBuild/.wasp/build/web-app/package.json

diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums
@@ -34,13 +34,6 @@
         ],
         "8a74b1091affea3c71c2cf04acbaa38c4a51a261a9a98dcc9e96473d07a85a27"
     ],
-    [
-        [
-            "file",
-            "server/.nvmrc"
-        ],
-        "e6c21e8d260fe71882debdb339d2402a2ca7648529bc2303f48649bce0380017"
-    ],
     [
         [
             "file",
@@ -53,7 +46,7 @@
             "file",
             "server/package.json"
         ],
-        "54d8353286dae688a59458973227cfc1fae57549f49f318ddd46a1abdd716da2"
+        "66df15608f1f501f1eda942061e7b627a82a1033b0d73f8e7d00e430b6906df1"
     ],
     [
         [
@@ -195,13 +188,6 @@
         ],
         "7151cf397def0c2cb0ab65643701d27d335a72c90f775675b5f826bc7005818a"
     ],
-    [
-        [
-            "file",
-            "web-app/.nvmrc"
-        ],
-        "e6c21e8d260fe71882debdb339d2402a2ca7648529bc2303f48649bce0380017"
-    ],
     [
         [
             "file",
@@ -221,7 +207,7 @@
             "file",
             "web-app/package.json"
         ],
-        "1c8677831516081acee6696e3553d36b887332ccfeaad6c84fa758dcba88031e"
+        "3b3724d8f44d2a7652b6426f7e1e494031df868d23a29850afa260e67ff8da72"
     ],
     [
         [

diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/.nvmrc b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/.nvmrc
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/package.json b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/package.json
@@ -16,9 +16,10 @@
     "prisma": "3.9.1",
     "standard": "^14.3.4"
   },
+  "engineStrict": true,
   "engines": {
-    "node": "^16.0.0",
-    "npm": "^8.0.0"
+    "node": "^16.0.0 <=16.15.0",
+    "npm": "^8.0.0 <=8.5.5"
   },
   "name": "server",
   "nodemonConfig": {

diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/.nvmrc b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/.nvmrc
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/package.json b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/package.json
@@ -23,9 +23,10 @@
     "uuid": "^3.4.0"
   },
   "devDependencies": {},
+  "engineStrict": true,
   "engines": {
-    "node": "^16.0.0",
-    "npm": "^8.0.0"
+    "node": "^16.0.0 <=16.15.0",
+    "npm": "^8.0.0 <=8.5.5"
   },
   "eslintConfig": {
     "extends": "react-app"

diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/files.manifest b/waspc/e2e-test/test-outputs/waspCompile-golden/files.manifest
@@ -4,7 +4,6 @@ waspCompile/.wasp/out/Dockerfile
 waspCompile/.wasp/out/db/schema.prisma
 waspCompile/.wasp/out/installedFullStackNpmDependencies.json
 waspCompile/.wasp/out/server/.npmrc
-waspCompile/.wasp/out/server/.nvmrc
 waspCompile/.wasp/out/server/README.md
 waspCompile/.wasp/out/server/package.json
 waspCompile/.wasp/out/server/src/app.js
@@ -26,7 +25,6 @@ waspCompile/.wasp/out/server/src/routes/operations/index.js
 waspCompile/.wasp/out/server/src/server.js
 waspCompile/.wasp/out/server/src/utils.js
 waspCompile/.wasp/out/web-app/.npmrc
-waspCompile/.wasp/out/web-app/.nvmrc
 waspCompile/.wasp/out/web-app/README.md
 waspCompile/.wasp/out/web-app/netlify.toml
 waspCompile/.wasp/out/web-app/package.json

diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums
@@ -34,13 +34,6 @@
         ],
         "8a74b1091affea3c71c2cf04acbaa38c4a51a261a9a98dcc9e96473d07a85a27"
     ],
-    [
-        [
-            "file",
-            "server/.nvmrc"
-        ],
-        "e6c21e8d260fe71882debdb339d2402a2ca7648529bc2303f48649bce0380017"
-    ],
     [
         [
             "file",
@@ -53,7 +46,7 @@
             "file",
             "server/package.json"
         ],
-        "54d8353286dae688a59458973227cfc1fae57549f49f318ddd46a1abdd716da2"
+        "66df15608f1f501f1eda942061e7b627a82a1033b0d73f8e7d00e430b6906df1"
     ],
     [
         [
@@ -195,13 +188,6 @@
         ],
         "7151cf397def0c2cb0ab65643701d27d335a72c90f775675b5f826bc7005818a"
     ],
-    [
-        [
-            "file",
-            "web-app/.nvmrc"
-        ],
-        "e6c21e8d260fe71882debdb339d2402a2ca7648529bc2303f48649bce0380017"
-    ],
     [
         [
             "file",
@@ -221,7 +207,7 @@
             "file",
             "web-app/package.json"
         ],
-        "386f6add035afddc94aacd930bd52a1b184cb41063ece66c5a83aba3ef1246d9"
+        "8351f0d9a0eb46ffc9b222567e1bcf89b68f59cec062caaaac0a71ff6f001b26"
     ],
     [
         [

diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/.nvmrc b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/.nvmrc
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/package.json b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/package.json
@@ -16,9 +16,10 @@
     "prisma": "3.9.1",
     "standard": "^14.3.4"
   },
+  "engineStrict": true,
   "engines": {
-    "node": "^16.0.0",
-    "npm": "^8.0.0"
+    "node": "^16.0.0 <=16.15.0",
+    "npm": "^8.0.0 <=8.5.5"
   },
   "name": "server",
   "nodemonConfig": {

diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/.nvmrc b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/.nvmrc
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/package.json b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/package.json
@@ -23,9 +23,10 @@
     "uuid": "^3.4.0"
   },
   "devDependencies": {},
+  "engineStrict": true,
   "engines": {
-    "node": "^16.0.0",
-    "npm": "^8.0.0"
+    "node": "^16.0.0 <=16.15.0",
+    "npm": "^8.0.0 <=8.5.5"
   },
   "eslintConfig": {
     "extends": "react-app"

diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/files.manifest b/waspc/e2e-test/test-outputs/waspJob-golden/files.manifest
@@ -4,7 +4,6 @@ waspJob/.wasp/out/Dockerfile
 waspJob/.wasp/out/db/schema.prisma
 waspJob/.wasp/out/installedFullStackNpmDependencies.json
 waspJob/.wasp/out/server/.npmrc
-waspJob/.wasp/out/server/.nvmrc
 waspJob/.wasp/out/server/README.md
 waspJob/.wasp/out/server/package.json
 waspJob/.wasp/out/server/src/app.js
@@ -28,7 +27,6 @@ waspJob/.wasp/out/server/src/routes/operations/index.js
 waspJob/.wasp/out/server/src/server.js
 waspJob/.wasp/out/server/src/utils.js
 waspJob/.wasp/out/web-app/.npmrc
-waspJob/.wasp/out/web-app/.nvmrc
 waspJob/.wasp/out/web-app/README.md
 waspJob/.wasp/out/web-app/netlify.toml
 waspJob/.wasp/out/web-app/package.json

diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums
@@ -34,13 +34,6 @@
         ],
         "8a74b1091affea3c71c2cf04acbaa38c4a51a261a9a98dcc9e96473d07a85a27"
     ],
-    [
-        [
-            "file",
-            "server/.nvmrc"
-        ],
-        "e6c21e8d260fe71882debdb339d2402a2ca7648529bc2303f48649bce0380017"
-    ],
     [
         [
             "file",
@@ -53,7 +46,7 @@
             "file",
             "server/package.json"
         ],
-        "ed4cedc6f1595457dbcf57380909f11e789d5b86af900009dbc1cfe6afa2bb04"
+        "af2ab353120775cc7d4e9ff61c853994c4e02e761e942fae06b70cee58651020"
     ],
     [
         [
@@ -209,13 +202,6 @@
         ],
         "7151cf397def0c2cb0ab65643701d27d335a72c90f775675b5f826bc7005818a"
     ],
-    [
-        [
-            "file",
-            "web-app/.nvmrc"
-        ],
-        "e6c21e8d260fe71882debdb339d2402a2ca7648529bc2303f48649bce0380017"
-    ],
     [
         [
             "file",
@@ -235,7 +221,7 @@
             "file",
             "web-app/package.json"
         ],
-        "67e7b3c15c7f0316d4988c50e0d03d3103759b369662ceca6cdc6217fe2b5632"
+        "b6e6aef85445808b54fa8cd9b5ac7b85105eeb2d55dc002fe20f374f06212c66"
     ],
     [
         [

diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/.nvmrc b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/.nvmrc
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/package.json b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/package.json
@@ -17,9 +17,10 @@
     "prisma": "3.9.1",
     "standard": "^14.3.4"
   },
+  "engineStrict": true,
   "engines": {
-    "node": "^16.0.0",
-    "npm": "^8.0.0"
+    "node": "^16.0.0 <=16.15.0",
+    "npm": "^8.0.0 <=8.5.5"
   },
   "name": "server",
   "nodemonConfig": {

diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/.nvmrc b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/.nvmrc
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/package.json b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/package.json
@@ -23,9 +23,10 @@
     "uuid": "^3.4.0"
   },
   "devDependencies": {},
+  "engineStrict": true,
   "engines": {
-    "node": "^16.0.0",
-    "npm": "^8.0.0"
+    "node": "^16.0.0 <=16.15.0",
+    "npm": "^8.0.0 <=8.5.5"
   },
   "eslintConfig": {
     "extends": "react-app"

diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/files.manifest b/waspc/e2e-test/test-outputs/waspMigrate-golden/files.manifest
@@ -9,7 +9,6 @@ waspMigrate/.wasp/out/db/schema.prisma.wasp-generate-checksum
 waspMigrate/.wasp/out/db/schema.prisma.wasp-migrate-checksum
 waspMigrate/.wasp/out/installedFullStackNpmDependencies.json
 waspMigrate/.wasp/out/server/.npmrc
-waspMigrate/.wasp/out/server/.nvmrc
 waspMigrate/.wasp/out/server/README.md
 waspMigrate/.wasp/out/server/package.json
 waspMigrate/.wasp/out/server/src/app.js
@@ -31,7 +30,6 @@ waspMigrate/.wasp/out/server/src/routes/operations/index.js
 waspMigrate/.wasp/out/server/src/server.js
 waspMigrate/.wasp/out/server/src/utils.js
 waspMigrate/.wasp/out/web-app/.npmrc
-waspMigrate/.wasp/out/web-app/.nvmrc
 waspMigrate/.wasp/out/web-app/README.md
 waspMigrate/.wasp/out/web-app/netlify.toml
 waspMigrate/.wasp/out/web-app/package.json

diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums
@@ -34,13 +34,6 @@
         ],
         "8a74b1091affea3c71c2cf04acbaa38c4a51a261a9a98dcc9e96473d07a85a27"
     ],
-    [
-        [
-            "file",
-            "server/.nvmrc"
-        ],
-        "e6c21e8d260fe71882debdb339d2402a2ca7648529bc2303f48649bce0380017"
-    ],
     [
         [
             "file",
@@ -53,7 +46,7 @@
             "file",
             "server/package.json"
         ],
-        "8d4dae59b2eeae186ef18098d546e6850a3702b9c7c0c059fb20b3f6e1d8a113"
+        "d75927e049f63a022dc0740641115b5841a393031899b2b84d1d0c43ecf2388a"
     ],
     [
         [
@@ -195,13 +188,6 @@
         ],
         "7151cf397def0c2cb0ab65643701d27d335a72c90f775675b5f826bc7005818a"
     ],
-    [
-        [
-            "file",
-            "web-app/.nvmrc"
-        ],
-        "e6c21e8d260fe71882debdb339d2402a2ca7648529bc2303f48649bce0380017"
-    ],
     [
         [
             "file",
@@ -221,7 +207,7 @@
             "file",
             "web-app/package.json"
         ],
-        "b8135251bd0b41b4e0460a700d21d0433ef4690b8bda65f919967532f4fd43f4"
+        "581f025e9f75fdca5ec2b11b1f2b7981142ea8ebb9662e61b535276eba6ae149"
     ],
     [
         [

diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/.nvmrc b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/.nvmrc
diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/package.json b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/package.json
@@ -16,9 +16,10 @@
     "prisma": "3.9.1",
     "standard": "^14.3.4"
   },
+  "engineStrict": true,
   "engines": {
-    "node": "^16.0.0",
-    "npm": "^8.0.0"
+    "node": "^16.0.0 <=16.15.0",
+    "npm": "^8.0.0 <=8.5.5"
   },
   "name": "server",
   "nodemonConfig": {

diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/web-app/.nvmrc b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/web-app/.nvmrc