@nx/rollup 17.0.0-beta.2 → 17.0.0-beta.5

package/executors.json

@@ -1,11 +1,4 @@
 {
-  "builders": {
-    "rollup": {
-      "implementation": "./src/executors/rollup/compat",
-      "schema": "./src/executors/rollup/schema.json",
-      "description": "Bundle a package using Rollup."
-    }
-  },
   "executors": {
     "rollup": {
       "implementation": "./src/executors/rollup/rollup.impl",

package/generators.json

@@ -1,20 +1,6 @@
 {
   "name": "Nx rollup",
   "version": "0.1",
-  "schematics": {
-    "init": {
-      "factory": "./src/generators/init/init#rollupInitSchematic",
-      "schema": "./src/generators/init/schema.json",
-      "description": "Initialize the `@nrwl/rollup` plugin.",
-      "hidden": true
-    },
-    "configuration": {
-      "aliases": ["rollup-project"],
-      "factory": "./src/generators/configuration/configuration#compat",
-      "schema": "./src/generators/configuration/schema.json",
-      "description": "Add rollup configuration to a project."
-    }
-  },
   "generators": {
     "init": {
       "factory": "./src/generators/init/init#rollupInitGenerator",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "17.0.0-beta.2",
+  "version": "17.0.0-beta.5",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -22,8 +22,8 @@
     "url": "https://github.com/nrwl/nx/issues"
   },
   "homepage": "https://nx.dev",
-  "schematics": "./generators.json",
-  "builders": "./executors.json",
+  "generators": "./generators.json",
+  "executors": "./executors.json",
   "ng-update": {
     "requirements": {},
     "migrations": "./migrations.json"
@@ -46,9 +46,9 @@
     "rollup-plugin-typescript2": "0.34.1",
     "rxjs": "^7.8.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.0-beta.2",
-    "@nx/js": "17.0.0-beta.2",
-    "@nrwl/rollup": "17.0.0-beta.2"
+    "@nx/devkit": "17.0.0-beta.5",
+    "@nx/js": "17.0.0-beta.5",
+    "@nrwl/rollup": "17.0.0-beta.5"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/rollup/lib/normalize.js

@@ -14,9 +14,6 @@ function normalizeRollupExecutorOptions(options, context, sourceRoot) {
         : (0, path_1.join)(root, 'package.json');
     const projectRoot = (0, path_1.dirname)(project);
     const outputPath = `${root}/${options.outputPath}`;
-    if (options.buildableProjectDepsInPackageJsonType == undefined) {
-        options.buildableProjectDepsInPackageJsonType = 'peerDependencies';
-    }
     return {
         ...options,
         // de-dupe formats

package/src/executors/rollup/lib/update-package-json.d.ts

@@ -1,6 +1,3 @@
-import { ExecutorContext } from 'nx/src/config/misc-interfaces';
-import { ProjectGraphProjectNode } from 'nx/src/config/project-graph';
-import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
 import { PackageJson } from 'nx/src/utils/package-json';
 import { NormalizedRollupExecutorOptions } from './normalize';
-export declare function updatePackageJson(options: NormalizedRollupExecutorOptions, context: ExecutorContext, target: ProjectGraphProjectNode, dependencies: DependentBuildableProjectNode[], packageJson: PackageJson): void;
+export declare function updatePackageJson(options: NormalizedRollupExecutorOptions, packageJson: PackageJson): void;

package/src/executors/rollup/lib/update-package-json.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updatePackageJson = void 0;
 const path_1 = require("path");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const fileutils_1 = require("nx/src/utils/fileutils");
 const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
 // TODO(jack): Use updatePackageJson from @nx/js instead.
-function updatePackageJson(options, context, target, dependencies, packageJson) {
+function updatePackageJson(options, packageJson) {
     const hasEsmFormat = options.format.includes('esm');
     const hasCjsFormat = options.format.includes('cjs');
     if (options.generateExportsField) {
@@ -74,10 +73,6 @@ function updatePackageJson(options, context, target, dependencies, packageJson)
         }
     }
     (0, fileutils_1.writeJsonFile)(`${options.outputPath}/package.json`, packageJson);
-    if (dependencies.length > 0 &&
-        options.updateBuildableProjectDepsInPackageJson) {
-        (0, buildable_libs_utils_1.updateBuildableProjectPackageJsonDependencies)(context.root, context.projectName, context.targetName, context.configurationName, target, dependencies, options.buildableProjectDepsInPackageJsonType);
-    }
 }
 exports.updatePackageJson = updatePackageJson;
 function getExports(options) {

package/src/executors/rollup/rollup.impl.js

@@ -47,7 +47,7 @@ async function* rollupExecutor(rawOptions, context) {
                     devkit_1.logger.info(`Bundling ${context.projectName}...`);
                 }
                 else if (data.code === 'END') {
-                    (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies, packageJson);
+                    (0, update_package_json_1.updatePackageJson)(options, packageJson);
                     devkit_1.logger.info('Bundle complete. Watching for file changes...');
                     obs.next({ success: true, outfile });
                 }
@@ -80,7 +80,7 @@ async function* rollupExecutor(rawOptions, context) {
                 if (result.success) {
                     const end = process.hrtime.bigint();
                     const duration = `${(Number(end - start) / 1000000000).toFixed(2)}s`;
-                    (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies, packageJson);
+                    (0, update_package_json_1.updatePackageJson)(options, packageJson);
                     devkit_1.logger.info(`⚡ Done in ${duration}`);
                 }
                 else {

package/src/executors/rollup/schema.d.ts

@@ -24,18 +24,6 @@ export interface RollupExecutorOptions {
   rollupConfig?: string | string[];
   watch?: boolean;
   assets?: any[];
-  /**
-   * @deprecated Configure the project to use the `@nx/dependency-checks` ESLint
-   * rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks).
-   * It will be removed in v17.
-   */
-  updateBuildableProjectDepsInPackageJson?: boolean;
-  /**
-   * @deprecated Configure the project to use the `@nx/dependency-checks` ESLint
-   * rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks).
-   * It will be removed in v17.
-   */
-  buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
   deleteOutputPath?: boolean;
   format?: ('cjs' | 'esm')[];
   compiler?: 'babel' | 'tsc' | 'swc';

package/src/executors/rollup/schema.json

@@ -76,19 +76,6 @@
       "description": "Enable re-building when files change.",
       "default": false
     },
-    "updateBuildableProjectDepsInPackageJson": {
-      "type": "boolean",
-      "description": "Update buildable project dependencies in `package.json`.",
-      "default": false,
-      "x-deprecated": "Configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks). It will be removed in v17."
-    },
-    "buildableProjectDepsInPackageJsonType": {
-      "type": "string",
-      "description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
-      "enum": ["dependencies", "peerDependencies"],
-      "default": "peerDependencies",
-      "x-deprecated": "Configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks). It will be removed in v17."
-    },
     "rollupConfig": {
       "oneOf": [
         {

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

@@ -2,4 +2,3 @@ import type { Tree } from '@nx/devkit';
 import { RollupProjectSchema } from './schema';
 export declare function configurationGenerator(tree: Tree, options: RollupProjectSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default configurationGenerator;
-export declare const compat: (generatorOptions: RollupProjectSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/configuration/configuration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compat = exports.configurationGenerator = void 0;
+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");
@@ -86,4 +86,3 @@ function addBuildTarget(tree, options) {
     });
 }
 exports.default = configurationGenerator;
-exports.compat = (0, devkit_1.convertNxGenerator)(configurationGenerator);

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

@@ -2,4 +2,3 @@ import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function rollupInitGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default rollupInitGenerator;
-export declare const rollupInitSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/init/init.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rollupInitSchematic = exports.rollupInitGenerator = void 0;
+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");
@@ -27,4 +27,3 @@ async function rollupInitGenerator(tree, schema) {
 }
 exports.rollupInitGenerator = rollupInitGenerator;
 exports.default = rollupInitGenerator;
-exports.rollupInitSchematic = (0, devkit_1.convertNxGenerator)(rollupInitGenerator);

package/src/executors/rollup/compat.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/src/executors/rollup/compat.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const rollup_impl_1 = require("./rollup.impl");
-exports.default = (0, devkit_1.convertNxExecutor)(rollup_impl_1.default);