@nx/webpack 17.1.1 → 17.2.0-beta.0

package/package.json

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

package/src/plugins/nx-webpack-plugin/lib/apply-base-config.d.ts

@@ -1,3 +1,5 @@
 import { Configuration, WebpackOptionsNormalized } from 'webpack';
 import { NormalizedNxWebpackPluginOptions } from '../nx-webpack-plugin-options';
-export declare function applyBaseConfig(options: NormalizedNxWebpackPluginOptions, config?: Partial<WebpackOptionsNormalized | Configuration>): void;
+export declare function applyBaseConfig(options: NormalizedNxWebpackPluginOptions, config?: Partial<WebpackOptionsNormalized | Configuration>, { useNormalizedEntry, }?: {
+    useNormalizedEntry?: boolean;
+}): void;

package/src/plugins/nx-webpack-plugin/lib/apply-base-config.js

@@ -20,7 +20,7 @@ const IGNORED_WEBPACK_WARNINGS = [
 ];
 const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
 const mainFields = ['module', 'main'];
-function applyBaseConfig(options, config = {}) {
+function applyBaseConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     const plugins = [
         new nx_tsconfig_paths_webpack_plugin_1.NxTsconfigPathsWebpackPlugin(options),
     ];
@@ -67,7 +67,12 @@ function applyBaseConfig(options, config = {}) {
     }
     config.entry ??= {};
     entries.forEach((entry) => {
-        config.entry[entry.name] = { import: entry.import };
+        if (useNormalizedEntry) {
+            config.entry[entry.name] = { import: entry.import };
+        }
+        else {
+            config.entry[entry.name] = entry.import;
+        }
     });
     if (options.progress) {
         plugins.push(new webpack_1.ProgressPlugin({ profile: options.verbose }));

package/src/plugins/nx-webpack-plugin/lib/apply-web-config.d.ts

@@ -1,3 +1,5 @@
 import { Configuration, WebpackOptionsNormalized } from 'webpack';
 import { NormalizedNxWebpackPluginOptions } from '../nx-webpack-plugin-options';
-export declare function applyWebConfig(options: NormalizedNxWebpackPluginOptions, config?: Partial<WebpackOptionsNormalized | Configuration>): void;
+export declare function applyWebConfig(options: NormalizedNxWebpackPluginOptions, config?: Partial<WebpackOptionsNormalized | Configuration>, { useNormalizedEntry, }?: {
+    useNormalizedEntry?: boolean;
+}): void;

package/src/plugins/nx-webpack-plugin/lib/apply-web-config.js

@@ -12,7 +12,7 @@ const stylesheet_loaders_1 = require("./stylesheet-loaders");
 const instantiate_script_plugins_1 = require("./instantiate-script-plugins");
 const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-function applyWebConfig(options, config = {}) {
+function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     const plugins = [];
     const stylesOptimization = typeof options.optimization === 'object'
         ? options.optimization.styles
@@ -44,7 +44,7 @@ function applyWebConfig(options, config = {}) {
     if (!options.ssr) {
         plugins.push(new webpack_1.DefinePlugin((0, get_client_environment_1.getClientEnvironment)(process.env.NODE_ENV).stringified));
     }
-    const entry = {};
+    const entries = {};
     const globalStylePaths = [];
     // Determine hashing format.
     const hashFormat = (0, hash_format_1.getOutputHashFormat)(options.outputHashing);
@@ -63,11 +63,11 @@ function applyWebConfig(options, config = {}) {
         (0, normalize_entry_1.normalizeExtraEntryPoints)(options.styles, 'styles').forEach((style) => {
             const resolvedPath = path.resolve(options.root, style.input);
             // Add style entry points.
-            if (entry[style.bundleName]) {
-                entry[style.bundleName].import.push(resolvedPath);
+            if (entries[style.bundleName]) {
+                entries[style.bundleName].import.push(resolvedPath);
             }
             else {
-                entry[style.bundleName] = { import: [resolvedPath] };
+                entries[style.bundleName] = { import: [resolvedPath] };
             }
             // Add global css paths.
             globalStylePaths.push(resolvedPath);
@@ -272,7 +272,14 @@ function applyWebConfig(options, config = {}) {
         throw new Error('Entry string is not supported. Use an object.');
     if (Array.isArray(config.entry))
         throw new Error('Entry array is not supported. Use an object.');
-    config.entry = { ...config.entry, ...entry };
+    Object.entries(entries).forEach(([entryName, entryData]) => {
+        if (useNormalizedEntry) {
+            config.entry[entryName] = { import: entryData.import };
+        }
+        else {
+            config.entry[entryName] = entryData.import;
+        }
+    });
     config.optimization = {
         ...config.optimization,
         minimizer: [...config.optimization.minimizer, ...minimizer],

package/src/plugins/nx-webpack-plugin/nx-webpack-plugin.js

@@ -31,12 +31,16 @@ class NxWebpackPlugin {
         if (this.options.deleteOutputPath) {
             (0, fs_1.deleteOutputDir)(this.options.root, this.options.outputPath);
         }
-        (0, apply_base_config_1.applyBaseConfig)(this.options, compiler.options);
+        (0, apply_base_config_1.applyBaseConfig)(this.options, compiler.options, {
+            useNormalizedEntry: true,
+        });
         if (compiler.options.target) {
             this.options.target = compiler.options.target;
         }
         if (this.options.target === 'web' || this.options.target === 'webworker') {
-            (0, apply_web_config_1.applyWebConfig)(this.options, compiler.options);
+            (0, apply_web_config_1.applyWebConfig)(this.options, compiler.options, {
+                useNormalizedEntry: true,
+            });
         }
     }
     readExecutorOptions() {

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

@@ -55,7 +55,7 @@ function getRemotes(devRemotes, skipRemotes, config, context, pathToManifestFile
             : (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 = knownRemotes.map((r) => context.projectGraph.nodes[r].data.targets['serve'].options.port);
+    const remotePorts = devServeRemotes.map((r) => context.projectGraph.nodes[r].data.targets['serve'].options.port);
     return {
         staticRemotes,
         devRemotes: devServeRemotes,