Merge branch 'feat/storage-additional-tests' of github.com:dac09/redw…

…ood into feat/storage-additional-tests * 'feat/storage-additional-tests' of github.com:dac09/redwood: chore(deps): update dependency @supabase/supabase-js to v2.45.3 (redwoodjs#11434) chore(deps): update dependency jsdom to v24.1.3 (redwoodjs#11438) chore(deps): update dependency @playwright/test to v1.47.0 (redwoodjs#11433) fix(resolutions): Remove rehackt resolution (redwoodjs#11447) chore(deps): update dependency @types/eslint to v8.56.12 (redwoodjs#11435) chore(deps): update dependency @envelop/core to v5.0.2 (redwoodjs#11432) chore(deps): update eslint monorepo to v9.9.1 (redwoodjs#11441) chore(deps): update actions/upload-artifact digest (redwoodjs#11442) chore(deps): update dependency prettier-plugin-packagejson to v2.5.2 (redwoodjs#11440) chore(deps): update mheap/github-action-required-labels digest to d25134c (redwoodjs#11443) chore(deps): update dependency prettier-plugin-packagejson to v2.5.2 (redwoodjs#11439) chore(deps): update actions/checkout action to v4.1.7 (redwoodjs#11444) Updates SDL codegen to handle prettier 3 correctly (redwoodjs#11446) Updates on how locking a job works chore(rsc): Switch to web streams instead of using node streams (redwoodjs#11445)
dac09 · Sep 6, 2024 · ec72c7a · ec72c7a
2 parents 34fec9b + 28d783c
commit ec72c7a
Show file tree

Hide file tree

Showing 24 changed files with 135 additions and 137 deletions.
diff --git a/.changesets/11447.md b/.changesets/11447.md
@@ -0,0 +1,5 @@
+- fix(resolutions): Remove rehackt resolution (#11447) by @Tobbe
+
+The rehackt resolution isn't needed anymore. Apollo Client has updated to rehackt 0.1.0. See https://github.com/apollographql/apollo-client/blob/HEAD/CHANGELOG.md#3101
+
+Unfortunately this requires our users to manually go and update their resolutions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -183,7 +183,7 @@ jobs:
           spec: |
             cypress/e2e/01-tutorial/*.cy.js
 
-      - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
+      - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
         if: always()
         with:
           name: logs

diff --git a/.github/workflows/require-release-label.yml b/.github/workflows/require-release-label.yml
@@ -21,7 +21,7 @@ jobs:
       issues: read
       pull-requests: read
     steps:
-      - uses: mheap/github-action-required-labels@5847eef68201219cf0a4643ea7be61e77837bbce # v5
+      - uses: mheap/github-action-required-labels@d25134c992b943fb6ad00c25ea00eb5988c0a9dd # v5
         with:
           mode: exactly
           count: 1

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: 'Checkout code'
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           persist-credentials: false
 
@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: 'Upload artifact'
-        uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
+        uses: actions/upload-artifact@ff15f0306b3f739f7b6fd43fb5d26cd321bd4de5 # v3.pre.node20
         with:
           name: SARIF file
           path: results.sarif

diff --git a/__fixtures__/rsc-caching/package.json b/__fixtures__/rsc-caching/package.json
@@ -23,7 +23,6 @@
   "packageManager": "[email protected]",
   "resolutions": {
     "@apollo/client-react-streaming/superjson": "^1.12.2",
-    "@apollo/client/rehackt": "0.1.0",
     "react-is": "19.0.0-rc-8269d55d-20240802"
   }
 }
diff --git a/__fixtures__/test-project-rsa/package.json b/__fixtures__/test-project-rsa/package.json
@@ -22,7 +22,6 @@
   "packageManager": "[email protected]",
   "resolutions": {
     "@apollo/client-react-streaming/superjson": "^1.12.2",
-    "@apollo/client/rehackt": "0.1.0",
     "react-is": "19.0.0-rc-8269d55d-20240802"
   }
 }
diff --git a/__fixtures__/test-project-rsc-kitchen-sink/package.json b/__fixtures__/test-project-rsc-kitchen-sink/package.json
@@ -23,7 +23,6 @@
   "packageManager": "[email protected]",
   "resolutions": {
     "@apollo/client-react-streaming/superjson": "^1.12.2",
-    "@apollo/client/rehackt": "0.1.0",
     "react-is": "19.0.0-rc-8269d55d-20240802"
   }
 }
diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json
@@ -23,7 +23,6 @@
   "packageManager": "[email protected]",
   "resolutions": {
     "@storybook/react-dom-shim@npm:7.6.17": "https://verdaccio.tobbe.dev/@storybook/react-dom-shim/-/react-dom-shim-8.0.8.tgz",
-    "@apollo/client/rehackt": "0.1.0",
     "react-is": "19.0.0-rc-8269d55d-20240802"
   }
 }
diff --git a/docs/versioned_docs/version-8.0/background-jobs.md b/docs/versioned_docs/version-8.0/background-jobs.md
@@ -327,7 +327,11 @@ The runner is a sort of overseer that doesn't do any work itself, but spawns wor
 
 It checks the `BackgroundJob` table every few seconds for a new job and, if it finds one, locks it so that no other workers can have it, then calls your `perform()` function, passing it the arguments you gave when you scheduled it.
 
-If the job succeeds then by default it's removed from the database (using the `PrismaAdapter`, other adapters behavior may vary). If the job fails, the job is un-locked in the database, the `runAt` is set to an incremental backoff time in the future, and `lastError` is updated with the error that occurred. The job will now be picked up in the future once the `runAt` time has passed and it'll try again.
+**Locking** a job consists of setting two fields: `lockedBy` which contains the process name of the worker, and `lockedAt` which is a timestamp. As long as these are set no other workers will pick up that same job.
+
+In addition to locking the job, the `attempts` column is incremented so it can keep track of how many times this job has been attempted and can properly reschedule it in the future if it errors out (see [Job Errors & Failure](#job-errors--failure) below).
+
+If the job succeeds then by default it's removed from the database (using the `PrismaAdapter`, other adapters' behavior may vary). If the job fails, the job is un-locked in the database, the `runAt` is set to an incremental backoff time in the future, and `lastError` is updated with the error that occurred. The job will now be picked up in the future once the `runAt` time has passed and a worker will lock it and try again. Again, see [Job Errors & Failure](#job-errors--failure) for details.
 
 To stop the runner (and the workers it started), press `Ctrl-C` (or send `SIGINT`). The workers will gracefully shut down, waiting for their work to complete before exiting. If you don't wait to wait, hit `Ctrl-C` again (or send `SIGTERM`).
 

diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
     "@babel/runtime-corejs3": "7.25.0",
     "@faker-js/faker": "8.4.1",
     "@npmcli/arborist": "7.5.4",
-    "@playwright/test": "1.46.0",
+    "@playwright/test": "1.47.0",
     "@testing-library/jest-dom": "6.4.8",
     "@testing-library/react": "14.3.1",
     "@testing-library/user-event": "14.5.2",
@@ -123,7 +123,7 @@
     "ora": "8.0.1",
     "prettier": "3.3.3",
     "prettier-plugin-curly": "0.2.2",
-    "prettier-plugin-packagejson": "2.5.1",
+    "prettier-plugin-packagejson": "2.5.2",
     "prettier-plugin-sh": "0.14.0",
     "prompts": "2.4.2",
     "rimraf": "6.0.1",

diff --git a/packages/auth-providers/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json
@@ -54,7 +54,7 @@
   "devDependencies": {
     "@redwoodjs/framework-tools": "workspace:*",
     "@supabase/ssr": "0.4.0",
-    "@supabase/supabase-js": "2.45.1",
+    "@supabase/supabase-js": "2.45.3",
     "@types/react": "^18.2.55",
     "concurrently": "8.2.2",
     "publint": "0.2.10",
@@ -64,7 +64,7 @@
     "vitest": "2.0.5"
   },
   "peerDependencies": {
-    "@supabase/supabase-js": "2.45.1"
+    "@supabase/supabase-js": "2.45.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/create-redwood-app/templates/js/package.json b/packages/create-redwood-app/templates/js/package.json
@@ -23,7 +23,6 @@
   "packageManager": "[email protected]",
   "resolutions": {
     "@storybook/react-dom-shim@npm:7.6.17": "https://verdaccio.tobbe.dev/@storybook/react-dom-shim/-/react-dom-shim-8.0.8.tgz",
-    "@apollo/client/rehackt": "0.1.0",
     "react-is": "19.0.0-rc-8269d55d-20240802"
   }
 }
diff --git a/packages/create-redwood-app/templates/ts/package.json b/packages/create-redwood-app/templates/ts/package.json
@@ -23,7 +23,6 @@
   "packageManager": "[email protected]",
   "resolutions": {
     "@storybook/react-dom-shim@npm:7.6.17": "https://verdaccio.tobbe.dev/@storybook/react-dom-shim/-/react-dom-shim-8.0.8.tgz",
-    "@apollo/client/rehackt": "0.1.0",
     "react-is": "19.0.0-rc-8269d55d-20240802"
   }
 }
diff --git a/packages/create-redwood-rsc-app/yarn.lock b/packages/create-redwood-rsc-app/yarn.lock
@@ -385,14 +385,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/config-array@npm:^0.17.1":
-  version: 0.17.1
-  resolution: "@eslint/config-array@npm:0.17.1"
+"@eslint/config-array@npm:^0.18.0":
+  version: 0.18.0
+  resolution: "@eslint/config-array@npm:0.18.0"
   dependencies:
     "@eslint/object-schema": "npm:^2.1.4"
     debug: "npm:^4.3.1"
     minimatch: "npm:^3.1.2"
-  checksum: 10c0/b986a0a96f2b42467578968ce3d4ae3b9284e587f8490f2dcdc44ff1b8d30580c62b221da6e58d07b09e156c3050e2dc38267f9370521d9cafc099c4e30154ef
+  checksum: 10c0/0234aeb3e6b052ad2402a647d0b4f8a6aa71524bafe1adad0b8db1dfe94d7f5f26d67c80f79bb37ac61361a1d4b14bb8fb475efe501de37263cf55eabb79868f
   languageName: node
   linkType: hard
 
@@ -413,10 +413,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.9.0, @eslint/js@npm:^9.7.0":
-  version: 9.9.0
-  resolution: "@eslint/js@npm:9.9.0"
-  checksum: 10c0/6ec9f1f0d576132444d6a5c66a8a08b0be9444e3ebb563fa6a6bebcf5299df3da7e454dc04c0fa601bb811197f00764b3a04430d8458cdb8e3a4677993d23f30
+"@eslint/js@npm:9.9.1, @eslint/js@npm:^9.7.0":
+  version: 9.9.1
+  resolution: "@eslint/js@npm:9.9.1"
+  checksum: 10c0/a3a91de2ce78469f7c4eee78c1eba77360706e1d0fa0ace2e19102079bcf237b851217c85ea501dc92c4c3719d60d9df966977abc8554d4c38e3638c1f53dcb2
   languageName: node
   linkType: hard
 
@@ -1963,14 +1963,14 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^9.7.0":
-  version: 9.9.0
-  resolution: "eslint@npm:9.9.0"
+  version: 9.9.1
+  resolution: "eslint@npm:9.9.1"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.11.0"
-    "@eslint/config-array": "npm:^0.17.1"
+    "@eslint/config-array": "npm:^0.18.0"
     "@eslint/eslintrc": "npm:^3.1.0"
-    "@eslint/js": "npm:9.9.0"
+    "@eslint/js": "npm:9.9.1"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@humanwhocodes/retry": "npm:^0.3.0"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -2007,7 +2007,7 @@ __metadata:
       optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/3a22f68c99d75dcbafe6e2fef18d2b5bbcc960c2437f48a414ccf9ca214254733a18e6b79d07bbd374a2369a648413e421aabd07b11be3de5a44d5a4b9997877
+  checksum: 10c0/5e71efda7c0a14ee95436d5cdfed04ee61dfb1d89d7a32b50a424de2e680af82849628ea6581950c2e0726491f786a3cfd0032ce013c1c5093786e475cfdfb33
   languageName: node
   linkType: hard
 
@@ -3491,17 +3491,17 @@ __metadata:
   linkType: hard
 
 "prettier-plugin-packagejson@npm:^2.5.1":
-  version: 2.5.1
-  resolution: "prettier-plugin-packagejson@npm:2.5.1"
+  version: 2.5.2
+  resolution: "prettier-plugin-packagejson@npm:2.5.2"
   dependencies:
-    sort-package-json: "npm:2.10.0"
+    sort-package-json: "npm:2.10.1"
     synckit: "npm:0.9.1"
   peerDependencies:
     prettier: ">= 1.16.0"
   peerDependenciesMeta:
     prettier:
       optional: true
-  checksum: 10c0/eb1b9f5a78b56b95adfe0b57f3ee888aa7717262b96052984d728fe3ff66e7fd4757e24e2b67632ee72c461de22b236e61fcd9fc5f2738bfe952be9eae179aca
+  checksum: 10c0/ddaf6a662f0156ad1a34d4e891b6ea05398de4fe56d6d14f4802f79b4824c71602e09661e665e0228232313a5cd27fe6d9d481080d6dd41620f9cf7fb285d240
   languageName: node
   linkType: hard
 
@@ -3815,9 +3815,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sort-package-json@npm:2.10.0":
-  version: 2.10.0
-  resolution: "sort-package-json@npm:2.10.0"
+"sort-package-json@npm:2.10.1":
+  version: 2.10.1
+  resolution: "sort-package-json@npm:2.10.1"
   dependencies:
     detect-indent: "npm:^7.0.1"
     detect-newline: "npm:^4.0.0"
@@ -3829,7 +3829,7 @@ __metadata:
     sort-object-keys: "npm:^1.1.3"
   bin:
     sort-package-json: cli.js
-  checksum: 10c0/f3325c402cd63fa42947e3861fde0ed26c742bb1db9011d4a4111f2a27427ec778ce8223af5c5dd8fcdb1cf49a1ff55d7e5323fb187d29811cd99e503a80fe26
+  checksum: 10c0/7511c57e4661be222bce68522fb90f72e77a2a4694d05df0e55e70e72736944371a4be82a7cb1be4402455bbfd23857b0fabae3bbe9a1ae1351ff7caac64a468
   languageName: node
   linkType: hard
 

diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@redwoodjs/framework-tools": "workspace:*",
-    "@types/eslint": "8.56.11",
+    "@types/eslint": "8.56.12",
     "@types/estree": "1.0.5",
     "@typescript-eslint/parser": "8.2.0",
     "@typescript-eslint/rule-tester": "8.2.0",

diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.25.0",
-    "@envelop/core": "5.0.1",
+    "@envelop/core": "5.0.2",
     "@envelop/depth-limit": "4.0.0",
     "@envelop/disable-introspection": "6.0.0",
     "@envelop/filter-operation-type": "6.0.0",

diff --git a/packages/internal/package.json b/packages/internal/package.json
@@ -96,7 +96,7 @@
     "@redwoodjs/graphql-server": "workspace:*",
     "@redwoodjs/project-config": "workspace:*",
     "@redwoodjs/router": "workspace:*",
-    "@sdl-codegen/node": "1.0.2",
+    "@sdl-codegen/node": "2.0.1",
     "chalk": "4.1.2",
     "core-js": "3.38.0",
     "deepmerge": "4.3.1",

diff --git a/packages/internal/src/generate/graphqlCodeGen.ts b/packages/internal/src/generate/graphqlCodeGen.ts
@@ -43,7 +43,7 @@ export const generateTypeDefGraphQLApi = async (): Promise<TypeDefResult> => {
     const dtsFiles: string[] = []
 
     try {
-      const output = sdlCodegen.runFullCodegen('redwood', { paths })
+      const output = await sdlCodegen.runFullCodegen('redwood', { paths })
       dtsFiles.concat(output.paths)
     } catch (e: unknown) {
       if (e instanceof Error) {

diff --git a/packages/ogimage-gen/package.json b/packages/ogimage-gen/package.json
@@ -48,7 +48,7 @@
     "react-dom": "19.0.0-rc-8269d55d-20240802"
   },
   "devDependencies": {
-    "@playwright/test": "1.46.0",
+    "@playwright/test": "1.47.0",
     "@redwoodjs/framework-tools": "workspace:*",
     "ts-toolbelt": "9.6.0",
     "tsx": "4.17.0",

diff --git a/packages/realtime/package.json b/packages/realtime/package.json
@@ -34,7 +34,7 @@
     "graphql": "16.9.0"
   },
   "devDependencies": {
-    "@envelop/core": "5.0.1",
+    "@envelop/core": "5.0.2",
     "@envelop/testing": "7.0.0",
     "@envelop/types": "5.0.0",
     "@redwoodjs/framework-tools": "workspace:*",

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -54,7 +54,7 @@
   "devDependencies": {
     "@redwoodjs/framework-tools": "workspace:*",
     "concurrently": "8.2.2",
-    "jsdom": "24.1.1",
+    "jsdom": "24.1.3",
     "publint": "0.2.10",
     "tsx": "4.17.0",
     "typescript": "5.5.4",

diff --git a/packages/vite/modules.d.ts b/packages/vite/modules.d.ts
@@ -15,6 +15,12 @@ type ClientManifest = {
   [id: string]: ClientReferenceManifestEntry
 }
 
+/**
+ * ReactClientValue is complicated. But basically it's anything that's serializable.
+ * @see {@link https://github.com/facebook/react/blob/4c58fce7777f2760f4a93091ca4fca0e3fc2f48c/packages/react-server/src/ReactFlightServer.js#L295}
+ */
+type ReactClientValue = any
+
 declare module 'react-server-dom-webpack/server.edge' {
   type Options = {
     environmentName?: string
@@ -24,7 +30,9 @@ declare module 'react-server-dom-webpack/server.edge' {
     onPostpone?: (reason: string) => void
   }
 
-  // https://github.com/facebook/react/blob/0711ff17638ed41f9cdea712a19b92f01aeda38f/packages/react-server-dom-webpack/src/ReactFlightDOMServerEdge.js#L48
+  /**
+   * @see {@link https://github.com/facebook/react/blob/4c58fce7777f2760f4a93091ca4fca0e3fc2f48c/packages/react-server-dom-webpack/src/server/ReactFlightDOMServerEdge.js#L57}
+   */
   export function renderToReadableStream(
     model: ReactClientValue,
     webpackMap: ClientManifest,