@nx/webpack 0.0.0-pr-30418-4e2b721 → 0.0.0-pr-3-ec41644

package/migrations.json

@@ -35,15 +35,6 @@
           "alwaysAddToPackageJson": false
         }
       }
-    },
-    "20.5.0": {
-      "version": "20.5.0-beta.3",
-      "packages": {
-        "sass-loader": {
-          "version": "^16.0.4",
-          "alwaysAddToPackageJson": false
-        }
-      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "0.0.0-pr-30418-4e2b721",
+  "version": "0.0.0-pr-3-ec41644",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -51,9 +51,8 @@
     "postcss-import": "~14.1.0",
     "postcss-loader": "^6.1.1",
     "rxjs": "^7.8.0",
-    "sass": "^1.85.0",
-    "sass-embedded": "^1.83.4",
-    "sass-loader": "^16.0.4",
+    "sass": "^1.42.1",
+    "sass-loader": "^12.2.0",
     "source-map-loader": "^5.0.0",
     "style-loader": "^3.3.0",
     "stylus": "^0.64.0",
@@ -66,8 +65,8 @@
     "webpack-dev-server": "^5.0.4",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "0.0.0-pr-30418-4e2b721",
-    "@nx/js": "0.0.0-pr-30418-4e2b721"
+    "@nx/devkit": "0.0.0-pr-3-ec41644",
+    "@nx/js": "0.0.0-pr-3-ec41644"
   },
   "publishConfig": {
     "access": "public"

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

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

package/src/executors/webpack/schema.d.ts

@@ -81,7 +81,6 @@ export interface WebpackExecutorOptions {
   index?: string;
   postcssConfig?: string;
   scripts?: Array<ExtraEntryPointClass | string>;
-  sassImplementation?: 'sass' | 'sass-embedded';
   stylePreprocessorOptions?: any;
   styles?: Array<ExtraEntryPointClass | string>;
   subresourceIntegrity?: boolean;

package/src/executors/webpack/schema.json

@@ -144,12 +144,6 @@
       },
       "additionalProperties": false
     },
-    "sassImplementation": {
-      "type": "string",
-      "description": "The implementation of the SASS compiler to use. Can be either `sass` or `sass-embedded`. Defaults to `sass-embedded`.",
-      "enum": ["sass", "sass-embedded"],
-      "default": "sass"
-    },
     "optimization": {
       "description": "Enables optimization of the build output.",
       "oneOf": [

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

@@ -56,8 +56,6 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     const globalStylePaths = [];
     // Determine hashing format.
     const hashFormat = (0, hash_format_1.getOutputHashFormat)(options.outputHashing);
-    const sassOptions = options.stylePreprocessorOptions?.sassOptions;
-    const lessOptions = options.stylePreprocessorOptions?.lessOptions;
     const includePaths = [];
     if (options?.stylePreprocessorOptions?.includePaths?.length > 0) {
         options.stylePreprocessorOptions.includePaths.forEach((includePath) => includePaths.push(path.resolve(options.root, includePath)));
@@ -99,15 +97,11 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                 {
                     loader: require.resolve('sass-loader'),
                     options: {
-                        api: 'modern-compiler',
-                        implementation: options.sassImplementation === 'sass-embedded'
-                            ? require.resolve('sass-embedded')
-                            : require.resolve('sass'),
+                        implementation: require('sass'),
                         sassOptions: {
                             fiber: false,
                             precision: 8,
                             includePaths,
-                            ...(sassOptions ?? {}),
                         },
                     },
                 },
@@ -123,7 +117,6 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                     options: {
                         lessOptions: {
                             paths: includePaths,
-                            ...(lessOptions ?? {}),
                         },
                     },
                 },
@@ -159,17 +152,13 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                 {
                     loader: require.resolve('sass-loader'),
                     options: {
-                        api: 'modern-compiler',
-                        implementation: options.sassImplementation === 'sass-embedded'
-                            ? require.resolve('sass-embedded')
-                            : require.resolve('sass'),
+                        implementation: require('sass'),
                         sourceMap: !!options.sourceMap,
                         sassOptions: {
                             fiber: false,
                             // bootstrap-sass requires a minimum precision of 8
                             precision: 8,
                             includePaths,
-                            ...(sassOptions ?? {}),
                         },
                     },
                 },
@@ -187,7 +176,6 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                         lessOptions: {
                             javascriptEnabled: true,
                             ...lessPathOptions,
-                            ...(lessOptions ?? {}),
                         },
                     },
                 },
@@ -224,17 +212,13 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                 {
                     loader: require.resolve('sass-loader'),
                     options: {
-                        api: 'modern-compiler',
-                        implementation: options.sassImplementation === 'sass-embedded'
-                            ? require.resolve('sass-embedded')
-                            : require.resolve('sass'),
+                        implementation: require('sass'),
                         sourceMap: !!options.sourceMap,
                         sassOptions: {
                             fiber: false,
                             // bootstrap-sass requires a minimum precision of 8
                             precision: 8,
                             includePaths,
-                            ...(sassOptions ?? {}),
                         },
                     },
                 },
@@ -252,7 +236,6 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                         lessOptions: {
                             javascriptEnabled: true,
                             ...lessPathOptions,
-                            ...(lessOptions ?? {}),
                         },
                     },
                 },

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

@@ -48,10 +48,7 @@ function normalizeOptions(options) {
         // executor options take precedence (especially for overriding with CLI args)
         originalTargetOptions);
     }
-    const sourceRoot = projectNode.data.sourceRoot ??
-        ((0, fs_1.existsSync)((0, path_1.join)(devkit_1.workspaceRoot, projectNode.data.root, 'src'))
-            ? (0, path_1.join)(projectNode.data.root, 'src')
-            : projectNode.data.root);
+    const sourceRoot = projectNode.data.sourceRoot ?? projectNode.data.root;
     if (!combinedPluginAndMaybeExecutorOptions.main) {
         throw new Error(`Missing "main" option for the entry file. Set this option in your Nx webpack plugin.`);
     }
@@ -88,7 +85,6 @@ function normalizeOptions(options) {
         target: combinedPluginAndMaybeExecutorOptions.target,
         targetName,
         vendorChunk: combinedPluginAndMaybeExecutorOptions.vendorChunk ?? !isProd,
-        sassImplementation: combinedPluginAndMaybeExecutorOptions.sassImplementation ?? 'sass',
     };
 }
 function normalizeAssets(assets, root, sourceRoot, projectRoot, resolveRelativePathsToProjectRoot = true) {

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

@@ -185,11 +185,7 @@ export interface NxAppWebpackPluginOptions {
     /**
      * Options for the style preprocessor. e.g. `{ "includePaths": [] }` for SASS.
      */
-    stylePreprocessorOptions?: {
-        includePaths?: string[];
-        sassOptions?: Record<string, any>;
-        lessOptions?: Record<string, any>;
-    };
+    stylePreprocessorOptions?: any;
     /**
      * External stylesheets that will be included with the application.
      */
@@ -210,10 +206,6 @@ export interface NxAppWebpackPluginOptions {
      * Use tsconfig-paths-webpack-plugin to resolve modules using paths in the tsconfig file.
      */
     useTsconfigPaths?: boolean;
-    /**
-     * The implementation of the SASS compiler to use. Can be either `sass` or `sass-embedded`. Defaults to `sass-embedded`.
-     */
-    sassImplementation?: 'sass' | 'sass-embedded';
     /**
      * Generate a separate vendor chunk for 3rd party packages.
      */

package/src/plugins/plugin.js

@@ -120,6 +120,7 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
         },
     };
     targets[options.serveTargetName] = {
+        continuous: true,
         command: `webpack-cli serve`,
         options: {
             cwd: projectRoot,
@@ -139,6 +140,7 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
         },
     };
     targets[options.previewTargetName] = {
+        continuous: true,
         command: `webpack-cli serve`,
         options: {
             cwd: projectRoot,
@@ -158,6 +160,7 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
         },
     };
     targets[options.serveStaticTargetName] = {
+        continuous: true,
         dependsOn: [options.buildTargetName],
         executor: '@nx/web:file-server',
         options: {

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

@@ -5,6 +5,7 @@ const child_process_1 = require("child_process");
 const client_1 = require("nx/src/daemon/client/client");
 const watch_1 = require("nx/src/command-line/watch/watch");
 const output_1 = require("nx/src/utils/output");
+const enabled_1 = require("nx/src/daemon/client/enabled");
 class WebpackNxBuildCoordinationPlugin {
     constructor(buildCmd, skipInitialBuildOrOptions) {
         this.buildCmd = buildCmd;
@@ -17,7 +18,7 @@ class WebpackNxBuildCoordinationPlugin {
             this.buildChangedProjects();
         }
         if (!options?.skipWatchingDeps) {
-            if ((0, client_1.isDaemonEnabled)()) {
+            if ((0, enabled_1.isDaemonEnabled)()) {
                 this.startWatchingBuildableLibs();
             }
             else {

package/src/utils/with-web.d.ts

@@ -8,13 +8,8 @@ export interface WithWebOptions {
     generateIndexHtml?: boolean;
     index?: string;
     postcssConfig?: string;
-    sassImplementation?: 'sass' | 'sass-embedded';
     scripts?: Array<ExtraEntryPointClass | string>;
-    stylePreprocessorOptions?: {
-        includePaths?: string[];
-        sassOptions?: Record<string, any>;
-        lessOptions?: Record<string, any>;
-    };
+    stylePreprocessorOptions?: any;
     styles?: Array<ExtraEntryPointClass | string>;
     subresourceIntegrity?: boolean;
     ssr?: boolean;