bunchee 6.0.0-rc.1 → 6.0.1

package/README.md

@@ -54,7 +54,7 @@ The output format will based on the exports condition and also the file extensio
 > [!NOTE]
 > All the `dependencies` and `peerDependencies` will be marked as external automatically and not included in the bundle. If you want to include them in the bundle, you can use the `--no-external` option.
 
-#### Prepare
+#### Prepare Package
 
 ```sh
 # Use bunchee to prepare package.json configuration
@@ -142,7 +142,7 @@ If you're using TypeScript with Node 10 and Node 16 module resolution, you can u
 
 </details>
 
-#### Lint
+#### Lint Package
 
 `lint` command will check the package.json configuration is valid or not, it can valid few things like:
 

package/dist/bin/cli.js

@@ -373,6 +373,17 @@ function getExportTypeFromFile(filename, pkgType) {
     return exportType;
 }
 
+const matchFile = (matchingPattern, filePath)=>{
+    return matchingPattern.some((pattern)=>{
+        // pattern is always posix
+        const normalizedPattern = path__default.default.posix.normalize(pattern);
+        const expandedPattern = normalizedPattern.endsWith('/') ? `${normalizedPattern}**` : `${normalizedPattern}/**`;
+        const matcher = picomatch__default.default(expandedPattern);
+        const normalizedFilePath = path__default.default.normalize(filePath.replace(/\\/g, '/'));
+        return matcher(normalizedFilePath);
+    });
+};
+
 function validateTypesFieldCondition(pair) {
     const [outputPath, composedExportType] = pair;
     const exportTypes = new Set(composedExportType.split('.'));
@@ -381,16 +392,9 @@ function validateTypesFieldCondition(pair) {
     }
     return false;
 }
-const isPathIncluded = (filesField, filePath)=>{
-    return filesField.some((pattern)=>{
-        const normalizedPattern = path__default.default.normalize(pattern);
-        const matcher = picomatch__default.default(normalizedPattern);
-        return matcher(filePath);
-    });
-};
 function validateFilesField(packageJson) {
     const state = {
-        definedField: false,
+        definedField: true,
         missingFiles: []
     };
     const filesField = packageJson.files || [];
@@ -420,7 +424,11 @@ function validateFilesField(packageJson) {
         }
     }
     state.missingFiles = exportedPaths.filter((exportPath)=>{
-        return !isPathIncluded(filesField, exportPath);
+        // Special case for package.json
+        if (exportPath === './package.json') {
+            return false;
+        }
+        return !matchFile(filesField, exportPath);
     });
     return state;
 }
@@ -431,7 +439,7 @@ function lint$1(pkg) {
     if (!name) {
         logger.warn('Missing package name');
     }
-    const state = {
+    const exportsState = {
         badMainExtension: false,
         badMainExport: false,
         invalidExportsFieldType: false,
@@ -458,10 +466,10 @@ function lint$1(pkg) {
         if (exports) {
             if (typeof exports === 'string') {
                 if (hasCjsExtension(exports)) {
-                    state.badMainExport = true;
+                    exportsState.badMainExport = true;
                 }
             } else if (typeof exports !== 'object') {
-                state.invalidExportsFieldType = true;
+                exportsState.invalidExportsFieldType = true;
             } else {
                 parsedExports.forEach((outputPairs)=>{
                     for (const outputPair of outputPairs){
@@ -470,7 +478,7 @@ function lint$1(pkg) {
                             outputPath,
                             composedExportType
                         ])) {
-                            state.badTypesExport.push([
+                            exportsState.badTypesExport.push([
                                 outputPath,
                                 composedExportType
                             ]);
@@ -487,12 +495,12 @@ function lint$1(pkg) {
                         const requireExt = requirePath && path__default.default.extname(requirePath);
                         const importExt = importPath && path__default.default.extname(importPath);
                         if (requireExt === '.mjs' || requireExt === '.js') {
-                            state.badEsmRequireExport.value = true;
-                            state.badEsmRequireExport.paths.push(requirePath);
+                            exportsState.badEsmRequireExport.value = true;
+                            exportsState.badEsmRequireExport.paths.push(requirePath);
                         }
                         if (importExt === '.cjs') {
-                            state.badEsmImportExport.value = true;
-                            state.badEsmImportExport.paths.push(importPath);
+                            exportsState.badEsmImportExport.value = true;
+                            exportsState.badEsmImportExport.paths.push(importPath);
                         }
                     }
                 });
@@ -501,15 +509,15 @@ function lint$1(pkg) {
     } else {
         // Validate CJS package
         if (main && path__default.default.extname(main) === '.mjs') {
-            state.badMainExtension = true;
+            exportsState.badMainExtension = true;
         }
         if (exports) {
             if (typeof exports === 'string') {
                 if (path__default.default.extname(exports) === '.mjs') {
-                    state.badMainExport = true;
+                    exportsState.badMainExport = true;
                 }
             } else if (typeof exports !== 'object') {
-                state.invalidExportsFieldType = true;
+                exportsState.invalidExportsFieldType = true;
             } else {
                 parsedExports.forEach((outputPairs)=>{
                     for (const outputPair of outputPairs){
@@ -518,7 +526,7 @@ function lint$1(pkg) {
                             outputPath,
                             composedExportType
                         ])) {
-                            state.badTypesExport.push([
+                            exportsState.badTypesExport.push([
                                 outputPath,
                                 composedExportType
                             ]);
@@ -535,12 +543,12 @@ function lint$1(pkg) {
                         const requireExt = requirePath && path__default.default.extname(requirePath);
                         const importExt = importPath && path__default.default.extname(importPath);
                         if (requireExt === '.mjs') {
-                            state.badCjsRequireExport.value = true;
-                            state.badCjsRequireExport.paths.push(requirePath);
+                            exportsState.badCjsRequireExport.value = true;
+                            exportsState.badCjsRequireExport.paths.push(requirePath);
                         }
                         if (importExt === '.js' || importExt === '.cjs') {
-                            state.badCjsImportExport.value = true;
-                            state.badCjsImportExport.paths.push(importPath);
+                            exportsState.badCjsImportExport.value = true;
+                            exportsState.badCjsImportExport.paths.push(importPath);
                         }
                     }
                 });
@@ -548,6 +556,12 @@ function lint$1(pkg) {
         }
     }
     const fieldState = validateFilesField(pkg);
+    const warningsCount = exportsState.badTypesExport.length + fieldState.missingFiles.length;
+    if (warningsCount) {
+        logger.warn(`Lint: ${warningsCount} issues found.`);
+    } else {
+        logger.info(`Lint: package.json is healthy.`);
+    }
     if (!fieldState.definedField) {
         logger.warn('Missing files field in package.json');
     } else if (fieldState.missingFiles.length) {
@@ -556,52 +570,51 @@ function lint$1(pkg) {
             logger.warn(`  ${p}`);
         });
     }
-    if (state.badMainExtension) {
+    if (exportsState.badMainExtension) {
         logger.warn('Cannot export `main` field with .mjs extension in CJS package, only .js extension is allowed');
     }
-    if (state.badMainExport) {
+    if (exportsState.badMainExport) {
         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) {
+    if (exportsState.invalidExportsFieldType) {
         logger.warn('Invalid exports field type, only object or string is allowed');
     }
-    if (state.badCjsRequireExport.value) {
+    if (exportsState.badCjsRequireExport.value) {
         logger.warn('Cannot export `require` field with .mjs extension in CJS package, only .cjs and .js extensions are allowed');
-        state.badCjsRequireExport.paths.forEach((p)=>{
+        exportsState.badCjsRequireExport.paths.forEach((p)=>{
             logger.warn(`  ${p}`);
         });
     }
-    if (state.badCjsImportExport.value) {
+    if (exportsState.badCjsImportExport.value) {
         logger.warn('Cannot export `import` field with .js or .cjs extension in CJS package, only .mjs extensions are allowed');
-        state.badCjsImportExport.paths.forEach((p)=>{
+        exportsState.badCjsImportExport.paths.forEach((p)=>{
             logger.warn(`  ${p}`);
         });
     }
-    if (state.badEsmRequireExport.value) {
+    if (exportsState.badEsmRequireExport.value) {
         logger.warn('Cannot export `require` field with .js or .mjs extension in ESM package, only .cjs extensions are allowed');
-        state.badEsmRequireExport.paths.forEach((p)=>{
+        exportsState.badEsmRequireExport.paths.forEach((p)=>{
             logger.warn(`  ${p}`);
         });
     }
-    if (state.badEsmImportExport.value) {
+    if (exportsState.badEsmImportExport.value) {
         logger.warn('Cannot export `import` field with .cjs extension in ESM package, only .js and .mjs extensions are allowed');
-        state.badEsmImportExport.paths.forEach((p)=>{
+        exportsState.badEsmImportExport.paths.forEach((p)=>{
             logger.warn(`  ${p}`);
         });
     }
-    if (state.badTypesExport.length) {
-        state.badTypesExport.forEach(([outputPath, composedExportType])=>{
+    if (exportsState.badTypesExport.length) {
+        exportsState.badTypesExport.forEach(([outputPath, composedExportType])=>{
             logger.error(`Bad export types field with ${composedExportType} in ${outputPath}, use "types" export condition for it`);
         });
-        process.exit(1);
     }
 }
 
-var version = "6.0.0-rc.1";
+var version = "6.0.1";
 
 async function writeDefaultTsconfig(tsConfigPath) {
     await fs.promises.writeFile(tsConfigPath, JSON.stringify(DEFAULT_TS_CONFIG, null, 2), 'utf-8');
@@ -1094,6 +1107,9 @@ async function parseCliArgs(argv) {
     }).option('dts-bundle', {
         type: 'boolean',
         description: 'bundle type declaration files'
+    }).option('prepare', {
+        type: 'boolean',
+        description: 'auto setup package.json for building'
     }).command('prepare', 'auto configure package.json exports for building', ()=>{}, (argv)=>{
         return prepare(argv.cwd || process.cwd());
     }).command('lint', 'lint package.json', ()=>{}, (argv)=>{
@@ -1105,6 +1121,11 @@ async function parseCliArgs(argv) {
             cmd
         };
     }
+    // Warn about this command being deprecated
+    if (args['prepare']) {
+        logger.warn('The "--prepare" option is deprecated. Please use `bunchee prepare` instead.');
+        return;
+    }
     const source = args._[0];
     const parsedArgs = {
         source,

package/dist/index.js

@@ -1801,11 +1801,10 @@ function runWatch({ input, output }) {
 }
 function catchErrorHandler(error) {
     if (!error) return;
-    logger.error(error);
     // filter out the rollup plugin error information such as loc/frame/code...
     const err = new Error(error.message);
     err.stack = error.stack;
-    throw err;
+    throw error;
 }
 
 function assignDefault(options, name, defaultValue) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunchee",
-  "version": "6.0.0-rc.1",
+  "version": "6.0.1",
   "description": "zero config bundler for js/ts/jsx libraries",
   "bin": "./dist/bin/cli.js",
   "main": "./dist/index.js",
@@ -41,12 +41,12 @@
     "@rollup/plugin-node-resolve": "^15.3.0",
     "@rollup/plugin-replace": "^6.0.1",
     "@rollup/plugin-wasm": "^6.2.2",
-    "@rollup/pluginutils": "^5.1.0",
+    "@rollup/pluginutils": "^5.1.3",
     "@swc/core": "^1.9.3",
     "@swc/helpers": "^0.5.11",
     "clean-css": "^5.3.3",
     "glob": "^11.0.0",
-    "magic-string": "^0.30.11",
+    "magic-string": "^0.30.14",
     "ora": "^8.0.1",
     "picomatch": "^4.0.2",
     "pretty-bytes": "^5.6.0",
@@ -70,7 +70,7 @@
   },
   "devDependencies": {
     "@huozhi/testing-package": "1.0.0",
-    "@swc-node/register": "^1.9.0",
+    "@swc-node/register": "^1.10.9",
     "@swc/jest": "^0.2.31",
     "@swc/types": "^0.1.9",
     "@types/clean-css": "^4.2.11",