@nx/rollup 17.3.0-beta.3 → 17.3.0-beta.5

package/package.json

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

package/src/generators/configuration/configuration.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from '@nx/devkit';
+import type { GeneratorCallback, Tree } from '@nx/devkit';
 import { RollupProjectSchema } from './schema';
-export declare function configurationGenerator(tree: Tree, options: RollupProjectSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function configurationGenerator(tree: Tree, options: RollupProjectSchema): Promise<GeneratorCallback>;
 export default configurationGenerator;

package/src/generators/configuration/configuration.js

@@ -4,16 +4,20 @@ exports.configurationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const init_1 = require("../init/init");
+const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 async function configurationGenerator(tree, options) {
-    const task = await (0, init_1.rollupInitGenerator)(tree, {
-        ...options,
-        skipFormat: true,
-    });
+    const tasks = [];
+    tasks.push(await (0, init_1.rollupInitGenerator)(tree, { ...options, skipFormat: true }));
+    if (!options.skipPackageJson) {
+        tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
+    }
     options.buildTarget ??= 'build';
     checkForTargetConflicts(tree, options);
     addBuildTarget(tree, options);
-    await (0, devkit_1.formatFiles)(tree);
-    return task;
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.configurationGenerator = configurationGenerator;
 function checkForTargetConflicts(tree, options) {

package/src/generators/init/init.js

@@ -2,23 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rollupInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("@nx/js/src/utils/versions");
-const versions_2 = require("../../utils/versions");
+const versions_1 = require("../../utils/versions");
 async function rollupInitGenerator(tree, schema) {
-    let task;
-    if (schema.compiler === 'swc') {
-        task = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@nx/rollup': versions_2.nxVersion,
-            '@swc/helpers': versions_1.swcHelpersVersion,
-            '@swc/core': versions_1.swcCoreVersion,
-            'swc-loader': versions_2.swcLoaderVersion,
-        });
-    }
-    else {
-        task = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@nx/rollup': versions_2.nxVersion,
-            tslib: versions_2.tsLibVersion,
-        });
+    let task = () => { };
+    if (!schema.skipPackageJson) {
+        task = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/rollup': versions_1.nxVersion });
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/init/schema.d.ts

@@ -1,4 +1,4 @@
 export interface Schema {
-  compiler?: 'babel' | 'swc' | 'tsc';
   skipFormat?: boolean;
+  skipPackageJson?: boolean;
 }

package/src/generators/init/schema.json

@@ -6,16 +6,15 @@
   "description": "Init Webpack Plugin.",
   "type": "object",
   "properties": {
-    "compiler": {
-      "type": "string",
-      "enum": ["babel", "swc", "tsc"],
-      "description": "The compiler to initialize for.",
-      "default": "babel"
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
       "default": false
+    },
+    "skipPackageJson": {
+      "description": "Do not add dependencies to `package.json`.",
+      "type": "boolean",
+      "default": false
     }
   },
   "required": []

package/src/utils/ensure-dependencies.d.ts

@@ -0,0 +1,5 @@
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+export type EnsureDependenciesOptions = {
+    compiler?: 'babel' | 'swc' | 'tsc';
+};
+export declare function ensureDependencies(tree: Tree, options: EnsureDependenciesOptions): GeneratorCallback;

package/src/utils/ensure-dependencies.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("@nx/js/src/utils/versions");
+const versions_2 = require("./versions");
+function ensureDependencies(tree, options) {
+    if (options.compiler === 'swc') {
+        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@swc/helpers': versions_1.swcHelpersVersion,
+            '@swc/core': versions_1.swcCoreVersion,
+            'swc-loader': versions_2.swcLoaderVersion,
+        });
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { tslib: versions_2.tsLibVersion });
+}
+exports.ensureDependencies = ensureDependencies;