Merge branch 'main' into jgmw/vitest-v2

redwoodjs · Jul 20, 2024 · c3bd29b · c3bd29b
2 parents c236d38 + 70fa007
commit c3bd29b
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 76 deletions.
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -34,7 +34,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.24.8",
     "@prisma/client": "5.17.0",
-    "@whatwg-node/fetch": "0.9.17",
+    "@whatwg-node/fetch": "0.9.18",
     "cookie": "0.6.0",
     "core-js": "3.37.1",
     "humanize-string": "2.1.0",

diff --git a/packages/auth-providers/supabase/api/package.json b/packages/auth-providers/supabase/api/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.24.8",
     "@redwoodjs/api": "workspace:*",
-    "@supabase/ssr": "0.3.0",
+    "@supabase/ssr": "0.4.0",
     "core-js": "3.37.1",
     "jsonwebtoken": "9.0.2"
   },

diff --git a/packages/auth-providers/supabase/middleware/package.json b/packages/auth-providers/supabase/middleware/package.json
@@ -40,7 +40,7 @@
   "dependencies": {
     "@redwoodjs/auth-supabase-api": "workspace:*",
     "@redwoodjs/web": "workspace:*",
-    "@supabase/ssr": "0.3.0"
+    "@supabase/ssr": "0.4.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.15.3",

diff --git a/packages/auth-providers/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@babel/cli": "7.24.8",
     "@babel/core": "^7.22.20",
-    "@supabase/ssr": "0.3.0",
+    "@supabase/ssr": "0.4.0",
     "@supabase/supabase-js": "2.44.4",
     "@types/react": "^18.2.55",
     "react": "19.0.0-beta-04b058868c-20240508",

diff --git a/packages/codemods/package.json b/packages/codemods/package.json
@@ -33,7 +33,7 @@
     "@svgr/core": "8.1.0",
     "@svgr/plugin-jsx": "8.1.0",
     "@vscode/ripgrep": "1.15.9",
-    "@whatwg-node/fetch": "0.9.17",
+    "@whatwg-node/fetch": "0.9.18",
     "cheerio": "1.0.0-rc.12",
     "core-js": "3.37.1",
     "deepmerge": "4.3.1",

diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json
@@ -55,7 +55,7 @@
     "@types/jsonwebtoken": "9.0.6",
     "@types/lodash": "4.17.7",
     "@types/uuid": "9.0.8",
-    "@whatwg-node/fetch": "0.9.17",
+    "@whatwg-node/fetch": "0.9.18",
     "jest": "29.7.0",
     "jsonwebtoken": "9.0.2",
     "tsx": "4.16.2",

diff --git a/packages/prerender/package.json b/packages/prerender/package.json
@@ -30,7 +30,7 @@
     "@redwoodjs/router": "workspace:*",
     "@redwoodjs/structure": "workspace:*",
     "@redwoodjs/web": "workspace:*",
-    "@whatwg-node/fetch": "0.9.17",
+    "@whatwg-node/fetch": "0.9.18",
     "babel-plugin-ignore-html-and-css-imports": "0.1.0",
     "cheerio": "1.0.0-rc.12",
     "core-js": "3.37.1",

diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -48,7 +48,7 @@
     "build:pack": "yarn pack -o storybook-framework-redwoodjs-vite.tgz"
   },
   "dependencies": {
-    "@joshwooding/vite-plugin-react-docgen-typescript": "0.3.1",
+    "@joshwooding/vite-plugin-react-docgen-typescript": "0.4.0",
     "@redwoodjs/testing": "workspace:*",
     "@rollup/pluginutils": "5.1.0",
     "@storybook/addon-essentials": "7.6.17",

diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@redwoodjs/project-config": "workspace:*",
     "@redwoodjs/structure": "workspace:*",
-    "@whatwg-node/fetch": "0.9.17",
+    "@whatwg-node/fetch": "0.9.18",
     "ci-info": "4.0.0",
     "envinfo": "7.13.0",
     "systeminformation": "5.22.11",

diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -84,7 +84,7 @@
     "@redwoodjs/web": "workspace:*",
     "@swc/core": "1.7.0",
     "@vitejs/plugin-react": "4.3.1",
-    "@whatwg-node/fetch": "0.9.17",
+    "@whatwg-node/fetch": "0.9.18",
     "@whatwg-node/server": "0.9.36",
     "acorn-loose": "8.4.0",
     "buffer": "6.0.3",

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -141,7 +141,7 @@
     "@babel/runtime-corejs3": "7.24.8",
     "@redwoodjs/auth": "workspace:*",
     "@redwoodjs/server-store": "workspace:*",
-    "@whatwg-node/fetch": "0.9.17",
+    "@whatwg-node/fetch": "0.9.18",
     "core-js": "3.37.1",
     "graphql": "16.9.0",
     "graphql-sse": "2.5.3",

diff --git a/yarn.lock b/yarn.lock
@@ -5145,12 +5145,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.3.1":
-  version: 0.3.1
-  resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.3.1"
+"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.4.0":
+  version: 0.4.0
+  resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.4.0"
   dependencies:
-    glob: "npm:^7.2.0"
-    glob-promise: "npm:^4.2.0"
+    glob: "npm:^10.0.0"
     magic-string: "npm:^0.27.0"
     react-docgen-typescript: "npm:^2.2.2"
   peerDependencies:
@@ -5159,7 +5158,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/a9c7a03d7d1daf5bd64949255516ba64c88d5600366c8c74dcdb6f37c2a6099daaec02860b7587d2220e61afa47a0b2de17ef70d723c2db02f24e0890edfd9f3
+  checksum: 10c0/c457d3962e43804b990dd3e945111b9872a04760edaf0135f56edde9c5ce11f2ec9044907d79c1e33fcbca46a5a91a5e129bbd19818e41504d8941de3226754f
   languageName: node
   linkType: hard
 
@@ -7282,7 +7281,7 @@ __metadata:
     "@types/memjs": "npm:1"
     "@types/pascalcase": "npm:1.0.3"
     "@types/split2": "npm:4.2.3"
-    "@whatwg-node/fetch": "npm:0.9.17"
+    "@whatwg-node/fetch": "npm:0.9.18"
     cookie: "npm:0.6.0"
     core-js: "npm:3.37.1"
     humanize-string: "npm:2.1.0"
@@ -7672,7 +7671,7 @@ __metadata:
     "@babel/core": "npm:^7.22.20"
     "@babel/runtime-corejs3": "npm:7.24.8"
     "@redwoodjs/api": "workspace:*"
-    "@supabase/ssr": "npm:0.3.0"
+    "@supabase/ssr": "npm:0.4.0"
     "@types/aws-lambda": "npm:8.10.141"
     "@types/jsonwebtoken": "npm:9.0.6"
     core-js: "npm:3.37.1"
@@ -7693,7 +7692,7 @@ __metadata:
     "@redwoodjs/framework-tools": "workspace:*"
     "@redwoodjs/graphql-server": "workspace:*"
     "@redwoodjs/web": "workspace:*"
-    "@supabase/ssr": "npm:0.3.0"
+    "@supabase/ssr": "npm:0.4.0"
     "@types/aws-lambda": "npm:8.10.141"
     concurrently: "npm:8.2.2"
     publint: "npm:0.2.9"
@@ -7726,7 +7725,7 @@ __metadata:
     "@babel/core": "npm:^7.22.20"
     "@babel/runtime-corejs3": "npm:7.24.8"
     "@redwoodjs/auth": "workspace:*"
-    "@supabase/ssr": "npm:0.3.0"
+    "@supabase/ssr": "npm:0.4.0"
     "@supabase/supabase-js": "npm:2.44.4"
     "@types/react": "npm:^18.2.55"
     core-js: "npm:3.37.1"
@@ -8013,7 +8012,7 @@ __metadata:
     "@types/jscodeshift": "npm:0.11.6"
     "@types/yargs": "npm:17.0.32"
     "@vscode/ripgrep": "npm:1.15.9"
-    "@whatwg-node/fetch": "npm:0.9.17"
+    "@whatwg-node/fetch": "npm:0.9.18"
     cheerio: "npm:1.0.0-rc.12"
     core-js: "npm:3.37.1"
     deepmerge: "npm:4.3.1"
@@ -8236,7 +8235,7 @@ __metadata:
     "@types/jsonwebtoken": "npm:9.0.6"
     "@types/lodash": "npm:4.17.7"
     "@types/uuid": "npm:9.0.8"
-    "@whatwg-node/fetch": "npm:0.9.17"
+    "@whatwg-node/fetch": "npm:0.9.18"
     core-js: "npm:3.37.1"
     graphql: "npm:16.9.0"
     graphql-scalars: "npm:1.23.0"
@@ -8426,7 +8425,7 @@ __metadata:
     "@redwoodjs/structure": "workspace:*"
     "@redwoodjs/web": "workspace:*"
     "@types/mime-types": "npm:2.1.4"
-    "@whatwg-node/fetch": "npm:0.9.17"
+    "@whatwg-node/fetch": "npm:0.9.18"
     babel-plugin-ignore-html-and-css-imports: "npm:0.1.0"
     babel-plugin-tester: "npm:11.0.4"
     cheerio: "npm:1.0.0-rc.12"
@@ -8595,7 +8594,7 @@ __metadata:
     "@types/envinfo": "npm:7.8.4"
     "@types/uuid": "npm:9.0.8"
     "@types/yargs": "npm:17.0.32"
-    "@whatwg-node/fetch": "npm:0.9.17"
+    "@whatwg-node/fetch": "npm:0.9.18"
     ci-info: "npm:4.0.0"
     envinfo: "npm:7.13.0"
     systeminformation: "npm:5.22.11"
@@ -8681,7 +8680,7 @@ __metadata:
     "@types/react": "npm:^18.2.55"
     "@types/yargs-parser": "npm:21.0.3"
     "@vitejs/plugin-react": "npm:4.3.1"
-    "@whatwg-node/fetch": "npm:0.9.17"
+    "@whatwg-node/fetch": "npm:0.9.18"
     "@whatwg-node/server": "npm:0.9.36"
     acorn-loose: "npm:8.4.0"
     buffer: "npm:6.0.3"
@@ -8756,7 +8755,7 @@ __metadata:
     "@testing-library/react": "npm:14.3.1"
     "@types/react": "npm:^18.2.55"
     "@types/react-dom": "npm:^18.2.19"
-    "@whatwg-node/fetch": "npm:0.9.17"
+    "@whatwg-node/fetch": "npm:0.9.18"
     concurrently: "npm:8.2.2"
     core-js: "npm:3.37.1"
     graphql: "npm:16.9.0"
@@ -8923,7 +8922,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-gnu@npm:4.19.0":
+"@rollup/rollup-linux-x64-gnu@npm:4.19.0, @rollup/rollup-linux-x64-gnu@npm:^4.9.5":
   version: 4.19.0
   resolution: "@rollup/rollup-linux-x64-gnu@npm:4.19.0"
   conditions: os=linux & cpu=x64 & libc=glibc
@@ -9875,15 +9874,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@supabase/ssr@npm:0.3.0":
-  version: 0.3.0
-  resolution: "@supabase/ssr@npm:0.3.0"
+"@supabase/ssr@npm:0.4.0":
+  version: 0.4.0
+  resolution: "@supabase/ssr@npm:0.4.0"
   dependencies:
-    cookie: "npm:^0.5.0"
-    ramda: "npm:^0.29.0"
+    "@rollup/rollup-linux-x64-gnu": "npm:^4.9.5"
+    cookie: "npm:^0.6.0"
   peerDependencies:
-    "@supabase/supabase-js": ^2.33.1
-  checksum: 10c0/c2e1df6b98b3cbb57c663771ea26b9afe2cf9037fde33d142d7552b740dcafe3110b5be8d15fc0c6612b8803176606fbab867235d745ee47d63d038511768dc6
+    "@supabase/supabase-js": ^2.43.4
+  dependenciesMeta:
+    "@rollup/rollup-linux-x64-gnu":
+      optional: true
+  checksum: 10c0/378f92e271eeed700dfc509f7f6398b4e0984a4845de91467b5ac211f50c690548fd32eb72f80b9600963084a947b4573a370b3419df15ca6fdf87df8252de09
   languageName: node
   linkType: hard
 
@@ -10688,16 +10690,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/glob@npm:^7.1.3":
-  version: 7.2.0
-  resolution: "@types/glob@npm:7.2.0"
-  dependencies:
-    "@types/minimatch": "npm:*"
-    "@types/node": "npm:*"
-  checksum: 10c0/a8eb5d5cb5c48fc58c7ca3ff1e1ddf771ee07ca5043da6e4871e6757b4472e2e73b4cfef2644c38983174a4bc728c73f8da02845c28a1212f98cabd293ecae98
-  languageName: node
-  linkType: hard
-
 "@types/graceful-fs@npm:^4.1.3":
   version: 4.1.6
   resolution: "@types/graceful-fs@npm:4.1.6"
@@ -10913,13 +10905,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/minimatch@npm:*":
-  version: 5.1.2
-  resolution: "@types/minimatch@npm:5.1.2"
-  checksum: 10c0/83cf1c11748891b714e129de0585af4c55dd4c2cafb1f1d5233d79246e5e1e19d1b5ad9e8db449667b3ffa2b6c80125c429dbee1054e9efb45758dbc4e118562
-  languageName: node
-  linkType: hard
-
 "@types/minimatch@npm:^3.0.3":
   version: 3.0.5
   resolution: "@types/minimatch@npm:3.0.5"
@@ -11558,13 +11543,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@whatwg-node/fetch@npm:0.9.17, @whatwg-node/fetch@npm:^0.9.17":
-  version: 0.9.17
-  resolution: "@whatwg-node/fetch@npm:0.9.17"
+"@whatwg-node/fetch@npm:0.9.18, @whatwg-node/fetch@npm:^0.9.17":
+  version: 0.9.18
+  resolution: "@whatwg-node/fetch@npm:0.9.18"
   dependencies:
     "@whatwg-node/node-fetch": "npm:^0.5.7"
     urlpattern-polyfill: "npm:^10.0.0"
-  checksum: 10c0/6638f1d456d17c9eab55f6278aa8045157ceb43a27acc65def1b7a2a3b80ef1b79f4c203e523865c9bcf1236ef64e1378ab0627e91932c97e9f1f3a129b17195
+  checksum: 10c0/53fbbdb9c8b99d5ac550c80c4523e0e574c311fca55854c81e26949a4269638a36688cc485220f65845c9c5f10251f474b4982d594f063859af7b44316775a64
   languageName: node
   linkType: hard
 
@@ -14486,7 +14471,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:0.6.0":
+"cookie@npm:0.6.0, cookie@npm:^0.6.0":
   version: 0.6.0
   resolution: "cookie@npm:0.6.0"
   checksum: 10c0/f2318b31af7a31b4ddb4a678d024514df5e705f9be5909a192d7f116cfb6d45cbacf96a473fa733faa95050e7cff26e7832bb3ef94751592f1387b71c8956686
@@ -18192,17 +18177,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob-promise@npm:^4.2.0":
-  version: 4.2.2
-  resolution: "glob-promise@npm:4.2.2"
-  dependencies:
-    "@types/glob": "npm:^7.1.3"
-  peerDependencies:
-    glob: ^7.1.6
-  checksum: 10c0/3eb01bed2901539365df6a4d27800afb8788840647d01f9bf3500b3de756597f2ff4b8c823971ace34db228c83159beca459dc42a70968d4e9c8200ed2cc96bd
-  languageName: node
-  linkType: hard
-
 "glob-to-regexp@npm:0.4.1, glob-to-regexp@npm:^0.4.1":
   version: 0.4.1
   resolution: "glob-to-regexp@npm:0.4.1"
@@ -25569,13 +25543,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ramda@npm:^0.29.0":
-  version: 0.29.1
-  resolution: "ramda@npm:0.29.1"
-  checksum: 10c0/5de53a07400959c1a704c366ec52b1b8cd9a444dc1f9cdf17d607e0b9eeaa38cbaea309d43e59dbd7f36731ba977a64d40092555c0e7c2d4a41e8e922239c0ba
-  languageName: node
-  linkType: hard
-
 "randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5":
   version: 2.1.0
   resolution: "randombytes@npm:2.1.0"
@@ -27735,7 +27702,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "storybook-framework-redwoodjs-vite@workspace:packages/storybook"
   dependencies:
-    "@joshwooding/vite-plugin-react-docgen-typescript": "npm:0.3.1"
+    "@joshwooding/vite-plugin-react-docgen-typescript": "npm:0.4.0"
     "@redwoodjs/testing": "workspace:*"
     "@rollup/pluginutils": "npm:5.1.0"
     "@storybook/addon-essentials": "npm:7.6.17"