bunchee 4.4.4 → 4.4.6

package/dist/bin/cli.js

@@ -481,13 +481,13 @@ function lint$1(pkg) {
             }
         }
     } else {
+        // Validate CJS package
         if (main && path__default.default.extname(main) === '.mjs') {
             state.badMainExtension = true;
         }
-        // Validate CJS package
         if (exports) {
             if (typeof exports === 'string') {
-                if (!hasCjsExtension(exports)) {
+                if (path__default.default.extname(exports) === '.mjs') {
                     state.badMainExport = true;
                 }
             }
@@ -523,7 +523,11 @@ function lint$1(pkg) {
         logger.warn('Cannot export `main` field with .mjs extension in CJS package, only .js extension is allowed');
     }
     if (state.badMainExport) {
-        logger.warn('Cannot export `exports` field with .cjs extension in ESM package, only .mjs and .js extensions are allowed');
+        if (isESM) {
+            logger.warn('Cannot export `exports` field with .cjs extension in ESM package, only .mjs and .js extensions are allowed');
+        } else {
+            logger.warn('Cannot export `exports` field with .mjs extension in CJS package, only .js and .cjs extensions are allowed');
+        }
     }
     if (state.invalidExportsFieldType) {
         logger.warn('Invalid exports field type, only object or string is allowed');
@@ -554,7 +558,7 @@ function lint$1(pkg) {
     }
 }
 
-var version = "4.4.4";
+var version = "4.4.6";
 
 function relativify(path) {
     return path.startsWith('.') ? path : `./${path}`;

package/dist/index.js

@@ -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);
 
@@ -304,6 +304,92 @@ async function writeDefaultTsconfig(tsConfigPath) {
     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: {
         // have to assign r.type = 'text/css' to make it work in Safari
@@ -931,6 +1017,9 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
             checkJs: false,
             declarationMap: false,
             skipLibCheck: true,
+            // preserveSymlinks should always be set to false to avoid issues with
+            // resolving types from <reference> from node_modules
+            preserveSymlinks: false,
             target: 'ESNext',
             ...!tsCompilerOptions.jsx ? {
                 jsx: 'react-jsx'
@@ -955,7 +1044,6 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
         rawContent({
             exclude: /node_modules/
         }),
-        esmShim__default.default(),
         preserveDirectives__default.default(),
         prependDirectives(),
         replace__default.default({
@@ -966,6 +1054,7 @@ async function buildInputConfig(entry, bundleConfig, exportCondition, buildConte
             preferBuiltins: runtime === 'node',
             extensions: nodeResolveExtensions
         }),
+        bundleConfig.format === 'esm' && esmShim(),
         pluginWasm.wasm(),
         rollupPluginSwc3.swc({
             include: availableESExtensionsRegex,
@@ -1612,11 +1701,12 @@ function logWatcherBuildTime(result) {
     let startTime = 0;
     result.map((watcher)=>{
         function start() {
-            if (startTime === 0) startTime = perf_hooks.performance.now();
+            if (watcherCounter === 0) startTime = perf_hooks.performance.now();
+            watcherCounter++;
         }
         function end() {
-            watcherCounter++;
-            if (watcherCounter === result.length) {
+            watcherCounter--;
+            if (watcherCounter === 0) {
                 logger.info(`Build in ${(perf_hooks.performance.now() - startTime).toFixed(2)}ms`);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "4.4.4",
+  "version": "4.4.6",
   "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",