@unpackjs/core 3.8.2 → 3.8.3

package/dist/index.js

@@ -729,26 +729,23 @@ let getOutputFilename = ({ type, hash, async })=>{
 };
 var css_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 async function applyHtmlConfig({ config, unpackConfig }) {
-    if (!unpackConfig.mpa) {
-        let htmlConfig = unpackConfig.html || {}, { template, templateContent } = getHtmlTemplateOrContent(htmlConfig.template, unpackConfig.root), templateParameters = {
-            mountId: htmlConfig.mountId,
-            title: isFunction(htmlConfig.title) ? htmlConfig.title({
-                entryName: 'index'
-            }) : htmlConfig.title || '',
-            headTag: htmlConfig.headTag || '',
-            ...htmlConfig.templateParameters
-        };
-        config.plugins.push(new rspack.HtmlRspackPlugin({
-            template,
-            templateContent,
-            templateParameters,
-            minify: !1,
-            chunks: [
-                'main'
-            ]
-        }));
-    }
-    return config;
+    let htmlConfig = unpackConfig.html || {}, { template, templateContent } = getHtmlTemplateOrContent(htmlConfig.template, unpackConfig.root), templateParameters = {
+        mountId: htmlConfig.mountId,
+        title: isFunction(htmlConfig.title) ? htmlConfig.title({
+            entryName: 'index'
+        }) : htmlConfig.title || '',
+        headTag: htmlConfig.headTag || '',
+        ...htmlConfig.templateParameters
+    };
+    return config.plugins.push(new rspack.HtmlRspackPlugin({
+        template,
+        templateContent,
+        templateParameters,
+        minify: !1,
+        chunks: [
+            'main'
+        ]
+    })), config;
 }
 let { RawSource: RawSource, SourceMapSource: SourceMapSource } = rspack.sources, isJsFile = /\.[cm]?js(\?.*)?$/i, jsMinify_PLUGIN_NAME = 'JsMinifyPlugin';
 class JsMinifyPlugin {
@@ -761,7 +758,7 @@ class JsMinifyPlugin {
     apply(compiler) {
         let meta = JSON.stringify({
             name: jsMinify_PLUGIN_NAME,
-            version: "3.8.2",
+            version: "3.8.3",
             options: this.minifyOptions
         });
         compiler.hooks.compilation.tap(jsMinify_PLUGIN_NAME, (compilation)=>{
@@ -1163,9 +1160,6 @@ async function getBundlerConfig(originalUnpackConfig) {
                 }
             }
         ]
-    }), config = await applyHtmlConfig({
-        config,
-        unpackConfig
     }), config = (({ config, unpackConfig })=>{
         let { chunkSplit } = unpackConfig.performance || {};
         if (chunkSplit?.strategy) {
@@ -1430,7 +1424,10 @@ async function getBundlerConfig(originalUnpackConfig) {
             unpackConfig
         }),
         unpackConfig
-    }), unpackConfig.performance?.cache && (config = await applyCacheConfig({
+    }), unpackConfig.mpa || (config = await applyHtmlConfig({
+        config,
+        unpackConfig
+    })), unpackConfig.performance?.cache && (config = await applyCacheConfig({
         config,
         unpackConfig,
         envFilePaths
@@ -1447,34 +1444,26 @@ async function getBundlerConfig(originalUnpackConfig) {
                 circularCount = 0;
             },
             onDetected (_, modules) {
-                circularCount++, console.log(''), logger_logger.warn('circular dependency detected:');
-                let uniquePaths = modules.map((module)=>{
+                var paths;
+                let arrow, lastIndex;
+                circularCount++, logger_logger.warn('circular dependency detected:'), paths = modules.map((module)=>{
                     let filePath = module.replace(/^.*!/, ''), relativePath = node_path.relative(unpackConfig.root, filePath);
                     return relativePath.startsWith('..') ? filePath : relativePath;
-                }).slice(0, -1);
-                if (2 + uniquePaths.join(' → ').length > (process.stdout.columns || 80)) {
-                    let arrow, lastIndex;
-                    console.log(''), arrow = '↳ ', lastIndex = uniquePaths.length - 1, uniquePaths.forEach((p, i)=>{
-                        switch(i){
-                            case 0:
-                                console.log(`  ${p}`);
-                                break;
-                            case lastIndex:
-                                console.log(`  ${arrow}${p} ${colors.dim('(cycle introduced)')}`);
-                                break;
-                            default:
-                                console.log(`  ${arrow}${p}`);
-                        }
-                    }), console.log(`  ${arrow}${uniquePaths[0]}`), console.log('');
-                } else {
-                    let line1, downArrowPos, lineLength;
-                    line1 = '  ', downArrowPos = 0, uniquePaths.forEach((p, i)=>{
-                        line1 += p, i < uniquePaths.length - 1 ? line1 += ' → ' : downArrowPos = line1.length - 1;
-                    }), lineLength = downArrowPos - 2, console.log(''), console.log(line1), console.log('  ' + ' '.repeat(0) + '↑' + ' '.repeat(downArrowPos - 2 - 1) + '↓'), console.log('  ' + ' '.repeat(0) + '└' + '─'.repeat(lineLength - 1) + '┘'), console.log('');
-                }
+                }).slice(0, -1), console.log(''), arrow = colors.dim('↳ '), lastIndex = paths.length - 1, paths.forEach((p, i)=>{
+                    switch(i){
+                        case 0:
+                            console.log(`  ${p}`);
+                            break;
+                        case lastIndex:
+                            console.log(`  ${arrow}${p} ${colors.yellow(colors.dim('(cycle introduced)'))}`);
+                            break;
+                        default:
+                            console.log(`  ${arrow}${p}`);
+                    }
+                }), console.log(`  ${arrow}${paths[0]}`), console.log('');
             },
             onEnd () {
-                circularCount > 0 && console.log(`Found ${circularCount} circular ${1 === circularCount ? 'dependency' : 'dependencies'}`);
+                circularCount > 0 && console.log('Found', colors.yellow(colors.bold(`${circularCount} circular ${1 === circularCount ? 'dependency' : 'dependencies'}`)));
             }
         });
         return config.plugins?.push(circularDependencyPlugin), config;
@@ -1609,7 +1598,7 @@ async function unpackDev(unpackConfig) {
             ...middlewares
         ]);
     let server = new RspackDevServer(devServerOptions, compiler);
-    await server.start(), logger_logger.greet(`  ${colors.brand(`${colors.bold(unpackConfig._context.callerName.toUpperCase())} v3.8.2${unpackConfig.performance?.cache ? ' ϟ' : ''}`)}  ${colors.dim('ready in')} ${colors.bold(Math.ceil(performance.now() - getUnpackStartTime()))} ${colors.dim('ms')}\n`), printServerUrls({
+    await server.start(), logger_logger.greet(`  ${colors.brand(`${colors.bold(unpackConfig._context.callerName.toUpperCase())} v3.8.3${unpackConfig.performance?.cache ? ' ϟ' : ''}`)}  ${colors.dim('ready in')} ${colors.bold(Math.ceil(performance.now() - getUnpackStartTime()))} ${colors.dim('ms')}\n`), printServerUrls({
         port,
         host: unpackConfig.server?.host,
         base: unpackConfig.base
@@ -1623,7 +1612,7 @@ async function unpackDev(unpackConfig) {
 function createUnpack({ cwd = process.cwd(), config: userConfig, callerName = 'unpack' }) {
     let _context = {
         callerName,
-        version: "3.8.2",
+        version: "3.8.3",
         cachePath: 'node_modules/.unpack'
     }, resolveConfig = (mode)=>{
         let rootPath, outputPath, basePath, cachedTraceMap, fs, isValidMethodName, parseFrame, formatOriginalLocation, formatFullStack, resolveErrorLocationAndStack, shouldTransformDeepImport, preJsAssets, jsAssets, cssAssets, bundledDepsCachePath, deepImportPkgPattern, deepImportRegex, root;
@@ -1731,7 +1720,7 @@ function createUnpack({ cwd = process.cwd(), config: userConfig, callerName = 'u
                                 /(^|[\\/])src[\\/]/.test(locationText) && srcLines.push(line);
                             }
                         }
-                        return srcLines.length > 0 ? srcLines.join('') : allLines.join('');
+                        return srcLines.length > 0 ? srcLines[0] : allLines.join('');
                     }, resolveErrorLocationAndStack = async (item)=>{
                         let locationFromMsg = item.message ? ((message)=>{
                             let match = message.match(/((?:[A-Za-z]:)?\/[^\s:]+):(\d+):(\d+)/);
@@ -1864,12 +1853,11 @@ function createUnpack({ cwd = process.cwd(), config: userConfig, callerName = 'u
                                                 }
                                                 switch(item.type){
                                                     case 'string':
-                                                        return ((message)=>{
-                                                            let trimmed = message.trim();
-                                                            if (!trimmed) return !0;
-                                                            let normalizedFirstLine = (trimmed.split('\n', 1)[0]?.trim() || '').replace(/`/g, '');
-                                                            return /^at\s+/.test(normalizedFirstLine);
-                                                        })(item.message) ? '' : item.message;
+                                                        let trimmed;
+                                                        return (trimmed = item.message.trim()) ? trimmed.split(/\r?\n/g).filter((line)=>{
+                                                            let normalized = line.trim().replace(/`/g, '');
+                                                            return !!normalized && !/^at\s+/.test(normalized);
+                                                        }).join('\n').trim() : '';
                                                     case 'null':
                                                         return null;
                                                     case 'undefined':
@@ -1905,7 +1893,7 @@ function createUnpack({ cwd = process.cwd(), config: userConfig, callerName = 'u
                                                     format(cleanedTemplate, ...rest)
                                                 ];
                                             })(formattedArgs), prefix = colors.dim(`[browser ${time}]`);
-                                            switch(level){
+                                            switch(console.log(''), level){
                                                 case 'error':
                                                     logger_logger.error(`${prefix} ${outputArgs.join(' ')}`);
                                                     break;
@@ -1932,7 +1920,7 @@ function createUnpack({ cwd = process.cwd(), config: userConfig, callerName = 'u
                         apply: (config, { command })=>'dev' === command && !!config.dev?.prebundle,
                         config: async (config, context)=>{
                             var externals;
-                            let existExternals, cacheDir, root = config.root;
+                            let existExternals, root = config.root;
                             bundledDepsCachePath = node_path.resolve(root, context.cachePath, 'umd');
                             let count = {
                                 total: 0,
@@ -2123,9 +2111,16 @@ function createUnpack({ cwd = process.cwd(), config: userConfig, callerName = 'u
                                             });
                                         });
                                     }))(depInfo)));
-                            cacheDir = node_path.dirname(failedDepsJsonPath), node_fs.existsSync(cacheDir) || node_fs.mkdirSync(cacheDir, {
-                                recursive: !0
-                            }), node_fs.writeFileSync(failedDepsJsonPath, JSON.stringify(failedCache, null, 2), 'utf-8');
+                            ((cache)=>{
+                                if (0 === Object.keys(cache).length) {
+                                    node_fs.existsSync(failedDepsJsonPath) && node_fs.unlinkSync(failedDepsJsonPath);
+                                    return;
+                                }
+                                let cacheDir = node_path.dirname(failedDepsJsonPath);
+                                node_fs.existsSync(cacheDir) || node_fs.mkdirSync(cacheDir, {
+                                    recursive: !0
+                                }), node_fs.writeFileSync(failedDepsJsonPath, JSON.stringify(cache, null, 2), 'utf-8');
+                            })(failedCache);
                             let externals1 = {};
                             bundledDeps.filter(Boolean).forEach((dep)=>{
                                 dep && (externals1[dep.name] = getExternalValue(dep.name), dep.assets.forEach((absPath)=>{
@@ -2273,7 +2268,7 @@ function createUnpack({ cwd = process.cwd(), config: userConfig, callerName = 'u
             let mode = watch ? 'development' : 'production';
             setNodeEnv(mode);
             let config = resolveConfig(mode);
-            console.log(colors.brand(`${callerName} v3.8.2${config.performance?.cache ? ' ϟ' : ''}`), colors.cyan(`building for ${mode}...`)), await unpackBuild(config);
+            console.log(colors.brand(`${callerName} v3.8.3${config.performance?.cache ? ' ϟ' : ''}`), colors.cyan(`building for ${mode}...`)), await unpackBuild(config);
         },
         dev: async ()=>{
             setUnpackStartTime(performance.now());

package/dist/typedCssModulesLoader.js

@@ -14,52 +14,7 @@ __webpack_require__.add({
         module.exports = __rspack_external__compiled_webpack_merge_index_js_efd91626;
     }
 });
-let CSS_MODULES_REGEX = /\.module\.\w+$/i, NODE_MODULES_REGEX = /[\\/]node_modules[\\/]/, isCI = !!process.env.CI, isTTY = !!process.stdout?.isTTY, noColor = !!process.env.NO_COLOR, forceColor = !!process.env.FORCE_COLOR, disableColor = !1;
-disableColor = !!noColor || !forceColor && (isCI || !isTTY);
-let COLOR_HEX = {
-    brand: '#B39AFF',
-    red: '#F38BA8',
-    green: '#A6E3A1',
-    yellow: '#F9E2AF',
-    blue: '#89B4FA',
-    magenta: '#EE90DB',
-    cyan: '#89DCEB',
-    gray: '#6C7086'
-}, COLOR_HEX_TO_OPEN = Object.fromEntries(Object.values(COLOR_HEX).map((hex)=>[
-        hex,
-        ((hex)=>{
-            let r, g, b, value = (hex || '').trim().replace(/^#/, '');
-            if (/^[0-9a-fA-F]{3}$/.test(value)) r = Number.parseInt(value[0] + value[0], 16), g = Number.parseInt(value[1] + value[1], 16), b = Number.parseInt(value[2] + value[2], 16);
-            else {
-                if (!/^[0-9a-fA-F]{6}$/.test(value)) return '';
-                r = Number.parseInt(value.slice(0, 2), 16), g = Number.parseInt(value.slice(2, 4), 16), b = Number.parseInt(value.slice(4, 6), 16);
-            }
-            return `\x1b[38;2;${r};${g};${b}m`;
-        })(hex)
-    ])), hexColor = (hex)=>{
-    if (disableColor) return (input)=>String(input);
-    let open = COLOR_HEX_TO_OPEN[hex];
-    return open ? (input)=>`${open}${input}\x1b[39m` : (input)=>String(input);
-}, ansi = (open, close)=>(input)=>disableColor ? String(input) : `${open}${input}${close}`;
-hexColor(COLOR_HEX.brand), hexColor(COLOR_HEX.red), hexColor(COLOR_HEX.green), hexColor(COLOR_HEX.yellow), hexColor(COLOR_HEX.blue), hexColor(COLOR_HEX.magenta), hexColor(COLOR_HEX.cyan), hexColor(COLOR_HEX.gray), ansi('\x1b[1m', '\x1b[22m'), ansi('\x1b[2m', '\x1b[22m'), Object.fromEntries(Object.entries({
-    31: COLOR_HEX.red,
-    32: COLOR_HEX.green,
-    33: COLOR_HEX.yellow,
-    34: COLOR_HEX.blue,
-    35: COLOR_HEX.magenta,
-    36: COLOR_HEX.cyan,
-    90: COLOR_HEX.gray,
-    91: COLOR_HEX.red,
-    92: COLOR_HEX.green,
-    93: COLOR_HEX.yellow,
-    94: COLOR_HEX.blue,
-    95: COLOR_HEX.magenta,
-    96: COLOR_HEX.cyan
-}).map(([code, hex])=>[
-        code,
-        COLOR_HEX_TO_OPEN[hex]
-    ]));
-let { merge: mergeConfig } = __webpack_require__("compiled/webpack-merge"), { default: launchEditor } = __webpack_require__("compiled/launch-editor"), enforceLFLineSeparators = (text)=>text ? text.replace(/\r\n/g, '\n') : text;
+let CSS_MODULES_REGEX = /\.module\.\w+$/i, NODE_MODULES_REGEX = /[\\/]node_modules[\\/]/, { merge: mergeConfig } = __webpack_require__("compiled/webpack-merge"), { default: launchEditor } = __webpack_require__("compiled/launch-editor"), enforceLFLineSeparators = (text)=>text ? text.replace(/\r\n/g, '\n') : text;
 export default function(content, ...rest) {
     var keys;
     let interfaceFields, bannerMessage, callback, dirName, baseName, filename, { failed, success } = (callback = this.async(), {

package/dist-types/bundler-config/detectCircular.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detectCircular.d.ts","sourceRoot":"","sources":["../../src/bundler-config/detectCircular.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAqEnE,wBAAgB,yBAAyB,CAAC,EACxC,MAAM,EACN,YAAY,GACb,EAAE;IACD,MAAM,EAAE,oBAAoB,CAAA;IAC5B,YAAY,EAAE,YAAY,CAAA;CAC3B,GAAG,oBAAoB,CAmDvB"}
+{"version":3,"file":"detectCircular.d.ts","sourceRoot":"","sources":["../../src/bundler-config/detectCircular.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAyBnE,wBAAgB,yBAAyB,CAAC,EACxC,MAAM,EACN,YAAY,GACb,EAAE;IACD,MAAM,EAAE,oBAAoB,CAAA;IAC5B,YAAY,EAAE,YAAY,CAAA;CAC3B,GAAG,oBAAoB,CAwCvB"}

package/dist-types/bundler-config/html.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../src/bundler-config/html.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAGnE,wBAAsB,eAAe,CAAC,EACpC,MAAM,EACN,YAAY,GACb,EAAE;IACD,MAAM,EAAE,oBAAoB,CAAA;IAC5B,YAAY,EAAE,YAAY,CAAA;CAC3B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA6BhC"}
+{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../src/bundler-config/html.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAGnE,wBAAsB,eAAe,CAAC,EACpC,MAAM,EACN,YAAY,GACb,EAAE;IACD,MAAM,EAAE,oBAAoB,CAAA;IAC5B,YAAY,EAAE,YAAY,CAAA;CAC3B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA2BhC"}

package/dist-types/bundler-config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bundler-config/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAiB,MAAM,WAAW,CAAA;AAwBlF,wBAAsB,gBAAgB,CACpC,oBAAoB,EAAE,YAAY,GACjC,OAAO,CAAC,oBAAoB,CAAC,CAgN/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bundler-config/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAiB,MAAM,WAAW,CAAA;AAwBlF,wBAAsB,gBAAgB,CACpC,oBAAoB,EAAE,YAAY,GACjC,OAAO,CAAC,oBAAoB,CAAC,CAkN/B"}

package/dist-types/plugins/browserLogs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browserLogs.d.ts","sourceRoot":"","sources":["../../src/plugins/browserLogs.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AA6B7C,eAAO,MAAM,iBAAiB,QAAO,YA+YpC,CAAA"}
+{"version":3,"file":"browserLogs.d.ts","sourceRoot":"","sources":["../../src/plugins/browserLogs.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AA6B7C,eAAO,MAAM,iBAAiB,QAAO,YAmZpC,CAAA"}

package/dist-types/plugins/prebundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prebundle.d.ts","sourceRoot":"","sources":["../../src/plugins/prebundle.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAwB,YAAY,EAAE,MAAM,WAAW,CAAA;AAkGnE,eAAO,MAAM,eAAe,QAAO,YAsYlC,CAAA"}
+{"version":3,"file":"prebundle.d.ts","sourceRoot":"","sources":["../../src/plugins/prebundle.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAwB,YAAY,EAAE,MAAM,WAAW,CAAA;AAkGnE,eAAO,MAAM,eAAe,QAAO,YA4YlC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unpackjs/core",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "description": "An Rspack-based build tool",
   "type": "module",
   "exports": {
@@ -11,6 +11,7 @@
     "./package.json": "./package.json"
   },
   "types": "./dist-types/index.d.ts",
+  "sideEffects": false,
   "keywords": [],
   "authors": [],
   "license": "MIT",