@nx/rollup 20.0.0-beta.3 → 20.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "20.0.0-beta.3",
+  "version": "20.0.0-beta.4",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -43,9 +43,9 @@
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-typescript2": "^0.36.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.0.0-beta.3",
-    "@nx/js": "20.0.0-beta.3",
-    "@nrwl/rollup": "20.0.0-beta.3"
+    "@nx/devkit": "20.0.0-beta.4",
+    "@nx/js": "20.0.0-beta.4",
+    "@nrwl/rollup": "20.0.0-beta.4"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/configuration/configuration.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGenerator = configurationGenerator;
 const devkit_1 = require("@nx/devkit");
 const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const init_1 = require("../init/init");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
@@ -32,28 +33,34 @@ async function configurationGenerator(tree, options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 function createRollupConfig(tree, options) {
+    const isUsingTsPlugin = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const buildOptions = {
-        outputPath: (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(project.root), 'dist', project.root === '.' ? project.name : project.root),
+        outputPath: isUsingTsPlugin
+            ? './dist'
+            : (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(project.root), 'dist', project.root === '.' ? project.name : project.root),
         compiler: options.compiler ?? 'babel',
         main: options.main ?? './src/index.ts',
         tsConfig: options.tsConfig ?? './tsconfig.lib.json',
     };
-    tree.write((0, devkit_1.joinPathFragments)(project.root, 'rollup.config.js'), (0, devkit_1.stripIndents) `
-      const { withNx } = require('@nx/rollup/with-nx');
-      
-      module.exports = withNx({
-        main: '${buildOptions.main}',
-        outputPath: '${buildOptions.outputPath}',
-        tsConfig: '${buildOptions.tsConfig}',
-        compiler: '${buildOptions.compiler}',
-        format: ${JSON.stringify(options.format ?? ['esm'])},
-        assets:[{ input: '.', output: '.', glob:'*.md'}],
-      }, {
-        // Provide additional rollup configuration here. See: https://rollupjs.org/configuration-options
-        // e.g. 
-        // output: { sourcemap: true },
-      });`);
+    tree.write((0, devkit_1.joinPathFragments)(project.root, 'rollup.config.js'), `const { withNx } = require('@nx/rollup/with-nx');
+
+module.exports = withNx(
+  {
+    main: '${buildOptions.main}',
+    outputPath: '${buildOptions.outputPath}',
+    tsConfig: '${buildOptions.tsConfig}',
+    compiler: '${buildOptions.compiler}',
+    format: ${JSON.stringify(options.format ?? ['esm'])},
+    assets: [{ input: '.', output: '.', glob:'*.md' }],
+  },
+  {
+    // Provide additional rollup configuration here. See: https://rollupjs.org/configuration-options
+    // e.g.
+    // output: { sourcemap: true },
+  }
+);
+`);
 }
 function checkForTargetConflicts(tree, options) {
     if (options.skipValidation)