@nx/rspack 22.7.0-beta.1 → 22.7.0-beta.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/rspack",
   "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
-  "version": "22.7.0-beta.1",
+  "version": "22.7.0-beta.11",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,10 +24,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/devkit": "22.7.0-beta.1",
-    "@nx/js": "22.7.0-beta.1",
-    "@nx/module-federation": "22.7.0-beta.1",
-    "@nx/web": "22.7.0-beta.1",
+    "@nx/devkit": "22.7.0-beta.11",
+    "@nx/js": "22.7.0-beta.11",
+    "@nx/module-federation": "22.7.0-beta.11",
+    "@nx/web": "22.7.0-beta.11",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "@rspack/core": "1.6.8",
     "@rspack/dev-server": "^1.1.4",
@@ -57,8 +57,8 @@
     "webpack-node-externals": "^3.0.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.1",
-    "@nx/nest": "22.7.0-beta.1"
+    "nx": "22.7.0-beta.11",
+    "@nx/nest": "22.7.0-beta.11"
   },
   "peerDependencies": {
     "@module-federation/enhanced": "^2.1.0",
@@ -69,6 +69,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "types": "./src/index.d.ts"
+  }
 }

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAMd,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAuBD,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CA4B5D,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAMd,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAqBD,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAgC5D,CAAC"}

package/src/plugins/plugin.js

@@ -13,7 +13,6 @@ const path_1 = require("path");
 const read_rspack_options_1 = require("../utils/read-rspack-options");
 const resolve_user_defined_rspack_config_1 = require("../utils/resolve-user-defined-rspack-config");
 const util_1 = require("@nx/js/src/plugins/typescript/util");
-const pmc = (0, package_manager_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     try {
         return process.env.NX_CACHE_PROJECT_GRAPH !== 'false'
@@ -39,15 +38,16 @@ exports.createNodesV2 = [
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `rspack-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
         const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const pmc = (0, package_manager_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup), configFilePaths, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup, pmc), configFilePaths, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
         }
     },
 ];
-async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc) {
     const projectRoot = (0, path_1.dirname)(configFilePath);
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
@@ -70,7 +70,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     // We do not want to alter how the hash is calculated, so appending the config file path to the hash
     // to prevent vite/vitest files overwriting the target cache created by the other
     const hash = `${nodeHash}_${configFilePath}`;
-    targetsCache[hash] ??= await createRspackTargets(configFilePath, projectRoot, normalizedOptions, context, isTsSolutionSetup);
+    targetsCache[hash] ??= await createRspackTargets(configFilePath, projectRoot, normalizedOptions, context, isTsSolutionSetup, pmc);
     const { targets, metadata } = targetsCache[hash];
     return {
         projects: {
@@ -82,7 +82,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         },
     };
 }
-async function createRspackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup) {
+async function createRspackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const rspackConfig = await (0, resolve_user_defined_rspack_config_1.resolveUserDefinedRspackConfig)((0, path_1.join)(context.workspaceRoot, configFilePath), (0, js_1.getRootTsConfigPath)(), true);
     const rspackOptions = await (0, read_rspack_options_1.readRspackOptions)(rspackConfig);

package/src/plugins/utils/plugins/rspack-nx-build-coordination-plugin.js

@@ -47,7 +47,7 @@ class RspackNxBuildCoordinationPlugin {
         try {
             return await new Promise((res) => {
                 this.buildCmdProcess = (0, child_process_1.exec)(this.buildCmd, {
-                    windowsHide: false,
+                    windowsHide: true,
                 });
                 this.buildCmdProcess.stdout.pipe(process.stdout);
                 this.buildCmdProcess.stderr.pipe(process.stderr);

package/project.json

@@ -1,39 +0,0 @@
-{
-    "name": "rspack",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/rspack/src",
-    "projectType": "library",
-    "targets": {
-        "build": {
-            "outputs": ["{workspaceRoot}/dist/packages/rspack/README.md"],
-            "command": "node ./scripts/copy-readme.js rspack"
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    "packages/rspack/*.md",
-                    {
-                        "input": "./packages/rspack/src",
-                        "glob": "**/!(*.ts)",
-                        "output": "./src"
-                    },
-                    {
-                        "input": "./packages/rspack/src",
-                        "glob": "**/*.d.ts",
-                        "output": "./src"
-                    },
-                    {
-                        "input": "./packages/rspack",
-                        "glob": "**.json",
-                        "output": ".",
-                        "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"]
-                    },
-                    "LICENSE"
-                ]
-            }
-        }
-    },
-    "tags": []
-}

package/src/generators/convert-to-inferred/__snapshots__/convert-to-inferred.spec.ts.snap

@@ -1,268 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`convert-to-inferred all projects should migrate all projects using the rspack executors 1`] = `
-"const { NxAppRspackPlugin } = require('@nx/rspack/app-plugin');
-const { NxReactRspackPlugin } = require('@nx/rspack/react-plugin');
-const { useLegacyNxPlugin } = require('@nx/rspack');
-
-// These options were migrated by @nx/rspack:convert-to-inferred from
-// the project.json file and merged with the options in this file
-const configValues = {
-  build: {
-    default: {
-      outputPath: '../../dist/apps/app1',
-      index: './src/index.html',
-      main: './src/main.tsx',
-      tsConfig: './tsconfig.app.json',
-      assets: ['./src/favicon.ico', './src/assets'],
-      styles: ['./src/styles.scss'],
-    },
-    development: {
-      extractLicenses: false,
-      optimization: false,
-      sourceMap: true,
-      vendorChunk: true,
-    },
-    production: {
-      fileReplacements: [
-        {
-          replace: './src/environments/environment.ts',
-          with: './src/environments/environment.prod.ts',
-        },
-      ],
-      optimization: true,
-      outputHashing: 'all',
-      sourceMap: false,
-      namedChunks: false,
-      extractLicenses: true,
-      vendorChunk: false,
-    },
-  },
-  serve: {
-    default: {
-      hmr: true,
-      server: {
-        type: 'https',
-        options: { cert: './server.crt', key: './server.key' },
-      },
-      port: 4200,
-      headers: { 'Access-Control-Allow-Origin': '*' },
-      historyApiFallback: {
-        index: '/index.html',
-        disableDotRule: true,
-        htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-      },
-    },
-    development: { open: true },
-    production: { hmr: false },
-  },
-};
-
-// Determine the correct configValue to use based on the configuration
-const configuration = process.env.NX_TASK_TARGET_CONFIGURATION || 'default';
-
-const buildOptions = {
-  ...configValues.build.default,
-  ...configValues.build[configuration],
-};
-const devServerOptions = {
-  ...configValues.serve.default,
-  ...configValues.serve[configuration],
-};
-
-/**
- * @type{import('@rspack/core').RspackOptionsNormalized}
- */
-module.exports = async () => ({
-  devServer: devServerOptions,
-  plugins: [
-    new NxAppRspackPlugin(buildOptions),
-    new NxReactRspackPlugin({
-      // Uncomment this line if you don't want to use SVGR
-      // See: https://react-svgr.com/
-      // svgr: false
-    }),
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    await useLegacyNxPlugin(require('./rspack.config.old'), buildOptions),
-  ],
-});
-"
-`;
-
-exports[`convert-to-inferred all projects should migrate all projects using the rspack executors 2`] = `
-"const { NxAppRspackPlugin } = require('@nx/rspack/app-plugin');
-const { NxReactRspackPlugin } = require('@nx/rspack/react-plugin');
-const { useLegacyNxPlugin } = require('@nx/rspack');
-
-// These options were migrated by @nx/rspack:convert-to-inferred from
-// the project.json file and merged with the options in this file
-const configValues = {
-  build: {
-    default: {
-      outputPath: '../../dist/apps/app2',
-      index: './src/index.html',
-      main: './src/main.tsx',
-      tsConfig: './tsconfig.app.json',
-      assets: ['./src/favicon.ico', './src/assets'],
-      styles: ['./src/styles.scss'],
-    },
-    development: {
-      extractLicenses: false,
-      optimization: false,
-      sourceMap: true,
-      vendorChunk: true,
-    },
-    production: {
-      fileReplacements: [
-        {
-          replace: './src/environments/environment.ts',
-          with: './src/environments/environment.prod.ts',
-        },
-      ],
-      optimization: true,
-      outputHashing: 'all',
-      sourceMap: false,
-      namedChunks: false,
-      extractLicenses: true,
-      vendorChunk: false,
-    },
-  },
-  serve: {
-    default: {
-      hmr: true,
-      server: {
-        type: 'https',
-        options: { cert: './server.crt', key: './server.key' },
-      },
-      port: 4200,
-      headers: { 'Access-Control-Allow-Origin': '*' },
-      historyApiFallback: {
-        index: '/index.html',
-        disableDotRule: true,
-        htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-      },
-    },
-    development: { open: true },
-    production: { hmr: false },
-  },
-};
-
-// Determine the correct configValue to use based on the configuration
-const configuration = process.env.NX_TASK_TARGET_CONFIGURATION || 'default';
-
-const buildOptions = {
-  ...configValues.build.default,
-  ...configValues.build[configuration],
-};
-const devServerOptions = {
-  ...configValues.serve.default,
-  ...configValues.serve[configuration],
-};
-
-/**
- * @type{import('@rspack/core').RspackOptionsNormalized}
- */
-module.exports = async () => ({
-  devServer: devServerOptions,
-  plugins: [
-    new NxAppRspackPlugin(buildOptions),
-    new NxReactRspackPlugin({
-      // Uncomment this line if you don't want to use SVGR
-      // See: https://react-svgr.com/
-      // svgr: false
-    }),
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    await useLegacyNxPlugin(require('./rspack.config.old'), buildOptions),
-  ],
-});
-"
-`;
-
-exports[`convert-to-inferred all projects should migrate all projects using the rspack executors 3`] = `
-"const { NxAppRspackPlugin } = require('@nx/rspack/app-plugin');
-const { NxReactRspackPlugin } = require('@nx/rspack/react-plugin');
-const { useLegacyNxPlugin } = require('@nx/rspack');
-
-// These options were migrated by @nx/rspack:convert-to-inferred from
-// the project.json file and merged with the options in this file
-const configValues = {
-  build: {
-    default: {
-      outputPath: '../../dist/apps/app3',
-      index: './src/index.html',
-      main: './src/main.tsx',
-      tsConfig: './tsconfig.app.json',
-      assets: ['./src/favicon.ico', './src/assets'],
-      styles: ['./src/styles.scss'],
-    },
-    development: {
-      extractLicenses: false,
-      optimization: false,
-      sourceMap: true,
-      vendorChunk: true,
-    },
-    production: {
-      fileReplacements: [
-        {
-          replace: './src/environments/environment.ts',
-          with: './src/environments/environment.prod.ts',
-        },
-      ],
-      optimization: true,
-      outputHashing: 'all',
-      sourceMap: false,
-      namedChunks: false,
-      extractLicenses: true,
-      vendorChunk: false,
-    },
-  },
-  serve: {
-    default: {
-      hmr: true,
-      server: {
-        type: 'https',
-        options: { cert: './server.crt', key: './server.key' },
-      },
-      port: 4200,
-      headers: { 'Access-Control-Allow-Origin': '*' },
-      historyApiFallback: {
-        index: '/index.html',
-        disableDotRule: true,
-        htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-      },
-    },
-    development: { open: true },
-    production: { hmr: false },
-  },
-};
-
-// Determine the correct configValue to use based on the configuration
-const configuration = process.env.NX_TASK_TARGET_CONFIGURATION || 'default';
-
-const buildOptions = {
-  ...configValues.build.default,
-  ...configValues.build[configuration],
-};
-const devServerOptions = {
-  ...configValues.serve.default,
-  ...configValues.serve[configuration],
-};
-
-/**
- * @type{import('@rspack/core').RspackOptionsNormalized}
- */
-module.exports = async () => ({
-  devServer: devServerOptions,
-  plugins: [
-    new NxAppRspackPlugin(buildOptions),
-    new NxReactRspackPlugin({
-      // Uncomment this line if you don't want to use SVGR
-      // See: https://react-svgr.com/
-      // svgr: false
-    }),
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    await useLegacyNxPlugin(require('./rspack.config.old'), buildOptions),
-  ],
-});
-"
-`;