Merge branch 'main' of github.com:redwoodjs/redwood into feat/storybo…

…ok-smoke-test * 'main' of github.com:redwoodjs/redwood: Remove extra checkout in RC workflow (redwoodjs#5414) chore(deps): update dependency @azure/msal-browser to v2.24.0 (redwoodjs#5412) fix(deps): update react monorepo (redwoodjs#5406) cli upgrade: Always search from the start for semvers (redwoodjs#5368) codegen graphql schema (redwoodjs#5213) fix(deps): update dependency core-js to v3.22.4 (redwoodjs#5409) fix(deps): update typescript-eslint monorepo to v5.22.0 (redwoodjs#5410) Add graphql-scalars to graphql-server (redwoodjs#5408) Update yarn.lock v1.2.1 fix(deps): update dependency cross-undici-fetch to v0.3.6 (redwoodjs#5402) fix(deps): update dependency cross-undici-fetch to v0.3.5 (redwoodjs#5398) fix(deps): update dependency cross-undici-fetch to v0.3.3 (redwoodjs#5378) chore(story📗): extract MSW logic into a loader (redwoodjs#4919)
dac09 · May 3, 2022 · 2a54b09 · 2a54b09
2 parents c0e1916 + af131c2
commit 2a54b09
Show file tree

Hide file tree

Showing 40 changed files with 552 additions and 266 deletions.
diff --git a/.github/workflows/publish-release-candidate.yml b/.github/workflows/publish-release-candidate.yml
@@ -56,7 +56,6 @@ jobs:
           #  This is required because lerna uses tags to determine the version.
           fetch-depth: 0
 
-      - uses: actions/checkout@v3
       - name: 🧶 Setup job
         uses: ./.github/actions/setup_job
 
@@ -74,7 +73,6 @@ jobs:
 
       - name: 🚢 Publish
         run: |
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
           echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}" > .npmrc
           SEMVER=$(basename $(dirname ${{ github.ref_name }}))
           yarn lerna publish pre$SEMVER --include-merged-tags \

diff --git a/__fixtures__/test-project/api/package.json b/__fixtures__/test-project/api/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "1.2.0",
-    "@redwoodjs/graphql-server": "1.2.0"
+    "@redwoodjs/api": "1.2.1",
+    "@redwoodjs/graphql-server": "1.2.1"
   }
 }
diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json
@@ -8,7 +8,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "1.2.0",
+    "@redwoodjs/core": "1.2.1",
     "autoprefixer": "^10.4.4",
     "postcss": "^8.4.12",
     "postcss-loader": "^6.2.1",

diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json
@@ -13,10 +13,10 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/auth": "1.2.0",
-    "@redwoodjs/forms": "1.2.0",
-    "@redwoodjs/router": "1.2.0",
-    "@redwoodjs/web": "1.2.0",
+    "@redwoodjs/auth": "1.2.1",
+    "@redwoodjs/forms": "1.2.1",
+    "@redwoodjs/router": "1.2.1",
+    "@redwoodjs/web": "1.2.1",
     "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-dom": "17.0.2"

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0",
+  "version": "1.2.1",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "babel-plugin-auto-import": "1.1.0",
     "babel-plugin-remove-code": "0.0.6",
     "boxen": "5.1.2",
-    "core-js": "3.22.3",
+    "core-js": "3.22.4",
     "cypress": "9.6.0",
     "cypress-wait-until": "1.7.2",
     "eslint": "8.14.0",

diff --git a/packages/api-server/package.json b/packages/api-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/api-server",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Redwood's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/api",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
-    "@redwoodjs/auth": "1.2.0",
+    "@redwoodjs/auth": "1.2.1",
     "@types/crypto-js": "4.1.1",
     "@types/jsonwebtoken": "8.5.8",
     "@types/md5": "2.3.2",

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@auth0/auth0-spa-js": "1.21.0",
-    "@azure/msal-browser": "2.23.0",
+    "@azure/msal-browser": "2.24.0",
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
     "@clerk/clerk-js": "3.9.0",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/cli",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "The Redwood Command Line",
   "repository": {
     "type": "git",
@@ -29,17 +29,17 @@
   },
   "dependencies": {
     "@prisma/sdk": "3.13.0",
-    "@redwoodjs/api-server": "1.2.0",
-    "@redwoodjs/internal": "1.2.0",
-    "@redwoodjs/prerender": "1.2.0",
-    "@redwoodjs/structure": "1.2.0",
-    "@redwoodjs/telemetry": "1.2.0",
+    "@redwoodjs/api-server": "1.2.1",
+    "@redwoodjs/internal": "1.2.1",
+    "@redwoodjs/prerender": "1.2.1",
+    "@redwoodjs/structure": "1.2.1",
+    "@redwoodjs/telemetry": "1.2.1",
     "boxen": "5.1.2",
     "camelcase": "6.3.0",
     "chalk": "4.1.2",
     "concurrently": "7.1.0",
     "configstore": "3.1.5",
-    "core-js": "3.22.3",
+    "core-js": "3.22.4",
     "cross-env": "7.0.3",
     "decamelize": "5.0.0",
     "dotenv-defaults": "5.0.0",

diff --git a/packages/cli/src/commands/upgrade.js b/packages/cli/src/commands/upgrade.js
@@ -64,7 +64,7 @@ export const builder = (yargs) => {
 
 // Used in yargs builder to coerce tag AND to parse yarn version
 const SEMVER_REGEX =
-  /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(?=$|\s)/gi
+  /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(?=$|\s)/i
 const validateTag = (tag) => {
   const isTagValid =
     tag === 'rc' ||

diff --git a/packages/codemods/package.json b/packages/codemods/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/codemods",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Codemods to ease upgrading a RedwoodJS Project",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "@babel/plugin-transform-typescript": "7.16.7",
     "@babel/runtime-corejs3": "7.16.7",
     "@vscode/ripgrep": "1.14.2",
-    "core-js": "3.22.3",
+    "core-js": "3.22.4",
     "cross-undici-fetch": "0.3.6",
     "deepmerge": "4.2.2",
     "fast-glob": "3.2.11",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/core",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Foundational packages and config required to build RedwoodJS.",
   "repository": {
     "type": "git",
@@ -46,18 +46,18 @@
     "@babel/preset-typescript": "7.16.7",
     "@babel/runtime-corejs3": "7.16.7",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
-    "@redwoodjs/cli": "1.2.0",
-    "@redwoodjs/eslint-config": "1.2.0",
-    "@redwoodjs/internal": "1.2.0",
-    "@redwoodjs/testing": "1.2.0",
+    "@redwoodjs/cli": "1.2.1",
+    "@redwoodjs/eslint-config": "1.2.1",
+    "@redwoodjs/internal": "1.2.1",
+    "@redwoodjs/testing": "1.2.1",
     "babel-loader": "8.2.3",
     "babel-plugin-auto-import": "1.1.0",
     "babel-plugin-graphql-tag": "3.3.0",
     "babel-plugin-inline-react-svg": "2.0.1",
     "babel-plugin-module-resolver": "4.1.0",
     "babel-timing": "0.9.1",
     "copy-webpack-plugin": "10.2.4",
-    "core-js": "3.22.3",
+    "core-js": "3.22.4",
     "css-loader": "6.7.1",
     "css-minimizer-webpack-plugin": "3.4.1",
     "dotenv-webpack": "7.1.0",
@@ -72,7 +72,7 @@
     "mini-css-extract-plugin": "2.6.0",
     "nodemon": "2.0.16",
     "null-loader": "4.0.1",
-    "react-refresh": "0.11.0",
+    "react-refresh": "0.13.0",
     "rimraf": "3.0.2",
     "style-loader": "3.3.1",
     "svg-react-loader": "0.4.6",

diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-redwood-app",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -24,8 +24,8 @@
     "@babel/core": "7.16.7",
     "@babel/node": "7.16.7",
     "@babel/runtime-corejs3": "7.16.7",
-    "@redwoodjs/internal": "1.2.0",
-    "@redwoodjs/telemetry": "1.2.0",
+    "@redwoodjs/internal": "1.2.1",
+    "@redwoodjs/telemetry": "1.2.1",
     "chalk": "4.1.2",
     "check-node-version": "4.2.1",
     "execa": "5.1.1",

diff --git a/packages/create-redwood-app/template/api/package.json b/packages/create-redwood-app/template/api/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "1.2.0",
-    "@redwoodjs/graphql-server": "1.2.0"
+    "@redwoodjs/api": "1.2.1",
+    "@redwoodjs/graphql-server": "1.2.1"
   }
 }
diff --git a/packages/create-redwood-app/template/package.json b/packages/create-redwood-app/template/package.json
@@ -8,7 +8,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "1.2.0"
+    "@redwoodjs/core": "1.2.1"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",

diff --git a/packages/create-redwood-app/template/web/package.json b/packages/create-redwood-app/template/web/package.json
@@ -13,9 +13,9 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/forms": "1.2.0",
-    "@redwoodjs/router": "1.2.0",
-    "@redwoodjs/web": "1.2.0",
+    "@redwoodjs/forms": "1.2.1",
+    "@redwoodjs/router": "1.2.1",
+    "@redwoodjs/web": "1.2.1",
     "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-dom": "17.0.2"

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/eslint-config",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -15,9 +15,9 @@
     "@babel/core": "7.16.7",
     "@babel/eslint-parser": "7.16.5",
     "@babel/eslint-plugin": "7.16.5",
-    "@redwoodjs/internal": "1.2.0",
-    "@typescript-eslint/eslint-plugin": "5.21.0",
-    "@typescript-eslint/parser": "5.21.0",
+    "@redwoodjs/internal": "1.2.1",
+    "@typescript-eslint/eslint-plugin": "5.22.0",
+    "@typescript-eslint/parser": "5.22.0",
     "eslint": "8.14.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-import-resolver-babel-module": "5.3.1",
@@ -27,7 +27,7 @@
     "eslint-plugin-jsx-a11y": "6.5.1",
     "eslint-plugin-prettier": "4.0.0",
     "eslint-plugin-react": "7.29.4",
-    "eslint-plugin-react-hooks": "4.3.0",
+    "eslint-plugin-react-hooks": "4.5.0",
     "prettier": "2.6.2"
   },
   "devDependencies": {

diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/forms",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",

diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/graphql-server",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -32,8 +32,8 @@
     "@graphql-tools/utils": "8.6.9",
     "@graphql-yoga/common": "2.4.0",
     "@prisma/client": "3.13.0",
-    "@redwoodjs/api": "1.2.0",
-    "core-js": "3.22.3",
+    "@redwoodjs/api": "1.2.1",
+    "core-js": "3.22.4",
     "cross-undici-fetch": "0.3.6",
     "graphql": "16.4.0",
     "graphql-scalars": "1.17.0",
@@ -47,7 +47,7 @@
     "@babel/core": "7.16.7",
     "@envelop/testing": "4.3.1",
     "@envelop/types": "2.0.0",
-    "@redwoodjs/auth": "1.2.0",
+    "@redwoodjs/auth": "1.2.1",
     "@types/lodash.merge": "4.6.7",
     "@types/lodash.omitby": "4.6.7",
     "@types/uuid": "8.3.4",

diff --git a/packages/internal/package.json b/packages/internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/internal",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -40,11 +40,11 @@
     "@graphql-codegen/typescript-operations": "2.3.5",
     "@graphql-codegen/typescript-react-apollo": "3.2.11",
     "@graphql-codegen/typescript-resolvers": "2.6.1",
-    "@redwoodjs/graphql-server": "1.2.0",
+    "@redwoodjs/graphql-server": "1.2.1",
     "babel-plugin-graphql-tag": "3.3.0",
     "babel-plugin-polyfill-corejs3": "0.5.0",
     "chalk": "4.1.2",
-    "core-js": "3.22.3",
+    "core-js": "3.22.4",
     "deepmerge": "4.2.2",
     "esbuild": "0.14.38",
     "fast-glob": "3.2.11",

diff --git a/packages/internal/src/__tests__/__snapshots__/graphqlSchema.test.ts.snap b/packages/internal/src/__tests__/__snapshots__/graphqlSchema.test.ts.snap
@@ -0,0 +1,44 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Generates GraphQL schema 1`] = `
+"directive @requireAuth(roles: [String]) on FIELD_DEFINITION
+
+directive @skipAuth on FIELD_DEFINITION
+
+scalar BigInt
+
+scalar Date
+
+scalar DateTime
+
+scalar JSON
+
+scalar JSONObject
+
+type Mutation {
+  createTodo(body: String!): Todo
+  renameTodo(body: String!, id: Int!): Todo
+  updateTodoStatus(id: Int!, status: String!): Todo
+}
+
+type Query {
+  currentUser: JSON
+  redwood: Redwood
+  todos: [Todo]
+  todosCount: Int!
+}
+
+type Redwood {
+  currentUser: JSON
+  prismaVersion: String
+  version: String
+}
+
+scalar Time
+
+type Todo {
+  body: String!
+  id: Int!
+  status: String!
+}"
+`;