@nx/webpack 19.3.0 → 19.3.1

package/generators.json

@@ -5,7 +5,7 @@
     "init": {
       "factory": "./src/generators/init/init#webpackInitGeneratorInternal",
       "schema": "./src/generators/init/schema.json",
-      "description": "Initialize the `@nrwl/webpack` plugin.",
+      "description": "Initialize the `@nx/webpack` plugin.",
       "aliases": ["ng-add"],
       "hidden": true
     },

package/package.json

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

package/plugin.d.ts

@@ -1 +1 @@
-export { createNodes } from './src/plugins/plugin';
+export { createNodes, createNodesV2, type WebpackPluginOptions, } from './src/plugins/plugin';

package/plugin.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = void 0;
+exports.createNodesV2 = exports.createNodes = void 0;
 var plugin_1 = require("./src/plugins/plugin");
 Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });
+Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return plugin_1.createNodesV2; } });

package/src/plugins/plugin.d.ts

@@ -1,9 +1,13 @@
-import { CreateDependencies, CreateNodes } from '@nx/devkit';
+import { CreateDependencies, CreateNodes, CreateNodesV2 } from '@nx/devkit';
 export interface WebpackPluginOptions {
     buildTargetName?: string;
     serveTargetName?: string;
     serveStaticTargetName?: string;
     previewTargetName?: string;
 }
+/**
+ * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
+ */
 export declare const createDependencies: CreateDependencies;
+export declare const createNodesV2: CreateNodesV2<WebpackPluginOptions>;
 export declare const createNodes: CreateNodes<WebpackPluginOptions>;

package/src/plugins/plugin.js

@@ -1,61 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.createDependencies = void 0;
+exports.createNodes = exports.createNodesV2 = exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
+const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
+const js_1 = require("@nx/js");
 const fs_1 = require("fs");
+const file_hasher_1 = require("nx/src/hasher/file-hasher");
+const cache_directory_1 = require("nx/src/utils/cache-directory");
+const path_1 = require("path");
 const read_webpack_options_1 = require("../utils/webpack/read-webpack-options");
 const resolve_user_defined_webpack_config_1 = require("../utils/webpack/resolve-user-defined-webpack-config");
-const js_1 = require("@nx/js");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
-const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'webpack.hash');
-const targetsCache = readTargetsCache();
-function readTargetsCache() {
+function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
-function writeTargetsToCache() {
-    const oldCache = readTargetsCache();
-    (0, devkit_1.writeJsonFile)(cachePath, {
-        ...oldCache,
-        ...targetsCache,
-    });
+function writeTargetsToCache(cachePath, results) {
+    (0, devkit_1.writeJsonFile)(cachePath, results);
 }
+/**
+ * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
+ */
 const createDependencies = () => {
-    writeTargetsToCache();
     return [];
 };
 exports.createDependencies = createDependencies;
+const webpackConfigGlob = '**/webpack.config.{js,ts,mjs,cjs}';
+exports.createNodesV2 = [
+    webpackConfigGlob,
+    async (configFilePaths, options, context) => {
+        const optionsHash = (0, file_hasher_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `webpack-${optionsHash}.hash`);
+        const targetsCache = readTargetsCache(cachePath);
+        const normalizedOptions = normalizeOptions(options);
+        try {
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache), configFilePaths, normalizedOptions, context);
+        }
+        finally {
+            writeTargetsToCache(cachePath, targetsCache);
+        }
+    },
+];
 exports.createNodes = [
-    '**/webpack.config.{js,ts,mjs,cjs}',
+    webpackConfigGlob,
     async (configFilePath, options, context) => {
-        options ??= {};
-        options.buildTargetName ??= 'build';
-        options.serveTargetName ??= 'serve';
-        options.serveStaticTargetName ??= 'serve-static';
-        options.previewTargetName ??= 'preview';
-        const projectRoot = (0, path_1.dirname)(configFilePath);
-        // Do not create a project if package.json and project.json isn't there.
-        const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
-        if (!siblingFiles.includes('package.json') &&
-            !siblingFiles.includes('project.json')) {
-            return {};
-        }
-        const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-        const targets = targetsCache[hash]
-            ? targetsCache[hash]
-            : await createWebpackTargets(configFilePath, projectRoot, options, context);
-        return {
-            projects: {
-                [projectRoot]: {
-                    projectType: 'application',
-                    targets,
-                },
-            },
-        };
+        devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
+        const normalizedOptions = normalizeOptions(options);
+        return createNodesInternal(configFilePath, normalizedOptions, context, {});
     },
 ];
+async function createNodesInternal(configFilePath, options, context, targetsCache) {
+    const projectRoot = (0, path_1.dirname)(configFilePath);
+    // Do not create a project if package.json and project.json isn't there.
+    const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+    if (!siblingFiles.includes('package.json') &&
+        !siblingFiles.includes('project.json')) {
+        return {};
+    }
+    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
+    targetsCache[hash] ??= await createWebpackTargets(configFilePath, projectRoot, options, context);
+    const { targets, metadata } = targetsCache[hash];
+    return {
+        projects: {
+            [projectRoot]: {
+                projectType: 'application',
+                targets,
+                metadata,
+            },
+        },
+    };
+}
 async function createWebpackTargets(configFilePath, projectRoot, options, context) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const webpackConfig = (0, resolve_user_defined_webpack_config_1.resolveUserDefinedWebpackConfig)((0, path_1.join)(context.workspaceRoot, configFilePath), (0, js_1.getRootTsConfigPath)(), true);
@@ -105,7 +118,7 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
             spa: true,
         },
     };
-    return targets;
+    return { targets, metadata: {} };
 }
 function normalizeOutputPath(outputPath, projectRoot) {
     if (!outputPath) {
@@ -135,3 +148,11 @@ function normalizeOutputPath(outputPath, projectRoot) {
         }
     }
 }
+function normalizeOptions(options) {
+    return {
+        buildTargetName: options.buildTargetName ?? 'build',
+        serveTargetName: options.serveTargetName ?? 'serve',
+        serveStaticTargetName: options.serveStaticTargetName ?? 'serve-static',
+        previewTargetName: options.previewTargetName ?? 'preview',
+    };
+}