@nx/rollup 23.0.0-beta.7 → 23.0.0-beta.9

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.7",
+  "version": "23.0.0-beta.9",
   "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.7",
-    "@nx/js": "23.0.0-beta.7",
+    "@nx/devkit": "23.0.0-beta.9",
+    "@nx/js": "23.0.0-beta.9",
+    "@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.7",
+    "nx": "23.0.0-beta.9",
     "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;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"}
+{"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

@@ -11,7 +11,9 @@ const normalize_1 = require("./lib/normalize");
 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 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);

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"],

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":"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"}
+{"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;AAkBpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,8BAoC7B;AAsPD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -11,6 +11,7 @@ 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) {
@@ -29,6 +30,7 @@ async function configurationGenerator(tree, options) {
         outputConfig = createRollupConfig(tree, options, isTsSolutionSetup);
     }
     else {
+        (0, deprecation_1.warnRollupExecutorGenerating)();
         options.buildTarget ??= 'build';
         checkForTargetConflicts(tree, options);
         addBuildTarget(tree, options, isTsSolutionSetup);

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,EAKL,IAAI,EAIL,MAAM,YAAY,CAAC;AAgBpB,yBAA+B,IAAI,EAAE,IAAI,iBAyFxC"}

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

@@ -0,0 +1,111 @@
+"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);
+    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);
+        }
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
+            const basename = filePath.split('/').pop();
+            if (!ROLLUP_CONFIG_NAMES.includes(basename))
+                return;
+            stripFromRollupConfig(tree, filePath);
+        });
+    }
+    // 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);
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function stripFromRollupConfig(tree, filePath) {
+    const original = tree.read(filePath, 'utf-8');
+    if (!original?.includes(PROPERTY_NAME))
+        return;
+    // 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;
+    // 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);
+}

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

@@ -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/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.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":"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,CAuQtB"}

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

@@ -166,39 +166,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,
             }),

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.');
+}