@nx/rollup 18.0.0-beta.1 → 18.0.0-beta.3

package/package.json

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

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

@@ -1,6 +1,7 @@
 import * as rollup from 'rollup';
 import type { ExecutorContext } from '@nx/devkit';
 import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+import type { PackageJson } from 'nx/src/utils/package-json';
 import { RollupExecutorOptions } from './schema';
 import { NormalizedRollupExecutorOptions } from './lib/normalize';
 export type RollupExecutorEvent = {
@@ -8,5 +9,5 @@ export type RollupExecutorEvent = {
     outfile?: string;
 };
 export declare function rollupExecutor(rawOptions: RollupExecutorOptions, context: ExecutorContext): AsyncGenerator<RollupExecutorEvent, any, undefined>;
-export declare function createRollupOptions(options: NormalizedRollupExecutorOptions, dependencies: DependentBuildableProjectNode[], context: ExecutorContext, packageJson: any, sourceRoot: string, npmDeps: string[]): rollup.InputOptions[];
+export declare function createRollupOptions(options: NormalizedRollupExecutorOptions, dependencies: DependentBuildableProjectNode[], context: ExecutorContext, packageJson: PackageJson, sourceRoot: string, npmDeps: string[]): rollup.InputOptions[];
 export default rollupExecutor;

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

@@ -13,13 +13,13 @@ const autoprefixer = require("autoprefixer");
 const devkit_1 = require("@nx/devkit");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const plugin_node_resolve_1 = require("@rollup/plugin-node-resolve");
+const type_definitions_1 = require("@nx/js/src/plugins/rollup/type-definitions");
 const run_rollup_1 = require("./lib/run-rollup");
 const normalize_1 = require("./lib/normalize");
 const analyze_plugin_1 = require("./lib/analyze-plugin");
 const fs_1 = require("../../utils/fs");
 const swc_plugin_1 = require("./lib/swc-plugin");
 const update_package_json_1 = require("./lib/update-package-json");
-const type_definitions_1 = require("@nx/js/src/plugins/rollup/type-definitions");
 // These use require because the ES import isn't correct.
 const commonjs = require('@rollup/plugin-commonjs');
 const image = require('@rollup/plugin-image');
@@ -103,6 +103,18 @@ function createRollupOptions(options, dependencies, context, packageJson, source
     if (!options.format || !options.format.length) {
         options.format = readCompatibleFormats(config);
     }
+    if (packageJson.type === 'module') {
+        if (options.format.includes('cjs')) {
+            devkit_1.logger.warn(`Package type is set to "module" but "cjs" format is included. Going to use "esm" format instead. You can change the package type to "commonjs" or remove type in the package.json file.`);
+        }
+        options.format = ['esm'];
+    }
+    else if (packageJson.type === 'commonjs') {
+        if (options.format.includes('esm')) {
+            devkit_1.logger.warn(`Package type is set to "commonjs" but "esm" format is included. Going to use "cjs" format instead. You can change the package type to "module" or remove type in the package.json file.`);
+        }
+        options.format = ['cjs'];
+    }
     return options.format.map((format, idx) => {
         // Either we're generating only one format, so we should bundle types
         // OR we are generating dual formats, so only bundle types for CJS.