@nx/rollup 23.0.0-beta.17 → 23.0.0-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "23.0.0-beta.17",
+  "version": "23.0.0-beta.18",
   "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": "23.0.0-beta.17",
-    "@nx/js": "23.0.0-beta.17",
+    "@nx/devkit": "23.0.0-beta.18",
+    "@nx/js": "23.0.0-beta.18",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
@@ -49,7 +49,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.17",
+    "nx": "23.0.0-beta.18",
     "source-map-js": "^1.2.0"
   },
   "publishConfig": {

package/src/migrations/update-23-0-0/remove-use-legacy-typescript-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-use-legacy-typescript-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/migrations/update-23-0-0/remove-use-legacy-typescript-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAIL,MAAM,YAAY,CAAC;AAgBpB,yBAA+B,IAAI,EAAE,IAAI,iBAyFxC"}
+{"version":3,"file":"remove-use-legacy-typescript-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/rollup/src/migrations/update-23-0-0/remove-use-legacy-typescript-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAIL,MAAM,YAAY,CAAC;AAgBpB,yBAA+B,IAAI,EAAE,IAAI,iBAwGxC"}

package/src/migrations/update-23-0-0/remove-use-legacy-typescript-plugin.js

@@ -12,6 +12,10 @@ const ROLLUP_CONFIG_NAMES = [
 const PROPERTY_NAME = 'useLegacyTypescriptPlugin';
 async function default_1(tree) {
     const projects = (0, devkit_1.getProjects)(tree);
+    // Track whether the migration actually stripped any legacy config so we
+    // only strip the orphan devDep when it was needed (a user could have
+    // installed `rollup-plugin-typescript2` for their own custom rollup setup).
+    let anyChange = false;
     for (const [projectName] of projects) {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
         let projectJsonChanged = false;
@@ -38,12 +42,15 @@ async function default_1(tree) {
         }
         if (projectJsonChanged) {
             (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+            anyChange = true;
         }
         (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
             const basename = filePath.split('/').pop();
             if (!ROLLUP_CONFIG_NAMES.includes(basename))
                 return;
-            stripFromRollupConfig(tree, filePath);
+            if (stripFromRollupConfig(tree, filePath)) {
+                anyChange = true;
+            }
         });
     }
     // Strip from nx.json targetDefaults (keyed by target name or executor name).
@@ -72,21 +79,27 @@ async function default_1(tree) {
         }
         if (nxJsonChanged) {
             (0, devkit_1.updateNxJson)(tree, nxJson);
+            anyChange = true;
         }
     }
+    // Only strip the orphan devDep when we actually stripped a legacy config.
+    // Skipping otherwise preserves a user's own dep on rollup-plugin-typescript2.
+    if (anyChange) {
+        (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['rollup-plugin-typescript2']);
+    }
     await (0, devkit_1.formatFiles)(tree);
 }
 function stripFromRollupConfig(tree, filePath) {
     const original = tree.read(filePath, 'utf-8');
     if (!original?.includes(PROPERTY_NAME))
-        return;
+        return false;
     // Filter by the property NAME (not any descendant Identifier) so we don't
     // strip `{ alias: useLegacyTypescriptPlugin }` where the identifier appears as a value.
     // Also handle shorthand `{ useLegacyTypescriptPlugin }` — strip the entry, leave
     // the variable declaration behind (not our problem).
     const matches = (0, tsquery_1.query)((0, tsquery_1.ast)(original), 'PropertyAssignment, ShorthandPropertyAssignment').filter((p) => p.name && p.name.text === PROPERTY_NAME);
     if (matches.length === 0)
-        return;
+        return false;
     // Walk in reverse so each splice doesn't shift the offsets of remaining matches
     // (a file may legitimately contain multiple withNx({...}) calls, e.g. multi-format
     // configs returning more than one rollup options object).
@@ -108,4 +121,5 @@ function stripFromRollupConfig(tree, filePath) {
         updated = updated.slice(0, start) + updated.slice(end);
     }
     tree.write(filePath, updated);
+    return true;
 }