Merge branch 'main' into renovate/major-jest-monorepo

redwoodjs · Aug 9, 2022 · 596682f · 596682f
2 parents b158a86 + 20a9e6c
commit 596682f
Show file tree

Hide file tree

Showing 4 changed files with 227 additions and 251 deletions.
diff --git a/packages/cli/src/commands/generate.js b/packages/cli/src/commands/generate.js
@@ -14,13 +14,14 @@ export const builder = (yargs) =>
     })
     .commandDir('./generate', {
       recurse: true,
-      /*
-      @NOTE This regex will ignore all double nested commands
-      e.g. /generate/hi.js & generate/hi/hi.js are picked up,
-      but generate/hi/utils/whatever.js will be ignored
-      The [\/\\] bit is for supporting both windows and unix style paths
-      */
-      exclude: /generate[\/\\]+.*[\/\\]+.*[\/\\]/,
+      // @NOTE This regex will ignore all commands nested more than two
+      // levels deep.
+      // e.g. /generate/hi.js & setup/hi/hi.js are picked up, but
+      // generate/hi/hello/bazinga.js will be ignored
+      // The [/\\] bit is for supporting both windows and unix style paths
+      // Also take care to not trip up on paths that have "setup" earlier
+      // in the path by eagerly matching in the start of the regexp
+      exclude: /.*[/\\]generate[/\\].*[/\\].*[/\\]/,
     })
     .demandCommand()
     .epilogue(

diff --git a/packages/cli/src/commands/setup.js b/packages/cli/src/commands/setup.js
@@ -9,13 +9,14 @@ export const builder = (yargs) =>
   yargs
     .commandDir('./setup', {
       recurse: true,
-      /*
-      @NOTE This regex will ignore all double nested commands
-      e.g. /setup/hi.js & setup/hi/hi.js are picked up,
-      but setup/hi/hello/bazinga.js will be ignored
-      The [\/\\] bit is for supporting both windows and unix style paths
-      */
-      exclude: /setup[\/\\]+.*[\/\\]+.*[\/\\]/,
+      // @NOTE This regex will ignore all commands nested more than two
+      // levels deep.
+      // e.g. /setup/hi.js & setup/hi/hi.js are picked up, but
+      // setup/hi/hello/bazinga.js will be ignored
+      // The [/\\] bit is for supporting both windows and unix style paths
+      // Also take care to not trip up on paths that have "setup" earlier
+      // in the path by eagerly matching in the start of the regexp
+      exclude: /.*[/\\]setup[/\\].*[/\\].*[/\\]/,
     })
     .demandCommand()
     .middleware(detectRwVersion)

diff --git a/packages/internal/package.json b/packages/internal/package.json
@@ -33,14 +33,14 @@
     "@babel/register": "7.16.7",
     "@babel/runtime-corejs3": "7.16.7",
     "@babel/traverse": "7.16.7",
-    "@graphql-codegen/add": "3.2.0",
-    "@graphql-codegen/cli": "2.11.0",
-    "@graphql-codegen/core": "2.6.0",
-    "@graphql-codegen/schema-ast": "2.5.0",
-    "@graphql-codegen/typescript": "2.7.2",
-    "@graphql-codegen/typescript-operations": "2.5.2",
-    "@graphql-codegen/typescript-react-apollo": "3.3.2",
-    "@graphql-codegen/typescript-resolvers": "2.7.2",
+    "@graphql-codegen/add": "3.2.1",
+    "@graphql-codegen/cli": "2.11.5",
+    "@graphql-codegen/core": "2.6.1",
+    "@graphql-codegen/schema-ast": "2.5.1",
+    "@graphql-codegen/typescript": "2.7.3",
+    "@graphql-codegen/typescript-operations": "2.5.3",
+    "@graphql-codegen/typescript-react-apollo": "3.3.3",
+    "@graphql-codegen/typescript-resolvers": "2.7.3",
     "@redwoodjs/graphql-server": "2.2.0",
     "babel-plugin-graphql-tag": "3.3.0",
     "babel-plugin-polyfill-corejs3": "0.5.0",