@nx/rollup 20.1.0-canary.20241102-c290b37 → 20.1.0-canary.20241105-b925f8c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "20.1.0-canary.20241102-c290b37",
+  "version": "20.1.0-canary.20241105-b925f8c",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -43,8 +43,8 @@
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-typescript2": "^0.36.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.1.0-canary.20241102-c290b37",
-    "@nx/js": "20.1.0-canary.20241102-c290b37"
+    "@nx/devkit": "20.1.0-canary.20241105-b925f8c",
+    "@nx/js": "20.1.0-canary.20241105-b925f8c"
   },
   "publishConfig": {
     "access": "public"

package/plugin.d.ts

@@ -1 +1 @@
-export { createNodes, RollupPluginOptions } from './src/plugins/plugin';
+export { createNodes, createNodesV2, RollupPluginOptions, } 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,6 +1,10 @@
-import { type CreateDependencies, type CreateNodes } from '@nx/devkit';
+import { type CreateDependencies, type CreateNodes, CreateNodesV2 } from '@nx/devkit';
+/**
+ * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
+ */
 export declare const createDependencies: CreateDependencies;
 export interface RollupPluginOptions {
     buildTargetName?: string;
 }
 export declare const createNodes: CreateNodes<RollupPluginOptions>;
+export declare const createNodesV2: CreateNodesV2<RollupPluginOptions>;

package/src/plugins/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.createDependencies = void 0;
+exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const path_1 = require("path");
 const fs_1 = require("fs");
@@ -8,47 +8,64 @@ const devkit_1 = require("@nx/devkit");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const js_1 = require("@nx/js");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'rollup.hash');
-const targetsCache = readTargetsCache();
-function readTargetsCache() {
+const file_hasher_1 = require("nx/src/hasher/file-hasher");
+const pmc = (0, devkit_1.getPackageManagerCommand)();
+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 rollupConfigGlob = '**/rollup.config.{js,cjs,mjs}';
 exports.createNodes = [
-    '**/rollup.config.{js,cjs,mjs}',
+    rollupConfigGlob,
     async (configFilePath, options, context) => {
-        const projectRoot = (0, path_1.dirname)(configFilePath);
-        const fullyQualifiedProjectRoot = (0, path_1.join)(context.workspaceRoot, projectRoot);
-        // Do not create a project if package.json and project.json do not exist
-        const siblingFiles = (0, fs_1.readdirSync)(fullyQualifiedProjectRoot);
-        if (!siblingFiles.includes('package.json') &&
-            !siblingFiles.includes('project.json')) {
-            return {};
+        devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
+        return createNodesInternal(configFilePath, normalizeOptions(options), context, {});
+    },
+];
+exports.createNodesV2 = [
+    rollupConfigGlob,
+    async (configFilePaths, options, context) => {
+        const normalizedOptions = normalizeOptions(options);
+        const optionsHash = (0, file_hasher_1.hashObject)(normalizedOptions);
+        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `rollup-${optionsHash}.hash`);
+        const targetsCache = readTargetsCache(cachePath);
+        try {
+            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache), configFilePaths, normalizedOptions, context);
+        }
+        finally {
+            writeTargetsToCache(cachePath, targetsCache);
         }
-        options = normalizeOptions(options);
-        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 buildRollupTarget(configFilePath, projectRoot, options, context);
-        return {
-            projects: {
-                [projectRoot]: {
-                    root: projectRoot,
-                    targets: targetsCache[hash],
-                },
-            },
-        };
     },
 ];
+async function createNodesInternal(configFilePath, options, context, targetsCache) {
+    const projectRoot = (0, path_1.dirname)(configFilePath);
+    const fullyQualifiedProjectRoot = (0, path_1.join)(context.workspaceRoot, projectRoot);
+    // Do not create a project if package.json and project.json do not exist
+    const siblingFiles = (0, fs_1.readdirSync)(fullyQualifiedProjectRoot);
+    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 buildRollupTarget(configFilePath, projectRoot, options, context);
+    return {
+        projects: {
+            [projectRoot]: {
+                root: projectRoot,
+                targets: targetsCache[hash],
+            },
+        },
+    };
+}
 async function buildRollupTarget(configFilePath, projectRoot, options, context) {
     let loadConfigFile;
     try {
@@ -83,6 +100,19 @@ async function buildRollupTarget(configFilePath, projectRoot, options, context)
             { externalDependencies: ['rollup'] },
         ],
         outputs,
+        metadata: {
+            technologies: ['rollup'],
+            description: 'Run Rollup',
+            help: {
+                command: `${pmc.exec} rollup --help`,
+                example: {
+                    options: {
+                        sourcemap: true,
+                        watch: true,
+                    },
+                },
+            },
+        },
     };
     return targets;
 }
@@ -113,7 +143,7 @@ function getOutputs(rollupConfigs, projectRoot) {
     return Array.from(outputs);
 }
 function normalizeOptions(options) {
-    options ??= {};
-    options.buildTargetName ??= 'build';
-    return options;
+    return {
+        buildTargetName: options.buildTargetName ?? 'build',
+    };
 }