@dcloudio/uni-cli-shared 3.0.0-alpha-3030020211208002 → 3.0.0-alpha-3030120211210003

package/dist/hbx/log.d.ts

@@ -1,8 +1,6 @@
+import { LogErrorOptions } from 'vite';
 import { Formatter } from '../logs/format';
 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;
+export declare const errorFormatter: Formatter<LogErrorOptions>;

package/dist/hbx/log.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HBuilderXVueFileFormatter = exports.HBuilderXFileFormatter = exports.VueFilenameFormatter = exports.FilenameFormatter = exports.removeWarnFormatter = exports.removeInfoFormatter = exports.h5ServeFormatter = void 0;
+exports.errorFormatter = exports.removeWarnFormatter = exports.removeInfoFormatter = exports.h5ServeFormatter = void 0;
 const path_1 = __importDefault(require("path"));
+const chalk_1 = __importDefault(require("chalk"));
 const utils_1 = require("../utils");
 const SIGNAL_H5_LOCAL = ' > Local:';
 const SIGNAL_H5_NETWORK = ' > Network:';
@@ -54,58 +55,45 @@ exports.removeWarnFormatter = {
         return '';
     },
 };
-const fileRE = /file:\s(.*):(\d+):(\d+)/;
-exports.FilenameFormatter = {
-    test(msg) {
-        return fileRE.test(msg);
-    },
-    format(msg) {
-        return msg.replace(fileRE, (_, filename, line, column) => {
-            return `file: ${filename.split('?')[0]}:${line}:${column}`;
-        });
+exports.errorFormatter = {
+    test(_, opts) {
+        return !!(opts && opts.error);
     },
-};
-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);
-    },
-    format(msg) {
-        return (msg
-            // remove color
-            .replace(/\x1B[[(?);]{0,2}(;?\d)*./g, '')
-            .replace(fileRE, (_, filename, line, column) => {
-            return ('at ' +
-                (0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, filename.split('?')[0])) +
-                ':' +
-                line +
-                ':' +
-                column);
-        }));
-    },
-};
-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');
-        }));
+    format(_, opts) {
+        return buildErrorMessage(opts.error, [], false);
     },
 };
+function buildErrorMessage(err, args = [], includeStack = true) {
+    var _a, _b;
+    if (err.plugin) {
+        args.push(`${chalk_1.default.magenta('[plugin:' + err.plugin + ']')} ${chalk_1.default.red(err.message)}`);
+    }
+    else {
+        args.push(chalk_1.default.red(err.message));
+    }
+    if (err.id) {
+        args.push(`at ${chalk_1.default.cyan((0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, err.id.split('?')[0])) +
+            ':' +
+            (((_a = err.loc) === null || _a === void 0 ? void 0 : _a.line) || 1) +
+            ':' +
+            (((_b = err.loc) === null || _b === void 0 ? void 0 : _b.column) || 0))}`);
+    }
+    if (err.frame) {
+        args.push(chalk_1.default.yellow(pad(err.frame)));
+    }
+    if (includeStack && err.stack) {
+        args.push(pad(cleanStack(err.stack)));
+    }
+    return args.join('\n');
+}
+function cleanStack(stack) {
+    return stack
+        .split(/\n/g)
+        .filter((l) => /^\s*at/.test(l))
+        .join('\n');
+}
+const splitRE = /\r?\n/;
+function pad(source, n = 2) {
+    const lines = source.split(splitRE);
+    return lines.map((l) => ` `.repeat(n) + l).join(`\n`);
+}

package/dist/logs/format.d.ts

@@ -1,7 +1,8 @@
-export interface Formatter {
-    test: (msg: string) => boolean;
-    format: (msg: string) => string;
+import { LogErrorOptions, LogOptions } from 'vite';
+export interface Formatter<T extends LogOptions = LogOptions> {
+    test: (msg: string, options?: T) => boolean;
+    format: (msg: string, options?: T) => string;
 }
-export declare function formatErrMsg(msg: string): string;
-export declare function formatInfoMsg(msg: string): string;
-export declare function formatWarnMsg(msg: string): string;
+export declare function formatErrMsg(msg: string, options?: LogErrorOptions): string;
+export declare function formatInfoMsg(msg: string, options?: LogOptions): string;
+export declare function formatWarnMsg(msg: string, options?: LogOptions): string;

package/dist/logs/format.js

@@ -12,14 +12,7 @@ const initErrFormattersOnce = (0, uni_shared_1.once)(() => {
     if ((0, env_1.isInHBuilderX)()) {
         errFormatters.push(alias_1.moduleAliasFormatter);
     }
-    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);
-    }
+    errFormatters.push(log_1.errorFormatter);
 });
 const initInfoFormattersOnce = (0, uni_shared_1.once)(() => {
     if ((0, env_1.isInHBuilderX)()) {
@@ -35,29 +28,29 @@ const initInfoFormattersOnce = (0, uni_shared_1.once)(() => {
 const initWarnFormattersOnce = (0, uni_shared_1.once)(() => {
     warnFormatters.push(log_1.removeWarnFormatter);
 });
-function formatErrMsg(msg) {
+function formatErrMsg(msg, options) {
     initErrFormattersOnce();
-    const formatter = errFormatters.find(({ test }) => test(msg));
+    const formatter = errFormatters.find(({ test }) => test(msg, options));
     if (formatter) {
-        return formatter.format(msg);
+        return formatter.format(msg, options);
     }
     return msg;
 }
 exports.formatErrMsg = formatErrMsg;
-function formatInfoMsg(msg) {
+function formatInfoMsg(msg, options) {
     initInfoFormattersOnce();
-    const formatter = infoFormatters.find(({ test }) => test(msg));
+    const formatter = infoFormatters.find(({ test }) => test(msg, options));
     if (formatter) {
-        return formatter.format(msg);
+        return formatter.format(msg, options);
     }
     return msg;
 }
 exports.formatInfoMsg = formatInfoMsg;
-function formatWarnMsg(msg) {
+function formatWarnMsg(msg, options) {
     initWarnFormattersOnce();
-    const formatter = warnFormatters.find(({ test }) => test(msg));
+    const formatter = warnFormatters.find(({ test }) => test(msg, options));
     if (formatter) {
-        return formatter.format(msg);
+        return formatter.format(msg, options);
     }
     return msg;
 }

package/dist/mp/transformImports.js

@@ -9,10 +9,10 @@ const types_1 = require("@babel/types");
 const shared_1 = require("@vue/shared");
 const estree_walker_1 = require("estree-walker");
 const magic_string_1 = __importDefault(require("magic-string"));
+const uni_shared_1 = require("@dcloudio/uni-shared");
 const messages_1 = require("../messages");
 const constants_1 = require("../constants");
 const utils_1 = require("../utils");
-const uni_shared_1 = require("@dcloudio/uni-shared");
 async function transformVueComponentImports(code, importer, { root, resolve, global, dynamicImport, babelParserPlugins, }) {
     if (!global && !code.includes(constants_1.BINDING_COMPONENTS)) {
         return { code, usingComponents: {} };
@@ -46,6 +46,7 @@ exports.transformVueComponentImports = transformVueComponentImports;
  * @returns
  */
 function findBindingComponents(ast) {
+    const mapping = findUnpluginComponents(ast);
     for (const node of ast) {
         if (!(0, types_1.isVariableDeclaration)(node)) {
             continue;
@@ -55,10 +56,10 @@ function findBindingComponents(ast) {
             declarator.id.name === constants_1.BINDING_COMPONENTS) {
             const bindingComponents = JSON.parse(declarator.init.value);
             return Object.keys(bindingComponents).reduce((bindings, tag) => {
-                const binding = bindingComponents[tag];
-                bindings[binding.name] = {
+                const { name, type } = bindingComponents[tag];
+                bindings[mapping[name] || name] = {
                     tag,
-                    type: binding.type,
+                    type: type,
                 };
                 return bindings;
             }, {});
@@ -66,6 +67,33 @@ function findBindingComponents(ast) {
     }
     return {};
 }
+function findUnpluginComponents(ast) {
+    const res = Object.create(null);
+    // if(!Array){}
+    const ifStatement = ast.find((statement) => (0, types_1.isIfStatement)(statement) &&
+        (0, types_1.isUnaryExpression)(statement.test) &&
+        statement.test.operator === '!' &&
+        (0, types_1.isIdentifier)(statement.test.argument) &&
+        statement.test.argument.name === 'Array');
+    if (!ifStatement) {
+        return res;
+    }
+    if (!(0, types_1.isBlockStatement)(ifStatement.consequent)) {
+        return res;
+    }
+    for (const node of ifStatement.consequent.body) {
+        if (!(0, types_1.isVariableDeclaration)(node)) {
+            continue;
+        }
+        const { id, init } = node.declarations[0];
+        if ((0, types_1.isIdentifier)(id) &&
+            (0, types_1.isIdentifier)(init) &&
+            init.name.includes('unplugin_components')) {
+            res[id.name] = init.name;
+        }
+    }
+    return res;
+}
 /**
  * 查找全局组件定义：app.component('component-a',{})
  * @param ast

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

@@ -167,7 +167,7 @@ function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false, canI
         const contentHash = getAssetHash(content);
         const { search, hash } = (0, url_1.parse)(id);
         const postfix = (search || '') + (hash || '');
-        const fileName = (0, utils_1.normalizePath)(path_1.default.posix.relative(process.env.UNI_INPUT_DIR, file));
+        const fileName = path_1.default.posix.relative((0, utils_1.normalizePath)(process.env.UNI_INPUT_DIR), file);
         if (!map.has(contentHash)) {
             map.set(contentHash, fileName);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3030020211208002",
+  "version": "3.0.0-alpha-3030120211210003",
   "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-3030020211208002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3030020211208002",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3030120211210003",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3030120211210003",
     "@rollup/pluginutils": "^4.1.1",
     "@vue/compiler-core": "3.2.24",
     "@vue/compiler-dom": "3.2.24",