@nx/webpack 18.2.2 → 18.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "18.2.2",
+  "version": "18.2.3",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -63,9 +63,9 @@
     "webpack-dev-server": "^4.9.3",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "18.2.2",
-    "@nx/js": "18.2.2",
-    "@nrwl/webpack": "18.2.2"
+    "@nx/devkit": "18.2.3",
+    "@nx/js": "18.2.3",
+    "@nrwl/webpack": "18.2.3"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/dev-server/dev-server.impl.js

@@ -48,6 +48,11 @@ async function* devServerExecutor(serveOptions, context) {
                 configuration: serveOptions.buildTarget.split(':')[2],
             });
         }
+        else if (userDefinedWebpackConfig) {
+            // New behavior, we want the webpack config to export object
+            config = userDefinedWebpackConfig;
+            config.devServer ??= devServer;
+        }
     }
     return yield* (0, rxjs_for_await_1.eachValueFrom)((0, run_webpack_1.runWebpackDevServer)(config, webpack, WebpackDevServer).pipe((0, operators_1.tap)(({ stats }) => {
         console.info(stats.toString(config.stats));

package/src/utils/ensure-dependencies.js

@@ -20,7 +20,6 @@ function ensureDependencies(tree, options) {
             versions_1.reactRefreshWebpackPluginVersion;
         devDependencies['@svgr/webpack'] = versions_1.svgrWebpackVersion;
         devDependencies['react-refresh'] = versions_1.reactRefreshVersion;
-        devDependencies['url-loader'] = versions_1.urlLoaderVersion;
     }
     tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies));
     return (0, devkit_1.runTasksInSerial)(...tasks);

package/src/utils/module-federation/get-remotes-for-host.d.ts

@@ -7,7 +7,8 @@ interface ModuleFederationExecutorContext {
 }
 export declare function getRemotes(devRemotes: string[], skipRemotes: string[], config: ModuleFederationConfig, context: ModuleFederationExecutorContext, pathToManifestFile?: string): {
     staticRemotes: string[];
-    devRemotes: string[];
+    devRemotes: any[];
+    dynamicRemotes: any[];
     remotePorts: any[];
 };
 export declare function getModuleFederationConfig(tsconfigPath: string, workspaceRoot: string, projectRoot: string, pluginName?: 'react' | 'angular'): any;

package/src/utils/module-federation/get-remotes-for-host.js

@@ -9,6 +9,7 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 function extractRemoteProjectsFromConfig(config, pathToManifestFile) {
     const remotes = [];
+    const dynamicRemotes = [];
     if (pathToManifestFile && (0, fs_1.existsSync)(pathToManifestFile)) {
         const moduleFederationManifestJson = (0, fs_1.readFileSync)(pathToManifestFile, 'utf-8');
         if (moduleFederationManifestJson) {
@@ -18,13 +19,13 @@ function extractRemoteProjectsFromConfig(config, pathToManifestFile) {
             // }
             const parsedManifest = JSON.parse(moduleFederationManifestJson);
             if (Object.keys(parsedManifest).every((key) => typeof key === 'string' && typeof parsedManifest[key] === 'string')) {
-                remotes.push(...Object.keys(parsedManifest));
+                dynamicRemotes.push(...Object.keys(parsedManifest));
             }
         }
     }
     const staticRemotes = config.remotes?.map((r) => (Array.isArray(r) ? r[0] : r)) ?? [];
     remotes.push(...staticRemotes);
-    return remotes;
+    return { remotes, dynamicRemotes };
 }
 function collectRemoteProjects(remote, collected, context) {
     const remoteProject = context.projectGraph.nodes[remote]?.data;
@@ -35,30 +36,33 @@ function collectRemoteProjects(remote, collected, context) {
     const remoteProjectRoot = remoteProject.root;
     const remoteProjectTsConfig = remoteProject.targets['build'].options.tsConfig;
     const remoteProjectConfig = getModuleFederationConfig(remoteProjectTsConfig, context.root, remoteProjectRoot);
-    const remoteProjectRemotes = extractRemoteProjectsFromConfig(remoteProjectConfig);
+    const { remotes: remoteProjectRemotes } = extractRemoteProjectsFromConfig(remoteProjectConfig);
     remoteProjectRemotes.forEach((r) => collectRemoteProjects(r, collected, context));
 }
 function getRemotes(devRemotes, skipRemotes, config, context, pathToManifestFile) {
     const collectedRemotes = new Set();
-    const remotes = extractRemoteProjectsFromConfig(config, pathToManifestFile);
+    const { remotes, dynamicRemotes } = extractRemoteProjectsFromConfig(config, pathToManifestFile);
     remotes.forEach((r) => collectRemoteProjects(r, collectedRemotes, context));
     const remotesToSkip = new Set((0, find_matching_projects_1.findMatchingProjects)(skipRemotes, context.projectGraph.nodes) ?? []);
     if (remotesToSkip.size > 0) {
         devkit_1.logger.info(`Remotes not served automatically: ${[...remotesToSkip.values()].join(', ')}`);
     }
     const knownRemotes = Array.from(collectedRemotes).filter((r) => !remotesToSkip.has(r));
-    devkit_1.logger.info(`NX Starting module federation dev-server for ${chalk.bold(context.projectName)} with ${knownRemotes.length} remotes`);
+    const knownDynamicRemotes = dynamicRemotes.filter((r) => !remotesToSkip.has(r));
+    devkit_1.logger.info(`NX Starting module federation dev-server for ${chalk.bold(context.projectName)} with ${[...knownRemotes, ...knownDynamicRemotes].length} remotes`);
     const devServeApps = new Set(!devRemotes
         ? []
         : Array.isArray(devRemotes)
             ? (0, find_matching_projects_1.findMatchingProjects)(devRemotes, context.projectGraph.nodes)
             : (0, find_matching_projects_1.findMatchingProjects)([devRemotes], context.projectGraph.nodes));
     const staticRemotes = knownRemotes.filter((r) => !devServeApps.has(r));
-    const devServeRemotes = knownRemotes.filter((r) => devServeApps.has(r));
-    const remotePorts = devServeRemotes.map((r) => context.projectGraph.nodes[r].data.targets['serve'].options.port);
+    const devServeRemotes = [...knownRemotes, ...dynamicRemotes].filter((r) => devServeApps.has(r));
+    const staticDynamicRemotes = knownDynamicRemotes.filter((r) => !devServeApps.has(r));
+    const remotePorts = [...devServeRemotes, ...staticDynamicRemotes].map((r) => context.projectGraph.nodes[r].data.targets['serve'].options.port);
     return {
         staticRemotes,
         devRemotes: devServeRemotes,
+        dynamicRemotes: staticDynamicRemotes,
         remotePorts,
     };
 }

package/src/utils/versions.d.ts

@@ -5,4 +5,3 @@ export declare const webpackCliVersion = "^5.1.4";
 export declare const reactRefreshWebpackPluginVersion = "^0.5.7";
 export declare const svgrWebpackVersion = "^8.0.1";
 export declare const reactRefreshVersion = "^0.10.0";
-export declare const urlLoaderVersion = "^4.1.1";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.urlLoaderVersion = exports.reactRefreshVersion = exports.svgrWebpackVersion = exports.reactRefreshWebpackPluginVersion = exports.webpackCliVersion = exports.tsLibVersion = exports.swcLoaderVersion = exports.nxVersion = void 0;
+exports.reactRefreshVersion = exports.svgrWebpackVersion = exports.reactRefreshWebpackPluginVersion = exports.webpackCliVersion = exports.tsLibVersion = exports.swcLoaderVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.swcLoaderVersion = '0.1.15';
 exports.tsLibVersion = '^2.3.0';
@@ -9,4 +9,3 @@ exports.webpackCliVersion = '^5.1.4';
 exports.reactRefreshWebpackPluginVersion = '^0.5.7';
 exports.svgrWebpackVersion = '^8.0.1';
 exports.reactRefreshVersion = '^0.10.0';
-exports.urlLoaderVersion = '^4.1.1';