@nx/webpack 16.10.0 → 17.0.0-beta.2

package/package.json

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

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

@@ -11,6 +11,7 @@ const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const run_webpack_1 = require("../../utils/run-webpack");
 const custom_webpack_1 = require("../../utils/webpack/custom-webpack");
 const normalize_options_1 = require("../webpack/lib/normalize-options");
+const path_1 = require("path");
 async function* devServerExecutor(serveOptions, context) {
     // Default to dev mode so builds are faster and HMR mode works better.
     process.env.NODE_ENV ??= 'development';
@@ -26,7 +27,10 @@ async function* devServerExecutor(serveOptions, context) {
     }
     let config = (0, get_dev_server_config_1.getDevServerConfig)(context, buildOptions, serveOptions);
     if (buildOptions.webpackConfig) {
-        let customWebpack = (0, custom_webpack_1.resolveCustomWebpackConfig)(buildOptions.webpackConfig, buildOptions.tsConfig);
+        let tsconfigPath = buildOptions.tsConfig.startsWith(context.root)
+            ? buildOptions.tsConfig
+            : (0, path_1.join)(context.root, buildOptions.tsConfig);
+        let customWebpack = (0, custom_webpack_1.resolveCustomWebpackConfig)(buildOptions.webpackConfig, tsconfigPath);
         if (typeof customWebpack.then === 'function') {
             customWebpack = await customWebpack;
         }

package/src/plugins/write-index-html-plugin.js

@@ -46,7 +46,6 @@ class WriteIndexHtmlPlugin {
             for (const file of chunk.files) {
                 files.push({
                     // The id is guaranteed to exist at this point in the compilation process
-                    // tslint:disable-next-line: no-non-null-assertion
                     id: chunk.id.toString(),
                     name: chunk.name,
                     file,

package/src/utils/run-webpack.js

@@ -12,7 +12,9 @@ function runWebpackDevServer(config, webpack, WebpackDevServer) {
         const devServerConfig = config.devServer || {};
         const originalOnListen = devServerConfig.onListening;
         devServerConfig.onListening = function (server) {
-            originalOnListen(server);
+            if (typeof originalOnListen === 'function') {
+                originalOnListen(server);
+            }
             const devServerOptions = server.options;
             baseUrl = `${server.options.https ? 'https' : 'http'}://${server.options.host}:${server.options.port}${devServerOptions.devMiddleware.publicPath}`;
         };

package/src/utils/webpack/custom-webpack.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isRegistered = exports.resolveCustomWebpackConfig = void 0;
 const internal_1 = require("@nx/js/src/internal");
 function resolveCustomWebpackConfig(path, tsConfig) {
-    const cleanupTranspiler = (0, internal_1.registerTsProject)(path, tsConfig);
+    const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);
     const customWebpackConfig = require(path);
     cleanupTranspiler();
     // If the user provides a configuration in TS file

package/src/utils/webpack/plugins/postcss-cli-resources.js

@@ -130,7 +130,6 @@ function PostcssCliResources(options) {
                 // We want to load it relative to the file that imports
                 const inputFile = decl.source && decl.source.input.file;
                 const context = (inputFile && path.dirname(inputFile)) || loader.context;
-                // tslint:disable-next-line:no-conditional-assignment
                 while ((match = urlRegex.exec(value))) {
                     const originalUrl = match[1] || match[2] || match[3];
                     let processedUrl;