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(#63): handle tsconfig with only relative baseUrl #64

Merged
merged 1 commit into from
Apr 16, 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
4 changes: 2 additions & 2 deletions src/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const getOptions = (
const compilerOptions = parseTsconfig(tsconfig).compilerOptions ?? {};

const tsconfigDir = path.dirname(tsconfig);
if (compilerOptions.paths != null) {
if (compilerOptions.paths != null || compilerOptions.baseUrl != null) {
compilerOptions.baseUrl = compilerOptions.baseUrl != null
? path.resolve(tsconfigDir, compilerOptions.baseUrl)
: tsconfigDir;
Expand All @@ -42,7 +42,7 @@ export const getOptions = (
}

const compilerOptions = result?.config.compilerOptions ?? {};
if (compilerOptions.paths != null) {
if (compilerOptions.paths != null || compilerOptions.baseUrl != null) {
if (result?.path) {
const tsconfigDir = path.dirname(result.path);
compilerOptions.baseUrl = compilerOptions.baseUrl != null
Expand Down
96 changes: 96 additions & 0 deletions test/__snapshots__/index.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,38 @@ ee.on(\\"test\\", function() {
"
`;

exports[`rollup-plugin-swc3 swc (rollup 2) issue 63 - tsconfig baseUrl only + relative baseUrl 1`] = `
"function _check_private_redeclaration(obj, privateCollection) {
if (privateCollection.has(obj)) {
throw new TypeError(\\"Cannot initialize the same private elements twice on an object\\");
}
}
function _class_call_check(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError(\\"Cannot call a class as a function\\");
}
}
function _class_private_field_init(obj, privateMap, value) {
_check_private_redeclaration(obj, privateMap);
privateMap.set(obj, value);
}
function test(s) {
console.log(s);
}
test(\\"hello swc!\\");
var _es2022Feature = /*#__PURE__*/ new WeakMap();
var Test = function Test() {
_class_call_check(this, Test);
_class_private_field_init(this, _es2022Feature, {
writable: true,
value: true
});
};

export { Test };
"
`;

exports[`rollup-plugin-swc3 swc (rollup 2) load json 1`] = `
"var foo = true;
var foo$1 = {
Expand Down Expand Up @@ -1026,6 +1058,38 @@ ee.on(\\"test\\", function() {
"
`;

exports[`rollup-plugin-swc3 swc (rollup 3) issue 63 - tsconfig baseUrl only + relative baseUrl 1`] = `
"function _check_private_redeclaration(obj, privateCollection) {
if (privateCollection.has(obj)) {
throw new TypeError(\\"Cannot initialize the same private elements twice on an object\\");
}
}
function _class_call_check(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError(\\"Cannot call a class as a function\\");
}
}
function _class_private_field_init(obj, privateMap, value) {
_check_private_redeclaration(obj, privateMap);
privateMap.set(obj, value);
}
function test(s) {
console.log(s);
}
test(\\"hello swc!\\");
var _es2022Feature = /*#__PURE__*/ new WeakMap();
var Test = function Test() {
_class_call_check(this, Test);
_class_private_field_init(this, _es2022Feature, {
writable: true,
value: true
});
};

export { Test };
"
`;

exports[`rollup-plugin-swc3 swc (rollup 3) load json 1`] = `
"var foo = true;
var foo$1 = {
Expand Down Expand Up @@ -1650,6 +1714,38 @@ ee.on(\\"test\\", function() {
"
`;

exports[`rollup-plugin-swc3 swc (rollup 4) issue 63 - tsconfig baseUrl only + relative baseUrl 1`] = `
"function _check_private_redeclaration(obj, privateCollection) {
if (privateCollection.has(obj)) {
throw new TypeError(\\"Cannot initialize the same private elements twice on an object\\");
}
}
function _class_call_check(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError(\\"Cannot call a class as a function\\");
}
}
function _class_private_field_init(obj, privateMap, value) {
_check_private_redeclaration(obj, privateMap);
privateMap.set(obj, value);
}
function test(s) {
console.log(s);
}
test(\\"hello swc!\\");
var _es2022Feature = /*#__PURE__*/ new WeakMap();
var Test = function Test() {
_class_call_check(this, Test);
_class_private_field_init(this, _es2022Feature, {
writable: true,
value: true
});
};

export { Test };
"
`;

exports[`rollup-plugin-swc3 swc (rollup 4) load json 1`] = `
"var foo = true;
var foo$1 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
function test(s: string) {
console.log(s)
}

test('hello swc!')

export class Test {
#es2022Feature = true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"compilerOptions": {
"baseUrl": "./src",
"module": "ES2022",
"target": "ES2017"
},
"include": ["./index.ts"],
}
10 changes: 10 additions & 0 deletions test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,16 @@ const tests = (rollupImpl: typeof rollup2 | typeof rollup3 | typeof rollup4, iso
{ input: './index.ts', dir, otherRollupPlugins: [nodeResolve(), commonjs()] }
))[0].code.should.matchSnapshot();
});

it('issue 63 - tsconfig baseUrl only + relative baseUrl', async () => {
const dir = await fixture('tsconfig-base-url-only-relative-issue-63');

(await build(
rollupImpl,
{ tsconfig: false },
{ input: './src/index.ts', dir, otherRollupPlugins: [nodeResolve(), commonjs()] }
))[0].code.should.matchSnapshot();
});
};

describe('rollup-plugin-swc3', () => {
Expand Down
Loading