@nx/webpack 19.7.0-beta.1 → 19.7.0-beta.3

package/index.d.ts

@@ -22,3 +22,4 @@ export * from './src/utils/get-css-module-local-ident';
 export * from './src/utils/with-nx';
 export * from './src/utils/with-web';
 export * from './src/utils/module-federation/public-api';
+export * from './src/utils/e2e-web-server-info-utils';

package/index.js

@@ -29,3 +29,4 @@ tslib_1.__exportStar(require("./src/utils/get-css-module-local-ident"), exports)
 tslib_1.__exportStar(require("./src/utils/with-nx"), exports);
 tslib_1.__exportStar(require("./src/utils/with-web"), exports);
 tslib_1.__exportStar(require("./src/utils/module-federation/public-api"), exports);
+tslib_1.__exportStar(require("./src/utils/e2e-web-server-info-utils"), exports);

package/migrations.json

@@ -11,6 +11,12 @@
       "version": "17.2.1-beta.0",
       "description": "Add webpack.config.js file when webpackConfig is not defined",
       "implementation": "./src/migrations/update-17-2-1/webpack-config-setup"
+    },
+    "update-19-6-3-proxy-config": {
+      "cli": "nx",
+      "version": "19.6.3-beta.0",
+      "description": "Migrate proxy config files to match new format from webpack-dev-server v5.",
+      "implementation": "./src/migrations/update-19-6-3/proxy-config"
     }
   },
   "packageJsonUpdates": {

package/package.json

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

package/src/executors/webpack/schema.json

@@ -163,6 +163,10 @@
       "type": "boolean",
       "description": "Generates a `package.json` and pruned lock file with the project's `node_module` dependencies populated for installing in a container. If a `package.json` exists in the project's directory, it will be reused with dependencies populated."
     },
+    "skipOverrides": {
+      "type": "boolean",
+      "description": "Do not add a `overrides` and `resolutions` entries to the generated package.json file. Only works in conjunction with `generatePackageJson` option."
+    },
     "skipPackageManager": {
       "type": "boolean",
       "description": "Do not add a `packageManager` entry to the generated package.json file. Only works in conjunction with `generatePackageJson` option."

package/src/migrations/update-19-6-3/proxy-config.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-19-6-3/proxy-config.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+async function update(tree) {
+    const unmigratedConfigs = [];
+    const migrate = (options) => {
+        if (!options.proxyConfig)
+            return;
+        if (options.proxyConfig.endsWith('.json')) {
+            (0, devkit_1.updateJson)(tree, options.proxyConfig, (json) => {
+                if (Array.isArray(json))
+                    return json;
+                if (typeof json === 'object') {
+                    return Object.keys(json).map((context) => ({
+                        context: [context],
+                        ...json[context],
+                    }));
+                }
+                return json;
+            });
+        }
+        else {
+            // For non-JSON files, it's not possible to automatically update the proxy config
+            // since its content can vary greatly.
+            unmigratedConfigs.push(options.proxyConfig);
+        }
+    };
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/webpack:dev-server', migrate);
+    // React dev-server calls Webpack dev-server.
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/react:module-federation-dev-server', migrate);
+    if (unmigratedConfigs.length > 0) {
+        devkit_1.logger.warn(`Some proxy config files need to be updated manually.
+  ${unmigratedConfigs.join('\n  ')}
+  
+Webpack-dev-server v5 changed the proxy config schema to accept only an array.
+
+For example, if you had the following:
+
+"proxy": {
+  "/api": { 
+    "target": "http://localhost:3000"
+   }
+}
+
+It needs to be updated to:
+
+"proxy": [{
+  "context": ["/api"],
+  "target": "http://localhost:3000"
+}]
+
+More information: https://github.com/webpack/webpack-dev-server/blob/master/migration-v5.md
+`);
+    }
+}

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

@@ -158,6 +158,10 @@ export interface NxAppWebpackPluginOptions {
      * External scripts that will be included before the main application entry.
      */
     scripts?: Array<ExtraEntryPointClass | string>;
+    /**
+     * Do not add a `overrides` and `resolutions` entries to the generated package.json file. Only works in conjunction with `generatePackageJson` option.
+     */
+    skipOverrides?: boolean;
     /**
      * Do not add a `packageManager` entry to the generated package.json file. Only works in conjunction with `generatePackageJson` option.
      */

package/src/utils/e2e-web-server-info-utils.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function getWebpackE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number): Promise<import("@nx/devkit/src/generators/e2e-web-server-info-utils").E2EWebServerDetails>;

package/src/utils/e2e-web-server-info-utils.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWebpackE2EWebServerInfo = getWebpackE2EWebServerInfo;
+const devkit_1 = require("@nx/devkit");
+const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
+async function getWebpackE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let e2ePort = e2ePortOverride ?? 4200;
+    if (nxJson.targetDefaults?.['serve'] &&
+        nxJson.targetDefaults?.['serve'].options?.port) {
+        e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
+    }
+    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+        plugin: '@nx/webpack/plugin',
+        serveTargetName: 'serveTargetName',
+        serveStaticTargetName: 'serveStaticTargetName',
+        configFilePath,
+    }, {
+        defaultServeTargetName: 'serve',
+        defaultServeStaticTargetName: 'serve-static',
+        defaultE2EWebServerAddress: `http://localhost:${e2ePort}`,
+        defaultE2ECiBaseUrl: 'http://localhost:4200',
+        defaultE2EPort: e2ePort,
+    }, isPluginBeingAdded);
+}