@nx/react 16.4.0-beta.6 → 16.4.0-beta.8

package/migrations.json

@@ -899,6 +899,40 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "16.4.0-beta.7": {
+      "version": "16.4.0-beta.7",
+      "packages": {
+        "@types/react": {
+          "version": "18.2.12",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react-dom": {
+          "version": "18.2.5",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react-is": {
+          "version": "18.2.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "16.4.0-beta.8": {
+      "version": "16.4.0-beta.8",
+      "packages": {
+        "@emotion/styled": {
+          "version": "11.11.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@emotion/react": {
+          "version": "11.11.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@emotion/babel-plugin": {
+          "version": "11.11.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "16.4.0-beta.6",
+  "version": "16.4.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": {
@@ -31,11 +31,11 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/react": "16.4.0-beta.6",
-    "@nx/devkit": "16.4.0-beta.6",
-    "@nx/js": "16.4.0-beta.6",
-    "@nx/linter": "16.4.0-beta.6",
-    "@nx/web": "16.4.0-beta.6",
+    "@nrwl/react": "16.4.0-beta.8",
+    "@nx/devkit": "16.4.0-beta.8",
+    "@nx/js": "16.4.0-beta.8",
+    "@nx/linter": "16.4.0-beta.8",
+    "@nx/web": "16.4.0-beta.8",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
@@ -46,5 +46,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "6eda3ff725a1e5ee973e71cb711b065dcc3f2a16"
+  "gitHead": "a6589ab111fc01fd4d2cd215c31bfcff004dfc00"
 }

package/src/generators/cypress-component-configuration/lib/add-files.d.ts

@@ -1,4 +1,4 @@
 import { ProjectConfiguration, Tree } from '@nx/devkit';
 import type { CypressComponentConfigurationSchema } from '../schema';
-import { FoundTarget } from '../../../utils/ct-utils';
+import { FoundTarget } from '@nx/cypress/src/utils/find-target-options';
 export declare function addFiles(tree: Tree, projectConfig: ProjectConfiguration, options: CypressComponentConfigurationSchema, found: FoundTarget): Promise<void>;

package/src/generators/cypress-component-configuration/lib/add-files.js

@@ -12,7 +12,10 @@ function addFiles(tree, projectConfig, options, found) {
         // must dyanmicaly import to prevent packages not using cypress from erroring out
         // when importing react
         const { addMountDefinition, addDefaultCTConfig } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
-        const actualBundler = yield (0, ct_utils_1.getBundlerFromTarget)(found, tree);
+        // Specifically undefined to allow Remix workaround of passing an empty string
+        const actualBundler = options.buildTarget !== undefined && options.bundler
+            ? options.bundler
+            : yield (0, ct_utils_1.getBundlerFromTarget)(found, tree);
         if (options.bundler && options.bundler !== actualBundler) {
             devkit_1.logger.warn(`You have specified ${options.bundler} as the bundler but this project is configured to use ${actualBundler}.
       This may cause errors. If you are seeing errors, try removing the --bundler option.`);

package/src/generators/library/library.js

@@ -50,6 +50,7 @@ function libraryGenerator(host, schema) {
                 includeVitest: options.unitTestRunner === 'vitest',
                 compiler: options.compiler,
                 skipFormat: true,
+                testEnvironment: 'jsdom',
             });
             tasks.push(viteTask);
         }
@@ -78,6 +79,7 @@ function libraryGenerator(host, schema) {
                 coverageProvider: 'c8',
                 inSourceTests: options.inSourceTests,
                 skipFormat: true,
+                testEnvironment: 'jsdom',
             });
             tasks.push(vitestTask);
         }

package/src/utils/ct-utils.d.ts

@@ -1,8 +1,5 @@
-import { TargetConfiguration, Tree } from '@nx/devkit';
-export interface FoundTarget {
-    config?: TargetConfiguration;
-    target: string;
-}
+import { Tree } from '@nx/devkit';
+import { type FoundTarget } from '@nx/cypress/src/utils/find-target-options';
 export declare function addCTTargetWithBuildTarget(tree: Tree, options: {
     project: string;
     buildTarget: string;

package/src/utils/ct-utils.js

@@ -6,17 +6,21 @@ const devkit_1 = require("@nx/devkit");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const ast_utils_1 = require("./ast-utils");
 let tsModule;
-const allowedFileExt = new RegExp(/\.[jt]sx?/g);
-const isSpecFile = new RegExp(/(spec|test)\./g);
+const allowedFileExt = new RegExp(/\.[jt]sx?/);
+const isSpecFile = new RegExp(/(spec|test)\./);
 function addCTTargetWithBuildTarget(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { findBuildConfig } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/find-target-options'));
-        const found = yield findBuildConfig(tree, {
-            project: options.project,
-            buildTarget: options.buildTarget,
-            validExecutorNames: options.validExecutorNames,
-        });
-        assertValidConfig(found === null || found === void 0 ? void 0 : found.config);
+        let found = { target: options.buildTarget, config: undefined };
+        // Specifically undefined as a workaround for Remix to pass an empty string as the buildTarget
+        if (options.buildTarget === undefined) {
+            const { findBuildConfig } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/find-target-options'));
+            found = yield findBuildConfig(tree, {
+                project: options.project,
+                buildTarget: options.buildTarget,
+                validExecutorNames: options.validExecutorNames,
+            });
+            assertValidConfig(found === null || found === void 0 ? void 0 : found.config);
+        }
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
         projectConfig.targets['component-test'].options = Object.assign(Object.assign({}, projectConfig.targets['component-test'].options), { devServerTarget: found.target, skipServe: true });
         (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);

package/src/utils/versions.d.ts

@@ -5,16 +5,16 @@ export declare const reactDomVersion = "18.2.0";
 export declare const reactIsVersion = "18.2.0";
 export declare const swcLoaderVersion = "0.1.15";
 export declare const babelLoaderVersion = "^9.1.2";
-export declare const typesReactVersion = "18.0.28";
-export declare const typesReactDomVersion = "18.0.11";
-export declare const typesReactIsVersion = "17.0.3";
+export declare const typesReactVersion = "18.2.12";
+export declare const typesReactDomVersion = "18.2.5";
+export declare const typesReactIsVersion = "18.2.0";
 export declare const typesNodeVersion = "18.14.2";
 export declare const babelPresetReactVersion = "^7.14.5";
 export declare const styledComponentsVersion = "5.3.6";
 export declare const typesStyledComponentsVersion = "5.1.26";
-export declare const emotionStyledVersion = "11.10.6";
-export declare const emotionReactVersion = "11.10.6";
-export declare const emotionBabelPlugin = "11.10.6";
+export declare const emotionStyledVersion = "11.11.0";
+export declare const emotionReactVersion = "11.11.1";
+export declare const emotionBabelPlugin = "11.11.0";
 export declare const styledJsxVersion = "5.1.2";
 export declare const reactRouterDomVersion = "6.11.2";
 export declare const testingLibraryReactVersion = "14.0.0";

package/src/utils/versions.js

@@ -9,16 +9,16 @@ exports.reactDomVersion = '18.2.0';
 exports.reactIsVersion = '18.2.0';
 exports.swcLoaderVersion = '0.1.15';
 exports.babelLoaderVersion = '^9.1.2';
-exports.typesReactVersion = '18.0.28';
-exports.typesReactDomVersion = '18.0.11';
-exports.typesReactIsVersion = '17.0.3';
+exports.typesReactVersion = '18.2.12';
+exports.typesReactDomVersion = '18.2.5';
+exports.typesReactIsVersion = '18.2.0';
 exports.typesNodeVersion = '18.14.2';
 exports.babelPresetReactVersion = '^7.14.5';
 exports.styledComponentsVersion = '5.3.6';
 exports.typesStyledComponentsVersion = '5.1.26';
-exports.emotionStyledVersion = '11.10.6';
-exports.emotionReactVersion = '11.10.6';
-exports.emotionBabelPlugin = '11.10.6';
+exports.emotionStyledVersion = '11.11.0';
+exports.emotionReactVersion = '11.11.1';
+exports.emotionBabelPlugin = '11.11.0';
 // WARNING: This needs to be in sync with Next.js' dependency or else there might be issues.
 exports.styledJsxVersion = '5.1.2';
 exports.reactRouterDomVersion = '6.11.2';