@nx/rollup 22.7.0-beta.11 → 22.7.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "22.7.0-beta.11",
+  "version": "22.7.0-beta.13",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -30,8 +30,8 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-beta.11",
-    "@nx/js": "22.7.0-beta.11",
+    "@nx/devkit": "22.7.0-beta.13",
+    "@nx/js": "22.7.0-beta.13",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-image": "^3.0.3",
@@ -49,7 +49,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.11",
+    "nx": "22.7.0-beta.13",
     "source-map-js": "^1.2.0"
   },
   "publishConfig": {

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":"AASA,OAAO,EAIL,6BAA6B,EAC9B,MAAM,uCAAuC,CAAC;AAW/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,CAwRtB"}
+{"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"}

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

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNx = withNx;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
 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 ts_config_1 = require("@nx/js/src/utils/typescript/ts-config");
 const plugin_babel_1 = require("@rollup/plugin-babel");
 const plugin_node_resolve_1 = tslib_1.__importDefault(require("@rollup/plugin-node-resolve"));
 const autoprefixer_1 = tslib_1.__importDefault(require("autoprefixer"));
@@ -151,7 +153,8 @@ dependencies) {
         else {
             options.generatePackageJson ??= true;
         }
-        const compilerOptions = createTsCompilerOptions(projectRoot, tsConfig, options, dependencies);
+        const originalTsConfigPath = (0, node_path_1.join)(devkit_1.workspaceRoot, options.tsConfig);
+        const compilerOptions = createTsCompilerOptions(projectRoot, tsConfig, originalTsConfigPath, options, dependencies);
         compilerOptions.outDir = Array.isArray(finalConfig.output)
             ? finalConfig.output[0].dir
             : finalConfig.output.dir;
@@ -264,8 +267,20 @@ function createInput(options) {
     });
     return input;
 }
-function createTsCompilerOptions(projectRoot, config, options, dependencies) {
+function createTsCompilerOptions(projectRoot, config, tsConfigPath, options, dependencies) {
     const compilerOptionPaths = (0, buildable_libs_utils_1.computeCompilerOptionsPaths)(config, dependencies ?? []);
+    // Resolve paths to absolute so they work without baseUrl and regardless
+    // of which tsconfig the plugin reads (project vs workspace root).
+    const pathsBase = (0, ts_config_1.resolvePathsBaseUrl)(tsConfigPath);
+    for (const key of Object.keys(compilerOptionPaths)) {
+        compilerOptionPaths[key] = compilerOptionPaths[key].map((p) => {
+            if ((0, path_1.isAbsolute)(p)) {
+                return p;
+            }
+            const stripped = p.startsWith('./') ? p.slice(2) : p;
+            return (0, path_1.resolve)(pathsBase, stripped).replace(/\\/g, '/');
+        });
+    }
     const compilerOptions = {
         rootDir: projectRoot,
         allowJs: options.allowJs,