bunchee 4.2.5 → 4.2.7

package/dist/bin/cli.js

@@ -115,7 +115,7 @@ async function fileExists(filePath) {
     }
 }
 
-var version = "4.2.5";
+var version = "4.2.7";
 
 const helpMessage = `
 Usage: bunchee [options]

package/dist/index.js

@@ -43,7 +43,7 @@ const helpers = {
 function __insertCSS(code) {
   if (!code || typeof document == 'undefined') return
   let head = document.head || document.getElementsByTagName('head')[0]
-  style = document.createElement('style')
+  let style = document.createElement('style')
   style.type = 'text/css'
   head.appendChild(style)
   ;style.styleSheet ? (style.styleSheet.cssText = code) : style.appendChild(document.createTextNode(code))
@@ -164,10 +164,7 @@ function prependDirectives() {
                         return directiveCode + '\n' + code;
                     }
                 }
-                return {
-                    code,
-                    map: null
-                };
+                return null;
             }
         }
     };
@@ -209,8 +206,7 @@ const disabledWarnings = new Set([
     'PREFER_NAMED_EXPORTS',
     'UNRESOLVED_IMPORT',
     'THIS_IS_UNDEFINED',
-    'INVALID_ANNOTATION',
-    'SOURCEMAP_BROKEN'
+    'INVALID_ANNOTATION'
 ]);
 
 function getDefaultExportFromCjs (x) {
@@ -374,11 +370,11 @@ function isExportLike(field) {
     ([key, value])=>typeof value === 'string' && !key.startsWith('.'));
 }
 function constructFullExportCondition(exportCondition, packageType) {
-    const isEsmPkg = isESModulePackage(packageType);
     let fullExportCond;
     if (typeof exportCondition === 'string') {
+        const exportType = getExportTypeFromFile(exportCondition, packageType);
         fullExportCond = {
-            [isEsmPkg ? 'import' : 'require']: exportCondition
+            [exportType]: exportCondition
         };
     } else {
         const exportTypes = Object.keys(exportCondition);
@@ -402,6 +398,8 @@ function joinRelativePath(...segments) {
     return result;
 }
 function findExport(exportPath, exportCondition, paths, packageType) {
+    // Skip `types` field, it cannot be the entry point
+    if (exportPath === 'types') return;
     if (isExportLike(exportCondition)) {
         const fullExportCondition = constructFullExportCondition(exportCondition, packageType);
         paths[exportPath] = {
@@ -640,6 +638,13 @@ function getTypeFilePath(entryFilePath, exportCondition, cwd) {
     const exportName = (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');
 }
+function getExportTypeFromFile(filename, pkgType) {
+    const isESModule = isESModulePackage(pkgType);
+    const isCjsExt = filename.endsWith('.cjs');
+    const isEsmExt = filename.endsWith('.mjs');
+    const exportType = isEsmExt ? 'import' : isCjsExt ? 'require' : isESModule ? 'import' : 'require';
+    return exportType;
+}
 
 const swcMinifyOptions = {
     compress: true,
@@ -727,23 +732,6 @@ async function buildInputConfig(entry, entries, pkg, options, cwd, { tsConfigPat
             entries: reversedAlias
         })
     ];
-    const baseResolvedTsOptions = {
-        declaration: true,
-        noEmit: false,
-        noEmitOnError: true,
-        emitDeclarationOnly: true,
-        checkJs: false,
-        declarationMap: false,
-        skipLibCheck: true,
-        preserveSymlinks: false,
-        // disable incremental build
-        incremental: false,
-        // use default tsBuildInfoFile value
-        tsBuildInfoFile: '.tsbuildinfo',
-        target: 'esnext',
-        module: 'esnext',
-        jsx: tsCompilerOptions.jsx || 'react-jsx'
-    };
     const typesPlugins = [
         ...commonPlugins,
         inlineCss({
@@ -751,16 +739,27 @@ async function buildInputConfig(entry, entries, pkg, options, cwd, { tsConfigPat
         })
     ];
     if (useTypescript) {
+        const overrideResolvedTsOptions = {
+            declaration: true,
+            noEmit: false,
+            noEmitOnError: true,
+            emitDeclarationOnly: true,
+            checkJs: false,
+            declarationMap: false,
+            skipLibCheck: true,
+            preserveSymlinks: false,
+            target: 'esnext',
+            module: 'esnext',
+            jsx: tsCompilerOptions.jsx || 'react-jsx'
+        };
         const mergedOptions = {
-            ...baseResolvedTsOptions,
-            ...tsCompilerOptions
+            ...tsCompilerOptions,
+            ...overrideResolvedTsOptions
         };
         // error TS5074: Option '--incremental' can only be specified using tsconfig, emitting to single
         // file or when option '--tsBuildInfoFile' is specified.
-        if (!mergedOptions.incremental) {
-            delete mergedOptions.incremental;
-            delete mergedOptions.tsBuildInfoFile;
-        }
+        delete mergedOptions.incremental;
+        delete mergedOptions.tsBuildInfoFile;
         const dtsPlugin = require('rollup-plugin-dts').default({
             tsconfig: undefined,
             compilerOptions: mergedOptions
@@ -999,12 +998,8 @@ async function buildEntryConfig(entries, pkg, exportPaths, bundleConfig, cwd, ts
                 path.join('bin', key),
                 binaryExports[key]
             ]);
-        const isESModule = isESModulePackage(pkg.type);
         const binExportPaths = binPairs.reduce((acc, [binName, binDistPath])=>{
-            const ext = path.extname(binDistPath).slice(1);
-            const isCjsExt = ext === 'cjs';
-            const isEsmExt = ext === 'mjs';
-            const exportType = isEsmExt ? 'import' : isCjsExt ? 'require' : isESModule ? 'import' : 'require';
+            const exportType = getExportTypeFromFile(binDistPath, pkg.type);
             acc[binName] = {
                 [exportType]: binDistPath
             };
@@ -1179,7 +1174,6 @@ async function resolveTsConfig(cwd) {
         const tsconfigJSON = ts.readConfigFile(tsConfigPath, ts.sys.readFile).config;
         tsCompilerOptions = ts.parseJsonConfigFileContent(tsconfigJSON, ts.sys, basePath).options;
     } else {
-        tsConfigPath = undefined;
         return null;
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "4.2.5",
+  "version": "4.2.7",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
@@ -62,7 +62,7 @@
     "rollup": "^4.9.1",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-swc3": "^0.11.0",
-    "rollup-preserve-directives": "^1.1.0",
+    "rollup-preserve-directives": "^1.1.1",
     "tslib": "^2.6.2"
   },
   "peerDependencies": {