@nx/webpack 22.0.0-beta.0 → 22.0.0-beta.2

package/migrations.json

@@ -1,11 +1,5 @@
 {
   "generators": {
-    "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"
-    },
     "update-21-0-0-remove-isolated-config": {
       "cli": "nx",
       "version": "21.0.0-beta.11",
@@ -20,28 +14,6 @@
     }
   },
   "packageJsonUpdates": {
-    "19.6.0": {
-      "version": "19.6.0-beta.1",
-      "packages": {
-        "webpack-dev-server": {
-          "version": "^5.0.4",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "19.7.0": {
-      "version": "19.7.0-beta.4",
-      "packages": {
-        "@module-federation/enhanced": {
-          "version": "~0.6.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@module-federation/sdk": {
-          "version": "~0.6.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "20.5.0": {
       "version": "20.5.0-beta.3",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "22.0.0-beta.0",
+  "version": "22.0.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -64,11 +64,11 @@
     "webpack-dev-server": "^5.2.1",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "22.0.0-beta.0",
-    "@nx/js": "22.0.0-beta.0"
+    "@nx/devkit": "22.0.0-beta.2",
+    "@nx/js": "22.0.0-beta.2"
   },
   "devDependencies": {
-    "nx": "22.0.0-beta.0"
+    "nx": "22.0.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

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,CA6VN"}
+{"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,CAkVN"}

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

@@ -296,20 +296,9 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
         ...config.module,
         rules: [
             ...(config.module.rules ?? []),
-            // Images: Inline small images, and emit a separate file otherwise.
+            // Images: Inline small images, and emit a separate file otherwise (including SVGs).
             {
-                test: /\.(avif|bmp|gif|ico|jpe?g|png|webp)$/,
-                type: 'asset',
-                parser: {
-                    dataUrlCondition: {
-                        maxSize: 10_000, // 10 kB
-                    },
-                },
-            },
-            // TODO(v22): Remove this but provide a migration in `@nx/react` to add @svgr/webpack in userland webpack config
-            // SVG: same as image but we need to separate it so it can be swapped for SVGR in the React plugin.
-            {
-                test: /\.svg$/,
+                test: /\.(avif|bmp|gif|ico|jpe?g|png|svg|webp)$/,
                 type: 'asset',
                 parser: {
                     dataUrlCondition: {

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

@@ -1,3 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;
-//# sourceMappingURL=proxy-config.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"proxy-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/migrations/update-19-6-3/proxy-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,IAAI,EAAc,MAAM,YAAY,CAAC;AAItD,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CA2D9D"}

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

@@ -1,57 +0,0 @@
-"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
-`);
-    }
-}