Merge branch 'main' of github.com:redwoodjs/redwood into feat/ts-stri…

…ctmode-gen * 'main' of github.com:redwoodjs/redwood: Update yarn.lock fix(deps): update graphql-tools monorepo (redwoodjs#5487) v1.3.2 Update yarn.lock fix: Run dedupe during upgrade on yarn 3 (redwoodjs#5458) Fix/ts resolvers type (redwoodjs#5437) fix(deps): update dependency graphql to v16.5.0 (redwoodjs#5488) fixed typo of roll to role (redwoodjs#5484) fix(deps): update typescript-eslint monorepo to v5.23.0 (redwoodjs#5489) chore(deps): update dependency cypress to v9.6.1 (redwoodjs#5482) chore(deps): update dependency firebase to v9.8.1 (redwoodjs#5485) fix(deps): update dependency @types/aws-lambda to v8.10.97 (redwoodjs#5486) chore(deps): update dependency @nhost/nhost-js to v1.1.10 (redwoodjs#5479) chore(deps): update dependency @nhost/hasura-auth-js to v1.1.5 (redwoodjs#5478) Fixing type for BrowserOnly children (redwoodjs#5475) fix: Run dedupe during upgrade on yarn 3 (redwoodjs#5458) Fix/ts resolvers type (redwoodjs#5437)
dac09 · May 10, 2022 · 448ad56 · 448ad56
2 parents df5844a + 30794be
commit 448ad56
Show file tree

Hide file tree

Showing 33 changed files with 313 additions and 322 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -238,11 +238,6 @@ jobs:
           yarn rw test web --no-watch
         working-directory: ${{ steps.setup_test_project.outputs.test_project_path }}
 
-      - name: Run "rw type-check"
-        run: |
-          yarn rw type-check
-        working-directory: ${{ steps.setup_test_project.outputs.test_project_path }}
-
       - name: Run "rw check"
         run: |
           yarn rw check
@@ -291,6 +286,16 @@ jobs:
           yarn rw g page ciTest
         working-directory: ${{ steps.setup_test_project.outputs.test_project_path }}
 
+      - name: Run "g sdl"
+        run: |
+          yarn rw g sdl userExample
+        working-directory: ${{ steps.setup_test_project.outputs.test_project_path }}
+
+      - name: Run "rw type-check"
+        run: |
+          yarn rw type-check
+        working-directory: ${{ steps.setup_test_project.outputs.test_project_path }}
+
       - name: Throw Error | Run `rw g sdl <model>`
         run: |
           yarn rw g sdl DoesNotExist

diff --git a/__fixtures__/test-project/api/package.json b/__fixtures__/test-project/api/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "1.3.1",
-    "@redwoodjs/graphql-server": "1.3.1"
+    "@redwoodjs/api": "1.3.2",
+    "@redwoodjs/graphql-server": "1.3.2"
   }
 }
diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json
@@ -8,7 +8,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "1.3.1",
+    "@redwoodjs/core": "1.3.2",
     "autoprefixer": "^10.4.4",
     "postcss": "^8.4.12",
     "postcss-loader": "^6.2.1",

diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json
@@ -13,10 +13,10 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/auth": "1.3.1",
-    "@redwoodjs/forms": "1.3.1",
-    "@redwoodjs/router": "1.3.1",
-    "@redwoodjs/web": "1.3.1",
+    "@redwoodjs/auth": "1.3.2",
+    "@redwoodjs/forms": "1.3.2",
+    "@redwoodjs/router": "1.3.2",
+    "@redwoodjs/web": "1.3.2",
     "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-dom": "17.0.2"

diff --git a/docs/docs/tutorial/chapter7/rbac.md b/docs/docs/tutorial/chapter7/rbac.md
@@ -1244,7 +1244,7 @@ Having a role like "admin" implies that they can do everything...shouldn't they
 1. Add "admin" to the list of roles in the `hasRole()` checks in components, `@requireAuth` directive, and `requireAuth()` check in services
 2. Don't make any changes in the code, just give the user in the database additional roles—so admins will also have the "moderator" role in addition to "admin"
 
-By virtue of the name "admin" it really feels like someone should only have that one single roll and be able to do everything. So in this case it might feel better to add "admin" to `hasRole()` and `requireAuth()`.
+By virtue of the name "admin" it really feels like someone should only have that one single role and be able to do everything. So in this case it might feel better to add "admin" to `hasRole()` and `requireAuth()`.
 
 But, if you wanted to be more fine-grained with your roles then maybe the "admin" role should really be called "author". That way it makes it clear they only author posts, and if you want someone to be able to do both actions you can explicitly give them the "moderator" role in addition to "author."
 

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.1",
+  "version": "1.3.2",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "babel-plugin-remove-code": "0.0.6",
     "boxen": "5.1.2",
     "core-js": "3.22.4",
-    "cypress": "9.6.0",
+    "cypress": "9.6.1",
     "cypress-wait-until": "1.7.2",
     "eslint": "8.15.0",
     "fast-glob": "3.2.11",

diff --git a/packages/api-server/package.json b/packages/api-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/api-server",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Redwood's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
-    "@types/aws-lambda": "8.10.96",
+    "@types/aws-lambda": "8.10.97",
     "@types/lodash.escape": "4.0.7",
     "@types/qs": "6.9.7",
     "@types/split2": "3.2.1",

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/api",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -48,8 +48,8 @@
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
     "@clerk/clerk-sdk-node": "3.4.0",
-    "@redwoodjs/auth": "1.3.1",
-    "@types/aws-lambda": "8.10.96",
+    "@redwoodjs/auth": "1.3.2",
+    "@types/aws-lambda": "8.10.97",
     "@types/crypto-js": "4.1.1",
     "@types/jsonwebtoken": "8.5.8",
     "@types/md5": "2.3.2",

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -33,12 +33,12 @@
     "@clerk/clerk-js": "3.10.1",
     "@clerk/clerk-sdk-node": "3.4.0",
     "@clerk/types": "2.10.0",
-    "@nhost/hasura-auth-js": "1.1.4",
-    "@nhost/nhost-js": "1.1.9",
+    "@nhost/hasura-auth-js": "1.1.5",
+    "@nhost/nhost-js": "1.1.10",
     "@supabase/supabase-js": "1.35.3",
     "@types/netlify-identity-widget": "1.9.3",
     "@types/react": "17.0.45",
-    "firebase": "9.8.0",
+    "firebase": "9.8.1",
     "firebase-admin": "10.2.0",
     "gotrue-js": "0.9.29",
     "jest": "27.5.1",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/cli",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "The Redwood Command Line",
   "repository": {
     "type": "git",
@@ -30,11 +30,11 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.16.7",
     "@prisma/sdk": "3.13.0",
-    "@redwoodjs/api-server": "1.3.1",
-    "@redwoodjs/internal": "1.3.1",
-    "@redwoodjs/prerender": "1.3.1",
-    "@redwoodjs/structure": "1.3.1",
-    "@redwoodjs/telemetry": "1.3.1",
+    "@redwoodjs/api-server": "1.3.2",
+    "@redwoodjs/internal": "1.3.2",
+    "@redwoodjs/prerender": "1.3.2",
+    "@redwoodjs/structure": "1.3.2",
+    "@redwoodjs/telemetry": "1.3.2",
     "boxen": "5.1.2",
     "camelcase": "6.3.0",
     "chalk": "4.1.2",

diff --git a/packages/cli/src/commands/upgrade.js b/packages/cli/src/commands/upgrade.js
@@ -278,24 +278,29 @@ const dedupeDeps = async (task, { verbose }) => {
   try {
     const yarnVersion = await getCmdMajorVersion('yarn')
     const npxVersion = await getCmdMajorVersion('npx')
-    if (yarnVersion > 1) {
-      task.skip('Deduplication is only required for <=1.x')
-      return
-    }
     let npxArgs = []
     if (npxVersion > 6) {
       npxArgs = ['--yes']
     }
 
-    await execa('npx', [...npxArgs, 'yarn-deduplicate'], {
+    const baseExecaArgsForDedupe = {
       shell: true,
       stdio: verbose ? 'inherit' : 'pipe',
       cwd: getPaths().base,
-    })
+    }
+    if (yarnVersion > 1) {
+      await execa('yarn', ['dedupe'], baseExecaArgsForDedupe)
+    } else {
+      await execa(
+        'npx',
+        [...npxArgs, 'yarn-deduplicate'],
+        baseExecaArgsForDedupe
+      )
+    }
   } catch (e) {
     console.log(c.error(e.message))
     throw new Error(
-      'Could not finish deduplication. If the project is using yarn 1.x, please run `npx yarn-deduplicate`, before continuing'
+      'Could not finish de-duplication. For yarn 1.x, please run `npx yarn-deduplicate`, or for yarn 3 run `yarn dedupe` before continuing'
     )
   }
   await yarnInstall({ verbose })

diff --git a/packages/codemods/package.json b/packages/codemods/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/codemods",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Codemods to ease upgrading a RedwoodJS Project",
   "repository": {
     "type": "git",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/core",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Foundational packages and config required to build RedwoodJS.",
   "repository": {
     "type": "git",
@@ -48,10 +48,10 @@
     "@babel/preset-typescript": "7.16.7",
     "@babel/runtime-corejs3": "7.16.7",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
-    "@redwoodjs/cli": "1.3.1",
-    "@redwoodjs/eslint-config": "1.3.1",
-    "@redwoodjs/internal": "1.3.1",
-    "@redwoodjs/testing": "1.3.1",
+    "@redwoodjs/cli": "1.3.2",
+    "@redwoodjs/eslint-config": "1.3.2",
+    "@redwoodjs/internal": "1.3.2",
+    "@redwoodjs/testing": "1.3.2",
     "babel-loader": "8.2.3",
     "babel-plugin-auto-import": "1.1.0",
     "babel-plugin-graphql-tag": "3.3.0",
@@ -67,7 +67,7 @@
     "esbuild-loader": "2.18.0",
     "fast-glob": "3.2.11",
     "file-loader": "6.2.0",
-    "graphql": "16.4.0",
+    "graphql": "16.5.0",
     "graphql-tag": "2.12.6",
     "html-webpack-plugin": "5.5.0",
     "lodash.escaperegexp": "4.1.2",

diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-redwood-app",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -24,8 +24,8 @@
     "@babel/core": "7.16.7",
     "@babel/node": "7.16.7",
     "@babel/runtime-corejs3": "7.16.7",
-    "@redwoodjs/internal": "1.3.1",
-    "@redwoodjs/telemetry": "1.3.1",
+    "@redwoodjs/internal": "1.3.2",
+    "@redwoodjs/telemetry": "1.3.2",
     "chalk": "4.1.2",
     "check-node-version": "4.2.1",
     "core-js": "3.22.4",

diff --git a/packages/create-redwood-app/template/api/package.json b/packages/create-redwood-app/template/api/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "1.3.1",
-    "@redwoodjs/graphql-server": "1.3.1"
+    "@redwoodjs/api": "1.3.2",
+    "@redwoodjs/graphql-server": "1.3.2"
   }
 }
diff --git a/packages/create-redwood-app/template/package.json b/packages/create-redwood-app/template/package.json
@@ -8,7 +8,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "1.3.1"
+    "@redwoodjs/core": "1.3.2"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",

diff --git a/packages/create-redwood-app/template/web/package.json b/packages/create-redwood-app/template/web/package.json
@@ -13,9 +13,9 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/forms": "1.3.1",
-    "@redwoodjs/router": "1.3.1",
-    "@redwoodjs/web": "1.3.1",
+    "@redwoodjs/forms": "1.3.2",
+    "@redwoodjs/router": "1.3.2",
+    "@redwoodjs/web": "1.3.2",
     "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-dom": "17.0.2"

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/eslint-config",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -15,9 +15,9 @@
     "@babel/core": "7.16.7",
     "@babel/eslint-parser": "7.16.5",
     "@babel/eslint-plugin": "7.16.5",
-    "@redwoodjs/internal": "1.3.1",
-    "@typescript-eslint/eslint-plugin": "5.22.0",
-    "@typescript-eslint/parser": "5.22.0",
+    "@redwoodjs/internal": "1.3.2",
+    "@typescript-eslint/eslint-plugin": "5.23.0",
+    "@typescript-eslint/parser": "5.23.0",
     "eslint": "8.15.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-import-resolver-babel-module": "5.3.1",

diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/forms",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -37,15 +37,15 @@
     "@types/react": "17.0.45",
     "@types/react-dom": "17.0.16",
     "@types/testing-library__jest-dom": "5.14.3",
-    "graphql": "16.4.0",
+    "graphql": "16.5.0",
     "jest": "27.5.1",
     "nodemon": "2.0.16",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "typescript": "4.6.4"
   },
   "peerDependencies": {
-    "graphql": "16.4.0",
+    "graphql": "16.5.0",
     "react": "17.0.2"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/graphql-server",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -28,15 +28,15 @@
     "@envelop/filter-operation-type": "3.3.1",
     "@envelop/parser-cache": "4.3.1",
     "@envelop/validation-cache": "4.3.1",
-    "@graphql-tools/merge": "8.2.10",
-    "@graphql-tools/schema": "8.3.10",
-    "@graphql-tools/utils": "8.6.9",
+    "@graphql-tools/merge": "8.2.11",
+    "@graphql-tools/schema": "8.3.11",
+    "@graphql-tools/utils": "8.6.10",
     "@graphql-yoga/common": "2.5.0",
     "@prisma/client": "3.13.0",
-    "@redwoodjs/api": "1.3.1",
+    "@redwoodjs/api": "1.3.2",
     "core-js": "3.22.4",
     "cross-undici-fetch": "0.1.27",
-    "graphql": "16.4.0",
+    "graphql": "16.5.0",
     "graphql-scalars": "1.17.0",
     "graphql-tag": "2.12.6",
     "lodash.merge": "4.6.2",
@@ -48,7 +48,7 @@
     "@babel/core": "7.16.7",
     "@envelop/testing": "4.3.1",
     "@envelop/types": "2.0.0",
-    "@redwoodjs/auth": "1.3.1",
+    "@redwoodjs/auth": "1.3.2",
     "@types/lodash.merge": "4.6.7",
     "@types/lodash.omitby": "4.6.7",
     "@types/uuid": "8.3.4",