bunchee 3.5.0 → 3.5.1

package/dist/cli.js

@@ -97,7 +97,7 @@ function _fileExists() {
     return _fileExists.apply(this, arguments);
 }
 
-var version = "3.5.0";
+var version = "3.5.1";
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
@@ -159,8 +159,8 @@ function _lintPackage() {
         if (!(yield hasPackageJson(cwd))) {
             return;
         }
-        const { publint  } = yield import('publint');
-        const { printMessage  } = yield import('publint/utils');
+        const { publint } = yield import('publint');
+        const { printMessage } = yield import('publint/utils');
         const messages = yield publint({
             pkgDir: cwd,
             level: 'error'
@@ -223,8 +223,8 @@ function run(args) {
 }
 function _run() {
     _run = _async_to_generator(function*(args) {
-        var _args_external;
-        const { source , format , watch , minify , sourcemap , target , runtime , dts , env  } = args;
+        var _args_external, _env;
+        const { source, format, watch, minify, sourcemap, target, runtime, dts, env } = args;
         const cwd = args.cwd || process.cwd();
         const file = args.file ? path__default.default.resolve(cwd, args.file) : undefined;
         const bundleConfig = {
@@ -238,7 +238,7 @@ function _run() {
             watch: !!watch,
             minify: !!minify,
             sourcemap: sourcemap === false ? false : true,
-            env: (env == null ? void 0 : env.split(',')) || []
+            env: ((_env = env) == null ? void 0 : _env.split(',')) || []
         };
         if (args.version) {
             return logger.log(version);

package/dist/index.js

@@ -10,6 +10,7 @@ var json = require('@rollup/plugin-json');
 var pluginNodeResolve = require('@rollup/plugin-node-resolve');
 var replace = require('@rollup/plugin-replace');
 var prettyBytes = require('pretty-bytes');
+var core = require('@swc/core');
 var MagicString = require('magic-string');
 var module$1 = require('module');
 
@@ -61,39 +62,7 @@ function chunkSizeCollector() {
     };
 }
 
-function preserveDirectivePlugin() {
-    const directives = new Set();
-    return {
-        name: 'use-directive',
-        transform (code, id) {
-            const regex = /^(?:['"]use[^'"]+['"][^\n]*|#![^\n]*)/gm;
-            const replacedCode = code.replace(regex, (match)=>{
-                // replace double quotes with single quotes
-                directives.add(match.replace(/["]/g, "'"));
-                return '';
-            });
-            return {
-                code: replacedCode,
-                map: null
-            };
-        },
-        renderChunk (code, _, { sourcemap  }) {
-            if (!directives.size) return null;
-            const s = new MagicString__default.default(code);
-            s.prepend(`${[
-                ...directives
-            ].join('\n')}\n`);
-            return {
-                code: s.toString(),
-                map: sourcemap ? s.generateMap({
-                    hires: true
-                }) : null
-            };
-        }
-    };
-}
-
-function asyncGeneratorStep$3(gen, resolve, reject, _next, _throw, key, arg) {
+function asyncGeneratorStep$4(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
         var value = info.value;
@@ -107,16 +76,16 @@ function asyncGeneratorStep$3(gen, resolve, reject, _next, _throw, key, arg) {
         Promise.resolve(value).then(_next, _throw);
     }
 }
-function _async_to_generator$3(fn) {
+function _async_to_generator$4(fn) {
     return function() {
         var self = this, args = arguments;
         return new Promise(function(resolve, reject) {
             var gen = fn.apply(self, args);
             function _next(value) {
-                asyncGeneratorStep$3(gen, resolve, reject, _next, _throw, "next", value);
+                asyncGeneratorStep$4(gen, resolve, reject, _next, _throw, "next", value);
             }
             function _throw(err) {
-                asyncGeneratorStep$3(gen, resolve, reject, _next, _throw, "throw", err);
+                asyncGeneratorStep$4(gen, resolve, reject, _next, _throw, "throw", err);
             }
             _next(undefined);
         });
@@ -130,7 +99,7 @@ function getPackageMeta(cwd) {
     return _getPackageMeta.apply(this, arguments);
 }
 function _getPackageMeta() {
-    _getPackageMeta = _async_to_generator$3(function*(cwd) {
+    _getPackageMeta = _async_to_generator$4(function*(cwd) {
         const pkgFilePath = path__default.default.resolve(cwd, 'package.json');
         let targetPackageJson = {};
         try {
@@ -157,7 +126,7 @@ function fileExists(filePath) {
     return _fileExists.apply(this, arguments);
 }
 function _fileExists() {
-    _fileExists = _async_to_generator$3(function*(filePath) {
+    _fileExists = _async_to_generator$4(function*(filePath) {
         try {
             yield fs__default.default.access(filePath);
             return true;
@@ -187,7 +156,7 @@ function findSourceEntryFile(cwd, exportPath, exportTypeSuffix, ext) {
     return _findSourceEntryFile.apply(this, arguments);
 }
 function _findSourceEntryFile() {
-    _findSourceEntryFile = _async_to_generator$3(function*(cwd, exportPath, exportTypeSuffix, ext) {
+    _findSourceEntryFile = _async_to_generator$4(function*(cwd, exportPath, exportTypeSuffix, ext) {
         const filename = resolveSourceFile(cwd, `${exportPath}${exportTypeSuffix ? `.${exportTypeSuffix}` : ''}.${ext}`);
         if (yield fileExists(filename)) {
             return filename;
@@ -203,6 +172,7 @@ function _findSourceEntryFile() {
 // Map '.' -> './index.[ext]'
 // Map './lite' -> './lite.[ext]'
 // Return undefined if no match or if it's package.json exports
+// TODO: add mts and cts once the types generation for dual package is supported
 const availableExtensions = [
     'js',
     'cjs',
@@ -216,11 +186,12 @@ const availableExportConventions = [
     'react-native',
     'edge-light'
 ];
+const availableESExtensionsRegex = /\.(m|c)?[jt]sx?$/;
 function getSourcePathFromExportPath(cwd, exportPath, exportType) {
     return _getSourcePathFromExportPath.apply(this, arguments);
 }
 function _getSourcePathFromExportPath() {
-    _getSourcePathFromExportPath = _async_to_generator$3(function*(cwd, exportPath, exportType) {
+    _getSourcePathFromExportPath = _async_to_generator$4(function*(cwd, exportPath, exportType) {
         for (const ext of availableExtensions){
             // ignore package.json
             if (exportPath.endsWith('package.json')) return;
@@ -243,6 +214,109 @@ function filenameWithoutExtension(file) {
 }
 const nonNullable = (n)=>Boolean(n);
 
+function asyncGeneratorStep$3(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator$3(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep$3(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep$3(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _extends$2() {
+    _extends$2 = Object.assign || function(target) {
+        for(var i = 1; i < arguments.length; i++){
+            var source = arguments[i];
+            for(var key in source){
+                if (Object.prototype.hasOwnProperty.call(source, key)) {
+                    target[key] = source[key];
+                }
+            }
+        }
+        return target;
+    };
+    return _extends$2.apply(this, arguments);
+}
+const directiveRegex = /^use (\w+)$/;
+function swcRenderDirectivePlugin({ swcParserConfig }) {
+    const meta = {
+        shebang: null,
+        directives: new Set()
+    };
+    const parseOptions = _extends$2({}, swcParserConfig, {
+        script: false,
+        target: 'es2018'
+    });
+    return {
+        name: 'swc-render-directive',
+        transform (code, id) {
+            return _async_to_generator$3(function*() {
+                const ext = path.extname(id);
+                if (!availableESExtensionsRegex.test(ext)) return code;
+                const { body, interpreter } = yield core.parse(code, parseOptions);
+                if (interpreter) {
+                    meta.shebang = `#!${interpreter}`;
+                    code = code.replace(new RegExp('^[\\s\\n]*' + meta.shebang.replace(/\//g, '\/') + '\\n*'), '') // Remove shebang from code
+                    ;
+                }
+                for (const node of body){
+                    if (node.type === 'ExpressionStatement') {
+                        if (node.expression.type === 'StringLiteral' && directiveRegex.test(node.expression.value)) {
+                            meta.directives.add(node.expression.value);
+                        }
+                    } else {
+                        break;
+                    }
+                }
+                return {
+                    code,
+                    map: null,
+                    meta
+                };
+            })();
+        },
+        renderChunk (code, _chunk, { sourcemap }) {
+            const { shebang, directives } = meta;
+            if (!directives.size && !shebang) return null;
+            const s = new MagicString__default.default(code);
+            if (directives.size) {
+                s.prepend(`${[
+                    ...directives
+                ].map((directive)=>`'${directive}';`).join('\n')}\n`);
+            }
+            if (shebang) {
+                s.prepend(`${shebang}\n`);
+            }
+            return {
+                code: s.toString(),
+                map: sourcemap ? s.generateMap({
+                    hires: true
+                }) : null
+            };
+        }
+    };
+}
+
 function getTypings(pkg) {
     return pkg.types || pkg.typings;
 }
@@ -379,7 +453,7 @@ function findExport(name, value, paths, packageType) {
  */ function getExportPaths(pkg) {
     const pathsMap = {};
     const packageType = getPackageType(pkg);
-    const { exports: exportsConditions  } = pkg;
+    const { exports: exportsConditions } = pkg;
     if (exportsConditions) {
         const paths = parseExport(exportsConditions, packageType);
         Object.assign(pathsMap, paths);
@@ -462,9 +536,10 @@ function getExportConditionDist(pkg, parsedExportCondition, cwd) {
     return dist;
 }
 function getTypeFilePath(entryFilePath, exportCondition, cwd) {
+    var _exportCondition;
     const name = filenameWithoutExtension(entryFilePath);
     const firstDistPath = exportCondition ? Object.values(exportCondition.export)[0] : undefined;
-    const exportName = (exportCondition == null ? void 0 : exportCondition.name) || 'index';
+    const exportName = ((_exportCondition = exportCondition) == null ? void 0 : _exportCondition.name) || 'index';
     return entryFilePath ? name + '.d.ts' : path.resolve(firstDistPath ? path.dirname(firstDistPath) : path.join(cwd, 'dist'), (exportName === '.' ? 'index' : exportName) + '.d.ts');
 }
 
@@ -511,7 +586,7 @@ function _extends$1() {
     };
     return _extends$1.apply(this, arguments);
 }
-const minifyOptions = {
+const swcMinifyOptions = {
     compress: true,
     format: {
         comments: 'some',
@@ -537,7 +612,8 @@ function getBuildEnv(envs) {
     }, {});
     return envVars;
 }
-function buildInputConfig(entry, pkg, options, cwd, { tsConfigPath , tsCompilerOptions  }, dts) {
+function buildInputConfig(entry, pkg, options, cwd, { tsConfigPath, tsCompilerOptions }, dts) {
+    var _tsCompilerOptions;
     var _options_external;
     const externals = options.noExternal ? [] : [
         pkg.peerDependencies,
@@ -546,11 +622,35 @@ function buildInputConfig(entry, pkg, options, cwd, { tsConfigPath , tsCompilerO
     ].filter((n)=>Boolean(n)).map((o)=>Object.keys(o)).reduce((a, b)=>a.concat(b), []).concat(((_options_external = options.external) != null ? _options_external : []).concat(pkg.name ? [
         pkg.name
     ] : []));
-    const { useTypescript , runtime , target: jscTarget , minify  } = options;
-    const hasSpecifiedTsTarget = Boolean((tsCompilerOptions == null ? void 0 : tsCompilerOptions.target) && tsConfigPath);
+    const { useTypescript, runtime, target: jscTarget, minify: shouldMinify } = options;
+    const hasSpecifiedTsTarget = Boolean(((_tsCompilerOptions = tsCompilerOptions) == null ? void 0 : _tsCompilerOptions.target) && tsConfigPath);
+    const swcParserConfig = {
+        syntax: useTypescript ? 'typescript' : 'ecmascript',
+        [useTypescript ? 'tsx' : 'jsx']: true,
+        privateMethod: true,
+        classPrivateProperty: true,
+        exportDefaultFrom: true
+    };
+    const swcOptions = {
+        jsc: _extends$1({}, !hasSpecifiedTsTarget && {
+            target: jscTarget
+        }, {
+            loose: true,
+            externalHelpers: false,
+            parser: swcParserConfig
+        }, shouldMinify && {
+            minify: _extends$1({}, swcMinifyOptions, {
+                sourceMap: options.sourcemap
+            })
+        }),
+        sourceMaps: options.sourcemap,
+        inlineSourcesContent: false
+    };
     const sizePlugin = sizeCollector.plugin(cwd);
     const commonPlugins = [
-        preserveDirectivePlugin(),
+        swcRenderDirectivePlugin({
+            swcParserConfig
+        }),
         sizePlugin
     ];
     const plugins = (dts ? [
@@ -593,30 +693,11 @@ function buildInputConfig(entry, pkg, options, cwd, { tsConfigPath , tsCompilerO
         }),
         json__default.default(),
         pluginWasm.wasm(),
-        rollupPluginSwc3.swc({
-            include: /\.(m|c)?[jt]sx?$/,
+        rollupPluginSwc3.swc(_extends$1({
+            include: availableESExtensionsRegex,
             exclude: 'node_modules',
-            tsconfig: tsConfigPath,
-            jsc: _extends$1({}, !hasSpecifiedTsTarget && {
-                target: jscTarget
-            }, {
-                loose: true,
-                externalHelpers: false,
-                parser: {
-                    syntax: useTypescript ? 'typescript' : 'ecmascript',
-                    [useTypescript ? 'tsx' : 'jsx']: true,
-                    privateMethod: true,
-                    classPrivateProperty: true,
-                    exportDefaultFrom: true
-                }
-            }, minify && {
-                minify: _extends$1({}, minifyOptions, {
-                    sourceMap: options.sourcemap
-                })
-            }),
-            sourceMaps: options.sourcemap,
-            inlineSourcesContent: false
-        })
+            tsconfig: tsConfigPath
+        }, swcOptions))
     ]).filter(isNotNull);
     return {
         input: entry,
@@ -635,7 +716,8 @@ function buildInputConfig(entry, pkg, options, cwd, { tsConfigPath , tsCompilerO
                 'MIXED_EXPORTS',
                 'PREFER_NAMED_EXPORTS',
                 'UNRESOLVED_IMPORT',
-                'THIS_IS_UNDEFINED'
+                'THIS_IS_UNDEFINED',
+                'MODULE_LEVEL_DIRECTIVE' // ignore warnings for directives like `use client`
             ].includes(code)) return;
             // If the circular dependency warning is from node_modules, ignore it
             if (code === 'CIRCULAR_DEPENDENCY' && /Circular dependency: node_modules/.test(warning.message)) {
@@ -646,6 +728,7 @@ function buildInputConfig(entry, pkg, options, cwd, { tsConfigPath , tsCompilerO
     };
 }
 function hasEsmExport(exportPaths, tsCompilerOptions) {
+    var _tsCompilerOptions;
     let hasEsm = false;
     for(const key in exportPaths){
         const exportInfo = exportPaths[key];
@@ -655,10 +738,10 @@ function hasEsmExport(exportPaths, tsCompilerOptions) {
             break;
         }
     }
-    return Boolean(hasEsm || (tsCompilerOptions == null ? void 0 : tsCompilerOptions.esModuleInterop));
+    return Boolean(hasEsm || ((_tsCompilerOptions = tsCompilerOptions) == null ? void 0 : _tsCompilerOptions.esModuleInterop));
 }
-function buildOutputConfigs(pkg, exportPaths, options, exportCondition, cwd, { tsCompilerOptions  }, dts) {
-    const { format  } = options;
+function buildOutputConfigs(pkg, exportPaths, options, exportCondition, cwd, { tsCompilerOptions }, dts) {
+    const { format } = options;
     // Add esm mark and interop helper if esm export is detected
     const useEsModuleMark = hasEsmExport(exportPaths, tsCompilerOptions);
     const typings = getTypings(pkg);
@@ -752,7 +835,7 @@ function _buildEntryConfig() {
     return _buildEntryConfig.apply(this, arguments);
 }
 function buildConfig(entry, pkg, exportPaths, bundleConfig, exportCondition, cwd, tsOptions, dts) {
-    const { file  } = bundleConfig;
+    const { file } = bundleConfig;
     const useTypescript = Boolean(tsOptions.tsConfigPath);
     const options = _extends$1({}, bundleConfig, {
         useTypescript
@@ -946,9 +1029,10 @@ function bundle(entryPath) {
 }
 function _bundle() {
     _bundle = _async_to_generator(function*(entryPath, _param = {}) {
-        var { cwd: _cwd  } = _param, options = _object_without_properties_loose(_param, [
+        var { cwd: _cwd } = _param, options = _object_without_properties_loose(_param, [
             "cwd"
         ]);
+        var _tsConfig, _tsConfig1, _tsConfig2;
         const cwd = path.resolve(process.cwd(), _cwd || '');
         assignDefault(options, 'format', 'es');
         assignDefault(options, 'minify', false);
@@ -963,10 +1047,10 @@ function _bundle() {
         // has `types` field in package.json or has `types` exports in any export condition for multi-entries
         const hasTypings = Object.values(exportPaths).some((condition)=>condition.hasOwnProperty('types'));
         const tsConfig = yield resolveTsConfig(cwd);
-        const hasTsConfig = Boolean(tsConfig == null ? void 0 : tsConfig.tsConfigPath);
+        const hasTsConfig = Boolean((_tsConfig = tsConfig) == null ? void 0 : _tsConfig.tsConfigPath);
         const defaultTsOptions = {
-            tsConfigPath: tsConfig == null ? void 0 : tsConfig.tsConfigPath,
-            tsCompilerOptions: (tsConfig == null ? void 0 : tsConfig.tsCompilerOptions) || {}
+            tsConfigPath: (_tsConfig1 = tsConfig) == null ? void 0 : _tsConfig1.tsConfigPath,
+            tsCompilerOptions: ((_tsConfig2 = tsConfig) == null ? void 0 : _tsConfig2.tsCompilerOptions) || {}
         };
         // Handle single entry file
         if (!isMultiEntries) {
@@ -994,7 +1078,7 @@ function _bundle() {
             }
         }
         const bundleOrWatch = (rollupConfig)=>{
-            const { input , exportName  } = rollupConfig;
+            const { input, exportName } = rollupConfig;
             const exportPath = getExportPath(pkg, cwd, exportName);
             // Log original entry file relative path
             const source = typeof input.input === 'string' ? path.relative(cwd, input.input) : exportPath;
@@ -1026,7 +1110,7 @@ function _bundle() {
     });
     return _bundle.apply(this, arguments);
 }
-function runWatch({ input , output  }, metadata) {
+function runWatch({ input, output }, metadata) {
     const watchOptions = [
         _extends({}, input, {
             output: output,
@@ -1059,7 +1143,7 @@ function runWatch({ input , output  }, metadata) {
     });
     return watcher;
 }
-function runBundle({ input , output  }) {
+function runBundle({ input, output }) {
     return rollup.rollup(input).then((bundle)=>{
         const writeJobs = output.map((options)=>bundle.write(options));
         return Promise.all(writeJobs);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": {
     "bunchee": "./dist/cli.js"
@@ -45,21 +45,21 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@rollup/plugin-commonjs": "24.0.1",
-    "@rollup/plugin-json": "6.0.0",
-    "@rollup/plugin-node-resolve": "15.0.2",
-    "@rollup/plugin-replace": "5.0.2",
-    "@rollup/plugin-wasm": "6.1.3",
-    "@swc/core": "1.3.46",
-    "@swc/helpers": "0.5.0",
-    "arg": "5.0.2",
-    "magic-string": "0.30.0",
-    "pretty-bytes": "5.6.0",
-    "publint": "0.1.11",
-    "rollup": "3.20.2",
-    "rollup-plugin-dts": "5.3.0",
-    "rollup-plugin-swc3": "0.8.1",
-    "tslib": "2.5.0"
+    "@rollup/plugin-commonjs": "~24.0.1",
+    "@rollup/plugin-json": "~6.0.0",
+    "@rollup/plugin-node-resolve": "~15.0.2",
+    "@rollup/plugin-replace": "~5.0.2",
+    "@rollup/plugin-wasm": "~6.1.3",
+    "@swc/core": "^1.3.46",
+    "@swc/helpers": "^0.5.0",
+    "arg": "~5.0.2",
+    "magic-string": "~0.30.0",
+    "pretty-bytes": "~5.6.0",
+    "publint": "~0.1.11",
+    "rollup": "~3.20.2",
+    "rollup-plugin-dts": "~5.3.0",
+    "rollup-plugin-swc3": "~0.8.1",
+    "tslib": "~2.5.0"
   },
   "peerDependencies": {
     "typescript": "^4.1 || ^5.0"