Skip to content
Draft
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
12 changes: 9 additions & 3 deletions packages/virtual/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,14 @@
"main": "./dist/cjs/index.js",
"module": "./dist/es/index.js",
"exports": {
"types": "./types/index.d.ts",
"import": "./dist/es/index.js",
"import": {
"types": "./types/index.d.mts",
"default": "./dist/es/index.js"
},
"require": {
"types": "./types/index.d.ts",
"default": "./dist/cjs/index.js"
},
"default": "./dist/cjs/index.js"
},
"engines": {
Expand All @@ -35,7 +41,7 @@
"pretest": "pnpm build",
"release": "pnpm --workspace-root package:release $(pwd)",
"test": "vitest --config ../../.config/vitest.config.mts run",
"test:ts": "tsc --noEmit"
"test:ts": "tsc --noEmit && vitest --config ../../.config/vitest.config.mts run test/types.test.js"
},
"files": [
"dist",
Expand Down
7 changes: 7 additions & 0 deletions packages/virtual/test/fixtures/types/commonjs.cts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import type { Plugin } from 'rollup';
import virtual, { type RollupVirtualOptions } from '@rollup/plugin-virtual';

const modules: RollupVirtualOptions = { entry: 'export default 42' };
const plugin: Plugin = virtual(modules);

export default plugin;
15 changes: 15 additions & 0 deletions packages/virtual/test/fixtures/types/esm.mts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import type { Plugin } from 'rollup';
import virtual, { type RollupVirtualOptions } from '@rollup/plugin-virtual';

const modules: RollupVirtualOptions = { entry: 'export default 42' };
const plugin: Plugin = virtual(modules);

virtual({});

// @ts-expect-error Virtual module sources must be strings.
virtual({ entry: 42 });

// @ts-expect-error A module map is required.
virtual();

export default plugin;
8 changes: 8 additions & 0 deletions packages/virtual/test/fixtures/types/legacy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import type { Plugin } from 'rollup';

import virtual, { type RollupVirtualOptions } from '../../..';

const modules: RollupVirtualOptions = { entry: 'export default 42' };
const plugin: Plugin = virtual(modules);

export default plugin;
41 changes: 41 additions & 0 deletions packages/virtual/test/types.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
const path = require('path');

const ts = require('typescript');

const modes = [
['Node16', ts.ModuleKind.Node16, ts.ModuleResolutionKind.Node16],
['NodeNext', ts.ModuleKind.NodeNext, ts.ModuleResolutionKind.NodeNext]
];

function diagnostics(fixture, module, moduleResolution) {
const program = ts.createProgram([path.join(__dirname, 'fixtures', 'types', fixture)], {
esModuleInterop: true,
module,
moduleResolution,
noEmit: true,
skipLibCheck: true,
strict: true,
target: ts.ScriptTarget.ES2019,
types: []
});

return ts
.getPreEmitDiagnostics(program)
.map((diagnostic) => ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'));
}

for (const [name, module, moduleResolution] of modes) {
test(`supports default imports in ${name} ES modules`, () => {
expect(diagnostics('esm.mts', module, moduleResolution)).toEqual([]);
});

test(`supports default imports in ${name} CommonJS modules`, () => {
expect(diagnostics('commonjs.cts', module, moduleResolution)).toEqual([]);
});
}

test('supports default imports with legacy Node resolution', () => {
expect(diagnostics('legacy.ts', ts.ModuleKind.CommonJS, ts.ModuleResolutionKind.NodeJs)).toEqual(
[]
);
});
4 changes: 4 additions & 0 deletions packages/virtual/types/index.d.mts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export type { RollupVirtualOptions } from './index.js';

declare const virtual: typeof import('./index.js').default;
export default virtual;