@dcloudio/uni-cli-shared 3.0.0-alpha-3021320211117002 → 3.0.0-alpha-3021320211117003

package/dist/hbx/log.d.ts

@@ -3,4 +3,6 @@ export declare const h5ServeFormatter: Formatter;
 export declare const removeInfoFormatter: Formatter;
 export declare const removeWarnFormatter: Formatter;
 export declare const FilenameFormatter: Formatter;
+export declare const VueFilenameFormatter: Formatter;
 export declare const HBuilderXFileFormatter: Formatter;
+export declare const HBuilderXVueFileFormatter: Formatter;

package/dist/hbx/log.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HBuilderXFileFormatter = exports.FilenameFormatter = exports.removeWarnFormatter = exports.removeInfoFormatter = exports.h5ServeFormatter = void 0;
+exports.HBuilderXVueFileFormatter = exports.HBuilderXFileFormatter = exports.VueFilenameFormatter = exports.FilenameFormatter = exports.removeWarnFormatter = exports.removeInfoFormatter = exports.h5ServeFormatter = void 0;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
 const SIGNAL_H5_LOCAL = ' > Local:';
@@ -65,6 +65,17 @@ exports.FilenameFormatter = {
         });
     },
 };
+const vueFileRE = /file:\s(.*)\?vue&type=(.*)/;
+exports.VueFilenameFormatter = {
+    test(msg) {
+        return vueFileRE.test(msg);
+    },
+    format(msg) {
+        return msg.replace(vueFileRE, (_, filename) => {
+            return `file: ${filename.split('?')[0]}`;
+        });
+    },
+};
 exports.HBuilderXFileFormatter = {
     test(msg) {
         return fileRE.test(msg);
@@ -83,3 +94,18 @@ exports.HBuilderXFileFormatter = {
         }));
     },
 };
+exports.HBuilderXVueFileFormatter = {
+    test(msg) {
+        return vueFileRE.test(msg);
+    },
+    format(msg) {
+        return (msg
+            // remove color
+            .replace(/\x1B[[(?);]{0,2}(;?\d)*./g, '')
+            .replace(vueFileRE, (_, filename) => {
+            return ('at ' +
+                (0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, filename)) +
+                ':1');
+        }));
+    },
+};

package/dist/logs/format.js

@@ -14,9 +14,11 @@ const initErrFormattersOnce = (0, uni_shared_1.once)(() => {
     }
     if ((0, env_1.runByHBuilderX)()) {
         errFormatters.push(log_1.HBuilderXFileFormatter);
+        errFormatters.push(log_1.HBuilderXVueFileFormatter);
     }
     else {
         errFormatters.push(log_1.FilenameFormatter);
+        errFormatters.push(log_1.VueFilenameFormatter);
     }
 });
 const initInfoFormattersOnce = (0, uni_shared_1.once)(() => {

package/dist/vite/plugins/vitejs/plugins/css.js

@@ -165,15 +165,16 @@ function cssPostPlugin(config, { chunkCssFilename, chunkCssCode, }) {
             }
             // resolve asset URL placeholders to their built file URLs and perform
             // minification if necessary
-            const processChunkCSS = async (css, { dirname, inlined, minify, }) => {
+            const processChunkCSS = async (css, { filename, inlined, minify, }) => {
                 // replace asset url references with resolved url.
                 css = css.replace(asset_1.assetUrlRE, (_, fileHash, postfix = '') => {
-                    return (0, utils_1.normalizePath)(path_1.default.relative(dirname, (0, asset_1.getAssetFilename)(fileHash, config) + postfix));
+                    return (0, utils_1.normalizePath)(path_1.default.relative(path_1.default.dirname(filename), (0, asset_1.getAssetFilename)(fileHash, config) + postfix));
                 });
                 if (minify && config.build.minify) {
                     css = await minifyCSS(css, config);
                 }
-                return css;
+                // 压缩后再处理，小程序平台会补充 @import nvue 代码，esbuild 的压缩会把 `@import "./nvue.css";` 的空格移除，变成 `@import"./nvue.css";` 在支付宝小程序中不支持
+                return chunkCssCode(filename, css);
             };
             const genCssCode = (fileName) => {
                 return [...cssChunks.get(fileName)]
@@ -182,8 +183,8 @@ function cssPostPlugin(config, { chunkCssFilename, chunkCssCode, }) {
             };
             for (const filename of cssChunks.keys()) {
                 const cssCode = genCssCode(filename);
-                let source = await processChunkCSS(chunkCssCode(filename, cssCode), {
-                    dirname: path_1.default.dirname(filename),
+                let source = await processChunkCSS(cssCode, {
+                    filename: filename,
                     inlined: false,
                     minify: true,
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3021320211117002",
+  "version": "3.0.0-alpha-3021320211117003",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,8 +20,8 @@
   "dependencies": {
     "@babel/parser": "^7.15.0",
     "@babel/types": "^7.15.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3021320211117002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3021320211117002",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3021320211117003",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3021320211117003",
     "@rollup/pluginutils": "^4.1.1",
     "@vue/compiler-core": "3.2.22",
     "@vue/compiler-dom": "3.2.22",