@nx/rollup 23.0.0-beta.2 → 23.0.0-beta.21

package/migrations.json

@@ -1,4 +1,11 @@
 {
-  "generators": {},
+  "generators": {
+    "update-23-0-0-remove-use-legacy-typescript-plugin": {
+      "cli": "nx",
+      "version": "23.0.0-beta.4",
+      "description": "Remove deprecated useLegacyTypescriptPlugin option from @nx/rollup:rollup",
+      "implementation": "./src/migrations/update-23-0-0/remove-use-legacy-typescript-plugin"
+    }
+  },
   "packageJsonUpdates": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "23.0.0-beta.2",
+  "version": "23.0.0-beta.21",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -30,8 +30,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.2",
-    "@nx/js": "23.0.0-beta.2",
+    "@nx/devkit": "23.0.0-beta.21",
+    "@nx/js": "23.0.0-beta.21",
+    "@phenomnomnominal/tsquery": "~6.2.0",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-image": "^3.0.3",
@@ -45,11 +46,10 @@
     "postcss": "^8.4.38",
     "postcss-modules": "^6.0.1",
     "rollup": "^4.14.0",
-    "rollup-plugin-typescript2": "^0.36.0",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.2",
+    "nx": "23.0.0-beta.21",
     "source-map-js": "^1.2.0"
   },
   "publishConfig": {

package/src/executors/rollup/lib/normalize.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeRollupExecutorOptions = normalizeRollupExecutorOptions;
 exports.normalizePluginPath = normalizePluginPath;
 const path_1 = require("path");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function normalizeRollupExecutorOptions(options, context) {
     const { root } = context;
-    const skipTypeCheck = (0, ts_solution_setup_1.isUsingTsSolutionSetup)() ? true : options.skipTypeCheck;
+    const skipTypeCheck = (0, internal_1.isUsingTsSolutionSetup)() ? true : options.skipTypeCheck;
     return {
         ...options,
         rollupConfig: []

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;AAMzB,wBAAuB,cAAc,CACnC,UAAU,EAAE,qBAAqB,EACjC,OAAO,EAAE,eAAe,qCAoEzB;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,20 +6,21 @@ 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");
+const internal_2 = require("@nx/js/internal");
+const deprecation_1 = require("../../utils/deprecation");
 async function* rollupExecutor(rawOptions, context) {
+    (0, deprecation_1.warnRollupExecutorDeprecation)();
     process.env.NODE_ENV ??= 'production';
     const options = (0, normalize_1.normalizeRollupExecutorOptions)(rawOptions, context);
     const rollupOptions = await createRollupOptions(options, 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') {
@@ -79,14 +80,14 @@ async function* rollupExecutor(rawOptions, context) {
 }
 // -----------------------------------------------------------------------------
 async function createRollupOptions(options, context) {
-    const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName, true);
+    const { dependencies } = (0, internal_2.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName, true);
     const rollupConfig = (0, with_nx_1.withNx)(options, {}, dependencies);
     // `generatePackageJson` is a plugin rather than being embedded into @nx/rollup:rollup.
     // Make sure the plugin is always present to keep the previous before of Nx < 19.4, where it was not a plugin.
     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/executors/rollup/schema.d.ts

@@ -33,6 +33,5 @@ export interface RollupExecutorOptions {
   rollupConfig?: string | string[];
   skipTypeCheck?: boolean;
   skipTypeField?: boolean;
-  useLegacyTypescriptPlugin?: boolean;
   watch?: boolean;
 }

package/src/executors/rollup/schema.json

@@ -5,6 +5,7 @@
   "description": "Packages a library for different web usages (ESM, CommonJS).",
   "cli": "nx",
   "type": "object",
+  "x-deprecated": "The `@nx/rollup:rollup` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rollup:convert-to-inferred` to migrate to the `@nx/rollup/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
   "properties": {
     "project": {
       "type": "string",
@@ -155,11 +156,6 @@
     "sourceMap": {
       "description": "Output sourcemaps.",
       "type": "boolean"
-    },
-    "useLegacyTypescriptPlugin": {
-      "type": "boolean",
-      "description": "Use rollup-plugin-typescript2 instead of @rollup/plugin-typescript.",
-      "default": false
     }
   },
   "required": ["tsConfig", "main", "outputPath"],
@@ -191,5 +187,5 @@
       ]
     }
   },
-  "examplesFile": "../../docs/rollup-examples.md"
+  "examplesFile": "../../../docs/rollup-examples.md"
 }

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":"AAIA,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,8BAoC7B;AAwPD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -1,16 +1,15 @@
 "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");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const posix_1 = require("node:path/posix");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const has_plugin_1 = require("../../utils/has-plugin");
+const deprecation_1 = require("../../utils/deprecation");
 const init_1 = require("../init/init");
 let ts;
 async function configurationGenerator(tree, options) {
@@ -23,12 +22,13 @@ async function configurationGenerator(tree, options) {
     if (!options.skipPackageJson) {
         tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
     }
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(tree);
     let outputConfig;
     if ((0, has_plugin_1.hasPlugin)(tree)) {
         outputConfig = createRollupConfig(tree, options, isTsSolutionSetup);
     }
     else {
+        (0, deprecation_1.warnRollupExecutorGenerating)();
         options.buildTarget ??= 'build';
         checkForTargetConflicts(tree, options);
         addBuildTarget(tree, options, isTsSolutionSetup);
@@ -103,7 +103,7 @@ function updatePackageJson(tree, options, outputConfig, isTsSolutionSetup) {
     }
     else {
         packageJson = {
-            name: options.importPath || (0, get_import_path_1.getImportPath)(tree, options.project),
+            name: options.importPath || (0, internal_2.getImportPath)(tree, options.project),
             version: '0.0.1',
         };
     }
@@ -117,9 +117,7 @@ function updatePackageJson(tree, options, outputConfig, isTsSolutionSetup) {
             // target must exist if we don't receive an outputConfig
             const projectTarget = project.targets[options.buildTarget];
             const nxJson = (0, devkit_1.readNxJson)(tree);
-            const mergedTarget = (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (projectTarget.executor
-                ? nxJson.targetDefaults?.[projectTarget.executor]
-                : undefined) ?? nxJson.targetDefaults?.[options.buildTarget]);
+            const mergedTarget = (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (0, internal_1.readTargetDefaultsForTarget)(options.buildTarget, nxJson.targetDefaults, projectTarget.executor));
             ({ main, outputPath } = mergedTarget.options);
         }
         packageJson = (0, js_1.getUpdatedPackageJsonContent)(packageJson, {
@@ -132,7 +130,7 @@ function updatePackageJson(tree, options, outputConfig, isTsSolutionSetup) {
             format: options.format ?? ['esm'],
             outputFileExtensionForCjs: '.cjs.js',
             outputFileExtensionForEsm: '.esm.js',
-            developmentConditionName: (0, ts_solution_setup_1.getDefinedCustomConditionName)(tree),
+            developmentConditionName: (0, internal_2.getDefinedCustomConditionName)(tree),
         });
         // rollup has a specific declaration file generation not handled by the util above,
         // adjust accordingly
@@ -143,8 +141,8 @@ 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, [
-        ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+    (0, internal_1.addBuildTargetDefaults)(tree, '@nx/rollup:rollup', options.buildTarget, [
+        internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
     ]);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const prevBuildOptions = project.targets?.[options.buildTarget]?.options;
@@ -207,7 +205,7 @@ function updateTsConfig(tree, options) {
         throw new Error(`The '${tsconfigPath}' file doesn't exist. Provide the 'tsConfig' option with the correct path pointing to the tsconfig file to use for builds.`);
     }
     if (!ts) {
-        ts = (0, ensure_typescript_1.ensureTypescript)();
+        ts = (0, internal_2.ensureTypescript)();
     }
     const parsedTsConfig = (0, js_1.readTsConfig)(tsconfigPath, {
         ...ts.sys,

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":"AAKA,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,iBA+GlE;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);
@@ -19,9 +18,13 @@ async function convertToInferred(tree, options) {
             return;
         // Since targetDefaults for '@nx/rollup:rollup' will no longer apply, we want to copy them to the target options.
         const nxJson = (0, devkit_1.readNxJson)(tree);
-        const defaults = nxJson.targetDefaults['@nx/rollup:rollup'];
+        const defaults = (0, internal_1.normalizeTargetDefaults)(nxJson?.targetDefaults).find((e) => e.executor === '@nx/rollup:rollup' &&
+            e.target === undefined &&
+            e.projects === undefined &&
+            e.plugin === undefined);
         if (defaults) {
-            for (const [key, value] of Object.entries(defaults)) {
+            const { target: _t, executor: _e, projects: _p, plugin: _pl, ...rest } = defaults;
+            for (const [key, value] of Object.entries(rest)) {
                 target[key] ??= value;
             }
         }
@@ -67,7 +70,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/migrations/update-23-0-0/remove-use-legacy-typescript-plugin.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=remove-use-legacy-typescript-plugin.d.ts.map

package/src/migrations/update-23-0-0/remove-use-legacy-typescript-plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-use-legacy-typescript-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/migrations/update-23-0-0/remove-use-legacy-typescript-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAIL,MAAM,YAAY,CAAC;AAgBpB,yBAA+B,IAAI,EAAE,IAAI,iBAwGxC"}

package/src/migrations/update-23-0-0/remove-use-legacy-typescript-plugin.js

@@ -0,0 +1,125 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const ROLLUP_CONFIG_NAMES = [
+    'rollup.config.cjs',
+    'rollup.config.mjs',
+    'rollup.config.js',
+    'rollup.config.ts',
+];
+const PROPERTY_NAME = 'useLegacyTypescriptPlugin';
+async function default_1(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    // Track whether the migration actually stripped any legacy config so we
+    // only strip the orphan devDep when it was needed (a user could have
+    // installed `rollup-plugin-typescript2` for their own custom rollup setup).
+    let anyChange = false;
+    for (const [projectName] of projects) {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        let projectJsonChanged = false;
+        if (projectConfig.targets) {
+            for (const [, targetConfig] of Object.entries(projectConfig.targets)) {
+                if (targetConfig.executor !== '@nx/rollup:rollup' &&
+                    targetConfig.executor !== '@nrwl/rollup:rollup') {
+                    continue;
+                }
+                if (targetConfig.options &&
+                    'useLegacyTypescriptPlugin' in targetConfig.options) {
+                    delete targetConfig.options.useLegacyTypescriptPlugin;
+                    projectJsonChanged = true;
+                }
+                if (targetConfig.configurations) {
+                    for (const [, config] of Object.entries(targetConfig.configurations)) {
+                        if ('useLegacyTypescriptPlugin' in config) {
+                            delete config.useLegacyTypescriptPlugin;
+                            projectJsonChanged = true;
+                        }
+                    }
+                }
+            }
+        }
+        if (projectJsonChanged) {
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+            anyChange = true;
+        }
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
+            const basename = filePath.split('/').pop();
+            if (!ROLLUP_CONFIG_NAMES.includes(basename))
+                return;
+            if (stripFromRollupConfig(tree, filePath)) {
+                anyChange = true;
+            }
+        });
+    }
+    // Strip from nx.json targetDefaults (keyed by target name or executor name).
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson?.targetDefaults) {
+        const ROLLUP_EXECUTORS = ['@nx/rollup:rollup', '@nrwl/rollup:rollup'];
+        let nxJsonChanged = false;
+        for (const [targetOrExecutor, targetDefault] of Object.entries(nxJson.targetDefaults)) {
+            if (!ROLLUP_EXECUTORS.includes(targetOrExecutor) &&
+                !ROLLUP_EXECUTORS.includes(targetDefault.executor)) {
+                continue;
+            }
+            if (targetDefault.options &&
+                'useLegacyTypescriptPlugin' in targetDefault.options) {
+                delete targetDefault.options.useLegacyTypescriptPlugin;
+                nxJsonChanged = true;
+            }
+            if (targetDefault.configurations) {
+                for (const [, config] of Object.entries(targetDefault.configurations)) {
+                    if ('useLegacyTypescriptPlugin' in config) {
+                        delete config.useLegacyTypescriptPlugin;
+                        nxJsonChanged = true;
+                    }
+                }
+            }
+        }
+        if (nxJsonChanged) {
+            (0, devkit_1.updateNxJson)(tree, nxJson);
+            anyChange = true;
+        }
+    }
+    // Only strip the orphan devDep when we actually stripped a legacy config.
+    // Skipping otherwise preserves a user's own dep on rollup-plugin-typescript2.
+    if (anyChange) {
+        (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['rollup-plugin-typescript2']);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function stripFromRollupConfig(tree, filePath) {
+    const original = tree.read(filePath, 'utf-8');
+    if (!original?.includes(PROPERTY_NAME))
+        return false;
+    // Filter by the property NAME (not any descendant Identifier) so we don't
+    // strip `{ alias: useLegacyTypescriptPlugin }` where the identifier appears as a value.
+    // Also handle shorthand `{ useLegacyTypescriptPlugin }` — strip the entry, leave
+    // the variable declaration behind (not our problem).
+    const matches = (0, tsquery_1.query)((0, tsquery_1.ast)(original), 'PropertyAssignment, ShorthandPropertyAssignment').filter((p) => p.name && p.name.text === PROPERTY_NAME);
+    if (matches.length === 0)
+        return false;
+    // Walk in reverse so each splice doesn't shift the offsets of remaining matches
+    // (a file may legitimately contain multiple withNx({...}) calls, e.g. multi-format
+    // configs returning more than one rollup options object).
+    let updated = original;
+    for (const propNode of matches.slice().reverse()) {
+        let start = propNode.getStart();
+        let end = propNode.getEnd();
+        if (updated[end] === ',')
+            end += 1;
+        // If the property occupies its own line, drop the whole line including indentation.
+        const lineStart = updated.lastIndexOf('\n', start - 1) + 1;
+        const nextNewline = updated.indexOf('\n', end);
+        const lineEnd = nextNewline === -1 ? updated.length : nextNewline + 1;
+        if (/^\s*$/.test(updated.slice(lineStart, start)) &&
+            /^\s*$/.test(updated.slice(end, lineEnd))) {
+            start = lineStart;
+            end = lineEnd;
+        }
+        updated = updated.slice(0, start) + updated.slice(end);
+    }
+    tree.write(filePath, updated);
+    return true;
+}

package/src/plugins/nx-copy-assets.plugin.d.ts

@@ -1,5 +1,5 @@
 import type { Plugin } from 'rollup';
-import { AssetGlob } from '@nx/js/src/utils/assets/assets';
+import { AssetGlob } from '@nx/js/internal';
 export interface NxCopyAssetsPluginOptions {
     assets: (string | AssetGlob)[];
     outputPath: string;

package/src/plugins/nx-copy-assets.plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-copy-assets.plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/plugins/nx-copy-assets.plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAG3D,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAiBA;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAqD7E"}
+{"version":3,"file":"nx-copy-assets.plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/plugins/nx-copy-assets.plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,SAAS,EAAqB,MAAM,iBAAiB,CAAC;AAC/D,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAiBA;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAqD7E"}

package/src/plugins/nx-copy-assets.plugin.js

@@ -4,7 +4,7 @@ exports.extractGlobLiteralPrefix = extractGlobLiteralPrefix;
 exports.nxCopyAssetsPlugin = nxCopyAssetsPlugin;
 const node_path_1 = require("node:path");
 const devkit_1 = require("@nx/devkit");
-const copy_assets_handler_1 = require("@nx/js/src/utils/assets/copy-assets-handler");
+const internal_1 = require("@nx/js/internal");
 /**
  * Splits a glob into its literal directory prefix and the remaining pattern.
  * CopyAssetsHandler expects input to be a directory and glob to be a pattern
@@ -60,7 +60,7 @@ function nxCopyAssetsPlugin(options) {
             const outputDir = (0, node_path_1.isAbsolute)(options.outputPath)
                 ? options.outputPath
                 : (0, node_path_1.join)(devkit_1.workspaceRoot, options.outputPath);
-            handler = new copy_assets_handler_1.CopyAssetsHandler({
+            handler = new internal_1.CopyAssetsHandler({
                 rootDir: devkit_1.workspaceRoot,
                 projectDir: options.projectRoot,
                 outputDir,

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,EAEL,KAAK,kBAAkB,EAIvB,aAAa,EAKd,MAAM,YAAY,CAAC;AASpB;;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,CAgE1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -1,29 +1,14 @@
 "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);
-}
+const internal_2 = require("@nx/js/internal");
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
@@ -38,34 +23,50 @@ 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 isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
-        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
+        const targetsCache = new internal_1.PluginCache(cachePath);
+        const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
+        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);
+            const { entries, preErrors } = await filterRollupConfigs(configFilePaths, context);
+            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.projectRoot), normalizedOptions, context, entries.map(() => [lockFileName]));
+            let results = [];
+            let nodeErrors = [];
+            try {
+                results = await (0, devkit_1.createNodesFromFiles)((configFile, _, ctx, idx) => createNodesInternal(configFile, normalizedOptions, ctx, targetsCache, isTsSolutionSetup, pmc, projectHashes[idx]), entries.map((e) => e.configFile), normalizedOptions, context);
+            }
+            catch (e) {
+                if (e instanceof devkit_1.AggregateCreateNodesError) {
+                    results = e.partialResults ?? [];
+                    nodeErrors = e.errors;
+                }
+                else {
+                    throw e;
+                }
+            }
+            const allErrors = [...preErrors, ...nodeErrors];
+            if (allErrors.length > 0) {
+                throw new devkit_1.AggregateCreateNodesError(allErrors, results);
+            }
+            return results;
         }
         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, hash) {
     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 {};
+    if (!targetsCache.has(hash)) {
+        targetsCache.set(hash, await buildRollupTarget(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc));
     }
-    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);
     return {
         projects: {
             [projectRoot]: {
                 root: projectRoot,
-                targets: targetsCache[hash],
+                targets: targetsCache.get(hash),
             },
         },
     };
@@ -89,7 +90,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);
@@ -106,7 +107,7 @@ async function buildRollupTarget(configFilePath, projectRoot, options, context,
                 ? ['production', '^production']
                 : ['default', '^default']),
             { externalDependencies: ['rollup'] },
-            ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+            internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
         ],
         outputs,
         metadata: {
@@ -128,7 +129,7 @@ async function buildRollupTarget(configFilePath, projectRoot, options, context,
             '@nx/js:typescript-sync',
         ];
     }
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return targets;
 }
 function getOutputs(rollupConfigs, projectRoot) {
@@ -157,6 +158,28 @@ function getOutputs(rollupConfigs, projectRoot) {
     }
     return Array.from(outputs);
 }
+async function filterRollupConfigs(configFiles, context) {
+    const preErrors = [];
+    const candidates = await Promise.all(configFiles.map(async (configFile) => {
+        try {
+            const projectRoot = (0, path_1.dirname)(configFile);
+            const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+            if (!siblingFiles.includes('package.json') &&
+                !siblingFiles.includes('project.json')) {
+                return null;
+            }
+            return { configFile, projectRoot };
+        }
+        catch (e) {
+            preErrors.push([configFile, e]);
+            return null;
+        }
+    }));
+    return {
+        entries: candidates.filter((c) => c !== null),
+        preErrors,
+    };
+}
 function normalizeOptions(options) {
     return {
         buildTargetName: options.buildTargetName ?? 'build',

package/src/plugins/with-nx/normalize-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/plugins/with-nx/normalize-options.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,mCAAmC,EACnC,yBAAyB,EAC1B,MAAM,mBAAmB,CAAC;AAI3B,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,yBAAyB,GACjC,mCAAmC,CAoCrC"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/plugins/with-nx/normalize-options.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,mCAAmC,EACnC,yBAAyB,EAC1B,MAAM,mBAAmB,CAAC;AAI3B,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,yBAAyB,GACjC,mCAAmC,CA+BrC"}

package/src/plugins/with-nx/normalize-options.js

@@ -5,13 +5,13 @@ const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function normalizeOptions(projectRoot, sourceRoot, options) {
     if (global.NX_GRAPH_CREATION)
         return options;
     normalizeRelativePaths(projectRoot, options);
     // New TS Solution already has a typecheck target
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)()) {
+    if ((0, internal_1.isUsingTsSolutionSetup)()) {
         options.skipTypeCheck = true;
     }
     return {
@@ -30,12 +30,7 @@ function normalizeOptions(projectRoot, sourceRoot, options) {
         javascriptEnabled: options.javascriptEnabled ?? false,
         skipTypeCheck: options.skipTypeCheck ?? false,
         skipTypeField: options.skipTypeField ?? false,
-        /**
-         * TODO(v23): Update default to true
-         * This defaults to false for pure plugin usage to match what is the current behaviour for users
-         * However, this differs from the Rollup executor usage as it defaulted to `true` in the `schema.json`
-         */
-        buildLibsFromSource: options.buildLibsFromSource ?? false,
+        buildLibsFromSource: options.buildLibsFromSource ?? true,
     };
 }
 function normalizeAssets(assets, root, sourceRoot) {

package/src/plugins/with-nx/type-definitions.d.ts

@@ -0,0 +1,8 @@
+import type { OutputBundle } from 'rollup';
+export declare function typeDefinitions(options: {
+    projectRoot: string;
+}): {
+    name: string;
+    generateBundle(_opts: unknown, bundle: OutputBundle): Promise<void>;
+};
+//# sourceMappingURL=type-definitions.d.ts.map

package/src/plugins/with-nx/type-definitions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-definitions.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/plugins/with-nx/type-definitions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAe3C,wBAAgB,eAAe,CAAC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE;;0BAGhC,OAAO,UAAU,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;EA2C5E"}

package/src/plugins/with-nx/type-definitions.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.typeDefinitions = typeDefinitions;
+const path_1 = require("path");
+const devkit_1 = require("@nx/devkit");
+/*
+ * This plugin takes all entry-points from the generated bundle and creates a
+ * bundled version of corresponding d.ts files.
+ *
+ * For example, `src/index.ts` generates two corresponding files:
+ * - `dist/xyz/index.js`
+ * - `dist/xyz/src/index.d.ts`
+ *
+ * We want a third file: `dist/index.d.ts` that re-exports from `src/index.d.ts`.
+ * That way, when TSC or IDEs look for types, it will find them in the right place.
+ */
+function typeDefinitions(options) {
+    return {
+        name: 'dts-bundle',
+        async generateBundle(_opts, bundle) {
+            for (const [name, file] of Object.entries(bundle)) {
+                if (file.type === 'asset' ||
+                    !file.isEntry ||
+                    file.facadeModuleId == null) {
+                    continue;
+                }
+                const hasDefaultExport = file.exports.includes('default');
+                const entrySourceFileName = (0, path_1.relative)(options.projectRoot, file.facadeModuleId);
+                const entrySourceDtsName = entrySourceFileName.replace(/\.[cm]?[jt]sx?$/, '');
+                // Replace various JavaScript file extensions (e.g., .js, .cjs, .mjs, .cjs.js, .mjs.js) with .d.ts for generating type definition file names.
+                // This regex matches the pattern used in packages/rollup/src/plugins/package-json/update-package-json.ts
+                const dtsFileName = file.fileName.replace(/(\.cjs|\.mjs|\.esm\.js|\.cjs\.js|\.mjs\.js|\.js)$/, '.d.ts');
+                const relativeSourceDtsName = JSON.stringify('./' + entrySourceDtsName);
+                const dtsFileSource = hasDefaultExport
+                    ? (0, devkit_1.stripIndents) `
+              export * from ${relativeSourceDtsName};
+              export { default } from ${relativeSourceDtsName};
+            `
+                    : `export * from ${relativeSourceDtsName};\n`;
+                this.emitFile({
+                    type: 'asset',
+                    fileName: dtsFileName,
+                    source: dtsFileSource,
+                });
+            }
+        },
+    };
+}

package/src/plugins/with-nx/with-nx-options.d.ts

@@ -80,10 +80,6 @@ export interface RollupWithNxPluginOptions {
      * The path to tsconfig file.
      */
     tsConfig: string;
-    /**
-     * Use rollup-plugin-typescript2 instead of @rollup/plugin-typescript.
-     */
-    useLegacyTypescriptPlugin?: boolean;
     /**
      * Whether to generate a package.json file in the output path. It's not supported when the workspace is
      * set up with TypeScript Project References along with the package managers' Workspaces feature. Otherwise,

package/src/plugins/with-nx/with-nx-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-nx-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/plugins/with-nx/with-nx-options.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,yBAAyB;IACxC;;SAEK;IACL,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;IACnC;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC;IACrC;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC9B;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC;IAC3B;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mCACf,SAAQ,yBAAyB;IACjC,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,QAAQ,EAAE,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;IAClC,MAAM,EAAE,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC;CAC3B"}
+{"version":3,"file":"with-nx-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/plugins/with-nx/with-nx-options.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,yBAAyB;IACxC;;SAEK;IACL,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;IACnC;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC;IACrC;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC9B;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC;IAC3B;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mCACf,SAAQ,yBAAyB;IACjC,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,QAAQ,EAAE,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;IAClC,MAAM,EAAE,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC;CAC3B"}

package/src/plugins/with-nx/with-nx.d.ts

@@ -1,4 +1,4 @@
-import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+import { DependentBuildableProjectNode } from '@nx/js/internal';
 import * as rollup from 'rollup';
 import { RollupWithNxPluginOptions } from './with-nx-options';
 export declare function withNx(rawOptions: RollupWithNxPluginOptions, rollupConfig?: rollup.RollupOptions, dependencies?: DependentBuildableProjectNode[]): rollup.RollupOptions;

package/src/plugins/with-nx/with-nx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-nx.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/plugins/with-nx/with-nx.ts"],"names":[],"mappings":"AAUA,OAAO,EAIL,6BAA6B,EAC9B,MAAM,uCAAuC,CAAC;AAY/C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAQjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AA4B9D,wBAAgB,MAAM,CACpB,UAAU,EAAE,yBAAyB,EACrC,YAAY,GAAE,MAAM,CAAC,aAAkB,EAEvC,YAAY,CAAC,EAAE,6BAA6B,EAAE,GAC7C,MAAM,CAAC,aAAa,CA0RtB"}
+{"version":3,"file":"with-nx.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/plugins/with-nx/with-nx.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,6BAA6B,EAG9B,MAAM,iBAAiB,CAAC;AASzB,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAQjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AA4B9D,wBAAgB,MAAM,CACpB,UAAU,EAAE,yBAAyB,EACrC,YAAY,GAAE,MAAM,CAAC,aAAkB,EAEvC,YAAY,CAAC,EAAE,6BAA6B,EAAE,GAC7C,MAAM,CAAC,aAAa,CAuQtB"}

package/src/plugins/with-nx/with-nx.js

@@ -4,10 +4,9 @@ exports.withNx = withNx;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const type_definitions_1 = require("@nx/js/src/plugins/rollup/type-definitions");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const ts_config_1 = require("@nx/js/src/utils/typescript/ts-config");
+const internal_1 = require("@nx/js/internal");
+const type_definitions_1 = require("./type-definitions");
+const js_1 = require("@nx/js");
 const plugin_babel_1 = require("@rollup/plugin-babel");
 const plugin_node_resolve_1 = tslib_1.__importDefault(require("@rollup/plugin-node-resolve"));
 const autoprefixer_1 = tslib_1.__importDefault(require("autoprefixer"));
@@ -52,16 +51,16 @@ dependencies) {
         : (0, devkit_1.readCachedProjectGraph)();
     // If dependencies are not passed from executor, calculate them from project graph.
     if (!dependencies && !global.NX_GRAPH_CREATION) {
-        const result = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(undefined, projectGraph, devkit_1.workspaceRoot, projectNode.name, process.env.NX_TASK_TARGET_TARGET, process.env.NX_TASK_TARGET_CONFIGURATION, true);
+        const result = (0, internal_1.calculateProjectBuildableDependencies)(undefined, projectGraph, devkit_1.workspaceRoot, projectNode.name, process.env.NX_TASK_TARGET_TARGET, process.env.NX_TASK_TARGET_CONFIGURATION, true);
         dependencies = result.dependencies;
     }
-    const projectSourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data);
+    const projectSourceRoot = (0, internal_1.getProjectSourceRoot)(projectNode.data);
     const options = (0, normalize_options_1.normalizeOptions)(projectNode.data.root, projectSourceRoot, rawOptions);
     const useBabel = options.compiler === 'babel';
     const useSwc = options.compiler === 'swc';
     const tsConfigPath = options.buildLibsFromSource || global.NX_GRAPH_CREATION
         ? (0, node_path_1.join)(devkit_1.workspaceRoot, options.tsConfig)
-        : (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, devkit_1.workspaceRoot, projectNode.data.root, dependencies);
+        : (0, internal_1.createTmpTsConfig)(options.tsConfig, devkit_1.workspaceRoot, projectNode.data.root, dependencies);
     ensureTypeScript();
     const tsConfigFile = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
     const tsConfig = ts.parseJsonConfigFileContent(tsConfigFile.config, ts.sys, (0, node_path_1.dirname)(tsConfigPath));
@@ -141,7 +140,7 @@ dependencies) {
     if (!global.NX_GRAPH_CREATION) {
         // Ensure TypeScript is available before any plugin initialization
         ensureTypeScript();
-        const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)();
         if (isTsSolutionSetup) {
             if (options.generatePackageJson) {
                 throw new Error(`Setting 'generatePackageJson: true' is not supported with the current TypeScript setup. Update the 'package.json' file at the project root as needed and unset the 'generatePackageJson' option. See https://nx.dev/docs/technologies/node/guides/deploying-node-projects for the recommended pruned package.json workflow.`);
@@ -166,39 +165,23 @@ dependencies) {
             }),
             image(),
             json(),
-            // TypeScript compilation and declaration generation
-            options.useLegacyTypescriptPlugin === true
-                ? (() => {
-                    // TODO(v23): Remove in Nx 23
-                    // Show deprecation warning
-                    devkit_1.logger.warn(`rollup-plugin-typescript2 is deprecated and will be removed in Nx 23. ` +
-                        `You are explicitly using it with 'useLegacyTypescriptPlugin: true'. ` +
-                        `Consider removing this option to use the official @rollup/plugin-typescript.`);
-                    return require('rollup-plugin-typescript2')({
-                        check: !options.skipTypeCheck,
-                        tsconfig: tsConfigPath,
-                        tsconfigOverride: {
-                            compilerOptions,
-                        },
-                    });
-                })()
-                : (() => {
-                    // @rollup/plugin-typescript needs outDir and declarationDir to match Rollup's output directory
-                    const { outDir, declarationDir, ...tsCompilerOptions } = compilerOptions;
-                    const rollupOutputDir = Array.isArray(finalConfig.output)
-                        ? finalConfig.output[0].dir
-                        : finalConfig.output.dir;
-                    return require('@rollup/plugin-typescript')({
-                        tsconfig: tsConfigPath,
-                        compilerOptions: {
-                            ...tsCompilerOptions,
-                            composite: false,
-                            outDir: rollupOutputDir,
-                            declarationDir: rollupOutputDir,
-                            noEmitOnError: !options.skipTypeCheck,
-                        },
-                    });
-                })(),
+            (() => {
+                // @rollup/plugin-typescript needs outDir and declarationDir to match Rollup's output directory
+                const { outDir, declarationDir, ...tsCompilerOptions } = compilerOptions;
+                const rollupOutputDir = Array.isArray(finalConfig.output)
+                    ? finalConfig.output[0].dir
+                    : finalConfig.output.dir;
+                return require('@rollup/plugin-typescript')({
+                    tsconfig: tsConfigPath,
+                    compilerOptions: {
+                        ...tsCompilerOptions,
+                        composite: false,
+                        outDir: rollupOutputDir,
+                        declarationDir: rollupOutputDir,
+                        noEmitOnError: !options.skipTypeCheck,
+                    },
+                });
+            })(),
             (0, type_definitions_1.typeDefinitions)({
                 projectRoot,
             }),
@@ -268,10 +251,10 @@ function createInput(options) {
     return input;
 }
 function createTsCompilerOptions(projectRoot, config, tsConfigPath, options, dependencies) {
-    const compilerOptionPaths = (0, buildable_libs_utils_1.computeCompilerOptionsPaths)(config, dependencies ?? []);
+    const compilerOptionPaths = (0, internal_1.computeCompilerOptionsPaths)(config, dependencies ?? []);
     // Resolve paths to absolute so they work without baseUrl and regardless
     // of which tsconfig the plugin reads (project vs workspace root).
-    const pathsBase = (0, ts_config_1.resolvePathsBaseUrl)(tsConfigPath);
+    const pathsBase = (0, js_1.resolvePathsBaseUrl)(tsConfigPath);
     for (const key of Object.keys(compilerOptionPaths)) {
         compilerOptionPaths[key] = compilerOptionPaths[key].map((p) => {
             if ((0, path_1.isAbsolute)(p)) {

package/src/utils/deprecation.d.ts

@@ -0,0 +1,4 @@
+export declare const ROLLUP_EXECUTOR_DEPRECATION_MESSAGE = "The `@nx/rollup:rollup` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rollup:convert-to-inferred` to migrate to the `@nx/rollup/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.";
+export declare function warnRollupExecutorDeprecation(): void;
+export declare function warnRollupExecutorGenerating(): void;
+//# sourceMappingURL=deprecation.d.ts.map

package/src/utils/deprecation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deprecation.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/utils/deprecation.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mCAAmC,mQACkN,CAAC;AAEnQ,wBAAgB,6BAA6B,IAAI,IAAI,CAEpD;AAMD,wBAAgB,4BAA4B,IAAI,IAAI,CAInD"}

package/src/utils/deprecation.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ROLLUP_EXECUTOR_DEPRECATION_MESSAGE = void 0;
+exports.warnRollupExecutorDeprecation = warnRollupExecutorDeprecation;
+exports.warnRollupExecutorGenerating = warnRollupExecutorGenerating;
+const devkit_1 = require("@nx/devkit");
+// TODO(v24): Remove the @nx/rollup:rollup executor. The inferred plugin
+// (@nx/rollup/plugin) and the convert-to-inferred generator stay supported.
+exports.ROLLUP_EXECUTOR_DEPRECATION_MESSAGE = 'The `@nx/rollup:rollup` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rollup:convert-to-inferred` to migrate to the `@nx/rollup/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.';
+function warnRollupExecutorDeprecation() {
+    devkit_1.logger.warn(exports.ROLLUP_EXECUTOR_DEPRECATION_MESSAGE);
+}
+// Fired when the @nx/rollup:configuration generator is about to generate a
+// target that uses the deprecated executor — i.e. when @nx/rollup/plugin
+// isn't registered in nx.json. Surfaces the deprecation at generation time
+// rather than only when the user later runs the generated target.
+function warnRollupExecutorGenerating() {
+    devkit_1.logger.warn('Generating a target that uses the deprecated `@nx/rollup:rollup` executor. The executor will be removed in Nx v24. Run `nx g @nx/rollup:convert-to-inferred` next to migrate this target to the `@nx/rollup/plugin` inferred plugin and prevent future generators from emitting executor targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
+}

package/src/utils/ensure-dependencies.js

@@ -2,22 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureDependencies = ensureDependencies;
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("@nx/js/src/utils/versions");
-const versions_2 = require("./versions");
+const internal_1 = require("@nx/js/internal");
+const versions_1 = require("./versions");
 function ensureDependencies(tree, options) {
     switch (options.compiler) {
         case 'swc':
             return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                '@swc/helpers': versions_1.swcHelpersVersion,
-                '@swc/core': versions_1.swcCoreVersion,
-                'swc-loader': versions_2.swcLoaderVersion,
+                '@swc/helpers': internal_1.swcHelpersVersion,
+                '@swc/core': internal_1.swcCoreVersion,
+                'swc-loader': versions_1.swcLoaderVersion,
             });
         case 'babel':
             return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                'core-js': versions_2.coreJsVersion, // needed for preset-env to work
-                tslib: versions_2.tsLibVersion,
+                'core-js': versions_1.coreJsVersion, // needed for preset-env to work
+                tslib: versions_1.tsLibVersion,
             });
         default:
-            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { tslib: versions_2.tsLibVersion });
+            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { tslib: versions_1.tsLibVersion });
     }
 }