@nx/rollup 21.2.1 → 21.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "21.2.1",
+  "version": "21.2.3",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -29,8 +29,8 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.2.1",
-    "@nx/js": "21.2.1",
+    "@nx/devkit": "21.2.3",
+    "@nx/js": "21.2.3",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-image": "^3.0.3",

package/src/executors/rollup/schema.d.ts

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

package/src/executors/rollup/schema.json

@@ -155,6 +155,11 @@
     "sourceMap": {
       "description": "Output sourcemaps.",
       "type": "boolean"
+    },
+    "useLegacyTypescriptPlugin": {
+      "type": "boolean",
+      "description": "Use rollup-plugin-typescript2 instead of @rollup/plugin-typescript.",
+      "default": true
     }
   },
   "required": ["tsConfig", "main", "outputPath"],

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

@@ -80,6 +80,10 @@ 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.d.ts

@@ -1,4 +1,4 @@
-import * as rollup from 'rollup';
 import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+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.js

@@ -1,22 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNx = withNx;
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const ts = require("typescript");
-const plugin_babel_1 = require("@rollup/plugin-babel");
-const autoprefixer = require("autoprefixer");
 const devkit_1 = require("@nx/devkit");
+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 plugin_babel_1 = require("@rollup/plugin-babel");
 const plugin_node_resolve_1 = require("@rollup/plugin-node-resolve");
-const type_definitions_1 = require("@nx/js/src/plugins/rollup/type-definitions");
+const autoprefixer = require("autoprefixer");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const analyze_1 = require("../analyze");
-const swc_1 = require("../swc");
+const delete_output_1 = require("../delete-output");
 const generate_package_json_1 = require("../package-json/generate-package-json");
+const swc_1 = require("../swc");
 const get_project_node_1 = require("./get-project-node");
-const delete_output_1 = require("../delete-output");
 const normalize_options_1 = require("./normalize-options");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 // These use require because the ES import isn't correct.
 const commonjs = require('@rollup/plugin-commonjs');
 const image = require('@rollup/plugin-image');
@@ -24,6 +23,18 @@ const json = require('@rollup/plugin-json');
 const copy = require('rollup-plugin-copy');
 const postcss = require('rollup-plugin-postcss');
 const fileExtensions = ['.js', '.jsx', '.ts', '.tsx'];
+let ts;
+function ensureTypeScript() {
+    if (!ts) {
+        try {
+            ts = require('typescript');
+        }
+        catch (e) {
+            throw new Error('TypeScript is required for the @nx/rollup plugin. Please install it in your workspace.');
+        }
+    }
+    return ts;
+}
 function withNx(rawOptions, rollupConfig = {}, 
 // Passed by @nx/rollup:rollup executor to previous behavior of remapping tsconfig paths based on buildable dependencies remains intact.
 dependencies) {
@@ -40,12 +51,14 @@ dependencies) {
         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);
         dependencies = result.dependencies;
     }
-    const options = (0, normalize_options_1.normalizeOptions)(projectNode.data.root, projectNode.data.sourceRoot, rawOptions);
+    const projectSourceRoot = (0, ts_solution_setup_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, projectRoot, dependencies);
+    ensureTypeScript();
     const tsConfigFile = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
     const tsConfig = ts.parseJsonConfigFileContent(tsConfigFile.config, ts.sys, (0, node_path_1.dirname)(tsConfigPath));
     if (!options.format || !options.format.length) {
@@ -122,6 +135,8 @@ dependencies) {
         };
     }
     if (!global.NX_GRAPH_CREATION) {
+        // Ensure TypeScript is available before any plugin initialization
+        ensureTypeScript();
         const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
         if (isTsSolutionSetup) {
             if (options.generatePackageJson) {
@@ -134,20 +149,50 @@ dependencies) {
         else {
             options.generatePackageJson ??= true;
         }
+        const compilerOptions = createTsCompilerOptions(projectRoot, tsConfig, options, dependencies);
+        compilerOptions.outDir = Array.isArray(finalConfig.output)
+            ? finalConfig.output[0].dir
+            : finalConfig.output.dir;
         finalConfig.plugins = [
             copy({
                 targets: convertCopyAssetsToRollupOptions(options.outputPath, options.assets),
             }),
             image(),
             json(),
-            // Needed to generate type definitions, even if we're using babel or swc.
-            require('rollup-plugin-typescript2')({
-                check: !options.skipTypeCheck,
-                tsconfig: tsConfigPath,
-                tsconfigOverride: {
-                    compilerOptions: createTsCompilerOptions(projectRoot, tsConfig, options, dependencies),
-                },
-            }),
+            // TypeScript compilation and declaration generation
+            // TODO(v22): Change default value of useLegacyTypescriptPlugin to false for Nx 22
+            options.useLegacyTypescriptPlugin !== false
+                ? (() => {
+                    // TODO(v23): Remove in Nx 23
+                    // Show deprecation warning
+                    devkit_1.logger.warn(`rollup-plugin-typescript2 usage is deprecated and will be removed in Nx 23. ` +
+                        `Set 'useLegacyTypescriptPlugin: false' 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,
+                            outDir: rollupOutputDir,
+                            declarationDir: rollupOutputDir,
+                        },
+                        declaration: true,
+                        declarationMap: !!options.sourceMap,
+                        noEmitOnError: !options.skipTypeCheck,
+                    });
+                })(),
             (0, type_definitions_1.typeDefinitions)({
                 projectRoot,
             }),
@@ -178,7 +223,7 @@ dependencies) {
                         supportsStaticESM: true,
                         isModern: true,
                     },
-                    cwd: (0, node_path_1.join)(devkit_1.workspaceRoot, projectNode.data.sourceRoot ?? projectNode.data.root),
+                    cwd: (0, node_path_1.join)(devkit_1.workspaceRoot, projectSourceRoot),
                     rootMode: options.babelUpwardRootMode ? 'upward' : undefined,
                     babelrc: true,
                     extensions: fileExtensions,
@@ -224,6 +269,7 @@ function createTsCompilerOptions(projectRoot, config, options, dependencies) {
         declaration: true,
         paths: compilerOptionPaths,
     };
+    ensureTypeScript();
     if (config.options.module === ts.ModuleKind.CommonJS) {
         compilerOptions['module'] = 'ESNext';
     }
@@ -241,6 +287,7 @@ function convertCopyAssetsToRollupOptions(outputPath, assets) {
         : undefined;
 }
 function readCompatibleFormats(config) {
+    ensureTypeScript();
     switch (config.options.module) {
         case ts.ModuleKind.CommonJS:
         case ts.ModuleKind.UMD: