@nx/rollup 23.0.0-beta.5 → 23.0.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "23.0.0-beta.5",
+  "version": "23.0.0-beta.6",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -30,8 +30,8 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.5",
-    "@nx/js": "23.0.0-beta.5",
+    "@nx/devkit": "23.0.0-beta.6",
+    "@nx/js": "23.0.0-beta.6",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-image": "^3.0.3",
@@ -49,7 +49,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.5",
+    "nx": "23.0.0-beta.6",
     "source-map-js": "^1.2.0"
   },
   "publishConfig": {

package/src/executors/rollup/rollup.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/executors/rollup/rollup.impl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,OAAO,EAAE,KAAK,eAAe,EAAU,MAAM,YAAY,CAAC;AAE1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EACL,+BAA+B,EAEhC,MAAM,iBAAiB,CAAC;AAOzB,wBAAuB,cAAc,CACnC,UAAU,EAAE,qBAAqB,EACjC,OAAO,EAAE,eAAe,qCAkEzB;AAID,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,+BAA+B,EACxC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC,CAuDxD;AAWD,eAAe,cAAc,CAAC"}
+{"version":3,"file":"rollup.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/executors/rollup/rollup.impl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,OAAO,EAAE,KAAK,eAAe,EAAU,MAAM,YAAY,CAAC;AAG1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EACL,+BAA+B,EAEhC,MAAM,iBAAiB,CAAC;AAKzB,wBAAuB,cAAc,CACnC,UAAU,EAAE,qBAAqB,EACjC,OAAO,EAAE,eAAe,qCAkEzB;AAID,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,+BAA+B,EACxC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC,CAuDxD;AAWD,eAAe,cAAc,CAAC"}

package/src/executors/rollup/rollup.impl.js

@@ -6,9 +6,8 @@ const tslib_1 = require("tslib");
 const rollup = tslib_1.__importStar(require("rollup"));
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const normalize_1 = require("./lib/normalize");
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const with_nx_1 = require("../../plugins/with-nx/with-nx");
 const generate_package_json_1 = require("../../plugins/package-json/generate-package-json");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
@@ -19,7 +18,7 @@ async function* rollupExecutor(rawOptions, context) {
     const outfile = resolveOutfile(context, options);
     if (options.watch) {
         // region Watch build
-        return yield* (0, async_iterable_1.createAsyncIterable)(({ next }) => {
+        return yield* (0, internal_1.createAsyncIterable)(({ next }) => {
             const watcher = rollup.watch(rollupOptions);
             watcher.on('event', (data) => {
                 if (data.code === 'START') {
@@ -86,7 +85,7 @@ async function createRollupOptions(options, context) {
     const generatePackageJsonPlugin = Array.isArray(rollupConfig.plugins)
         ? rollupConfig.plugins.find((p) => p['name'] === generate_package_json_1.pluginName)
         : null;
-    const userDefinedRollupConfigs = options.rollupConfig.map((plugin) => (0, config_utils_1.loadConfigFile)(plugin));
+    const userDefinedRollupConfigs = options.rollupConfig.map((plugin) => (0, internal_1.loadConfigFile)(plugin));
     let finalConfig = rollupConfig;
     for (const _config of userDefinedRollupConfigs) {
         const config = await _config;

package/src/generators/configuration/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAOjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAkBpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,8BAmC7B;AAsPD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,iBAAiB,EAOjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAiBpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,8BAmC7B;AAsPD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGenerator = configurationGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const js_1 = require("@nx/js");
 const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
@@ -143,7 +143,7 @@ function updatePackageJson(tree, options, outputConfig, isTsSolutionSetup) {
     (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
 }
 function addBuildTarget(tree, options, isTsSolutionSetup) {
-    (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, '@nx/rollup:rollup', options.buildTarget, [
+    (0, internal_1.addBuildTargetDefaults)(tree, '@nx/rollup:rollup', options.buildTarget, [
         ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
     ]);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);

package/src/generators/convert-to-inferred/convert-to-inferred.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBAkGlE;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAMpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBAkGlE;AAED,eAAe,iBAAiB,CAAC"}

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferred = convertToInferred;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const extract_rollup_config_from_executor_options_1 = require("./lib/extract-rollup-config-from-executor-options");
 const add_plugin_registrations_1 = require("./lib/add-plugin-registrations");
-const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
 async function convertToInferred(tree, options) {
     const migratedProjects = new Map();
     let projects = (0, devkit_1.getProjects)(tree);
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/rollup:rollup', (_, projectName, targetName, configurationName) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/rollup:rollup', (_, projectName, targetName, configurationName) => {
         if (options.project && projectName !== options.project)
             return;
         const project = projects.get(projectName);
@@ -67,7 +66,7 @@ async function convertToInferred(tree, options) {
         migratedProjects.set(projectName, { buildTargetName: targetName });
     });
     if (migratedProjects.size === 0) {
-        throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
+        throw new internal_1.NoTargetsToMigrateError();
     }
     projects = (0, devkit_1.getProjects)(tree);
     await (0, add_plugin_registrations_1.addPluginRegistrations)(tree, migratedProjects, projects, '@nx/rollup/plugin');

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAkDnE;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAkDnE;AAED,eAAe,mBAAmB,CAAC"}

package/src/generators/init/init.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rollupInitGenerator = rollupInitGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
 async function rollupInitGenerator(tree, schema) {
     let task = () => { };
@@ -20,7 +20,7 @@ async function rollupInitGenerator(tree, schema) {
         task = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, schema.keepExistingVersions);
     }
     if (schema.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/rollup/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/rollup/plugin', plugin_1.createNodesV2, {
             buildTargetName: ['build', 'rollup:build', 'rollup-build'],
             buildDepsTargetName: [
                 'build-deps',

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/plugins/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,kBAAkB,EAGvB,aAAa,EAOd,MAAM,YAAY,CAAC;AA+BpB;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAkC1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/plugins/plugin.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,KAAK,kBAAkB,EAGvB,aAAa,EAKd,MAAM,YAAY,CAAC;AAUpB;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAMD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAmC1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -1,29 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const path_1 = require("path");
 const fs_1 = require("fs");
 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 file_hasher_1 = require("nx/src/hasher/file-hasher");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const util_1 = require("@nx/js/src/plugins/typescript/util");
-function readTargetsCache(cachePath) {
-    try {
-        return process.env.NX_CACHE_PROJECT_GRAPH !== 'false'
-            ? (0, devkit_1.readJsonFile)(cachePath)
-            : {};
-    }
-    catch {
-        return {};
-    }
-}
-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'.
  */
@@ -38,19 +24,21 @@ exports.createNodes = [
         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);
+        const targetsCache = new internal_1.PluginCache(cachePath);
         const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
-        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
+        const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
+        const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
+        const lockFileName = (0, js_1.getLockFileName)(packageManager);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache, isTsSolutionSetup, pmc), configFilePaths, normalizedOptions, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache, isTsSolutionSetup, pmc, lockFileName), configFilePaths, normalizedOptions, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc, lockFileName) {
     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
@@ -59,13 +47,15 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         !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, isTsSolutionSetup, pmc);
+    const hash = await (0, internal_1.calculateHashForCreateNodes)(projectRoot, options, context, [lockFileName]);
+    if (!targetsCache.has(hash)) {
+        targetsCache.set(hash, await buildRollupTarget(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc));
+    }
     return {
         projects: {
             [projectRoot]: {
                 root: projectRoot,
-                targets: targetsCache[hash],
+                targets: targetsCache.get(hash),
             },
         },
     };
@@ -89,7 +79,7 @@ async function buildRollupTarget(configFilePath, projectRoot, options, context,
     }
     const isTsConfig = configFilePath.endsWith('ts');
     const tsConfigPlugin = '@rollup/plugin-typescript';
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, context);
     const rollupConfig = (await loadConfigFile((0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath), isTsConfig ? { configPlugin: tsConfigPlugin } : {}, true // Enable watch mode so that rollup properly reloads config files without reusing a cached version
     )).options;
     const outputs = getOutputs(rollupConfig, projectRoot);