bunchee 4.4.3 → 4.4.5

package/dist/bin/cli.js

@@ -6,6 +6,7 @@ var fsp = require('fs/promises');
 require('rimraf');
 var require$$0 = require('tty');
 var bunchee = require('bunchee');
+require('module');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -553,12 +554,17 @@ function lint$1(pkg) {
     }
 }
 
-var version = "4.4.3";
+var version = "4.4.5";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;
 }
 
+async function writeDefaultTsconfig(tsConfigPath) {
+    await fs.promises.writeFile(tsConfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');
+    logger.log(`Detected using TypeScript but tsconfig.json is missing, created a ${pc.blue('tsconfig.json')} for you.`);
+}
+
 // Output with posix style in package.json
 function getDistPath(...subPaths) {
     return `./${DIST}/${subPaths.join('/')}`;
@@ -687,7 +693,7 @@ async function prepare(cwd) {
     let isUsingTs = false;
     // Collect bins and exports entries
     const { bins, exportsEntries } = await collectSourceEntries(sourceFolder);
-    const tsconfigPath = path__default.default.join(cwd, 'tsconfig.json');
+    const tsConfigPath = path__default.default.join(cwd, 'tsconfig.json');
     const sourceFiles = [
         ...exportsEntries.values()
     ].concat([
@@ -696,9 +702,8 @@ async function prepare(cwd) {
     const hasTypeScriptFiles = sourceFiles.some((filename)=>isTypescriptFile(filename));
     if (hasTypeScriptFiles) {
         isUsingTs = true;
-        if (!fs__default.default.existsSync(tsconfigPath)) {
-            await fsp__default.default.writeFile(tsconfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');
-            logger.log(`Detected using TypeScript but tsconfig.json is missing, created a ${pc.blue('tsconfig.json')} for you.`);
+        if (!fs__default.default.existsSync(tsConfigPath)) {
+            await writeDefaultTsconfig(tsConfigPath);
         }
     }
     // Configure as ESM package by default if there's no package.json

package/dist/index.js

@@ -5,8 +5,8 @@ var fsp = require('fs/promises');
 var fs = require('fs');
 var path = require('path');
 var perf_hooks = require('perf_hooks');
-var require$$0 = require('tty');
 var module$1 = require('module');
+var require$$0 = require('tty');
 var rimraf = require('rimraf');
 var pluginWasm = require('@rollup/plugin-wasm');
 var rollupPluginSwc3 = require('rollup-plugin-swc3');
@@ -14,8 +14,8 @@ var commonjs = require('@rollup/plugin-commonjs');
 var json = require('@rollup/plugin-json');
 var pluginNodeResolve = require('@rollup/plugin-node-resolve');
 var replace = require('@rollup/plugin-replace');
-var esmShim = require('@rollup/plugin-esm-shim');
 var preserveDirectives = require('rollup-preserve-directives');
+var MagicString = require('magic-string');
 var CleanCSS = require('clean-css');
 var pluginutils = require('@rollup/pluginutils');
 var prettyBytes = require('pretty-bytes');
@@ -29,8 +29,8 @@ var require$$0__default = /*#__PURE__*/_interopDefault(require$$0);
 var commonjs__default = /*#__PURE__*/_interopDefault(commonjs);
 var json__default = /*#__PURE__*/_interopDefault(json);
 var replace__default = /*#__PURE__*/_interopDefault(replace);
-var esmShim__default = /*#__PURE__*/_interopDefault(esmShim);
 var preserveDirectives__default = /*#__PURE__*/_interopDefault(preserveDirectives);
+var MagicString__default = /*#__PURE__*/_interopDefault(MagicString);
 var CleanCSS__default = /*#__PURE__*/_interopDefault(CleanCSS);
 var prettyBytes__default = /*#__PURE__*/_interopDefault(prettyBytes);
 
@@ -244,9 +244,24 @@ const hasAvailableExtension = (filename)=>availableExtensions.has(path__default.
 const hasCjsExtension = (filename)=>path__default.default.extname(filename) === '.cjs';
 // TODO: add unit test
 const baseNameWithoutExtension = (filename)=>path__default.default.basename(filename, path__default.default.extname(filename));
+const memoize = (fn, resolver)=>{
+    const cache = new Map();
+    return (...args)=>{
+        const key = resolver ? resolver(...args) : JSON.stringify({
+            args
+        });
+        const existing = cache.get(key);
+        if (existing !== undefined) {
+            return existing;
+        }
+        const result = fn(...args);
+        cache.set(key, result);
+        return result;
+    };
+};
 
 let hasLoggedTsWarning = false;
-function resolveTypescript(cwd) {
+function resolveTypescriptHandler(cwd) {
     let ts;
     const m = new module$1.Module('', undefined);
     m.paths = module$1.Module._nodeModulePaths(cwd);
@@ -261,7 +276,8 @@ function resolveTypescript(cwd) {
     }
     return ts;
 }
-function resolveTsConfig(cwd) {
+const resolveTypescript = memoize(resolveTypescriptHandler);
+function resolveTsConfigHandler(cwd) {
     let tsCompilerOptions = {};
     let tsConfigPath;
     tsConfigPath = path.resolve(cwd, 'tsconfig.json');
@@ -278,10 +294,101 @@ function resolveTsConfig(cwd) {
         tsConfigPath
     };
 }
+const resolveTsConfig = memoize(resolveTsConfigHandler);
 async function convertCompilerOptions(cwd, json) {
     const ts = resolveTypescript(cwd);
     return ts.convertCompilerOptionsFromJson(json, './');
 }
+async function writeDefaultTsconfig(tsConfigPath) {
+    await fs.promises.writeFile(tsConfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');
+    logger.log(`Detected using TypeScript but tsconfig.json is missing, created a ${pc.blue('tsconfig.json')} for you.`);
+}
+
+const FILENAME_REGEX = /__filename/;
+const DIRNAME_REGEX = /__dirname/;
+const GLOBAL_REQUIRE_REGEX = /require(\.resolve)?\(/;
+const PolyfillComment = '/** rollup-private-do-not-use-esm-shim-polyfill */';
+const createESMShim = ({ filename, dirname, globalRequire })=>{
+    const useNodeUrl = filename || dirname;
+    const useNodePath = dirname;
+    const useNodeModule = globalRequire;
+    return `\
+${PolyfillComment}
+${useNodeUrl ? `import __node_cjsUrl from 'node:url'` : ''};
+${useNodePath ? `import __node_cjsPath from 'node:path';` : ''}
+${useNodeModule ? `import __node_cjsModule from 'node:module';` : ''}
+${useNodeUrl ? 'const __filename = __node_cjsUrl.fileURLToPath(import.meta.url);' : ''}
+${useNodePath ? 'const __dirname = __node_cjsPath.dirname(__filename);' : ''}
+${useNodeModule ? 'const require = __node_cjsModule.createRequire(import.meta.url);' : ''}
+`.trim() + '\n';
+};
+function esmShim() {
+    return {
+        name: 'esm-shim',
+        transform: {
+            order: 'post',
+            handler (code, id) {
+                const ext = path.extname(id);
+                if (!availableESExtensionsRegex.test(ext) || code.includes(PolyfillComment)) {
+                    return null;
+                }
+                let hasFilename = false;
+                let hasDirname = false;
+                let hasGlobalRequire = false;
+                if (FILENAME_REGEX.test(code)) {
+                    hasFilename = true;
+                }
+                if (DIRNAME_REGEX.test(code)) {
+                    hasDirname = true;
+                }
+                if (GLOBAL_REQUIRE_REGEX.test(code)) {
+                    hasGlobalRequire = true;
+                }
+                if (!hasFilename && !hasDirname && !hasGlobalRequire) {
+                    return null;
+                }
+                const magicString = new MagicString__default.default(code);
+                let ast = null;
+                try {
+                    // rollup 2 built-in parser doesn't have `allowShebang`, we need to use the sliced code here. Hence the `magicString.toString()`
+                    ast = this.parse(magicString.toString(), {
+                        allowReturnOutsideFunction: true
+                    });
+                } catch (e) {
+                    console.warn(e);
+                    return null;
+                }
+                if (ast.type !== 'Program') {
+                    return null;
+                }
+                let lastImportNode = null;
+                for (const node of ast.body){
+                    if (node.type === 'ImportDeclaration') {
+                        lastImportNode = node;
+                        continue;
+                    }
+                }
+                let end = 0;
+                if (lastImportNode) {
+                    end = lastImportNode.end;
+                } else {
+                    end = ast.body.length > 0 ? ast.body[0].end : 0;
+                }
+                magicString.appendRight(end, '\n' + createESMShim({
+                    filename: hasFilename,
+                    dirname: hasDirname,
+                    globalRequire: hasGlobalRequire
+                }));
+                return {
+                    code: magicString.toString(),
+                    map: magicString.generateMap({
+                        hires: true
+                    })
+                };
+            }
+        }
+    };
+}
 
 const helpers = {
     cssImport: {
@@ -878,6 +985,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
     // common plugins for both dts and ts assets that need to be processed
     const aliasFormat = dts ? ((_bundleConfig_file = bundleConfig.file) == null ? void 0 : _bundleConfig_file.endsWith('.d.cts')) ? 'cjs' : 'esm' : bundleConfig.format;
     const commonPlugins = [
+        json__default.default(),
         sizePlugin,
         aliasEntries({
             entry,
@@ -933,7 +1041,6 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
         rawContent({
             exclude: /node_modules/
         }),
-        esmShim__default.default(),
         preserveDirectives__default.default(),
         prependDirectives(),
         replace__default.default({
@@ -944,6 +1051,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
             preferBuiltins: runtime === 'node',
             extensions: nodeResolveExtensions
         }),
+        bundleConfig.format === 'esm' && esmShim(),
         pluginWasm.wasm(),
         rollupPluginSwc3.swc({
             include: availableESExtensionsRegex,
@@ -954,8 +1062,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
         }),
         commonjs__default.default({
             exclude: bundleConfig.external || null
-        }),
-        json__default.default()
+        })
     ]).filter(isNotNull);
     return {
         input: entry,
@@ -1474,7 +1581,7 @@ async function bundle(cliEntryPath, { cwd: _cwd, ...options } = {}) {
     ;
     const hasBin = Boolean(pkg.bin);
     const isFromCli = Boolean(cliEntryPath);
-    let tsConfig = await resolveTsConfig(cwd);
+    let tsConfig = resolveTsConfig(cwd);
     let hasTsConfig = Boolean(tsConfig == null ? void 0 : tsConfig.tsConfigPath);
     const defaultTsOptions = {
         tsConfigPath: tsConfig == null ? void 0 : tsConfig.tsConfigPath,
@@ -1536,8 +1643,7 @@ async function bundle(cliEntryPath, { cwd: _cwd, ...options } = {}) {
     if (hasTypeScriptFiles && !hasTsConfig) {
         const tsConfigPath = path.resolve(cwd, 'tsconfig.json');
         defaultTsOptions.tsConfigPath = tsConfigPath;
-        await fsp__default.default.writeFile(tsConfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');
-        logger.log(`Detected using TypeScript but tsconfig.json is missing, created a ${pc.blue('tsconfig.json')} for you.`);
+        await writeDefaultTsconfig(tsConfigPath);
         hasTsConfig = true;
     }
     const sizeCollector = createOutputState({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "4.4.3",
+  "version": "4.4.5",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
@@ -48,7 +48,6 @@
   "license": "MIT",
   "dependencies": {
     "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-esm-shim": "^0.1.5",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-replace": "^5.0.5",
@@ -58,6 +57,7 @@
     "@swc/helpers": "^0.5.3",
     "arg": "^5.0.2",
     "clean-css": "^5.3.3",
+    "magic-string": "^0.30.6",
     "pretty-bytes": "^5.6.0",
     "rimraf": "^5.0.5",
     "rollup": "^4.9.4",
@@ -112,7 +112,8 @@
     "testPathIgnorePatterns": [
       "/node_modules/",
       "<rootDir>/test/integration/.*/*src"
-    ]
+    ],
+    "testTimeout": 8000
   },
   "packageManager": "pnpm@8.8.0"
 }