Merge branch 'main' into feat/create-suspending-cell

redwoodjs · Aug 30, 2023 · 5177391 · 5177391
2 parents 9553de1 + b5fdb47
commit 5177391
Show file tree

Hide file tree

Showing 31 changed files with 5,780 additions and 5,815 deletions.
diff --git a/__fixtures__/example-todo-main/yarn.lock b/__fixtures__/example-todo-main/yarn.lock
diff --git a/package.json b/package.json
@@ -82,9 +82,9 @@
     "jest-runner-tsd": "5.0.0",
     "jscodeshift": "0.15.0",
     "lerna": "7.1.4",
-    "listr2": "6.6.0",
+    "listr2": "6.6.1",
     "make-dir-cli": "3.0.0",
-    "msw": "1.2.3",
+    "msw": "1.2.5",
     "ncp": "2.0.0",
     "nodemon": "2.0.22",
     "npm-packlist": "7.0.4",

diff --git a/packages/api-server/package.json b/packages/api-server/package.json
@@ -39,7 +39,7 @@
     "core-js": "3.32.0",
     "fast-glob": "3.3.1",
     "fast-json-parse": "1.0.3",
-    "fastify": "4.21.0",
+    "fastify": "4.22.0",
     "fastify-raw-body": "4.2.1",
     "lodash": "4.17.21",
     "pretty-bytes": "5.6.0",

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.10",
-    "@prisma/client": "5.1.1",
+    "@prisma/client": "5.2.0",
     "@whatwg-node/fetch": "0.9.9",
     "core-js": "3.32.0",
     "humanize-string": "2.1.0",

diff --git a/packages/auth-providers/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json
@@ -30,13 +30,13 @@
     "@babel/cli": "7.22.10",
     "@babel/core": "7.22.10",
     "@types/react": "18.2.14",
-    "firebase": "10.1.0",
+    "firebase": "10.3.0",
     "jest": "29.6.2",
     "react": "18.3.0-canary-035a41c4e-20230704",
     "typescript": "5.1.6"
   },
   "peerDependencies": {
-    "firebase": "10.1.0"
+    "firebase": "10.3.0"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -32,7 +32,7 @@
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "14.0.0",
     "jest": "29.6.2",
-    "msw": "1.2.3",
+    "msw": "1.2.5",
     "typescript": "5.1.6"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/cli-helpers/package.json b/packages/cli-helpers/package.json
@@ -30,7 +30,7 @@
     "chalk": "4.1.2",
     "core-js": "3.32.0",
     "execa": "5.1.1",
-    "listr2": "6.6.0",
+    "listr2": "6.6.1",
     "lodash": "4.17.21",
     "pascalcase": "1.0.0",
     "prettier": "2.8.8",

diff --git a/packages/cli-packages/dataMigrate/e2eTest.mjs b/packages/cli-packages/dataMigrate/e2eTest.mjs
@@ -118,8 +118,6 @@ await execa.command('yarn rw g data-migration test', {
   stdio: 'inherit',
 })
 
-await execa.command('yarn rw data-migrate up', {
-  stdio: 'inherit',
-})
+await execa.command(command)
 
 // check that up worked...
diff --git a/packages/cli-packages/dataMigrate/package.json b/packages/cli-packages/dataMigrate/package.json
@@ -25,17 +25,19 @@
   },
   "dependencies": {
     "@redwoodjs/babel-config": "6.0.7",
+    "@redwoodjs/cli-helpers": "6.0.7",
     "@redwoodjs/project-config": "6.0.7",
     "@redwoodjs/telemetry": "6.0.7",
     "chalk": "4.1.2",
+    "dotenv-defaults": "5.0.2",
     "execa": "5.1.1",
     "fs-extra": "11.1.1",
-    "listr2": "6.6.0",
+    "listr2": "6.6.1",
     "terminal-link": "2.1.1",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@prisma/client": "5.1.1",
+    "@prisma/client": "5.2.0",
     "@types/fs-extra": "11.0.1",
     "@types/yargs": "17.0.24",
     "esbuild": "0.18.19",

diff --git a/packages/cli-packages/dataMigrate/src/bin.ts b/packages/cli-packages/dataMigrate/src/bin.ts
@@ -1,11 +1,23 @@
+import path from 'path'
+
+// @ts-expect-error not sure; other packages use this and don't provide the types
+import { config } from 'dotenv-defaults'
 import { hideBin } from 'yargs/helpers'
 import yargs from 'yargs/yargs'
 
+import { getPaths } from '@redwoodjs/project-config'
+
 import { description, builder } from './commands/up'
 import { handler } from './commands/upHandler'
 
+config({
+  path: path.join(getPaths().base, '.env'),
+  defaults: path.join(getPaths().base, '.env.defaults'),
+  multiline: true,
+})
+
 yargs(hideBin(process.argv))
   .scriptName('data-migrate')
-  // @ts-expect-error not sure why
+  // @ts-expect-error not sure; this is a valid signature
   .command('$0', description, builder, handler)
   .parse()
diff --git a/packages/cli-packages/dataMigrate/src/index.ts b/packages/cli-packages/dataMigrate/src/index.ts
@@ -1,3 +1,6 @@
+import terminalLink from 'terminal-link'
+import type { Argv } from 'yargs'
+
 import {
   command as installCommand,
   description as installDescription,
@@ -11,17 +14,28 @@ import {
   handler as upHandler,
 } from './commands/up'
 
+const command = 'data-migrate <command>'
+const aliases = ['dataMigrate', 'dm']
+const description = 'Migrate the data in your database'
+
+function builder(yargs: Argv) {
+  yargs
+    .command(installCommand, installDescription, installBuilder, installHandler)
+    // @ts-expect-error not sure; this is a valid signature
+    .command(upCommand, upDescription, upBuilder, upHandler)
+    .epilogue(
+      `Also see the ${terminalLink(
+        'Redwood CLI Reference',
+        'https://redwoodjs.com/docs/cli-commands#datamigrate'
+      )}`
+    )
+}
+
 export const commands = [
   {
-    command: installCommand,
-    description: installDescription,
-    builder: installBuilder,
-    handler: installHandler,
-  },
-  {
-    command: upCommand,
-    description: upDescription,
-    builder: upBuilder,
-    handler: upHandler,
+    command,
+    aliases,
+    description,
+    builder,
   },
 ]
diff --git a/packages/cli-packages/storybook/package.json b/packages/cli-packages/storybook/package.json
@@ -27,13 +27,13 @@
     "@redwoodjs/cli-helpers": "6.0.7",
     "@redwoodjs/project-config": "6.0.7",
     "@redwoodjs/telemetry": "6.0.7",
-    "@storybook/addon-a11y": "7.3.2",
-    "@storybook/addon-docs": "7.3.2",
-    "@storybook/addon-essentials": "7.3.2",
-    "@storybook/react-webpack5": "7.3.2",
+    "@storybook/addon-a11y": "7.4.0",
+    "@storybook/addon-docs": "7.4.0",
+    "@storybook/addon-essentials": "7.4.0",
+    "@storybook/react-webpack5": "7.4.0",
     "chalk": "4.1.2",
     "execa": "5.1.1",
-    "storybook": "7.3.2",
+    "storybook": "7.4.0",
     "terminal-link": "2.1.1",
     "yargs": "17.7.2"
   },

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -36,7 +36,7 @@
     "@opentelemetry/resources": "1.15.0",
     "@opentelemetry/sdk-trace-node": "1.15.0",
     "@opentelemetry/semantic-conventions": "1.15.0",
-    "@prisma/internals": "5.1.1",
+    "@prisma/internals": "5.2.0",
     "@redwoodjs/api-server": "6.0.7",
     "@redwoodjs/cli-helpers": "6.0.7",
     "@redwoodjs/fastify": "6.0.7",
@@ -57,21 +57,21 @@
     "crypto-js": "4.1.1",
     "decamelize": "5.0.1",
     "dotenv-defaults": "5.0.2",
-    "enquirer": "2.3.6",
+    "enquirer": "2.4.1",
     "envinfo": "7.9.0",
     "execa": "5.1.1",
     "fast-glob": "3.3.1",
     "fs-extra": "11.1.1",
     "humanize-string": "2.1.0",
     "latest-version": "5.1.0",
-    "listr2": "6.6.0",
+    "listr2": "6.6.1",
     "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": "5.1.1",
+    "prisma": "5.2.0",
     "prompts": "2.4.2",
     "rimraf": "5.0.1",
     "secure-random-password": "0.2.3",

diff --git a/packages/cli/src/plugin.js b/packages/cli/src/plugin.js
@@ -19,6 +19,12 @@ const PLUGIN_CACHE_DEFAULT = {
         'Launch Storybook: a tool for building UI components and pages in isolation',
     },
   },
+  '@redwoodjs/cli-data-migrate': {
+    'data-migrate': {
+      aliases: ['dataMigrate', 'dm'],
+      description: 'Migrate the data in your database',
+    },
+  },
 }
 
 const PLUGIN_CACHE_BUILTIN = [
@@ -27,9 +33,6 @@ const PLUGIN_CACHE_BUILTIN = [
   'diagnostics',
   'console',
   'c',
-  'data-migrate',
-  'dm',
-  'dataMigrate',
   'deploy',
   'destroy',
   'd',

diff --git a/packages/codemods/package.json b/packages/codemods/package.json
@@ -39,7 +39,7 @@
     "deepmerge": "4.3.1",
     "execa": "5.1.1",
     "fast-glob": "3.3.1",
-    "graphql": "16.7.1",
+    "graphql": "16.8.0",
     "jest": "29.6.2",
     "jscodeshift": "0.15.0",
     "pascalcase": "1.0.0",

diff --git a/packages/fastify/package.json b/packages/fastify/package.json
@@ -25,7 +25,7 @@
     "@redwoodjs/project-config": "6.0.7",
     "ansi-colors": "4.1.3",
     "fast-glob": "3.3.1",
-    "fastify": "4.21.0",
+    "fastify": "4.22.0",
     "fastify-raw-body": "4.2.1",
     "lodash": "4.17.21",
     "qs": "6.11.2"

diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -38,15 +38,15 @@
     "@types/react": "18.2.14",
     "@types/react-dom": "18.2.6",
     "@types/testing-library__jest-dom": "5.14.8",
-    "graphql": "16.7.1",
+    "graphql": "16.8.0",
     "jest": "29.6.2",
     "nodemon": "2.0.22",
     "react": "18.3.0-canary-035a41c4e-20230704",
     "react-dom": "18.3.0-canary-035a41c4e-20230704",
     "typescript": "5.1.6"
   },
   "peerDependencies": {
-    "graphql": "16.7.1",
+    "graphql": "16.8.0",
     "react": "18.3.0-canary-035a41c4e-20230704"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json
@@ -35,7 +35,7 @@
     "@opentelemetry/api": "1.4.1",
     "@redwoodjs/api": "6.0.7",
     "core-js": "3.32.0",
-    "graphql": "16.7.1",
+    "graphql": "16.8.0",
     "graphql-scalars": "1.22.2",
     "graphql-tag": "2.12.6",
     "graphql-yoga": "4.0.4",

diff --git a/packages/internal/package.json b/packages/internal/package.json
@@ -51,7 +51,7 @@
     "esbuild": "0.18.19",
     "fast-glob": "3.3.1",
     "fs-extra": "11.1.1",
-    "graphql": "16.7.1",
+    "graphql": "16.8.0",
     "kill-port": "1.6.1",
     "prettier": "2.8.8",
     "rimraf": "5.0.1",

diff --git a/packages/prerender/package.json b/packages/prerender/package.json
@@ -35,7 +35,7 @@
     "babel-plugin-ignore-html-and-css-imports": "0.1.0",
     "cheerio": "1.0.0-rc.12",
     "core-js": "3.32.0",
-    "graphql": "16.7.1",
+    "graphql": "16.8.0",
     "mime-types": "2.1.35"
   },
   "devDependencies": {

diff --git a/packages/realtime/package.json b/packages/realtime/package.json
@@ -31,7 +31,7 @@
     "@graphql-yoga/subscription": "4.0.0",
     "@n1ru4l/graphql-live-query": "0.10.0",
     "@n1ru4l/in-memory-live-query-store": "0.10.0",
-    "graphql": "16.7.1",
+    "graphql": "16.8.0",
     "ioredis": "5.3.2"
   },
   "devDependencies": {

diff --git a/packages/record/package.json b/packages/record/package.json
@@ -28,14 +28,14 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.10",
-    "@prisma/client": "5.1.1",
+    "@prisma/client": "5.2.0",
     "@redwoodjs/project-config": "6.0.7",
     "core-js": "3.32.0"
   },
   "devDependencies": {
     "@babel/cli": "7.22.10",
     "@babel/core": "7.22.10",
-    "@prisma/internals": "5.1.1",
+    "@prisma/internals": "5.2.0",
     "esbuild": "0.18.19",
     "jest": "29.6.2"
   },

diff --git a/packages/structure/package.json b/packages/structure/package.json
@@ -32,16 +32,16 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.10",
     "@iarna/toml": "2.2.5",
-    "@prisma/internals": "5.1.1",
+    "@prisma/internals": "5.2.0",
     "@redwoodjs/project-config": "6.0.7",
     "@types/line-column": "1.0.0",
     "camelcase": "6.3.0",
     "core-js": "3.32.0",
     "deepmerge": "4.3.1",
     "dotenv-defaults": "5.0.2",
-    "enquirer": "2.3.6",
+    "enquirer": "2.4.1",
     "fast-glob": "3.3.1",
-    "graphql": "16.7.1",
+    "graphql": "16.8.0",
     "lazy-get-decorator": "2.2.1",
     "line-column": "1.0.2",
     "lodash": "4.17.21",

diff --git a/packages/studio/frontend/package.json b/packages/studio/frontend/package.json
@@ -22,7 +22,7 @@
     "@tailwindcss/forms": "0.5.3",
     "@tremor/react": "3.4.1",
     "graphiql": "2.4.7",
-    "graphql": "16.7.1",
+    "graphql": "16.8.0",
     "graphql-scalars": "1.22.2",
     "json-bigint-patch": "0.0.8",
     "pretty-ms": "7.0.1",