@nx/rollup 22.1.2 → 22.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "22.1.2",
+  "version": "22.1.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": "22.1.2",
-    "@nx/js": "22.1.2",
+    "@nx/devkit": "22.1.3",
+    "@nx/js": "22.1.3",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-image": "^3.0.3",
@@ -42,13 +42,12 @@
     "picomatch": "4.0.2",
     "postcss": "^8.4.38",
     "rollup": "^4.14.0",
-    "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-typescript2": "^0.36.0",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.1.2"
+    "nx": "22.1.3"
   },
   "publishConfig": {
     "access": "public"

package/src/plugins/nx-copy-assets.plugin.d.ts

@@ -0,0 +1,24 @@
+import type { Plugin } from 'rollup';
+import { AssetGlob } from '@nx/js/src/utils/assets/assets';
+export interface NxCopyAssetsPluginOptions {
+    assets: (string | AssetGlob)[];
+    outputPath: string;
+    projectRoot: string;
+}
+/**
+ * Splits a glob into its literal directory prefix and the remaining pattern.
+ * CopyAssetsHandler expects input to be a directory and glob to be a pattern
+ * within it (e.g., input: 'docs', glob: '**\/*.md'), not combined paths.
+ *
+ * 'libs/mylib/README.md' => { prefix: 'libs/mylib', glob: 'README.md' }
+ * 'docs/*.md' => { prefix: 'docs', glob: '*.md' }
+ * '**\/*.md' => { prefix: '.', glob: '**\/*.md' }
+ *
+ * @visibleForTesting
+ */
+export declare function extractGlobLiteralPrefix(glob: string): {
+    prefix: string;
+    glob: string;
+};
+export declare function nxCopyAssetsPlugin(options: NxCopyAssetsPluginOptions): Plugin;
+//# sourceMappingURL=nx-copy-assets.plugin.d.ts.map

package/src/plugins/nx-copy-assets.plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nx-copy-assets.plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rollup/src/plugins/nx-copy-assets.plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAG3D,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAiBA;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAqD7E"}

package/src/plugins/nx-copy-assets.plugin.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractGlobLiteralPrefix = extractGlobLiteralPrefix;
+exports.nxCopyAssetsPlugin = nxCopyAssetsPlugin;
+const node_path_1 = require("node:path");
+const devkit_1 = require("@nx/devkit");
+const copy_assets_handler_1 = require("@nx/js/src/utils/assets/copy-assets-handler");
+/**
+ * Splits a glob into its literal directory prefix and the remaining pattern.
+ * CopyAssetsHandler expects input to be a directory and glob to be a pattern
+ * within it (e.g., input: 'docs', glob: '**\/*.md'), not combined paths.
+ *
+ * 'libs/mylib/README.md' => { prefix: 'libs/mylib', glob: 'README.md' }
+ * 'docs/*.md' => { prefix: 'docs', glob: '*.md' }
+ * '**\/*.md' => { prefix: '.', glob: '**\/*.md' }
+ *
+ * @visibleForTesting
+ */
+function extractGlobLiteralPrefix(glob) {
+    const parts = glob.split('/');
+    const isGlobPart = (p) => p.includes('*') || p.includes('?') || p.includes('[') || p.includes('{');
+    const firstGlobIndex = parts.findIndex(isGlobPart);
+    const hasGlob = firstGlobIndex !== -1;
+    const prefixParts = hasGlob
+        ? parts.slice(0, firstGlobIndex)
+        : parts.slice(0, -1);
+    const globParts = hasGlob ? parts.slice(firstGlobIndex) : parts.slice(-1);
+    return {
+        prefix: prefixParts.join('/') || '.',
+        glob: globParts.join('/'),
+    };
+}
+function nxCopyAssetsPlugin(options) {
+    let handler;
+    let dispose;
+    if (global.NX_GRAPH_CREATION)
+        return { name: 'nx-copy-assets-plugin' };
+    const relativeProjectRoot = (0, node_path_1.relative)(devkit_1.workspaceRoot, options.projectRoot);
+    return {
+        name: 'nx-copy-assets-plugin',
+        async buildStart() {
+            // Input must be relative to rootDir because CopyAssetsHandler computes
+            // destination paths using path.relative(input, globResult), and glob
+            // returns paths relative to rootDir.
+            const assets = options.assets.map((a) => {
+                if (typeof a === 'string') {
+                    return (0, node_path_1.join)(relativeProjectRoot, a);
+                }
+                else {
+                    // relative() returns '' when paths are equal, normalize to '.'
+                    const relativeInput = (0, node_path_1.relative)(devkit_1.workspaceRoot, a.input) || '.';
+                    const { prefix: globPrefix, glob: normalizedGlob } = extractGlobLiteralPrefix(a.glob);
+                    return {
+                        ...a,
+                        input: (0, node_path_1.join)(relativeInput, globPrefix),
+                        glob: normalizedGlob,
+                    };
+                }
+            });
+            const outputDir = (0, node_path_1.isAbsolute)(options.outputPath)
+                ? options.outputPath
+                : (0, node_path_1.join)(devkit_1.workspaceRoot, options.outputPath);
+            handler = new copy_assets_handler_1.CopyAssetsHandler({
+                rootDir: devkit_1.workspaceRoot,
+                projectDir: options.projectRoot,
+                outputDir,
+                assets,
+            });
+            if (this.meta.watchMode && (0, devkit_1.isDaemonEnabled)()) {
+                dispose = await handler.watchAndProcessOnAssetChange();
+            }
+        },
+        async writeBundle() {
+            await handler.processAllAssetsOnce();
+        },
+        closeWatcher() {
+            dispose?.();
+        },
+    };
+}

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;AAOjC,OAAO,EAAoB,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AA2BhF,wBAAgB,MAAM,CACpB,UAAU,EAAE,yBAAyB,EACrC,YAAY,GAAE,MAAM,CAAC,aAAkB,EAEvC,YAAY,CAAC,EAAE,6BAA6B,EAAE,GAC7C,MAAM,CAAC,aAAa,CAyRtB"}
+{"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;AA0B9D,wBAAgB,MAAM,CACpB,UAAU,EAAE,yBAAyB,EACrC,YAAY,GAAE,MAAM,CAAC,aAAkB,EAEvC,YAAY,CAAC,EAAE,6BAA6B,EAAE,GAC7C,MAAM,CAAC,aAAa,CAwRtB"}

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

@@ -12,6 +12,7 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const analyze_1 = require("../analyze");
 const delete_output_1 = require("../delete-output");
+const nx_copy_assets_plugin_1 = require("../nx-copy-assets.plugin");
 const generate_package_json_1 = require("../package-json/generate-package-json");
 const swc_1 = require("../swc");
 const get_project_node_1 = require("./get-project-node");
@@ -20,7 +21,6 @@ const normalize_options_1 = require("./normalize-options");
 const commonjs = require('@rollup/plugin-commonjs');
 const image = require('@rollup/plugin-image');
 const json = require('@rollup/plugin-json');
-const copy = require('rollup-plugin-copy');
 const postcss = require('rollup-plugin-postcss');
 const fileExtensions = ['.js', '.jsx', '.ts', '.tsx'];
 let ts;
@@ -154,8 +154,10 @@ dependencies) {
             ? finalConfig.output[0].dir
             : finalConfig.output.dir;
         finalConfig.plugins = [
-            copy({
-                targets: convertCopyAssetsToRollupOptions(options.outputPath, options.assets),
+            (0, nx_copy_assets_plugin_1.nxCopyAssetsPlugin)({
+                assets: options.assets,
+                outputPath: options.outputPath,
+                projectRoot,
             }),
             image(),
             json(),
@@ -277,14 +279,6 @@ function createTsCompilerOptions(projectRoot, config, options, dependencies) {
     }
     return compilerOptions;
 }
-function convertCopyAssetsToRollupOptions(outputPath, assets) {
-    return assets
-        ? assets.map((a) => ({
-            src: (0, node_path_1.join)(a.input, a.glob).replace(/\\/g, '/'),
-            dest: (0, node_path_1.join)(devkit_1.workspaceRoot, outputPath, a.output).replace(/\\/g, '/'),
-        }))
-        : undefined;
-}
 function readCompatibleFormats(config) {
     ensureTypeScript();
     switch (config.options.module) {