@nx/react 17.3.0-beta.5 → 17.3.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "17.3.0-beta.5",
+  "version": "17.3.0-beta.8",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -35,13 +35,13 @@
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "file-loader": "^6.2.0",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.3.0-beta.5",
-    "@nx/js": "17.3.0-beta.5",
-    "@nx/eslint": "17.3.0-beta.5",
-    "@nx/web": "17.3.0-beta.5",
-    "@nrwl/react": "17.3.0-beta.5"
+    "@nx/devkit": "17.3.0-beta.8",
+    "@nx/js": "17.3.0-beta.8",
+    "@nx/eslint": "17.3.0-beta.8",
+    "@nx/web": "17.3.0-beta.8",
+    "@nrwl/react": "17.3.0-beta.8"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/component/files/__fileName__.tsx__tmpl__

@@ -64,7 +64,7 @@ const Styled<%= className %> = styled.div`
         <% } %>
       </<%= wrapper %>>
     );
-  };
+  }
   <% } %>
 
   export default <%= className %>;

package/src/generators/federate-module/schema.d.ts

@@ -4,7 +4,7 @@ export interface Schema {
   remote: string;
   remoteDirectory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
-  e2eTestRunner?: 'cypress' | 'none';
+  e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   host?: string;
   linter?: Linter;
   skipFormat?: boolean;

package/src/generators/federate-module/schema.json

@@ -68,7 +68,7 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "none"],
+      "enum": ["cypress", "playwright", "none"],
       "description": "Test runner to use for end to end (e2e) tests.",
       "default": "cypress"
     },

package/src/generators/hook/files/__fileName__.ts__tmpl__

@@ -1,15 +1,15 @@
-import { useState, useCallback } from 'react'
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface <%= hookTypeName %> {
-  count: number;
-  increment: () => void;
-}
-
-export function <%= hookName %>(): <%= hookTypeName %> {
-  const [count, setCount] = useState(0)
-  const increment = useCallback(() => setCount((x) => x + 1), [])
-  return { count, increment }
-};
-
-export default <%= hookName %>;
+import { useState, useCallback } from 'react'
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface <%= hookTypeName %> {
+  count: number;
+  increment: () => void;
+}
+
+export function <%= hookName %>(): <%= hookTypeName %> {
+  const [count, setCount] = useState(0)
+  const increment = useCallback(() => setCount((x) => x + 1), [])
+  return { count, increment }
+}
+
+export default <%= hookName %>;

package/src/generators/host/schema.d.ts

@@ -8,7 +8,7 @@ export interface Schema {
   devServerPort?: number;
   directory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
-  e2eTestRunner: 'cypress' | 'none';
+  e2eTestRunner: 'cypress' | 'playwright' | 'none';
   globalCss?: boolean;
   js?: boolean;
   linter: Linter;

package/src/generators/host/schema.json

@@ -99,7 +99,7 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "none"],
+      "enum": ["cypress", "playwright", "none"],
       "description": "Test runner to use for end to end (e2e) tests.",
       "default": "cypress"
     },

package/src/generators/init/init.js

@@ -12,7 +12,7 @@ async function reactInitGenerator(host, schema) {
             'react-dom': versions_1.reactDomVersion,
         }, {
             '@nx/react': versions_1.nxVersion,
-        }));
+        }, undefined, schema.keepExistingVersions));
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

package/src/generators/init/schema.d.ts

@@ -1,4 +1,5 @@
 export interface InitSchema {
   skipFormat?: boolean;
   skipPackageJson?: boolean;
+  keepExistingVersions?: boolean;
 }

package/src/generators/init/schema.json

@@ -15,6 +15,12 @@
       "description": "Do not add dependencies to `package.json`.",
       "type": "boolean",
       "default": false
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
     }
   },
   "required": []

package/src/generators/remote/schema.d.ts

@@ -9,7 +9,7 @@ export interface Schema {
   devServerPort?: number;
   directory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
-  e2eTestRunner: 'cypress' | 'none';
+  e2eTestRunner: 'cypress' | 'playwright' | 'none';
   globalCss?: boolean;
   host?: string;
   js?: boolean;

package/src/generators/remote/schema.json

@@ -105,7 +105,7 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "none"],
+      "enum": ["cypress", "playwright", "none"],
       "description": "Test runner to use for end to end (e2e) tests.",
       "default": "cypress"
     },

package/src/generators/stories/stories.js

@@ -6,7 +6,7 @@ const component_cypress_spec_1 = require("../component-cypress-spec/component-cy
 const ast_utils_1 = require("../../utils/ast-utils");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const minimatch = require("minimatch");
+const minimatch_1 = require("minimatch");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const versions_1 = require("../../utils/versions");
 let tsModule;
@@ -53,7 +53,7 @@ async function createAllStories(tree, projectName, interactionTests, js, project
         // Ignore private files starting with "_".
         if ((0, path_1.basename)(path).startsWith('_'))
             return;
-        if (ignorePaths?.some((pattern) => minimatch(path, pattern)))
+        if (ignorePaths?.some((pattern) => (0, minimatch_1.minimatch)(path, pattern)))
             return;
         if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
             (path.endsWith('.js') && !path.endsWith('.spec.js')) ||