@nx/rollup 19.3.0-beta.0 → 19.3.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "19.3.0-beta.0",
+  "version": "19.3.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -43,9 +43,9 @@
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-typescript2": "^0.36.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.3.0-beta.0",
-    "@nx/js": "19.3.0-beta.0",
-    "@nrwl/rollup": "19.3.0-beta.0"
+    "@nx/devkit": "19.3.0-beta.1",
+    "@nx/js": "19.3.0-beta.1",
+    "@nrwl/rollup": "19.3.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

package/src/plugins/plugin.js

@@ -8,9 +8,6 @@ const devkit_1 = require("@nx/devkit");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const js_1 = require("@nx/js");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-// This import causes an error due to the module resolution used. If we switch to bundler or nodenext in the future we remove this ignore.
-// @ts-ignore
-const loadConfigFile_1 = require("rollup/loadConfigFile");
 const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'rollup.hash');
 const targetsCache = readTargetsCache();
 function readTargetsCache() {
@@ -53,8 +50,24 @@ exports.createNodes = [
     },
 ];
 async function buildRollupTarget(configFilePath, projectRoot, options, context) {
+    let loadConfigFile;
+    try {
+        // Try to load the workspace version of rollup first (it should already exist).
+        // Using the workspace rollup ensures that the config file is compatible with the `loadConfigFile` function.
+        // e.g. rollup@2 supports having `require` calls in rollup config, but rollup@4 does not.
+        const m = require(require.resolve('rollup/loadConfigFile', {
+            paths: [(0, path_1.dirname)(configFilePath)],
+        }));
+        // Rollup 2 has this has default export, but it is named in 3 and 4.
+        // See: https://www.unpkg.com/browse/rollup@2.79.1/dist/loadConfigFile.js
+        loadConfigFile = typeof m === 'function' ? m : m.loadConfigFile;
+    }
+    catch {
+        // Fallback to our own if needed.
+        loadConfigFile = require('rollup/loadConfigFile').loadConfigFile;
+    }
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
-    const rollupConfig = (await (0, loadConfigFile_1.loadConfigFile)((0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath), {}, true // Enable watch mode so that rollup properly reloads config files without reusing a cached version
+    const rollupConfig = (await loadConfigFile((0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath), {}, true // Enable watch mode so that rollup properly reloads config files without reusing a cached version
     )).options;
     const outputs = getOutputs(rollupConfig, projectRoot);
     const targets = {};