@nx/webpack 17.3.0-beta.2 → 17.3.0-beta.4

package/package.json

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

package/src/generators/init/init.js

@@ -2,40 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
 const versions_1 = require("../../utils/versions");
 async function webpackInitGenerator(tree, schema) {
     const shouldAddPlugin = process.env.NX_PCV3 === 'true';
-    const tasks = [];
-    const devDependencies = {
-        '@nx/webpack': versions_1.nxVersion,
-    };
     if (shouldAddPlugin) {
-        devDependencies['webpack-cli'] = versions_1.webpackCliVersion;
-    }
-    if (schema.compiler === 'swc') {
-        devDependencies['swc-loader'] = versions_1.swcLoaderVersion;
-        const addSwcTask = (0, add_swc_dependencies_1.addSwcDependencies)(tree);
-        tasks.push(addSwcTask);
-    }
-    if (schema.compiler === 'tsc') {
-        devDependencies['tslib'] = versions_1.tsLibVersion;
+        addPlugin(tree);
     }
-    if (schema.uiFramework === 'react') {
-        devDependencies['@pmmmwh/react-refresh-webpack-plugin'] =
-            versions_1.reactRefreshWebpackPluginVersion;
-        devDependencies['@svgr/webpack'] = versions_1.svgrWebpackVersion;
-        devDependencies['react-refresh'] = versions_1.reactRefreshVersion;
-        devDependencies['url-loader'] = versions_1.urlLoaderVersion;
+    let installTask = () => { };
+    if (!schema.skipPackageJson) {
+        const devDependencies = {
+            '@nx/webpack': versions_1.nxVersion,
+        };
+        if (shouldAddPlugin) {
+            devDependencies['webpack-cli'] = versions_1.webpackCliVersion;
+        }
+        installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    const baseInstallTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
-    tasks.push(baseInstallTask);
-    if (shouldAddPlugin)
-        addPlugin(tree);
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    return installTask;
 }
 exports.webpackInitGenerator = webpackInitGenerator;
 function addPlugin(tree) {

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

@@ -1,5 +1,4 @@
 export interface Schema {
-  compiler?: 'babel' | 'swc' | 'tsc';
-  uiFramework?: 'react' | 'none';
   skipFormat?: boolean;
+  skipPackageJson?: boolean;
 }

package/src/generators/init/schema.json

@@ -6,22 +6,15 @@
   "description": "Initialize the Webpack Plugin.",
   "type": "object",
   "properties": {
-    "uiFramework": {
-      "type": "string",
-      "description": "UI Framework to use for Webpack.",
-      "enum": ["react", "none"],
-      "x-prompt": "What UI framework plugin should Webpack use?"
-    },
-    "compiler": {
-      "type": "string",
-      "enum": ["babel", "swc", "tsc"],
-      "description": "The compiler to initialize for.",
-      "default": "babel"
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
       "default": false
+    },
+    "skipPackageJson": {
+      "description": "Do not add dependencies to `package.json`.",
+      "type": "boolean",
+      "default": false
     }
   },
   "required": []

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

@@ -271,13 +271,15 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
     }
     config.resolve = {
         ...config.resolve,
-        extensions: [...extensions, ...(config?.resolve?.extensions ?? [])],
-        alias: options.fileReplacements &&
-            options.fileReplacements.reduce((aliases, replacement) => ({
+        extensions: [...(config?.resolve?.extensions ?? []), ...extensions],
+        alias: {
+            ...(config.resolve?.alias ?? {}),
+            ...(options.fileReplacements?.reduce((aliases, replacement) => ({
                 ...aliases,
                 [replacement.replace]: replacement.with,
-            }), {}),
-        mainFields,
+            }), {}) ?? {}),
+        },
+        mainFields: config.resolve?.mainFields ?? mainFields,
     };
     config.externals = externals;
     config.module = {

package/src/utils/ensure-dependencies.d.ts

@@ -0,0 +1,6 @@
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+export type EnsureDependenciesOptions = {
+    compiler?: 'swc' | 'tsc';
+    uiFramework?: 'none' | 'react';
+};
+export declare function ensureDependencies(tree: Tree, options: EnsureDependenciesOptions): GeneratorCallback;

package/src/utils/ensure-dependencies.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
+const versions_1 = require("./versions");
+function ensureDependencies(tree, options) {
+    const tasks = [];
+    const devDependencies = {};
+    if (options.compiler === 'swc') {
+        devDependencies['swc-loader'] = versions_1.swcLoaderVersion;
+        const addSwcTask = (0, add_swc_dependencies_1.addSwcDependencies)(tree);
+        tasks.push(addSwcTask);
+    }
+    if (options.compiler === 'tsc') {
+        devDependencies['tslib'] = versions_1.tsLibVersion;
+    }
+    if (options.uiFramework === 'react') {
+        devDependencies['@pmmmwh/react-refresh-webpack-plugin'] =
+            versions_1.reactRefreshWebpackPluginVersion;
+        devDependencies['@svgr/webpack'] = versions_1.svgrWebpackVersion;
+        devDependencies['react-refresh'] = versions_1.reactRefreshVersion;
+        devDependencies['url-loader'] = versions_1.urlLoaderVersion;
+    }
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies));
+    return (0, devkit_1.runTasksInSerial)(...tasks);
+}
+exports.ensureDependencies = ensureDependencies;