Skip to content
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
48 changes: 47 additions & 1 deletion packages/vite/hmr/shared/vendor/vendor-esbuild-plugins.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import * as esbuild from 'esbuild';
import { mkdtempSync, mkdirSync, writeFileSync } from 'node:fs';
import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises';
import { runInNewContext } from 'node:vm';
import { tmpdir } from 'node:os';
import path from 'node:path';
import { describe, expect, it } from 'vitest';

import { createNodeBuiltinPolyfillEsbuildPlugin, createWebpackLoaderStubEsbuildPlugin } from './vendor-esbuild-plugins.js';
import { createNodeBuiltinPolyfillEsbuildPlugin, createWebpackLoaderStubEsbuildPlugin, createOptionalDependencyStubEsbuildPlugin } from './vendor-esbuild-plugins.js';

// --- createWebpackLoaderStubEsbuildPlugin --------------------------------
//
Expand Down Expand Up @@ -119,3 +121,47 @@ describe('createNodeBuiltinPolyfillEsbuildPlugin', () => {
expect(output).toMatch(/from\s+["']fs["']/);
});
});

describe('createOptionalDependencyStubEsbuildPlugin', () => {
it('resolves package imports while preserving absent optional dependency fallbacks', async () => {
const projectRoot = await mkdtemp(path.join(tmpdir(), 'ns-vendor-imports-'));
try {
const dependency = path.join(projectRoot, 'node_modules', 'fixture');
await mkdir(dependency, { recursive: true });
await writeFile(path.join(projectRoot, 'package.json'), JSON.stringify({ private: true }));
await writeFile(path.join(dependency, 'package.json'), JSON.stringify({ name: 'fixture', type: 'module', imports: { '#internal': './internal.js' } }));
await writeFile(path.join(dependency, 'internal.js'), 'export const value = 42;');
await writeFile(
path.join(dependency, 'index.js'),
`import { value } from '#internal';
let optional;
let optionalError;
try {
optional = require('missing-optional-fixture');
} catch (error) {
optional = 'fallback';
optionalError = error.message;
}
export { value, optional, optionalError };`,
);

const result = await esbuild.build({
entryPoints: [path.join(dependency, 'index.js')],
bundle: true,
format: 'cjs',
platform: 'neutral',
write: false,
plugins: [createOptionalDependencyStubEsbuildPlugin(projectRoot)],
});
const module = { exports: {} };
runInNewContext(result.outputFiles[0].text, { module });
expect(module.exports).toMatchObject({
value: 42,
optional: 'fallback',
optionalError: "Cannot find module 'missing-optional-fixture'",
});
} finally {
await rm(projectRoot, { recursive: true, force: true });
}
});
});
4 changes: 3 additions & 1 deletion packages/vite/hmr/shared/vendor/vendor-esbuild-plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,9 @@ export function createOptionalDependencyStubEsbuildPlugin(projectRoot: string):
// Only bare ids requested by node_modules code; app-code imports
// should keep failing loudly so misconfiguration stays visible.
if (!args.importer || !/node_modules[\\/]/.test(args.importer)) return undefined;
if (args.path.startsWith('node:')) return undefined;
// `#` imports resolve against the project's package.json under
// createRequire (`paths` doesn't change that); esbuild uses the importer's.
if (args.path.startsWith('node:') || args.path.startsWith('#')) return undefined;
try {
requireFromProject.resolve(args.path, { paths: [path.dirname(args.importer)] });
return undefined; // resolvable — let esbuild handle it normally
Expand Down
Loading