@nx/rollup 0.0.0-pr-29176-d3c6c29 → 0.0.0-pr-29314-e664f92

package/package.json

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

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

@@ -3,8 +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");
 function normalizeRollupExecutorOptions(options, context) {
     const { root } = context;
+    const skipTypeCheck = (0, ts_solution_setup_1.isUsingTsSolutionSetup)() ? true : options.skipTypeCheck;
     return {
         ...options,
         rollupConfig: []
@@ -12,7 +14,7 @@ function normalizeRollupExecutorOptions(options, context) {
             .filter(Boolean)
             .map((p) => normalizePluginPath(p, root)),
         projectRoot: context.projectGraph.nodes[context.projectName].data.root,
-        skipTypeCheck: options.skipTypeCheck || false,
+        skipTypeCheck: skipTypeCheck || false,
     };
 }
 function normalizePluginPath(pluginPath, root) {

package/src/generators/configuration/configuration.js

@@ -58,7 +58,7 @@ function createRollupConfig(tree, options, isTsSolutionSetup) {
             ? `./${(0, posix_1.relative)(project.root, options.tsConfig)}`
             : './tsconfig.lib.json',
     };
-    tree.write((0, devkit_1.joinPathFragments)(project.root, 'rollup.config.js'), `const { withNx } = require('@nx/rollup/with-nx');
+    tree.write((0, devkit_1.joinPathFragments)(project.root, 'rollup.config.cjs'), `const { withNx } = require('@nx/rollup/with-nx');
 
 module.exports = withNx(
   {

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

@@ -47,11 +47,11 @@ async function convertToInferred(tree, options) {
             // If users have this set erroneously, then it will continue to not work.
             (target.outputs[0] === '{options.outputPath}' ||
                 target.outputs[0] === '{workspaceRoot}/{options.outputPath}')) {
-            // If only the default `options.outputPath` is set as output, remove it and use path inferred from `rollup.config.js`.
+            // If only the default `options.outputPath` is set as output, remove it and use path inferred from `rollup.config.cjs`.
             delete target.outputs;
         }
         else {
-            // Otherwise, replace `options.outputPath` with what is inferred from `rollup.config.js`.
+            // Otherwise, replace `options.outputPath` with what is inferred from `rollup.config.cjs`.
             target.outputs = target.outputs.map((output) => 
             // Again, "{projectRoot}/{options.outputPath}" is an invalid output for Rollup.
             output === '{options.outputPath}' ||

package/src/generators/convert-to-inferred/lib/extract-rollup-config-from-executor-options.js

@@ -17,9 +17,13 @@ function extractRollupConfigFromExecutorOptions(tree, options, configurations, p
             ? [options.rollupConfig]
             : [];
     delete options.rollupConfig;
-    // Resolve conflict with rollup.config.js if it exists.
+    // Resolve conflict with rollup.config.cjs or rollup.config.js if they exist.
     for (let i = 0; i < oldRollupConfig.length; i++) {
         const file = oldRollupConfig[i];
+        if (file === './rollup.config.cjs') {
+            tree.rename((0, devkit_1.joinPathFragments)(projectRoot, 'rollup.config.cjs'), (0, devkit_1.joinPathFragments)(projectRoot, `rollup.migrated.config.cjs`));
+            oldRollupConfig.splice(i, 1, './rollup.migrated.config.cjs');
+        }
         if (file === './rollup.config.js') {
             tree.rename((0, devkit_1.joinPathFragments)(projectRoot, 'rollup.config.js'), (0, devkit_1.joinPathFragments)(projectRoot, `rollup.migrated.config.js`));
             oldRollupConfig.splice(i, 1, './rollup.migrated.config.js');
@@ -82,7 +86,7 @@ function extractRollupConfigFromExecutorOptions(tree, options, configurations, p
             }
         }
     }
-    tree.write((0, devkit_1.joinPathFragments)(projectRoot, `rollup.config.js`), createNewRollupConfig(oldRollupConfig, defaultOptions, configurationOptions));
+    tree.write((0, devkit_1.joinPathFragments)(projectRoot, `rollup.config.cjs`), createNewRollupConfig(oldRollupConfig, defaultOptions, configurationOptions));
     return defaultOptions;
 }
 function createNewRollupConfig(oldRollupConfig, defaultOptions, configurationOptions, singleConfiguration = false) {

package/src/plugins/plugin.js

@@ -9,6 +9,7 @@ const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculat
 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 pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
@@ -28,7 +29,7 @@ exports.createNodes = [
     rollupConfigGlob,
     async (configFilePath, options, context) => {
         devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
-        return createNodesInternal(configFilePath, normalizeOptions(options), context, {});
+        return createNodesInternal(configFilePath, normalizeOptions(options), context, {}, (0, ts_solution_setup_1.isUsingTsSolutionSetup)());
     },
 ];
 exports.createNodesV2 = [
@@ -38,15 +39,16 @@ exports.createNodesV2 = [
         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)();
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache), configFilePaths, normalizedOptions, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache, isTsSolutionSetup), configFilePaths, normalizedOptions, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
         }
     },
 ];
-async function createNodesInternal(configFilePath, options, context, targetsCache) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup) {
     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
@@ -56,7 +58,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         return {};
     }
     const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-    targetsCache[hash] ??= await buildRollupTarget(configFilePath, projectRoot, options, context);
+    targetsCache[hash] ??= await buildRollupTarget(configFilePath, projectRoot, options, context, isTsSolutionSetup);
     return {
         projects: {
             [projectRoot]: {
@@ -66,7 +68,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         },
     };
 }
-async function buildRollupTarget(configFilePath, projectRoot, options, context) {
+async function buildRollupTarget(configFilePath, projectRoot, options, context, isTsSolutionSetup) {
     let loadConfigFile;
     try {
         // Try to load the workspace version of rollup first (it should already exist).
@@ -114,6 +116,11 @@ async function buildRollupTarget(configFilePath, projectRoot, options, context)
             },
         },
     };
+    if (isTsSolutionSetup) {
+        targets[options.buildTargetName].syncGenerators = [
+            '@nx/js:typescript-sync',
+        ];
+    }
     return targets;
 }
 function getOutputs(rollupConfigs, projectRoot) {

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

@@ -5,10 +5,15 @@ 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");
 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)()) {
+        options.skipTypeCheck = true;
+    }
     return {
         ...options,
         additionalEntryPoints: (0, js_1.createEntryPoints)(options.additionalEntryPoints, devkit_1.workspaceRoot),