@nx/rollup 21.0.0-beta.1 → 21.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "21.0.0-beta.1",
+  "version": "21.0.0-beta.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.0.0-beta.1",
-    "@nx/js": "21.0.0-beta.1",
+    "@nx/devkit": "21.0.0-beta.3",
+    "@nx/js": "21.0.0-beta.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

@@ -15,22 +15,23 @@ export interface Globals {
 export interface RollupExecutorOptions {
   outputPath: string;
   tsConfig: string;
-  allowJs?: boolean;
-  project: string;
   main: string;
-  outputFileName?: string;
-  extractCss?: boolean | string;
-  external?: string[] | 'all' | 'none';
-  rollupConfig?: string | string[];
-  watch?: boolean;
+  additionalEntryPoints?: string[];
+  allowJs?: boolean;
   assets?: any[];
+  babelUpwardRootMode?: boolean;
+  buildLibsFromSource?: boolean;
+  compiler?: 'babel' | 'tsc' | 'swc';
   deleteOutputPath?: boolean;
+  external?: string[] | 'all' | 'none';
+  extractCss?: boolean | string;
   format?: ('cjs' | 'esm')[];
-  compiler?: 'babel' | 'tsc' | 'swc';
-  javascriptEnabled?: boolean;
   generateExportsField?: boolean;
-  additionalEntryPoints?: string[];
+  javascriptEnabled?: boolean;
+  project?: string;
+  outputFileName?: string;
+  rollupConfig?: string | string[];
   skipTypeCheck?: boolean;
-  babelUpwardRootMode?: boolean;
   skipTypeField?: boolean;
+  watch?: boolean;
 }

package/src/executors/rollup/schema.json

@@ -1,15 +1,14 @@
 {
   "version": 2,
   "outputCapture": "direct-nodejs",
-  "title": "Web Library Rollup Target (Experimental)",
+  "title": "Web Library Rollup Target",
   "description": "Packages a library for different web usages (ESM, CommonJS).",
   "cli": "nx",
   "type": "object",
   "properties": {
     "project": {
       "type": "string",
-      "description": "The path to package.json file.",
-      "x-priority": "important"
+      "description": "The path to package.json file."
     },
     "main": {
       "type": "string",
@@ -138,6 +137,11 @@
       },
       "x-priority": "important"
     },
+    "buildLibsFromSource": {
+      "type": "boolean",
+      "description": "Read buildable libraries from source instead of building them separately.",
+      "default": true
+    },
     "skipTypeCheck": {
       "type": "boolean",
       "description": "Whether to skip TypeScript type checking.",

package/src/generators/configuration/configuration.js

@@ -68,7 +68,7 @@ module.exports = withNx(
     compiler: '${buildOptions.compiler}',
     format: ${JSON.stringify(options.format ?? ['esm'])},${!isTsSolutionSetup
         ? `
-    assets: [{ input: '.', output: '.', glob:'*.md' }],`
+    assets: [{ input: '{projectRoot}', output: '.', glob:'*.md' }],`
         : ''}
   },
   {
@@ -122,6 +122,8 @@ function updatePackageJson(tree, options, outputConfig, isTsSolutionSetup) {
                 : undefined) ?? nxJson.targetDefaults?.[options.buildTarget]);
             ({ main, outputPath } = mergedTarget.options);
         }
+        // the file must exist in the TS solution setup
+        const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
         packageJson = (0, js_1.getUpdatedPackageJsonContent)(packageJson, {
             main,
             outputPath,
@@ -132,6 +134,7 @@ function updatePackageJson(tree, options, outputConfig, isTsSolutionSetup) {
             format: options.format ?? ['esm'],
             outputFileExtensionForCjs: '.cjs.js',
             outputFileExtensionForEsm: '.esm.js',
+            skipDevelopmentExports: !tsconfigBase.compilerOptions?.customConditions?.includes('development'),
         });
         // rollup has a specific declaration file generation not handled by the util above,
         // adjust accordingly

package/src/plugins/plugin.js

@@ -86,15 +86,15 @@ async function buildRollupTarget(configFilePath, projectRoot, options, context,
         // Fallback to our own if needed.
         loadConfigFile = require('rollup/loadConfigFile').loadConfigFile;
     }
+    const isTsConfig = configFilePath.endsWith('ts');
+    const tsConfigPlugin = '@rollup/plugin-typescript';
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
-    const rollupConfig = (await loadConfigFile((0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath), {}, true // Enable watch mode so that rollup properly reloads config files without reusing a cached version
+    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);
     const targets = {};
     targets[options.buildTargetName] = {
-        command: `rollup -c ${(0, path_1.basename)(configFilePath)}${configFilePath.endsWith('ts')
-            ? ' --configPlugin @rollup/plugin-typescript'
-            : ''}`,
+        command: `rollup -c ${(0, path_1.basename)(configFilePath)}${isTsConfig ? ` --configPlugin ${tsConfigPlugin}` : ''}`,
         options: { cwd: projectRoot },
         cache: true,
         dependsOn: [`^${options.buildTargetName}`],

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

@@ -15,6 +15,10 @@ export interface RollupWithNxPluginOptions {
      * Whether to set rootmode to upward. See https://babeljs.io/docs/en/options#rootmode
      */
     babelUpwardRootMode?: boolean;
+    /**
+     * Build the libraries from source. Default is `true`.
+     */
+    buildLibsFromSource?: boolean;
     /**
      * Which compiler to use.
      */

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

@@ -43,7 +43,9 @@ dependencies) {
     const options = (0, normalize_options_1.normalizeOptions)(projectNode.data.root, projectNode.data.sourceRoot, rawOptions);
     const useBabel = options.compiler === 'babel';
     const useSwc = options.compiler === 'swc';
-    const tsConfigPath = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, options.tsConfig);
+    const tsConfigPath = options.buildLibsFromSource || global.NX_GRAPH_CREATION
+        ? (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, options.tsConfig)
+        : (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, devkit_1.workspaceRoot, projectRoot, dependencies);
     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) {
@@ -141,7 +143,7 @@ dependencies) {
             // Needed to generate type definitions, even if we're using babel or swc.
             require('rollup-plugin-typescript2')({
                 check: !options.skipTypeCheck,
-                tsconfig: options.tsConfig,
+                tsconfig: tsConfigPath,
                 tsconfigOverride: {
                     compilerOptions: createTsCompilerOptions(projectRoot, tsConfig, options, dependencies),
                 },