Merge branch 'main' into patch-1

redwoodjs · Jun 10, 2022 · 5ce24df · 5ce24df
2 parents 71fa45d + ebd0ffe
commit 5ce24df
Show file tree

Hide file tree

Showing 27 changed files with 333 additions and 322 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -31,39 +31,6 @@ module.exports = {
   ],
   rules: {
     '@typescript-eslint/no-explicit-any': 'off',
-    'import/order': [
-      'error',
-      {
-        'newlines-between': 'always',
-        pathGroupsExcludedImportTypes: ['react'],
-        pathGroups: [
-          {
-            pattern: 'react',
-            group: 'builtin',
-            position: 'after',
-          },
-          {
-            pattern: '@redwoodjs/**',
-            group: 'external',
-            position: 'after',
-          },
-          {
-            pattern: 'src/lib/test',
-            group: 'parent',
-            position: 'before',
-          },
-          {
-            pattern: 'src/**',
-            group: 'parent',
-            position: 'before',
-          },
-        ],
-        alphabetize: {
-          order: 'asc',
-          caseInsensitive: true,
-        },
-      },
-    ],
     curly: 'error',
   },
   overrides: [

diff --git a/docs/docs/project-configuration-dev-test-build.mdx b/docs/docs/project-configuration-dev-test-build.mdx
@@ -162,6 +162,6 @@ You can also pass a flag when you launch your dev servers, for example:
 ```bash
 yarn rw dev --debugPort 75028
 ```
-The flag passed in the CLI will always take precendence over your setting in the redwood.toml
+The flag passed in the CLI will always take precedence over your setting in the `redwood.toml`
 
 Just remember to also change the port you are attaching to in your `./vscode/launch.json`
diff --git a/docs/docs/tutorial/chapter3/saving-data.md b/docs/docs/tutorial/chapter3/saving-data.md
@@ -173,7 +173,7 @@ You'd only get a single `contacts` type to return them all.
 
 :::
 
-We'll only need `createContact` for our contact page. It accepts a single variable, `input`, that is an object that conforms to what we expect for a `CreateContactInput`, namely `{ name, email, message }`. This mutation should be able to be accessed by anyone, so we'll need want to change `@requireAuth` to `@skipAuth`. This one says that authentication is *not* required and will allow anyone to anonymously send us a message. Note that having at least one schema directive is required for each `Query` and `Mutation` or you'll get an error: Redwood embraces the idea of "secure by default" meaning that we try and keep your application safe, even if you do nothing special to prevent access. In this case it's much safer to throw an error than to accidentally expose all of your users' data to the internet!
+We'll only need `createContact` for our contact page. It accepts a single variable, `input`, that is an object that conforms to what we expect for a `CreateContactInput`, namely `{ name, email, message }`. This mutation should be able to be accessed by anyone, so we'll need to change `@requireAuth` to `@skipAuth`. This one says that authentication is *not* required and will allow anyone to anonymously send us a message. Note that having at least one schema directive is required for each `Query` and `Mutation` or you'll get an error: Redwood embraces the idea of "secure by default" meaning that we try and keep your application safe, even if you do nothing special to prevent access. In this case it's much safer to throw an error than to accidentally expose all of your users' data to the internet!
 
 :::info
 

diff --git a/docs/docs/tutorial/chapter4/authentication.md b/docs/docs/tutorial/chapter4/authentication.md
@@ -882,7 +882,7 @@ export const getCurrentUser = async (session) => {
 ```
 
 </TabItem>
-<TabItem value="ts" label="TyepScript">
+<TabItem value="ts" label="TypeScript">
 
 ```javascript title="api/src/lib/auth.js"
 export const getCurrentUser = async (session) => {

diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
@@ -115,6 +115,7 @@ const config = {
           sidebarPath: require.resolve('./sidebars.js'),
           // ? — blob? tree?
           editUrl: 'https://github.com/redwoodjs/redwood/blob/main/docs', // base path for repo edit pages
+          editCurrentVersion: true,
           remarkPlugins: [autoImportTabs, fileExtSwitcher],
           versions: {
             current: {

diff --git a/docs/package.json b/docs/package.json
@@ -36,6 +36,6 @@
   "devDependencies": {
     "@docusaurus/module-type-aliases": "2.0.0-beta.21",
     "@tsconfig/docusaurus": "1.0.5",
-    "typescript": "4.7.2"
+    "typescript": "4.7.3"
   }
 }
diff --git a/docs/yarn.lock b/docs/yarn.lock
@@ -4637,7 +4637,7 @@ __metadata:
     react: 17.0.2
     react-dom: 17.0.2
     react-player: 2.10.1
-    typescript: 4.7.2
+    typescript: 4.7.3
   languageName: unknown
   linkType: soft
 
@@ -10138,23 +10138,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:4.7.2":
-  version: 4.7.2
-  resolution: "typescript@npm:4.7.2"
+"typescript@npm:4.7.3":
+  version: 4.7.3
+  resolution: "typescript@npm:4.7.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: c458df58a52f1cb1c954109dbc3477abfeb632644bc6552a9ac2152bce86e377afe11bf661466926bc4dcdc945f1e053d492c347ae377f1cba7051226b930ea3
+  checksum: 4f2597ac203e792881e02db85cd01bcba0ff0edfdb467e16af5a35808d35c424fe4fbc99ce8cea3745b206e66dbbe67e9ca0a0b03117672d7d95cad7055bd2b6
   languageName: node
   linkType: hard
 
-"typescript@patch:[email protected].2#~builtin<compat/typescript>":
-  version: 4.7.2
-  resolution: "typescript@patch:typescript@npm%3A4.7.2#~builtin<compat/typescript>::version=4.7.2&hash=7ad353"
+"typescript@patch:[email protected].3#~builtin<compat/typescript>":
+  version: 4.7.3
+  resolution: "typescript@patch:typescript@npm%3A4.7.3#~builtin<compat/typescript>::version=4.7.3&hash=7ad353"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: f454730aef4a8cef2ad5650ce769f38ed4460583fe5867d4f93592282afdbd9b5142b75d448b647e4984edf23575ac1f2adafb2db8614f253f700721d3eb439a
+  checksum: fd3972aed0089d64c03235f4352a232eb62e5810e7b37e28ff804d1dbb728cda4c81b7e2d1e9b0e72d9fc8a7ccb1c211e044078b6b3774d4a18a6fcb9f16f86f
   languageName: node
   linkType: hard
 

diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "typescript": "4.7.2",
+    "typescript": "4.7.3",
     "vscode-languageserver": "6.1.1",
     "vscode-languageserver-protocol": "3.15.3",
     "vscode-languageserver-textdocument": "1.0.5",
@@ -89,12 +89,12 @@
     "node-notifier": "10.0.1",
     "nodemon": "2.0.16",
     "npm-packlist": "5.1.0",
-    "octokit": "1.7.1",
+    "octokit": "1.7.2",
     "ora": "5.4.1",
     "prompts": "2.4.2",
     "rimraf": "3.0.2",
     "terminal-link": "2.1.1",
-    "typescript": "4.7.2",
+    "typescript": "4.7.3",
     "typescript-transform-paths": "3.3.1",
     "zx": "6.1.0"
   },

diff --git a/packages/api-server/package.json b/packages/api-server/package.json
@@ -56,7 +56,7 @@
     "@types/yargs": "17.0.10",
     "aws-lambda": "1.0.7",
     "jest": "27.5.1",
-    "typescript": "4.7.2"
+    "typescript": "4.7.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.16.7",
-    "@prisma/client": "3.14.0",
+    "@prisma/client": "3.15.1",
     "core-js": "3.22.8",
     "cross-undici-fetch": "0.1.27",
     "crypto-js": "4.1.1",
@@ -47,7 +47,7 @@
   "devDependencies": {
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
-    "@clerk/clerk-sdk-node": "3.6.0",
+    "@clerk/clerk-sdk-node": "3.6.1",
     "@redwoodjs/auth": "1.5.1",
     "@types/aws-lambda": "8.10.97",
     "@types/crypto-js": "4.1.1",
@@ -59,10 +59,10 @@
     "aws-lambda": "1.0.7",
     "jest": "27.5.1",
     "split2": "4.1.0",
-    "typescript": "4.7.2"
+    "typescript": "4.7.3"
   },
   "peerDependencies": {
-    "@clerk/clerk-sdk-node": "3.6.0",
+    "@clerk/clerk-sdk-node": "3.6.1",
     "@magic-sdk/admin": "1.4.1",
     "firebase-admin": "10.2.0"
   },

diff --git a/packages/api/src/auth/decoders/auth0.ts b/packages/api/src/auth/decoders/auth0.ts
@@ -41,7 +41,7 @@ export const verifyAuth0Token = (
       bearerToken,
       (header, callback) => {
         client.getSigningKey(header.kid as string, (error, key) => {
-          callback(error, key.getPublicKey())
+          callback(error, key?.getPublicKey())
         })
       },
       {

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -31,9 +31,9 @@
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
     "@clerk/clerk-js": "3.12.0",
-    "@clerk/clerk-sdk-node": "3.6.0",
+    "@clerk/clerk-sdk-node": "3.6.1",
     "@clerk/types": "2.14.0",
-    "@nhost/hasura-auth-js": "1.1.12",
+    "@nhost/hasura-auth-js": "1.1.14",
     "@nhost/nhost-js": "1.1.14",
     "@supabase/supabase-js": "1.35.3",
     "@types/netlify-identity-widget": "1.9.3",
@@ -46,7 +46,7 @@
     "netlify-identity-widget": "1.9.2",
     "react": "17.0.2",
     "supertokens-auth-react": "0.21.3",
-    "typescript": "4.7.2"
+    "typescript": "4.7.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.16.7",
-    "@prisma/sdk": "3.14.0",
+    "@prisma/sdk": "3.15.1",
     "@redwoodjs/api-server": "1.5.1",
     "@redwoodjs/internal": "1.5.1",
     "@redwoodjs/prerender": "1.5.1",
@@ -57,7 +57,7 @@
     "pascalcase": "1.0.0",
     "pluralize": "8.0.0",
     "prettier": "2.6.2",
-    "prisma": "3.14.0",
+    "prisma": "3.15.1",
     "prompts": "2.4.2",
     "rimraf": "3.0.2",
     "secure-random-password": "0.2.3",
@@ -70,7 +70,7 @@
     "@babel/core": "7.16.7",
     "@types/listr": "0.14.4",
     "jest": "27.5.1",
-    "typescript": "4.7.2"
+    "typescript": "4.7.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -63,7 +63,7 @@
     "css-loader": "6.7.1",
     "css-minimizer-webpack-plugin": "4.0.0",
     "dotenv-webpack": "7.1.0",
-    "esbuild": "0.14.42",
+    "esbuild": "0.14.43",
     "esbuild-loader": "2.19.0",
     "fast-glob": "3.2.11",
     "file-loader": "6.2.0",
@@ -78,7 +78,7 @@
     "rimraf": "3.0.2",
     "style-loader": "3.3.1",
     "svg-react-loader": "0.4.6",
-    "typescript": "4.7.2",
+    "typescript": "4.7.3",
     "url-loader": "4.1.1",
     "webpack": "5.72.1",
     "webpack-bundle-analyzer": "4.5.0",

diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json
@@ -37,7 +37,7 @@
   "devDependencies": {
     "@babel/cli": "7.16.7",
     "jest": "27.5.1",
-    "typescript": "4.7.2"
+    "typescript": "4.7.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -33,7 +33,7 @@
   "devDependencies": {
     "@babel/cli": "7.16.7",
     "jest": "27.5.1",
-    "typescript": "4.7.2"
+    "typescript": "4.7.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/eslint-config/shared.js b/packages/eslint-config/shared.js
@@ -64,6 +64,39 @@ module.exports = {
     ],
     'react/display-name': 'off',
     'react-hooks/exhaustive-deps': 'warn',
+    'import/order': [
+      'error',
+      {
+        'newlines-between': 'always',
+        pathGroupsExcludedImportTypes: ['react'],
+        pathGroups: [
+          {
+            pattern: 'react',
+            group: 'builtin',
+            position: 'after',
+          },
+          {
+            pattern: '@redwoodjs/**',
+            group: 'external',
+            position: 'after',
+          },
+          {
+            pattern: 'src/lib/test',
+            group: 'parent',
+            position: 'before',
+          },
+          {
+            pattern: 'src/**',
+            group: 'parent',
+            position: 'before',
+          },
+        ],
+        alphabetize: {
+          order: 'asc',
+          caseInsensitive: true,
+        },
+      },
+    ],
   },
   overrides: [
     {

diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -42,7 +42,7 @@
     "nodemon": "2.0.16",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "typescript": "4.7.2"
+    "typescript": "4.7.3"
   },
   "peerDependencies": {
     "graphql": "16.5.0",

diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json
@@ -23,16 +23,16 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.16.7",
-    "@envelop/depth-limit": "1.5.2",
-    "@envelop/disable-introspection": "3.3.2",
+    "@envelop/depth-limit": "1.5.3",
+    "@envelop/disable-introspection": "3.3.3",
     "@envelop/filter-operation-type": "3.3.2",
     "@envelop/parser-cache": "4.3.2",
     "@envelop/validation-cache": "4.3.2",
     "@graphql-tools/merge": "8.2.13",
     "@graphql-tools/schema": "8.3.13",
     "@graphql-tools/utils": "8.6.12",
     "@graphql-yoga/common": "2.7.0",
-    "@prisma/client": "3.14.0",
+    "@prisma/client": "3.15.1",
     "@redwoodjs/api": "1.5.1",
     "core-js": "3.22.8",
     "cross-undici-fetch": "0.1.27",
@@ -54,7 +54,7 @@
     "@types/uuid": "8.3.4",
     "aws-lambda": "1.0.7",
     "jest": "27.5.1",
-    "typescript": "4.7.2"
+    "typescript": "4.7.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/internal/package.json b/packages/internal/package.json
@@ -46,7 +46,7 @@
     "chalk": "4.1.2",
     "core-js": "3.22.8",
     "deepmerge": "4.2.2",
-    "esbuild": "0.14.42",
+    "esbuild": "0.14.43",
     "fast-glob": "3.2.11",
     "findup-sync": "5.0.0",
     "fs-extra": "10.1.0",
@@ -70,7 +70,7 @@
     "babel-plugin-tester": "10.1.0",
     "graphql-tag": "2.12.6",
     "jest": "27.5.1",
-    "typescript": "4.7.2"
+    "typescript": "4.7.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/prerender/package.json b/packages/prerender/package.json
@@ -42,7 +42,7 @@
     "@types/mime-types": "2.1.1",
     "babel-plugin-tester": "10.1.0",
     "jest": "27.5.1",
-    "typescript": "4.7.2"
+    "typescript": "4.7.3"
   },
   "peerDependencies": {
     "react": "17.0.2",
-Original file line number
+Diff line change
@@ Expand Up / @@ -173,7 +173,7 @@ You'd only get a single `contacts` type to return them all. @@
     :::
-    We'll only need `createContact` for our contact page. It accepts a single variable, `input`, that is an object that conforms to what we expect for a `CreateContactInput`, namely `{ name, email, message }`. This mutation should be able to be accessed by anyone, so we'll need want to change `@requireAuth` to `@skipAuth`. This one says that authentication is *not* required and will allow anyone to anonymously send us a message. Note that having at least one schema directive is required for each `Query` and `Mutation` or you'll get an error: Redwood embraces the idea of "secure by default" meaning that we try and keep your application safe, even if you do nothing special to prevent access. In this case it's much safer to throw an error than to accidentally expose all of your users' data to the internet!
+    We'll only need `createContact` for our contact page. It accepts a single variable, `input`, that is an object that conforms to what we expect for a `CreateContactInput`, namely `{ name, email, message }`. This mutation should be able to be accessed by anyone, so we'll need to change `@requireAuth` to `@skipAuth`. This one says that authentication is *not* required and will allow anyone to anonymously send us a message. Note that having at least one schema directive is required for each `Query` and `Mutation` or you'll get an error: Redwood embraces the idea of "secure by default" meaning that we try and keep your application safe, even if you do nothing special to prevent access. In this case it's much safer to throw an error than to accidentally expose all of your users' data to the internet!
     :::info
@@ Expand Down @@