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
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ jobs:
- run: npm install --legacy-peer-deps
- run: npm run lint
- run: npm run build
- run: npm test
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"lint": "npm run lint:es",
"lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
"prepare": "husky",
"prepublishOnly": "father doctor && npm run build && rc-np"
"prepublishOnly": "father doctor && npm run build && npm test && rc-np",
"test": "node --test"
},
"commitlint": {
"extends": [
Expand All @@ -41,8 +42,8 @@
"devDependencies": {
"@commitlint/cli": "^21.2.0",
"@commitlint/config-conventional": "^21.2.0",
"@eslint/js": "^10.0.1",
"@eslint/compat": "^2.1.0",
"@eslint/js": "^10.0.1",
"@rc-component/np": "^1.0.4",
"@types/fs-extra": "^11.0.4",
"eslint": "^10.6.0",
Expand Down
27 changes: 17 additions & 10 deletions src/babelPluginImportLib2Es.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
/**
* migrate from https://github.com/umijs/father/blob/2.x/packages/father-build/src/importLibToEs.js
*/
import fs from 'fs';
import { dirname, join } from 'path';

const cwd = process.cwd();

function replacePath(path: any) {
if (path.node.source && /\/lib\//.test(path.node.source.value)) {
const esModule = path.node.source.value.replace('/lib/', '/es/');
const esPath = dirname(join(cwd, `node_modules/${esModule}`));
export function replaceLibWithEs(moduleName: string, paths = [cwd]) {
if (!/\/lib\//.test(moduleName)) {
return moduleName;
}

const esModule = moduleName.replace('/lib/', '/es/');

if (fs.existsSync(esPath)) {
path.node.source.value = esModule;
}
try {
require.resolve(esModule, { paths });
return esModule;
} catch {
return moduleName;
}
}

function replacePath(path: any) {
if (path.node.source) {
path.node.source.value = replaceLibWithEs(path.node.source.value);
}
}

Expand Down
68 changes: 68 additions & 0 deletions test/babelPluginImportLib2Es.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
const assert = require('node:assert/strict');
const fs = require('node:fs');
const os = require('node:os');
const path = require('node:path');
const { afterEach, test } = require('node:test');

const { replaceLibWithEs } = require('../dist/babelPluginImportLib2Es');

const fixtures = [];

afterEach(() => {
fixtures.splice(0).forEach((fixture) => {
fs.rmSync(fixture, { recursive: true, force: true });
});
});

function createFixture({ withEsm }) {
const fixture = fs.mkdtempSync(path.join(os.tmpdir(), 'father-plugin-'));
const consumer = path.join(fixture, 'packages', 'consumer');
const packageDir = path.join(fixture, 'node_modules', 'fixture-icons');

fixtures.push(fixture);
fs.mkdirSync(consumer, { recursive: true });
fs.mkdirSync(path.join(packageDir, 'lib', 'asn'), { recursive: true });
fs.writeFileSync(
path.join(packageDir, 'package.json'),
'{"name":"fixture-icons"}',
);
fs.writeFileSync(
path.join(packageDir, 'lib', 'asn', 'Smile.js'),
'module.exports = {};',
);

if (withEsm) {
fs.mkdirSync(path.join(packageDir, 'es', 'asn'), { recursive: true });
fs.writeFileSync(
path.join(packageDir, 'es', 'asn', 'Smile.js'),
'export default {};',
);
}

return consumer;
}

test('resolves ESM modules from a hoisted node_modules directory', () => {
const consumer = createFixture({ withEsm: true });

assert.equal(
replaceLibWithEs('fixture-icons/lib/asn/Smile', [consumer]),
'fixture-icons/es/asn/Smile',
);
});

test('keeps the CommonJS path when the ESM module is unavailable', () => {
const consumer = createFixture({ withEsm: false });

assert.equal(
replaceLibWithEs('fixture-icons/lib/asn/Smile', [consumer]),
'fixture-icons/lib/asn/Smile',
);
});

test('ignores imports outside lib directories', () => {
assert.equal(
replaceLibWithEs('fixture-icons/legacy/Smile'),
'fixture-icons/legacy/Smile',
);
});