Merge branch 'main' into ds-coherence/add-back-coherence-deploy

redwoodjs · May 17, 2023 · 61930b4 · 61930b4
2 parents 4f5b227 + a6b70be
commit 61930b4
Show file tree

Hide file tree

Showing 22 changed files with 408 additions and 346 deletions.
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "@babel/preset-react": "7.18.6",
     "@babel/preset-typescript": "7.21.5",
     "@babel/runtime-corejs3": "7.21.5",
-    "@faker-js/faker": "8.0.0",
+    "@faker-js/faker": "8.0.1",
     "@npmcli/arborist": "6.2.9",
     "@playwright/test": "1.33.0",
     "@replayio/playwright": "0.3.30",
@@ -78,14 +78,14 @@
     "jest-runner-tsd": "5.0.0",
     "jscodeshift": "0.15.0",
     "lerna": "6.6.2",
-    "listr2": "6.5.0",
+    "listr2": "6.6.0",
     "lodash.template": "4.5.0",
     "make-dir-cli": "3.0.0",
     "msw": "1.2.1",
     "ncp": "2.0.0",
     "nodemon": "2.0.22",
     "npm-packlist": "7.0.4",
-    "nx": "16.1.4",
+    "nx": "16.2.1",
     "nx-cloud": "16.0.5",
     "octokit": "2.0.14",
     "ora": "5.4.1",

diff --git a/packages/api-server/package.json b/packages/api-server/package.json
@@ -44,7 +44,7 @@
     "lodash.escape": "4.0.1",
     "pretty-bytes": "5.6.0",
     "pretty-ms": "7.0.1",
-    "qs": "6.11.1",
+    "qs": "6.11.2",
     "split2": "4.2.0",
     "yargs": "17.7.2"
   },

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -32,8 +32,8 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.21.5",
-    "@prisma/client": "4.14.0",
-    "@whatwg-node/fetch": "0.8.8",
+    "@prisma/client": "4.14.1",
+    "@whatwg-node/fetch": "0.9.0",
     "core-js": "3.30.2",
     "humanize-string": "2.1.0",
     "jsonwebtoken": "9.0.0",

diff --git a/packages/auth-providers/clerk/api/package.json b/packages/auth-providers/clerk/api/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.21.5",
-    "@clerk/clerk-sdk-node": "4.8.7",
+    "@clerk/clerk-sdk-node": "4.9.1",
     "core-js": "3.30.2"
   },
   "devDependencies": {

diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json
@@ -29,15 +29,15 @@
   "devDependencies": {
     "@babel/cli": "7.21.5",
     "@babel/core": "7.21.8",
-    "@clerk/clerk-react": "4.15.4",
-    "@clerk/types": "3.36.0",
+    "@clerk/clerk-react": "4.16.1",
+    "@clerk/types": "3.38.0",
     "@types/react": "18.2.6",
     "jest": "29.5.0",
     "react": "18.2.0",
     "typescript": "5.0.4"
   },
   "peerDependencies": {
-    "@clerk/clerk-react": "4.15.4"
+    "@clerk/clerk-react": "4.16.1"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/cli-helpers/package.json b/packages/cli-helpers/package.json
@@ -29,7 +29,7 @@
     "chalk": "4.1.2",
     "core-js": "3.30.2",
     "execa": "5.1.1",
-    "listr2": "6.5.0",
+    "listr2": "6.6.0",
     "lodash.memoize": "4.1.2",
     "pascalcase": "1.0.0",
     "prettier": "2.8.8",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -30,7 +30,8 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.21.5",
     "@iarna/toml": "2.2.5",
-    "@prisma/internals": "4.14.0",
+    "@prisma/internals": "4.14.1",
+    "@redwoodjs/api-server": "5.0.0",
     "@redwoodjs/cli-helpers": "5.0.0",
     "@redwoodjs/fastify": "5.0.0",
     "@redwoodjs/internal": "5.0.0",
@@ -57,14 +58,14 @@
     "fs-extra": "11.1.1",
     "humanize-string": "2.1.0",
     "latest-version": "5.1.0",
-    "listr2": "6.5.0",
+    "listr2": "6.6.0",
     "lodash": "4.17.21",
     "param-case": "3.0.4",
     "pascalcase": "1.0.0",
     "pluralize": "8.0.0",
     "portfinder": "1.0.32",
     "prettier": "2.8.8",
-    "prisma": "4.14.0",
+    "prisma": "4.14.1",
     "prompts": "2.4.2",
     "rimraf": "5.0.0",
     "secure-random-password": "0.2.3",

diff --git a/packages/codemods/package.json b/packages/codemods/package.json
@@ -29,8 +29,8 @@
     "@babel/runtime-corejs3": "7.21.5",
     "@babel/traverse": "7.21.5",
     "@iarna/toml": "2.2.5",
-    "@vscode/ripgrep": "1.15.2",
-    "@whatwg-node/fetch": "0.8.8",
+    "@vscode/ripgrep": "1.15.3",
+    "@whatwg-node/fetch": "0.9.0",
     "cheerio": "1.0.0-rc.12",
     "core-js": "3.30.2",
     "deepmerge": "4.3.1",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -79,7 +79,7 @@
     "style-loader": "3.3.2",
     "typescript": "5.0.4",
     "url-loader": "4.1.1",
-    "webpack": "5.82.1",
+    "webpack": "5.83.1",
     "webpack-bundle-analyzer": "4.8.0",
     "webpack-cli": "5.1.1",
     "webpack-dev-server": "4.15.0",

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -17,8 +17,8 @@
     "@babel/eslint-plugin": "7.19.1",
     "@redwoodjs/internal": "5.0.0",
     "@redwoodjs/project-config": "5.0.0",
-    "@typescript-eslint/eslint-plugin": "5.59.5",
-    "@typescript-eslint/parser": "5.59.5",
+    "@typescript-eslint/eslint-plugin": "5.59.6",
+    "@typescript-eslint/parser": "5.59.6",
     "eslint": "8.40.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-import-resolver-babel-module": "5.3.2",

diff --git a/packages/fastify/package.json b/packages/fastify/package.json
@@ -27,7 +27,7 @@
     "fastify": "4.17.0",
     "fastify-raw-body": "4.2.0",
     "lodash.escape": "4.0.1",
-    "qs": "6.11.1"
+    "qs": "6.11.2"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.115",

diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json
@@ -53,7 +53,7 @@
     "@types/lodash.merge": "4.6.7",
     "@types/lodash.omitby": "4.6.7",
     "@types/uuid": "9.0.1",
-    "@whatwg-node/fetch": "0.8.8",
+    "@whatwg-node/fetch": "0.9.0",
     "aws-lambda": "1.0.7",
     "jest": "29.5.0",
     "jsonwebtoken": "9.0.0",

diff --git a/packages/graphql-server/src/functions/graphql.ts b/packages/graphql-server/src/functions/graphql.ts
@@ -9,6 +9,8 @@ import type {
 import { GraphQLSchema, OperationTypeNode } from 'graphql'
 import { Plugin, useReadinessCheck, createYoga } from 'graphql-yoga'
 
+import { getConfig } from '@redwoodjs/project-config'
+
 import { mapRwCorsOptionsToYoga } from '../cors'
 import { makeDirectivesForPlugin } from '../directives/makeDirectives'
 import { getAsyncStoreInstance } from '../globalContext'
@@ -114,7 +116,16 @@ export const createGraphQLHandler = ({
   plugins.push(...redwoodDirectivePlugins)
 
   // Custom Redwood OpenTelemetry plugin
-  plugins.push(useRedwoodOpenTelemetry())
+  let openTelemetryPluginEnabled = false
+  try {
+    openTelemetryPluginEnabled = getConfig().experimental.opentelemetry.enabled
+  } catch (_error) {
+    // Swallow this error for the time being as we don't always have access to the
+    // config toml depending on the deploy environment
+  }
+  if (openTelemetryPluginEnabled) {
+    plugins.push(useRedwoodOpenTelemetry())
+  }
 
   // Secure the GraphQL server
   plugins.push(useArmor(logger, armorConfig))

diff --git a/packages/prerender/package.json b/packages/prerender/package.json
@@ -31,7 +31,7 @@
     "@redwoodjs/router": "5.0.0",
     "@redwoodjs/structure": "5.0.0",
     "@redwoodjs/web": "5.0.0",
-    "@whatwg-node/fetch": "0.8.8",
+    "@whatwg-node/fetch": "0.9.0",
     "babel-plugin-ignore-html-and-css-imports": "0.1.0",
     "cheerio": "1.0.0-rc.12",
     "core-js": "3.30.2",

diff --git a/packages/project-config/package.json b/packages/project-config/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@types/findup-sync": "4.0.2",
-    "dependency-cruiser": "12.12.2",
+    "dependency-cruiser": "13.0.1",
     "jest": "29.5.0",
     "rimraf": "5.0.0",
     "typescript": "5.0.4"

diff --git a/packages/record/package.json b/packages/record/package.json
@@ -28,14 +28,14 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.21.5",
-    "@prisma/client": "4.14.0",
+    "@prisma/client": "4.14.1",
     "@redwoodjs/project-config": "5.0.0",
     "core-js": "3.30.2"
   },
   "devDependencies": {
     "@babel/cli": "7.21.5",
     "@babel/core": "7.21.8",
-    "@prisma/internals": "4.14.0",
+    "@prisma/internals": "4.14.1",
     "esbuild": "0.17.19",
     "jest": "29.5.0"
   },

diff --git a/packages/structure/package.json b/packages/structure/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.21.5",
     "@iarna/toml": "2.2.5",
-    "@prisma/internals": "4.14.0",
+    "@prisma/internals": "4.14.1",
     "@redwoodjs/project-config": "5.0.0",
     "@types/line-column": "1.0.0",
     "camelcase": "6.3.0",

diff --git a/packages/studio/frontend/yarn.lock b/packages/studio/frontend/yarn.lock
@@ -1180,10 +1180,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.6.1":
-  version: 1.6.1
-  resolution: "@remix-run/router@npm:1.6.1"
-  checksum: 6d6dad1b6a06171d5d8549eca7cd7ef332a40987b732829e48993d55b3c7a7ca661c7d891be938055a42a4b18f07b5f2b66295c89cb221464eda2678ac41621e
+"@remix-run/router@npm:1.6.2":
+  version: 1.6.2
+  resolution: "@remix-run/router@npm:1.6.2"
+  checksum: 73da6884e53873e4290abb3978373cafc3f351994273b0663eda5e12c81cb427fc6fe4df1924569d9a214f701d0106cf37122455951e0239d7e6fa35071df558
   languageName: node
   linkType: hard
 
@@ -1206,8 +1206,8 @@ __metadata:
   linkType: hard
 
 "@tremor/react@npm:^2.2.0":
-  version: 2.6.1
-  resolution: "@tremor/react@npm:2.6.1"
+  version: 2.6.2
+  resolution: "@tremor/react@npm:2.6.2"
   dependencies:
     "@floating-ui/react": ^0.19.1
     date-fns: ^2.28.0
@@ -1217,7 +1217,7 @@ __metadata:
   peerDependencies:
     react: ^18.0.0
     react-dom: ">=16.6.0"
-  checksum: 9411584ef562f487c739a18db1904f3944d0082595631d673333feef012aa4a4ea6de08d04296ac6d8a6ba209108d66fe5bc75579f90173166695baee0fb6bbd
+  checksum: 5fbbe28c06a0d6416a49d005bb33b9c7a706da37c3c45977c6e5718ed3e884f97a02208739021394fefef51f5a5dd7f103f4520264542564136334c8cb044ab0
   languageName: node
   linkType: hard
 
@@ -3633,26 +3633,26 @@ __metadata:
   linkType: hard
 
 "react-router-dom@npm:^6.8.1":
-  version: 6.11.1
-  resolution: "react-router-dom@npm:6.11.1"
+  version: 6.11.2
+  resolution: "react-router-dom@npm:6.11.2"
   dependencies:
-    "@remix-run/router": 1.6.1
-    react-router: 6.11.1
+    "@remix-run/router": 1.6.2
+    react-router: 6.11.2
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: 17f1f9c3d71604fb9e270b672a97accbee0bedf5b8cb03518fd20068aa4d653fcbb46c2dfd5cd04a41864bed21cc23c275d7af39e4be2224435529779bf7e7e4
+  checksum: be7433bc290e56c0dd3e1008d53a76cc9866bf460980658501880876420086f11810ec3355a3abcd79ac537d6a1351eda009fade841c266456d0e8df60967b76
   languageName: node
   linkType: hard
 
-"react-router@npm:6.11.1":
-  version: 6.11.1
-  resolution: "react-router@npm:6.11.1"
+"react-router@npm:6.11.2":
+  version: 6.11.2
+  resolution: "react-router@npm:6.11.2"
   dependencies:
-    "@remix-run/router": 1.6.1
+    "@remix-run/router": 1.6.2
   peerDependencies:
     react: ">=16.8"
-  checksum: 3b49692947ef2ddae134a15462e4fa47022d82c358cc90085b471989e4bc3c4e1637aa3a81389166b69db557ac420c289f64d64309f4d0bd87a6099e49aee6e1
+  checksum: a437606078d6096a6dfa322adf80d00ce153f20cd470ad888088c8da99f44477b963425c53f5461a540b909fc274154292ed80d636482dcdc58a423915ca1433
   languageName: node
   linkType: hard
 
@@ -4368,8 +4368,8 @@ __metadata:
   linkType: hard
 
 "vite@npm:^4.1.0":
-  version: 4.3.5
-  resolution: "vite@npm:4.3.5"
+  version: 4.3.7
+  resolution: "vite@npm:4.3.7"
   dependencies:
     esbuild: ^0.17.5
     fsevents: ~2.3.2
@@ -4400,7 +4400,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 56c5de4c6a4cb383492302173372be71c4e55a9eabc7268b6036152880800b7a85ee19be3d4c9f2cdd7af33df53c0153c58e6db402b08e8f6299a7b15fd53b88
+  checksum: 7d148052419840dfc2b650309924f841d333dfcf5da10d839c9af715da45b1313a771dbb0356145db4aa827e86eb9f7673daffeca9a90d24eade2d4f70d5dad6
   languageName: node
   linkType: hard
 

diff --git a/packages/studio/package.json b/packages/studio/package.json
@@ -45,7 +45,7 @@
     "jsonwebtoken": "9.0.0",
     "lodash.escape": "4.0.1",
     "pretty-bytes": "5.6.0",
-    "qs": "6.11.1",
+    "qs": "6.11.2",
     "split2": "4.2.0",
     "sqlite": "4.2.0",
     "sqlite3": "5.1.6",

diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
@@ -29,7 +29,7 @@
     "@babel/runtime-corejs3": "7.21.5",
     "@redwoodjs/project-config": "5.0.0",
     "@redwoodjs/structure": "5.0.0",
-    "@whatwg-node/fetch": "0.8.8",
+    "@whatwg-node/fetch": "0.9.0",
     "ci-info": "3.8.0",
     "core-js": "3.30.2",
     "envinfo": "7.8.1",

diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -31,14 +31,14 @@
     "@vitejs/plugin-react": "4.0.0",
     "buffer": "6.0.3",
     "core-js": "3.30.2",
-    "vite": "4.3.5",
+    "vite": "4.3.7",
     "vite-plugin-commonjs": "0.6.2",
     "vite-plugin-environment": "1.1.3",
     "vite-plugin-html": "3.2.0"
   },
   "devDependencies": {
     "@babel/cli": "7.21.5",
-    "glob": "10.2.3",
+    "glob": "10.2.4",
     "jest": "29.5.0",
     "typescript": "5.0.4"
   },