@nx/rollup 22.7.0-pr.35019.f500fd7 → 22.7.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "22.7.0-pr.35019.f500fd7",
+  "version": "22.7.0-rc.0",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -15,7 +15,8 @@
     "CLI"
   ],
   "main": "./index.js",
-  "typings": "./index.d.ts",
+  "type": "commonjs",
+  "types": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
@@ -29,8 +30,8 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-pr.35019.f500fd7",
-    "@nx/js": "22.7.0-pr.35019.f500fd7",
+    "@nx/devkit": "22.7.0-rc.0",
+    "@nx/js": "22.7.0-rc.0",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-image": "^3.0.3",
@@ -40,7 +41,7 @@
     "autoprefixer": "^10.4.9",
     "concat-with-sourcemaps": "^1.1.0",
     "picocolors": "^1.1.0",
-    "picomatch": "4.0.2",
+    "picomatch": "4.0.4",
     "postcss": "^8.4.38",
     "postcss-modules": "^6.0.1",
     "rollup": "^4.14.0",
@@ -48,12 +49,10 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-pr.35019.f500fd7",
+    "nx": "22.7.0-rc.0",
     "source-map-js": "^1.2.0"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "types": "./index.d.ts",
-  "type": "commonjs"
+  }
 }

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/plugins/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,kBAAkB,EAGvB,aAAa,EAOd,MAAM,YAAY,CAAC;AAwBpB;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CA8B1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/plugins/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,kBAAkB,EAGvB,aAAa,EAOd,MAAM,YAAY,CAAC;AAsBpB;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAkC1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -11,7 +11,6 @@ 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 util_1 = require("@nx/js/src/plugins/typescript/util");
-const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
@@ -34,8 +33,9 @@ exports.createNodes = [
         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)();
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache, isTsSolutionSetup), configFilePaths, normalizedOptions, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, _, context) => createNodesInternal(configFile, normalizedOptions, context, targetsCache, isTsSolutionSetup, pmc), configFilePaths, normalizedOptions, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
@@ -43,7 +43,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc) {
     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
@@ -53,7 +53,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, isTsSolutionSetup);
+    targetsCache[hash] ??= await buildRollupTarget(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc);
     return {
         projects: {
             [projectRoot]: {
@@ -63,7 +63,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         },
     };
 }
-async function buildRollupTarget(configFilePath, projectRoot, options, context, isTsSolutionSetup) {
+async function buildRollupTarget(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc) {
     let loadConfigFile;
     try {
         // Try to load the workspace version of rollup first (it should already exist).

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,

package/project.json

@@ -1,52 +0,0 @@
-{
-    "name": "rollup",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/rollup",
-    "projectType": "library",
-    "targets": {
-        "build": {
-            "outputs": ["{workspaceRoot}/dist/packages/rollup/README.md"],
-            "command": "node ./scripts/copy-readme.js rollup"
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    {
-                        "input": "packages/rollup",
-                        "glob": "**/files/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/rollup",
-                        "glob": "**/files/**/.gitkeep",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/rollup",
-                        "glob": "**/*.json",
-                        "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/rollup",
-                        "glob": "**/*.js",
-                        "ignore": ["**/jest.config.js"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/rollup",
-                        "glob": "**/*.d.ts",
-                        "output": "/"
-                    },
-                    {
-                        "input": "",
-                        "glob": "LICENSE",
-                        "output": "/"
-                    }
-                ]
-            }
-        }
-    }
-}