Skip to content
Open
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
7 changes: 7 additions & 0 deletions .changeset/swift-ferrets-climb.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@strapi/sdk-plugin": patch
---

chore(deps): bump @vitejs/plugin-react from 4.7.0 to 5.2.0

fix: resolve ESM default exports for `@vitejs/plugin-react` and dynamic `import()` usage so admin plugin builds and unit tests load the React Vite plugin correctly
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"dependencies": {
"@types/prompts": "2.4.9",
"@vitejs/plugin-react": "^4.7.0",
"@vitejs/plugin-react": "^5.2.0",
"boxen": "8.0.1",
"chalk": "4.1.2",
"commander": "14.0.3",
Expand Down
84 changes: 42 additions & 42 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions src/__tests__/e2e/build.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import fs from 'node:fs';
import path from 'node:path';

import { build } from '../../cli/commands/utils/build';
import { createLogger } from '../../cli/commands/utils/logger';

import { getFixturePath, invokeCLI, withMockedCLI } from './test-utils';

describe('build command', () => {
Expand Down Expand Up @@ -70,6 +67,8 @@ describe('build command', () => {
});

it('should build custom exports defined in package.json', async () => {
const { build } = await import('../../cli/commands/utils/build');
const { createLogger } = await import('../../cli/commands/utils/logger');
const logger = createLogger({ silent: true, debug: false, timestamp: false });

await build({
Expand All @@ -83,6 +82,8 @@ describe('build command', () => {
});

it('should build ESM-only custom export when only import is specified', async () => {
const { build } = await import('../../cli/commands/utils/build');
const { createLogger } = await import('../../cli/commands/utils/logger');
const logger = createLogger({ silent: true, debug: false, timestamp: false });

await build({
Expand All @@ -98,6 +99,8 @@ describe('build command', () => {
});

it('should generate type declarations for custom exports with types field', async () => {
const { build } = await import('../../cli/commands/utils/build');
const { createLogger } = await import('../../cli/commands/utils/logger');
const logger = createLogger({ silent: true, debug: false, timestamp: false });

await build({
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/utils/build/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/
import fs from 'node:fs';
import path from 'node:path';
import { build as viteBuild } from 'vite';

import { createViteConfig } from './vite-config';

Expand Down Expand Up @@ -111,6 +110,7 @@ export async function build(options: BuildOptions): Promise<void> {
silent,
});

const { build: viteBuild } = await import('vite');
await viteBuild(config);

if (!silent) {
Expand Down
14 changes: 14 additions & 0 deletions src/cli/commands/utils/build/react-plugin-loader.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { importEsm, resolveDefaultExport } from '../esm-interop';

import type { Plugin } from 'vite';

type ReactPluginFactory = (options?: unknown) => Plugin | Plugin[];

export const loadReactPlugins = async (): Promise<Plugin[]> => {
const mod = await importEsm('@vitejs/plugin-react');
const reactPlugin = resolveDefaultExport<ReactPluginFactory>(mod);
const result = reactPlugin();
const plugins = Array.isArray(result) ? result : [result];

return plugins.filter(Boolean) as Plugin[];
};
17 changes: 9 additions & 8 deletions src/cli/commands/utils/build/vite-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@ import fs from 'node:fs';
import { builtinModules } from 'node:module';
import path from 'node:path';

import { resolveDefaultExport } from '../esm-interop';

import { loadReactPlugins } from './react-plugin-loader';

import type { BundleConfig } from './index';
import type { InlineConfig, Plugin } from 'vite';
import type dtsPlugin from 'vite-plugin-dts';

export interface ViteConfigOptions {
cwd: string;
Expand Down Expand Up @@ -90,15 +95,10 @@ export async function createViteConfig(options: ViteConfigOptions): Promise<Inli

// Add React plugin for admin builds
if (isAdmin) {
// Dynamically import to avoid loading React plugin for server builds
const { default: reactPlugin } = await import('@vitejs/plugin-react');
const reactPluginResult = reactPlugin();
const reactPlugins = Array.isArray(reactPluginResult) ? reactPluginResult : [reactPluginResult];
const reactPlugins = await loadReactPlugins();

for (const plugin of reactPlugins) {
if (plugin) {
plugins.unshift(plugin as Plugin);
}
plugins.unshift(plugin);
}
}

Expand Down Expand Up @@ -141,7 +141,8 @@ export async function createViteConfig(options: ViteConfigOptions): Promise<Inli
}

if (tsconfigPath) {
const { default: dts } = await import('vite-plugin-dts');
const dtsMod = await import('vite-plugin-dts');
const dts = resolveDefaultExport<typeof dtsPlugin>(dtsMod);

// Output types to the correct location
// Expected: dist/admin/src/index.d.ts or dist/server/src/index.d.ts
Expand Down
Loading
Loading