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.

Sign up for GitHub

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

Jump to bottom

feat: support .tsx file as entry #82

Merged
merged 3 commits into from
Sep 12, 2024
Merged

feat: support .tsx file as entry #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b18b7f
feat: support .tsx file as entry
uinz Aug 31, 2024
78f3968
Merge branch 'master' into feat/support-tsx-as-entry
privatenumber Sep 11, 2024
45c8b07
wip
privatenumber Sep 12, 2024
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
2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
},
"devDependencies": {
"@types/node": "^20.14.11",
"@types/react": "^18.3.5",
"clean-pkg-json": "^1.2.0",
"cleye": "^1.3.2",
"execa": "^9.3.0",
Expand All @@ -70,6 +71,7 @@
"lintroll": "^1.7.1",
"manten": "^1.3.0",
"outdent": "^0.8.0",
"react": "^18.3.1",
"rollup-plugin-dts": "6.1.1",
"tsx": "^4.16.2",
"type-fest": "^4.22.1",
Expand Down
32 changes: 32 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions src/utils/get-source-path.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ const tryExtensions = async (
};

const extensionMap = {
'.d.ts': ['.d.ts', '.d.mts', '.d.cts', '.ts', '.mts', '.cts'],
'.d.mts': ['.d.mts', '.d.ts', '.d.cts', '.ts', '.mts', '.cts'],
'.d.cts': ['.d.cts', '.d.ts', '.d.mts', '.ts', '.mts', '.cts'],
'.d.ts': ['.d.ts', '.d.mts', '.d.cts', '.ts', '.tsx', '.mts', '.cts'],
'.d.mts': ['.d.mts', '.d.ts', '.d.cts', '.ts', '.tsx', '.mts', '.cts'],
'.d.cts': ['.d.cts', '.d.ts', '.d.mts', '.ts', '.tsx', '.mts', '.cts'],
'.js': ['.js', '.ts', '.tsx', '.mts', '.cts'],
'.mjs': ['.mjs', '.js', '.cjs', '.mts', '.cts', '.ts'],
'.cjs': ['.cjs', '.js', '.mjs', '.mts', '.cts', '.ts'],
'.mjs': ['.mjs', '.js', '.cjs', '.mts', '.cts', '.ts', '.tsx'],
'.cjs': ['.cjs', '.js', '.mjs', '.mts', '.cts', '.ts', '.tsx'],
} as const;

const distExtensions = Object.keys(extensionMap) as (keyof typeof extensionMap)[];
Expand Down
25 changes: 11 additions & 14 deletions tests/fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@ import type { PackageJson, TsConfigJson } from 'type-fest';
export const createPackageJson = (packageJson: PackageJson) => JSON.stringify(packageJson);
export const createTsconfigJson = (tsconfigJson: TsConfigJson) => JSON.stringify(tsconfigJson);

const typeScriptPath = path.resolve('node_modules/typescript');

export const installTypeScript: FileTree = {
'node_modules/typescript': ({ symlink }) => symlink(typeScriptPath, 'dir'),
'node_modules/typescript': ({ symlink }) => symlink(path.resolve('node_modules/typescript'), 'dir'),
};

export const installReact: FileTree = {
'node_modules/react': ({ symlink }) => symlink(path.resolve('node_modules/react'), 'dir'),
'node_modules/@types/react': ({ symlink }) => symlink(path.resolve('node_modules/@types/react'), 'dir'),
};

type Options = {
installTypeScript?: boolean;
installReact?: boolean;
};

export const fixtureFiles = {
Expand Down Expand Up @@ -159,20 +163,13 @@ export const fixtureFiles = {
`,
};

export const packageFixture = (
options: Options = {},
): FileTree => ({
export const packageFixture = (options: Options = {}): FileTree => ({
src: fixtureFiles,
...(
options.installTypeScript
? installTypeScript
: {}
),
...(options.installTypeScript ? installTypeScript : {}),
...(options.installReact ? installReact : {}),
});

export const fixtureDependencyExportsMap = (
entryFile: string,
): FileTree => ({
export const fixtureDependencyExportsMap = (entryFile: string): FileTree => ({
'package.json': createPackageJson({
main: entryFile,
}),
Expand Down
32 changes: 31 additions & 1 deletion tests/specs/builds/output-commonjs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { testSuite, expect } from 'manten';
import { createFixture } from 'fs-fixture';
import { pkgroll } from '../../utils.js';
import { packageFixture, createPackageJson } from '../../fixtures.js';
import { packageFixture, createPackageJson, createTsconfigJson } from '../../fixtures.js';

export default testSuite(({ describe }, nodePath: string) => {
describe('output: commonjs', ({ test }) => {
Expand Down Expand Up @@ -126,6 +126,36 @@ export default testSuite(({ describe }, nodePath: string) => {
expect(content).toMatch('exports.sayHello =');
});

test('{ type: commonjs, field: component, srcExt: mjs, distExt: cjs }', async () => {
await using fixture = await createFixture({
...packageFixture({ installReact: true }),
'package.json': createPackageJson({
main: './dist/component.cjs',
peerDependencies: {
react: '*',
},
}),
'tsconfig.json': createTsconfigJson({
compilerOptions: {
jsx: 'react-jsx',
},
}),
});

const pkgrollProcess = await pkgroll([], {
cwd: fixture.path,
nodePath,
});

expect(pkgrollProcess.exitCode).toBe(0);
expect(pkgrollProcess.stderr).toBe('');

const content = await fixture.readFile('dist/component.cjs', 'utf8');
expect(content).toMatch(`require('react/jsx-runtime')`);
expect(content).toMatch('const Component = () => /* @__PURE__ */ jsxRuntime.jsx("div", { children: "Hello World" })');
expect(content).toMatch('exports.Component = Component');
});

test('nested directory', async () => {
await using fixture = await createFixture({
...packageFixture(),
Expand Down
32 changes: 31 additions & 1 deletion tests/specs/builds/output-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { testSuite, expect } from 'manten';
import { createFixture } from 'fs-fixture';
import { pkgroll } from '../../utils.js';
import { packageFixture, createPackageJson } from '../../fixtures.js';
import { packageFixture, createPackageJson, createTsconfigJson } from '../../fixtures.js';

export default testSuite(({ describe }, nodePath: string) => {
describe('output: module', ({ test }) => {
Expand Down Expand Up @@ -86,6 +86,36 @@ export default testSuite(({ describe }, nodePath: string) => {
expect(content).toMatch('export { cjs$1 as default }');
});

test('{ type: commonjs, field: component, srcExt: tsx, distExt: mjs }', async () => {
await using fixture = await createFixture({
...packageFixture({ installReact: true }),
'package.json': createPackageJson({
main: './dist/component.mjs',
peerDependencies: {
react: '*',
},
}),
'tsconfig.json': createTsconfigJson({
compilerOptions: {
jsx: 'react-jsx',
},
}),
});

const pkgrollProcess = await pkgroll([], {
cwd: fixture.path,
nodePath,
});

expect(pkgrollProcess.exitCode).toBe(0);
expect(pkgrollProcess.stderr).toBe('');

const content = await fixture.readFile('dist/component.mjs', 'utf8');
expect(content).toMatch(`import { jsx } from 'react/jsx-runtime'`);
expect(content).toMatch('const Component = () => /* @__PURE__ */ jsx("div", { children: "Hello World" })');
expect(content).toMatch('export { Component }');
});

test('{ type: commonjs, field: main, srcExt: mts, distExt: mjs }', async () => {
await using fixture = await createFixture({
...packageFixture(),
Expand Down
99 changes: 99 additions & 0 deletions tests/specs/builds/output-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,105 @@ export default testSuite(({ describe }, nodePath: string) => {
expect(content).toMatch('declare function');
});

test('{ srcExt: tsx, distExt: d.ts }', async () => {
await using fixture = await createFixture({
...packageFixture({
installTypeScript: true,
installReact: true,
}),
'package.json': createPackageJson({
types: './dist/component.d.ts',
peerDependencies: {
react: '*',
},
}),
'tsconfig.json': createTsconfigJson({
compilerOptions: {
jsx: 'react-jsx',
},
}),
});

const pkgrollProcess = await pkgroll([], {
cwd: fixture.path,
nodePath,
});

expect(pkgrollProcess.exitCode).toBe(0);
expect(pkgrollProcess.stderr).toBe('');

const content = await fixture.readFile('dist/component.d.ts', 'utf8');
expect(content).toMatch(`import * as react_jsx_runtime from 'react/jsx-runtime'`);
expect(content).toMatch('declare const Component: () => react_jsx_runtime.JSX.Element');
expect(content).toMatch('export { Component }');
});

test('{ srcExt: tsx, distExt: d.mts }', async () => {
await using fixture = await createFixture({
...packageFixture({
installTypeScript: true,
installReact: true,
}),
'package.json': createPackageJson({
types: './dist/component.d.mts',
peerDependencies: {
react: '*',
},
}),
'tsconfig.json': createTsconfigJson({
compilerOptions: {
jsx: 'react-jsx',
},
}),
});

const pkgrollProcess = await pkgroll([], {
cwd: fixture.path,
nodePath,
});

expect(pkgrollProcess.exitCode).toBe(0);
expect(pkgrollProcess.stderr).toBe('');

const content = await fixture.readFile('dist/component.d.mts', 'utf8');
expect(content).toMatch(`import * as react_jsx_runtime from 'react/jsx-runtime'`);
expect(content).toMatch('declare const Component: () => react_jsx_runtime.JSX.Element');
expect(content).toMatch('export { Component }');
});

test('{ srcExt: tsx, distExt: d.cts }', async () => {
await using fixture = await createFixture({
...packageFixture({
installTypeScript: true,
installReact: true,
}),
'package.json': createPackageJson({
types: './dist/component.d.cts',
peerDependencies: {
react: '*',
},
}),
'tsconfig.json': createTsconfigJson({
compilerOptions: {
jsx: 'react-jsx',
},
}),
});

const pkgrollProcess = await pkgroll([], {
cwd: fixture.path,
nodePath,
});

expect(pkgrollProcess.exitCode).toBe(0);
expect(pkgrollProcess.stderr).toBe('');

const content = await fixture.readFile('dist/component.d.cts', 'utf8');
expect(content).toMatch(`import * as react_jsx_runtime from 'react/jsx-runtime'`);
expect(content).toMatch('declare const Component: () => react_jsx_runtime.JSX.Element');
expect(content).toMatch('export { Component }');
});

test('{ srcExt: .mts, distExt: d.cts }', async () => {
await using fixture = await createFixture({
...packageFixture({ installTypeScript: true }),
Expand Down
Loading