@nx/react 22.7.0-pr.34971.73bed1f → 22.7.0-pr.35356.e1b62ce

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "22.7.0-pr.34971.73bed1f",
+  "version": "22.7.0-pr.35356.e1b62ce",
   "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, Vitest, Playwright, 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": {
@@ -18,7 +18,8 @@
     "Front-end"
   ],
   "main": "./index.js",
-  "typings": "./index.d.ts",
+  "type": "commonjs",
+  "types": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
@@ -37,28 +38,28 @@
     "minimatch": "10.2.4",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "22.7.0-pr.34971.73bed1f",
-    "@nx/js": "22.7.0-pr.34971.73bed1f",
-    "@nx/eslint": "22.7.0-pr.34971.73bed1f",
-    "@nx/web": "22.7.0-pr.34971.73bed1f",
-    "@nx/module-federation": "22.7.0-pr.34971.73bed1f",
-    "@nx/rollup": "22.7.0-pr.34971.73bed1f",
+    "@nx/devkit": "22.7.0-pr.35356.e1b62ce",
+    "@nx/js": "22.7.0-pr.35356.e1b62ce",
+    "@nx/eslint": "22.7.0-pr.35356.e1b62ce",
+    "@nx/web": "22.7.0-pr.35356.e1b62ce",
+    "@nx/module-federation": "22.7.0-pr.35356.e1b62ce",
+    "@nx/rollup": "22.7.0-pr.35356.e1b62ce",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.5",
     "semver": "^7.6.3"
   },
   "devDependencies": {
-    "@nx/cypress": "22.7.0-pr.34971.73bed1f",
-    "@nx/playwright": "22.7.0-pr.34971.73bed1f",
-    "@nx/rsbuild": "22.7.0-pr.34971.73bed1f",
-    "@nx/vite": "22.7.0-pr.34971.73bed1f",
-    "@nx/vitest": "22.7.0-pr.34971.73bed1f",
-    "@nx/webpack": "22.7.0-pr.34971.73bed1f",
-    "@nx/storybook": "22.7.0-pr.34971.73bed1f",
-    "nx": "22.7.0-pr.34971.73bed1f"
+    "@nx/cypress": "22.7.0-pr.35356.e1b62ce",
+    "@nx/playwright": "22.7.0-pr.35356.e1b62ce",
+    "@nx/rsbuild": "22.7.0-pr.35356.e1b62ce",
+    "@nx/vite": "22.7.0-pr.35356.e1b62ce",
+    "@nx/vitest": "22.7.0-pr.35356.e1b62ce",
+    "@nx/webpack": "22.7.0-pr.35356.e1b62ce",
+    "@nx/storybook": "22.7.0-pr.35356.e1b62ce",
+    "nx": "22.7.0-pr.35356.e1b62ce"
   },
   "optionalDependencies": {
-    "@nx/vite": "22.7.0-pr.34971.73bed1f"
+    "@nx/vite": "22.7.0-pr.35356.e1b62ce"
   },
   "publishConfig": {
     "access": "public"
@@ -216,7 +217,5 @@
       "types": "./mf/*.d.ts"
     },
     "./typings/*.d.ts": "./typings/*.d.ts"
-  },
-  "types": "./index.d.ts",
-  "type": "commonjs"
+  }
 }

package/plugins/component-testing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,yBAAyB,EAC1B,MAAM,oCAAoC,CAAC;AAsB5C,KAAK,aAAa,GAAG;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,SAAS,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,yBAAyB,GAClC;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,aAAa,GAAG,gBAAgB,CAAC;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAkIA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,yBAAyB,EAC1B,MAAM,oCAAoC,CAAC;AAsB5C,KAAK,aAAa,GAAG;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,SAAS,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,yBAAyB,GAClC;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,aAAa,GAAG,gBAAgB,CAAC;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAmIA"}

package/plugins/component-testing/index.js

@@ -45,6 +45,9 @@ function nxComponentTestingPreset(pathToConfig, options) {
                 ...{ framework: 'react', bundler: 'vite' },
                 viteConfig: async () => {
                     const viteConfigPath = findViteConfig(normalizedProjectRootPath);
+                    // TODO(jack): Remove this cast when @nx/react switches to
+                    // moduleResolution: "nodenext". Vite 8 ships ESM-only type
+                    // declarations (.d.mts) not resolvable under moduleResolution: "node".
                     const { mergeConfig, loadConfigFromFile, searchForWorkspaceRoot } = await Function('return import("vite")')();
                     const resolved = await loadConfigFromFile({
                         mode: 'watch',

package/plugins/component-testing/webpack-fallback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack-fallback.d.ts","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/webpack-fallback.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGxC,wBAAgB,sBAAsB,CAAC,EACrC,YAAiC,EACjC,QAAkB,GACnB,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,KAAK,GAAG,OAAO,CAAC;CAC3B,GAAG,aAAa,CAsEhB"}
+{"version":3,"file":"webpack-fallback.d.ts","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/webpack-fallback.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAIxC,wBAAgB,sBAAsB,CAAC,EACrC,YAAiC,EACjC,QAAkB,GACnB,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,KAAK,GAAG,OAAO,CAAC;CAC3B,GAAG,aAAa,CAuEhB"}

package/plugins/component-testing/webpack-fallback.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildBaseWebpackConfig = buildBaseWebpackConfig;
 const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
 const webpack_1 = require("@nx/webpack");
+const ts_config_1 = require("@nx/js/src/utils/typescript/ts-config");
 function buildBaseWebpackConfig({ tsConfigPath = 'tsconfig.cy.json', compiler = 'babel', }) {
     const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
     const config = {
@@ -12,6 +13,7 @@ function buildBaseWebpackConfig({ tsConfigPath = 'tsconfig.cy.json', compiler =
             plugins: [
                 new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
                     configFile: tsConfigPath,
+                    baseUrl: (0, ts_config_1.resolvePathsBaseUrl)(tsConfigPath),
                     extensions,
                 }),
             ],

package/src/generators/application/lib/bundlers/add-vite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-vite.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/react/src/generators/application/lib/bundlers/add-vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAoC,MAAM,YAAY,CAAC;AAEzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAExD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBAyDb;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBA0Cb"}
+{"version":3,"file":"add-vite.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/react/src/generators/application/lib/bundlers/add-vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAoC,MAAM,YAAY,CAAC;AAEzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAExD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBA2Db;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBA0Cb"}

package/src/generators/application/lib/bundlers/add-vite.js

@@ -67,6 +67,8 @@ async function setupViteConfiguration(tree, options, tasks) {
         addPlugin: options.addPlugin,
         projectType: 'application',
         port: options.port,
+        // React Router does not yet support Vite 8, so force Vite 7.
+        ...(options.useReactRouter ? { useViteV7: true } : {}),
     });
     tasks.push(viteTask);
     createOrEditViteConfig(tree, {

package/src/generators/host/lib/update-module-federation-tsconfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-module-federation-tsconfig.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/update-module-federation-tsconfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,QAyC1B"}
+{"version":3,"file":"update-module-federation-tsconfig.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/update-module-federation-tsconfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,QAmC1B"}

package/src/generators/host/lib/update-module-federation-tsconfig.js

@@ -8,12 +8,7 @@ function updateModuleFederationTsconfig(host, options) {
     const tsconfigRuntimePath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json');
     if (!host.exists(tsconfigPath) || !host.exists(tsconfigRuntimePath))
         return;
-    // Not setting `baseUrl` does not work with MF.
     if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-        (0, devkit_1.updateJson)(host, 'tsconfig.base.json', (json) => {
-            json.compilerOptions.baseUrl = '.';
-            return json;
-        });
         // Update references to match what `nx sync` does.
         if (options.remotes?.length) {
             (0, devkit_1.updateJson)(host, tsconfigPath, (json) => {

package/project.json

@@ -1,62 +0,0 @@
-{
-    "name": "react",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/react",
-    "projectType": "library",
-    "targets": {
-        "build": {
-            "command": "node ./scripts/copy-readme.js react",
-            "outputs": ["{workspaceRoot}/dist/packages/react/README.md"]
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    {
-                        "input": "packages/react",
-                        "glob": "**/files/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/react",
-                        "glob": "**/files/**/.gitkeep",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/react",
-                        "glob": "**/files/**/.babelrc__tmpl__",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/react",
-                        "glob": "**/files/**/.browserslistrc__tmpl__",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/react",
-                        "glob": "**/*.json",
-                        "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/react",
-                        "glob": "**/*.d.ts",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/react",
-                        "glob": "**/*.js",
-                        "ignore": ["**/jest.config.js"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "",
-                        "glob": "LICENSE",
-                        "output": "/"
-                    }
-                ]
-            }
-        }
-    }
-}