Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(bundling): load rollup config using the rollup version installed in the workspace #26298

Merged
merged 1 commit into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/rollup/src/plugins/plugin.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { type CreateNodesContext, joinPathFragments } from '@nx/devkit';
import { type CreateNodesContext } from '@nx/devkit';
import { createNodes } from './plugin';
import { TempFs } from 'nx/src/internal-testing-utils/temp-fs';

Expand All @@ -10,9 +10,6 @@ jest.mock('rollup/loadConfigFile', () => {
};
});

// @ts-ignore
import { loadConfigFile } from 'rollup/loadConfigFile';

describe('@nx/rollup/plugin', () => {
let createNodesFunction = createNodes[1];
let context: CreateNodesContext;
Expand Down Expand Up @@ -65,6 +62,7 @@ describe('@nx/rollup/plugin', () => {
}`
);

const { loadConfigFile } = require('rollup/loadConfigFile');
loadConfigFile.mockReturnValue(rollupConfigOptions);

process.chdir(tempFs.tempDir);
Expand Down Expand Up @@ -140,6 +138,8 @@ describe('@nx/rollup/plugin', () => {
console.log("hello world");
}`
);

const { loadConfigFile } = require('rollup/loadConfigFile');
loadConfigFile.mockReturnValue(rollupConfigOptions);

process.chdir(tempFs.tempDir);
Expand Down
33 changes: 25 additions & 8 deletions packages/rollup/src/plugins/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,20 @@ import { workspaceDataDirectory } from 'nx/src/utils/cache-directory';
import { basename, dirname, join } from 'path';
import { existsSync, readdirSync } from 'fs';
import {
type TargetConfiguration,
type CreateDependencies,
type CreateNodes,
readJsonFile,
writeJsonFile,
detectPackageManager,
CreateNodesContext,
detectPackageManager,
joinPathFragments,
readJsonFile,
type TargetConfiguration,
writeJsonFile,
} from '@nx/devkit';
import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes';
import { getLockFileName } from '@nx/js';
import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs';
import { type RollupOptions } from 'rollup';

// 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
import { loadConfigFile } from 'rollup/loadConfigFile';

const cachePath = join(workspaceDataDirectory, 'rollup.hash');
const targetsCache = readTargetsCache();

Expand Down Expand Up @@ -94,6 +90,27 @@ async function buildRollupTarget(
options: RollupPluginOptions,
context: CreateNodesContext
): Promise<Record<string, TargetConfiguration>> {
let loadConfigFile: (
path: string,
commandOptions: unknown,
watchMode: boolean
) => Promise<{ options: RollupOptions[] }>;

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: [dirname(configFilePath)],
}));
// Rollup 2 has this has default export, but it is named in 3 and 4.
// See: https://www.unpkg.com/browse/[email protected]/dist/loadConfigFile.js
loadConfigFile = typeof m === 'function' ? m : m.loadConfigFile;
} catch {
// Fallback to our own if needed.
loadConfigFile = require('rollup/loadConfigFile').loadConfigFile;
}

const namedInputs = getNamedInputs(projectRoot, context);
const rollupConfig = (
(await loadConfigFile(
Expand Down