@nx/webpack 21.4.0-beta.0 → 21.4.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "21.4.0-beta.0",
+  "version": "21.4.0-beta.10",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -56,8 +56,6 @@
     "sass-loader": "^16.0.4",
     "source-map-loader": "^5.0.0",
     "style-loader": "^3.3.0",
-    "stylus": "^0.64.0",
-    "stylus-loader": "^7.1.0",
     "terser-webpack-plugin": "^5.3.3",
     "ts-loader": "^9.3.1",
     "tsconfig-paths-webpack-plugin": "4.0.0",
@@ -66,11 +64,11 @@
     "webpack-dev-server": "^5.2.1",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "21.4.0-beta.0",
-    "@nx/js": "21.4.0-beta.0"
+    "@nx/devkit": "21.4.0-beta.10",
+    "@nx/js": "21.4.0-beta.10"
   },
   "devDependencies": {
-    "nx": "21.4.0-beta.0"
+    "nx": "21.4.0-beta.10"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/webpack/schema.json

@@ -370,7 +370,7 @@
               "type": "string",
               "description": "The file to include.",
               "x-completion-type": "file",
-              "x-completion-glob": "**/*@(.css|.scss|.less|.sass|.styl|.stylus)"
+              "x-completion-glob": "**/*@(.css|.scss|.less|.sass)"
             },
             "bundleName": {
               "type": "string",
@@ -389,7 +389,7 @@
           "type": "string",
           "description": "The file to include.",
           "x-completion-type": "file",
-          "x-completion-glob": "**/*@(.css|.scss|.less|.sass|.styl|.stylus)"
+          "x-completion-glob": "**/*@(.css|.scss|.less|.sass)"
         }
       ]
     },

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAE9D;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA2E5E;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAE9D;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAkF5E;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/init/init.js

@@ -47,6 +47,13 @@ async function webpackInitGeneratorInternal(tree, schema) {
                 'webpack:watch-deps',
                 'webpack-watch-deps',
             ],
+            serveStaticTargetName: [
+                'serve-static',
+                'webpack:serve-static',
+                'serve-static:webpack',
+                'webpack-serve-static',
+                'serve-static-webpack',
+            ],
         }, schema.updatePackageScripts);
     }
     let installTask = () => { };

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

@@ -1 +1 @@
-{"version":3,"file":"apply-web-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-web-config.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EAIb,wBAAwB,EAEzB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,mCAAmC,EAAE,MAAM,kCAAkC,CAAC;AAavF,wBAAgB,cAAc,CAC5B,OAAO,EAAE,mCAAmC,EAC5C,MAAM,GAAE,OAAO,CAAC,wBAAwB,GAAG,aAAa,CAAM,EAC9D,EACE,kBAAkB,GACnB,GAAE;IAID,kBAAkB,CAAC,EAAE,OAAO,CAAC;CACzB,GACL,IAAI,CA8ZN"}
+{"version":3,"file":"apply-web-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-web-config.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EAIb,wBAAwB,EAEzB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,mCAAmC,EAAE,MAAM,kCAAkC,CAAC;AAavF,wBAAgB,cAAc,CAC5B,OAAO,EAAE,mCAAmC,EAC5C,MAAM,GAAE,OAAO,CAAC,wBAAwB,GAAG,aAAa,CAAM,EAC9D,EACE,kBAAkB,GACnB,GAAE;IAID,kBAAkB,CAAC,EAAE,OAAO,CAAC;CACzB,GACL,IAAI,CAsWN"}

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

@@ -46,7 +46,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     const minimizer = [new webpack_1.ids.HashedModuleIdsPlugin()];
     if (stylesOptimization) {
         minimizer.push(new CssMinimizerPlugin({
-            test: /\.(?:css|scss|sass|less|styl)$/,
+            test: /\.(?:css|scss|sass|less)$/,
         }));
     }
     if (!options.ssr) {
@@ -129,21 +129,6 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                 },
             ],
         },
-        {
-            test: /\.module\.styl$/,
-            exclude: globalStylePaths,
-            use: [
-                ...(0, stylesheet_loaders_1.getCommonLoadersForCssModules)(options, includePaths),
-                {
-                    loader: path.join(__dirname, '../../../utils/webpack/deprecated-stylus-loader.js'),
-                    options: {
-                        stylusOptions: {
-                            include: includePaths,
-                        },
-                    },
-                },
-            ],
-        },
     ];
     const globalCssRules = [
         {
@@ -193,22 +178,6 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                 },
             ],
         },
-        {
-            test: /\.styl$/,
-            exclude: globalStylePaths,
-            use: [
-                ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalCss)(options, includePaths),
-                {
-                    loader: path.join(__dirname, '../../../utils/webpack/deprecated-stylus-loader.js'),
-                    options: {
-                        sourceMap: !!options.sourceMap,
-                        stylusOptions: {
-                            include: includePaths,
-                        },
-                    },
-                },
-            ],
-        },
     ];
     const globalStyleRules = [
         {
@@ -258,26 +227,10 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                 },
             ],
         },
-        {
-            test: /\.styl$/,
-            include: globalStylePaths,
-            use: [
-                ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalStyle)(options, includePaths),
-                {
-                    loader: path.join(__dirname, '../../../utils/webpack/deprecated-stylus-loader.js'),
-                    options: {
-                        sourceMap: !!options.sourceMap,
-                        stylusOptions: {
-                            include: includePaths,
-                        },
-                    },
-                },
-            ],
-        },
     ];
     const rules = [
         {
-            test: /\.css$|\.scss$|\.sass$|\.less$|\.styl$/,
+            test: /\.css$|\.scss$|\.sass$|\.less$/,
             oneOf: [...cssModuleRules, ...globalCssRules, ...globalStyleRules],
         },
     ];

package/src/utils/webpack/deprecated-stylus-loader.d.ts

@@ -1,2 +0,0 @@
-export default function (source: string): string;
-//# sourceMappingURL=deprecated-stylus-loader.d.ts.map

package/src/utils/webpack/deprecated-stylus-loader.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deprecated-stylus-loader.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/utils/webpack/deprecated-stylus-loader.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,GAAG,MAAM,CAK/C"}

package/src/utils/webpack/deprecated-stylus-loader.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const devkit_1 = require("@nx/devkit");
-// @ts-ignore
-const stylusLoader = require("stylus-loader");
-// TOOD(v19): Remove this file and stylus support.
-function default_1(source) {
-    devkit_1.logger.warn(`Stylus is support is deprecated and will be removed in Nx 20. We recommend that you migrate to Sass by renaming \`.styl\` files to \`.scss\` and ensuring that the content is valid Sass.`);
-    return stylusLoader.call(this, source);
-}