Merge branch 'main' into renovate/react-player-2.x

.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

__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"
   }
 }

__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",

__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"

constraints.pro

@@ -17,3 +17,16 @@ gen_enforced_dependency(WorkspaceCwd, DependencyIdent, DependencyRange2, Depende
 gen_enforced_dependency(WorkspaceCwd, DependencyIdent, TargetDependencyRange, DependencyType) :-
   workspace_has_dependency(WorkspaceCwd, DependencyIdent, CurrentDependencyRange, DependencyType),
   atom_concat('^', TargetDependencyRange, CurrentDependencyRange).
+
+% Enforce that all workspaces building with Babel depend on '@babel/runtime-corejs3' and 'core-js'.
+gen_enforced_dependency(WorkspaceCwd, DependencyIdent, DependencyRange, 'dependencies') :-
+  member(DependencyIdent, [
+    '@babel/runtime-corejs3',
+    'core-js'
+  ]),
+  % Exclude the root workspace
+  WorkspaceCwd \= '.',
+  % Only target workspaces with a build:js script
+  workspace_field(WorkspaceCwd, 'scripts.build:js', _),
+  % Get the range from the root workspace
+  workspace_has_dependency('.', DependencyIdent, DependencyRange, _).

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."
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.1",
+  "version": "1.3.2",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

package.json

@@ -37,7 +37,7 @@
     "vscode-languageserver": "6.1.1",
     "vscode-languageserver-protocol": "3.15.3",
     "vscode-languageserver-textdocument": "1.0.4",
-    "vscode-languageserver-types": "3.16.0"
+    "vscode-languageserver-types": "3.17.0"
   },
   "devDependencies": {
     "@actions/core": "1.8.0",
@@ -71,10 +71,10 @@
     "babel-plugin-auto-import": "1.1.0",
     "babel-plugin-remove-code": "0.0.6",
     "boxen": "5.1.2",
-    "core-js": "3.22.4",
-    "cypress": "9.6.0",
+    "core-js": "3.22.5",
+    "cypress": "9.6.1",
     "cypress-wait-until": "1.7.2",
-    "eslint": "8.14.0",
+    "eslint": "8.15.0",
     "fast-glob": "3.2.11",
     "fs-extra": "10.1.0",
     "is-port-reachable": "3.1.0",

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",
@@ -28,12 +28,14 @@
   },
   "dependencies": {
     "@babel/plugin-transform-runtime": "7.16.7",
+    "@babel/runtime-corejs3": "7.16.7",
     "@fastify/http-proxy": "7.1.0",
     "@fastify/static": "5.0.2",
     "@fastify/url-data": "4.0.0",
     "ansi-colors": "4.1.1",
     "chalk": "4.1.2",
     "chokidar": "3.5.3",
+    "core-js": "3.22.5",
     "fast-json-parse": "1.0.3",
     "fastify": "3.29.0",
     "fastify-raw-body": "3.2.0",
@@ -47,7 +49,7 @@
   "devDependencies": {
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
-    "@types/aws-lambda": "8.10.95",
+    "@types/aws-lambda": "8.10.97",
     "@types/lodash.escape": "4.0.7",
     "@types/qs": "6.9.7",
     "@types/split2": "3.2.1",

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",
@@ -32,6 +32,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.16.7",
     "@prisma/client": "3.13.0",
+    "core-js": "3.22.5",
     "cross-undici-fetch": "0.1.27",
     "crypto-js": "4.1.1",
     "humanize-string": "2.1.0",
@@ -47,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.95",
+    "@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",

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",
@@ -21,27 +21,31 @@
     "test": "jest src",
     "test:watch": "yarn test --watch"
   },
+  "dependencies": {
+    "@babel/runtime-corejs3": "7.16.7",
+    "core-js": "3.22.5"
+  },
   "devDependencies": {
-    "@auth0/auth0-spa-js": "1.21.0",
+    "@auth0/auth0-spa-js": "1.21.1",
     "@azure/msal-browser": "2.24.0",
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
     "@clerk/clerk-js": "3.10.1",
     "@clerk/clerk-sdk-node": "3.4.0",
     "@clerk/types": "2.10.0",
-    "@nhost/hasura-auth-js": "1.1.2",
-    "@nhost/nhost-js": "1.1.9",
-    "@supabase/supabase-js": "1.35.2",
+    "@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",
     "magic-sdk": "8.1.1",
     "netlify-identity-widget": "1.9.2",
     "react": "17.0.2",
-    "supertokens-auth-react": "0.20.4",
+    "supertokens-auth-react": "0.20.5",
     "typescript": "4.6.4"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

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",
@@ -28,18 +28,19 @@
     "test:watch": "yarn test --watch"
   },
   "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",
     "concurrently": "7.1.0",
     "configstore": "3.1.5",
-    "core-js": "3.22.4",
+    "core-js": "3.22.5",
     "cross-env": "7.0.3",
     "decamelize": "5.0.0",
     "dotenv-defaults": "5.0.0",

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 })

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",
@@ -27,7 +27,7 @@
     "@babel/plugin-transform-typescript": "7.16.7",
     "@babel/runtime-corejs3": "7.16.7",
     "@vscode/ripgrep": "1.14.2",
-    "core-js": "3.22.4",
+    "core-js": "3.22.5",
     "cross-undici-fetch": "0.1.27",
     "deepmerge": "4.2.2",
     "execa": "5.1.1",

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",
@@ -47,27 +47,27 @@
     "@babel/preset-react": "7.16.7",
     "@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",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.6",
+    "@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",
     "babel-plugin-inline-react-svg": "2.0.1",
     "babel-plugin-module-resolver": "4.1.0",
     "babel-timing": "0.9.1",
     "copy-webpack-plugin": "10.2.4",
-    "core-js": "3.22.4",
+    "core-js": "3.22.5",
     "css-loader": "6.7.1",
     "css-minimizer-webpack-plugin": "3.4.1",
     "dotenv-webpack": "7.1.0",
     "esbuild": "0.14.38",
     "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",

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,10 +24,11 @@
     "@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.5",
     "execa": "5.1.1",
     "fs-extra": "10.1.0",
     "listr": "0.14.3",

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"
   }
 }

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",