@nx/webpack 17.2.0-beta.6 → 17.2.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "17.2.0-beta.6",
+  "version": "17.2.0-beta.8",
   "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.2.0-beta.6",
-    "@nx/js": "17.2.0-beta.6",
-    "@nrwl/webpack": "17.2.0-beta.6"
+    "@nx/devkit": "17.2.0-beta.8",
+    "@nx/js": "17.2.0-beta.8",
+    "@nrwl/webpack": "17.2.0-beta.8"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/webpack/lib/normalize-options.js

@@ -13,6 +13,7 @@ function normalizeOptions(options, root, projectRoot, sourceRoot) {
         outputFileName: options.outputFileName ?? 'main.js',
         assets: (0, normalize_options_1.normalizeAssets)(options.assets, root, sourceRoot),
         webpackConfig: normalizePluginPath(options.webpackConfig, root),
+        fileReplacements: (0, normalize_options_1.normalizeFileReplacements)(root, options.fileReplacements),
         optimization: typeof options.optimization !== 'object'
             ? {
                 scripts: options.optimization,

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

@@ -254,11 +254,13 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             oneOf: [...cssModuleRules, ...globalCssRules, ...globalStyleRules],
         },
     ];
-    plugins.push(
-    // extract global css from js files into own css file
-    new MiniCssExtractPlugin({
-        filename: `[name]${hashFormat.extract}.css`,
-    }));
+    if (options.extractCss) {
+        plugins.push(
+        // extract global css from js files into own css file
+        new MiniCssExtractPlugin({
+            filename: `[name]${hashFormat.extract}.css`,
+        }));
+    }
     config.output = {
         ...config.output,
         crossOriginLoading: options.subresourceIntegrity

package/src/plugins/nx-webpack-plugin/lib/normalize-options.d.ts

@@ -1,3 +1,4 @@
-import { AssetGlobPattern, NormalizedNxWebpackPluginOptions, NxWebpackPluginOptions } from '../nx-webpack-plugin-options';
+import { AssetGlobPattern, FileReplacement, NormalizedNxWebpackPluginOptions, NxWebpackPluginOptions } from '../nx-webpack-plugin-options';
 export declare function normalizeOptions(options: NxWebpackPluginOptions): NormalizedNxWebpackPluginOptions;
 export declare function normalizeAssets(assets: any[], root: string, sourceRoot: string): AssetGlobPattern[];
+export declare function normalizeFileReplacements(root: string, fileReplacements: FileReplacement[]): FileReplacement[];

package/src/plugins/nx-webpack-plugin/lib/normalize-options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeAssets = exports.normalizeOptions = void 0;
+exports.normalizeFileReplacements = exports.normalizeAssets = exports.normalizeOptions = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
@@ -114,3 +114,4 @@ function normalizeFileReplacements(root, fileReplacements) {
         }))
         : [];
 }
+exports.normalizeFileReplacements = normalizeFileReplacements;

package/src/plugins/nx-webpack-plugin/lib/stylesheet-loaders.js

@@ -62,7 +62,9 @@ exports.getCommonLoadersForGlobalCss = getCommonLoadersForGlobalCss;
 function getCommonLoadersForGlobalStyle(options, includePaths) {
     return [
         {
-            loader: MiniCssExtractPlugin.loader,
+            loader: options.extractCss
+                ? MiniCssExtractPlugin.loader
+                : require.resolve('style-loader'),
             options: { esModule: true },
         },
         { loader: require.resolve('css-loader'), options: { url: false } },