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

redwoodjs · May 8, 2022 · 5dba332 · 5dba332
2 parents d50b6a2 + 7f75796
commit 5dba332
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -47,6 +47,9 @@
     "@babel/node": "7.16.7",
     "@babel/plugin-proposal-class-properties": "7.16.7",
     "@babel/plugin-proposal-decorators": "7.16.7",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.16.7",
+    "@babel/plugin-proposal-private-methods": "7.16.7",
+    "@babel/plugin-proposal-private-property-in-object": "7.16.7",
     "@babel/plugin-transform-runtime": "7.16.7",
     "@babel/preset-env": "7.16.7",
     "@babel/preset-react": "7.16.7",

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -46,11 +46,15 @@
   "devDependencies": {
     "@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",
     "@types/crypto-js": "4.1.1",
     "@types/jsonwebtoken": "8.5.8",
     "@types/md5": "2.3.2",
+    "@types/pascalcase": "1.0.1",
     "@types/split2": "3.2.1",
+    "@types/uuid": "8.3.4",
     "aws-lambda": "1.0.7",
     "jest": "27.5.1",
     "split2": "4.1.0",

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -29,6 +29,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",
     "@types/netlify-identity-widget": "1.9.3",

diff --git a/packages/auth/src/authClients/firebase.ts b/packages/auth/src/authClients/firebase.ts
@@ -1,6 +1,6 @@
-import type { FirebaseApp } from '@firebase/app'
-import type { CustomParameters, OAuthProvider, User } from '@firebase/auth'
-import type FirebaseAuthNamespace from '@firebase/auth'
+import type { FirebaseApp } from 'firebase/app'
+import type { CustomParameters, OAuthProvider, User } from 'firebase/auth'
+import type FirebaseAuthNamespace from 'firebase/auth'
 
 import { AuthClient } from './'
 

diff --git a/packages/auth/src/authClients/supabase.ts b/packages/auth/src/authClients/supabase.ts
@@ -1,5 +1,10 @@
-import { Session, User, Provider } from '@supabase/gotrue-js'
-import type { SupabaseClient, ApiError } from '@supabase/supabase-js'
+import type {
+  SupabaseClient,
+  ApiError,
+  Session,
+  User,
+  Provider,
+} from '@supabase/supabase-js'
 
 import type { AuthClient } from './index'
 

diff --git a/packages/codemods/package.json b/packages/codemods/package.json
@@ -30,6 +30,7 @@
     "core-js": "3.22.4",
     "cross-undici-fetch": "0.1.27",
     "deepmerge": "4.2.2",
+    "execa": "5.1.1",
     "fast-glob": "3.2.11",
     "findup-sync": "5.0.0",
     "jest": "27.5.1",
@@ -41,9 +42,12 @@
   },
   "devDependencies": {
     "@types/babel__core": "7.1.19",
+    "@types/findup-sync": "4.0.2",
     "@types/fs-extra": "9.0.13",
+    "@types/jest": "27.5.0",
     "@types/jscodeshift": "0.11.5",
     "@types/prettier": "2.6.0",
+    "@types/yargs": "17.0.10",
     "fs-extra": "10.1.0",
     "tempy": "1.0.1"
   },

diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -36,6 +36,7 @@
     "@types/react": "17.0.45",
     "@types/react-dom": "17.0.16",
     "@types/testing-library__jest-dom": "5.14.3",
+    "graphql": "16.4.0",
     "jest": "27.5.1",
     "nodemon": "2.0.16",
     "react": "17.0.2",

diff --git a/packages/router/package.json b/packages/router/package.json
@@ -31,6 +31,8 @@
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
     "@types/lodash.isequal": "4.5.6",
+    "@types/react": "17.0.45",
+    "@types/react-dom": "17.0.16",
     "jest": "27.5.1",
     "prop-types": "15.8.1",
     "react": "17.0.2",

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -51,11 +51,13 @@
     "@babel/core": "7.16.7",
     "@testing-library/jest-dom": "5.16.4",
     "@testing-library/react": "12.1.5",
+    "@types/prop-types": "15.7.4",
     "@types/react": "17.0.45",
     "@types/react-dom": "17.0.16",
     "@types/testing-library__jest-dom": "5.14.3",
     "jest": "27.5.1",
     "nodemon": "2.0.16",
+    "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "typescript": "4.6.4"

diff --git a/yarn.lock b/yarn.lock
@@ -5090,7 +5090,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nhost/core@npm:^0.5.2":
+"@nhost/core@npm:^0.5.0, @nhost/core@npm:^0.5.2":
   version: 0.5.2
   resolution: "@nhost/core@npm:0.5.2"
   dependencies:
@@ -5101,6 +5101,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nhost/hasura-auth-js@npm:1.1.2":
+  version: 1.1.2
+  resolution: "@nhost/hasura-auth-js@npm:1.1.2"
+  dependencies:
+    "@nhost/core": ^0.5.0
+    jwt-decode: ^3.1.2
+  checksum: 51fc8b5cb4bac844fd85d3d0e99d80f0957f9331d8aeddd1a6edc952c0eb3edd53fef06cd619d4eadfe284f48b3ce5d18272c5f97e0fc42330f3d24f83e0c604
+  languageName: node
+  linkType: hard
+
 "@nhost/hasura-auth-js@npm:^1.1.4":
   version: 1.1.4
   resolution: "@nhost/hasura-auth-js@npm:1.1.4"
@@ -6022,12 +6032,16 @@ __metadata:
     "@babel/cli": 7.16.7
     "@babel/core": 7.16.7
     "@babel/runtime-corejs3": 7.16.7
+    "@clerk/clerk-sdk-node": 3.4.0
     "@prisma/client": 3.13.0
     "@redwoodjs/auth": 1.3.1
+    "@types/aws-lambda": 8.10.95
     "@types/crypto-js": 4.1.1
     "@types/jsonwebtoken": 8.5.8
     "@types/md5": 2.3.2
+    "@types/pascalcase": 1.0.1
     "@types/split2": 3.2.1
+    "@types/uuid": 8.3.4
     aws-lambda: 1.0.7
     cross-undici-fetch: 0.1.27
     crypto-js: 4.1.1
@@ -6072,6 +6086,7 @@ __metadata:
     "@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
     "@types/netlify-identity-widget": 1.9.3
@@ -6147,13 +6162,17 @@ __metadata:
     "@babel/plugin-transform-typescript": 7.16.7
     "@babel/runtime-corejs3": 7.16.7
     "@types/babel__core": 7.1.19
+    "@types/findup-sync": 4.0.2
     "@types/fs-extra": 9.0.13
+    "@types/jest": 27.5.0
     "@types/jscodeshift": 0.11.5
     "@types/prettier": 2.6.0
+    "@types/yargs": 17.0.10
     "@vscode/ripgrep": 1.14.2
     core-js: 3.22.4
     cross-undici-fetch: 0.1.27
     deepmerge: 4.2.2
+    execa: 5.1.1
     fast-glob: 3.2.11
     findup-sync: 5.0.0
     fs-extra: 10.1.0
@@ -6286,6 +6305,7 @@ __metadata:
     "@types/react": 17.0.45
     "@types/react-dom": 17.0.16
     "@types/testing-library__jest-dom": 5.14.3
+    graphql: 16.4.0
     jest: 27.5.1
     nodemon: 2.0.16
     pascalcase: 1.0.0
@@ -6434,6 +6454,8 @@ __metadata:
     "@reach/skip-nav": 0.16.0
     "@redwoodjs/auth": 1.3.1
     "@types/lodash.isequal": 4.5.6
+    "@types/react": 17.0.45
+    "@types/react-dom": 17.0.16
     core-js: 3.22.4
     jest: 27.5.1
     lodash.isequal: 4.5.0
@@ -6551,13 +6573,15 @@ __metadata:
     "@redwoodjs/auth": 1.3.1
     "@testing-library/jest-dom": 5.16.4
     "@testing-library/react": 12.1.5
+    "@types/prop-types": 15.7.4
     "@types/react": 17.0.45
     "@types/react-dom": 17.0.16
     "@types/testing-library__jest-dom": 5.14.3
     graphql: 16.4.0
     graphql-tag: 2.12.6
     jest: 27.5.1
     nodemon: 2.0.16
+    prop-types: 15.8.1
     react: 17.0.2
     react-dom: 17.0.2
     react-helmet-async: 1.3.0
@@ -8886,7 +8910,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/prop-types@npm:*":
+"@types/prop-types@npm:*, @types/prop-types@npm:15.7.4":
   version: 15.7.4
   resolution: "@types/prop-types@npm:15.7.4"
   checksum: 014bb826592fab01499931259969aafc21d5a8ff4ece3e3fb8e2b5186bed17656f7dcdccf9a98c27fee74d7d0697aa3f53ea971a72679597f0ca0c3d5ca585d3
@@ -27118,6 +27142,9 @@ __metadata:
     "@babel/node": 7.16.7
     "@babel/plugin-proposal-class-properties": 7.16.7
     "@babel/plugin-proposal-decorators": 7.16.7
+    "@babel/plugin-proposal-nullish-coalescing-operator": 7.16.7
+    "@babel/plugin-proposal-private-methods": 7.16.7
+    "@babel/plugin-proposal-private-property-in-object": 7.16.7
     "@babel/plugin-transform-runtime": 7.16.7
     "@babel/preset-env": 7.16.7
     "@babel/preset-react": 7.16.7