@nx/webpack 18.3.0-beta.1 → 18.3.0-beta.2

package/package.json

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

package/src/generators/init/init.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackInitGeneratorInternal = exports.webpackInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function webpackInitGenerator(tree, schema) {
@@ -15,7 +15,29 @@ async function webpackInitGeneratorInternal(tree, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        addPlugin(tree);
+        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/webpack/plugin', plugin_1.createNodes, {
+            buildTargetName: [
+                'build',
+                'webpack:build',
+                'build:webpack',
+                'webpack-build',
+                'build-webpack',
+            ],
+            serveTargetName: [
+                'serve',
+                'webpack:serve',
+                'serve:webpack',
+                'webpack-serve',
+                'serve-webpack',
+            ],
+            previewTargetName: [
+                'preview',
+                'webpack:preview',
+                'preview:webpack',
+                'webpack-preview',
+                'preview-webpack',
+            ],
+        }, schema.updatePackageScripts);
     }
     let installTask = () => { };
     if (!schema.skipPackageJson) {
@@ -28,33 +50,10 @@ async function webpackInitGeneratorInternal(tree, schema) {
         }
         installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, schema.keepExistingVersions);
     }
-    if (schema.updatePackageScripts) {
-        await (0, update_package_scripts_1.updatePackageScripts)(tree, plugin_1.createNodes);
-    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
     return installTask;
 }
 exports.webpackInitGeneratorInternal = webpackInitGeneratorInternal;
-function addPlugin(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.plugins ??= [];
-    for (const plugin of nxJson.plugins) {
-        if (typeof plugin === 'string'
-            ? plugin === '@nx/webpack/plugin'
-            : plugin.plugin === '@nx/webpack/plugin') {
-            return;
-        }
-    }
-    nxJson.plugins.push({
-        plugin: '@nx/webpack/plugin',
-        options: {
-            buildTargetName: 'build',
-            serveTargetName: 'serve',
-            previewTargetName: 'preview',
-        },
-    });
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-}
 exports.default = webpackInitGenerator;