@dcloudio/uni-cli-shared 3.0.0-alpha-3030820220114004 → 3.0.0-alpha-3031020220124001

package/dist/hbx/log.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.errorFormatter = exports.removeWarnFormatter = exports.removeInfoFormatter = exports.h5ServeFormatter = void 0;
 const path_1 = __importDefault(require("path"));
-const picocolors_1 = __importDefault(require("picocolors"));
+const chalk_1 = __importDefault(require("chalk"));
 const utils_1 = require("../utils");
 const SIGNAL_H5_LOCAL = ' > Local:';
 const SIGNAL_H5_NETWORK = ' > Network:';
@@ -66,20 +66,20 @@ exports.errorFormatter = {
 function buildErrorMessage(err, args = [], includeStack = true) {
     var _a, _b;
     if (err.plugin) {
-        args.push(`${picocolors_1.default.magenta('[plugin:' + err.plugin + ']')} ${picocolors_1.default.red(err.message)}`);
+        args.push(`${chalk_1.default.magenta('[plugin:' + err.plugin + ']')} ${chalk_1.default.red(err.message)}`);
     }
     else {
-        args.push(picocolors_1.default.red(err.message));
+        args.push(chalk_1.default.red(err.message));
     }
     if (err.id) {
-        args.push(`at ${picocolors_1.default.cyan((0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, err.id.split('?')[0])) +
+        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(picocolors_1.default.yellow(pad(err.frame)));
+        args.push(chalk_1.default.yellow(pad(err.frame)));
     }
     if (includeStack && err.stack) {
         args.push(pad(cleanStack(err.stack)));

package/dist/mp/event.js

@@ -1,12 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatMiniProgramEvent = void 0;
-const uni_shared_1 = require("@dcloudio/uni-shared");
 function formatMiniProgramEvent(eventName, { isCatch, isCapture, isComponent, }) {
-    if (isComponent) {
-        // 自定义组件的自定义事件需要格式化，因为 triggerEvent 时也会格式化
-        eventName = (0, uni_shared_1.customizeEvent)(eventName);
-    }
     if (!isComponent && eventName === 'click') {
         eventName = 'tap';
     }

package/dist/mp/usingComponents.js

@@ -130,22 +130,8 @@ function findBindingComponent(tag, bindingComponents) {
         return tag === componentTag || tag === camelName || tag === PascalName;
     });
 }
-function normalizeComponentId(id) {
-    // _unref(test) => test
-    if (id.includes('_unref(')) {
-        return id.replace('_unref(', '').replace(')', '');
-    }
-    // $setup["test"] => test
-    if (id.includes('$setup[')) {
-        return id.replace('$setup["', '').replace('"', '');
-    }
-    return id;
-}
 function parseBindingComponents(templateBindingComponents, scriptBindingComponents) {
-    const bindingComponents = {};
-    Object.keys(templateBindingComponents).forEach((id) => {
-        bindingComponents[normalizeComponentId(id)] = templateBindingComponents[id];
-    });
+    const bindingComponents = { ...templateBindingComponents };
     Object.keys(scriptBindingComponents).forEach((id) => {
         const { tag } = scriptBindingComponents[id];
         const name = findBindingComponent(tag, templateBindingComponents);

package/dist/vite/features.js

@@ -131,8 +131,8 @@ function initManifestFeature({ manifestJson, command, platform, }) {
     };
     if (command === 'build') {
         // TODO 需要预编译一遍？
-        // features.wxs = false
-        // features.longpress = false
+        features.wxs = false;
+        features.longpress = false;
     }
     if (manifestJson.h5 &&
         manifestJson.h5.router &&

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

@@ -26,7 +26,7 @@ exports.minifyCSS = exports.cssUrlRE = exports.cssPostPlugin = exports.cssPlugin
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
-const picocolors_1 = __importDefault(require("picocolors"));
+const chalk_1 = __importDefault(require("chalk"));
 const postcss_load_config_1 = __importDefault(require("postcss-load-config"));
 const pluginutils_1 = require("@rollup/pluginutils");
 const utils_1 = require("../utils");
@@ -396,7 +396,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
                     column: message.column,
                 })}`;
             }
-            config.logger.warn(picocolors_1.default.yellow(msg));
+            config.logger.warn(chalk_1.default.yellow(msg));
         }
     }
     return {
@@ -505,7 +505,7 @@ async function minifyCSS(css, config) {
     });
     if (warnings.length) {
         const msgs = await (0, esbuild_1.formatMessages)(warnings, { kind: 'warning' });
-        config.logger.warn(picocolors_1.default.yellow(`warnings when minifying css:\n${msgs.join('\n')}`));
+        config.logger.warn(chalk_1.default.yellow(`warnings when minifying css:\n${msgs.join('\n')}`));
     }
     return code;
 }

package/dist/vite/utils/url.d.ts

@@ -11,17 +11,6 @@ export declare function parseVueRequest(id: string): {
     query: VueQuery;
 };
 export declare const isImportRequest: (url: string) => boolean;
-/**
- * Prefix for resolved fs paths, since windows paths may not be valid as URLs.
- */
-export declare const FS_PREFIX = "/@fs/";
-/**
- * Prefix for resolved Ids that are not valid browser import specifiers
- */
-export declare const VALID_ID_PREFIX = "/@id/";
-export declare const CLIENT_PUBLIC_PATH = "/@vite/client";
-export declare const ENV_PUBLIC_PATH = "/@vite/env";
-export declare const isInternalRequest: (url: string) => boolean;
 export declare const queryRE: RegExp;
 export declare const hashRE: RegExp;
 export declare const cleanUrl: (url: string) => string;

package/dist/vite/utils/url.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.isJsFile = exports.cleanUrl = exports.hashRE = exports.queryRE = exports.isInternalRequest = exports.ENV_PUBLIC_PATH = exports.CLIENT_PUBLIC_PATH = exports.VALID_ID_PREFIX = exports.FS_PREFIX = exports.isImportRequest = exports.parseVueRequest = void 0;
+exports.isJsFile = exports.cleanUrl = exports.hashRE = exports.queryRE = exports.isImportRequest = exports.parseVueRequest = void 0;
 const path_1 = __importDefault(require("path"));
 const querystring_1 = __importDefault(require("querystring"));
 const constants_1 = require("../../constants");
@@ -28,28 +28,9 @@ function parseVueRequest(id) {
     };
 }
 exports.parseVueRequest = parseVueRequest;
-const importQueryRE = /(\?|&)import=?(?:&|$)/;
+const importQueryRE = /(\?|&)import(?:&|$)/;
 const isImportRequest = (url) => importQueryRE.test(url);
 exports.isImportRequest = isImportRequest;
-/**
- * Prefix for resolved fs paths, since windows paths may not be valid as URLs.
- */
-exports.FS_PREFIX = `/@fs/`;
-/**
- * Prefix for resolved Ids that are not valid browser import specifiers
- */
-exports.VALID_ID_PREFIX = `/@id/`;
-exports.CLIENT_PUBLIC_PATH = `/@vite/client`;
-exports.ENV_PUBLIC_PATH = `/@vite/env`;
-const internalPrefixes = [
-    exports.FS_PREFIX,
-    exports.VALID_ID_PREFIX,
-    exports.CLIENT_PUBLIC_PATH,
-    exports.ENV_PUBLIC_PATH,
-];
-const InternalPrefixRE = new RegExp(`^(?:${internalPrefixes.join('|')})`);
-const isInternalRequest = (url) => InternalPrefixRE.test(url);
-exports.isInternalRequest = isInternalRequest;
 exports.queryRE = /\?.*$/;
 exports.hashRE = /#.*$/;
 const cleanUrl = (url) => url.replace(exports.hashRE, '').replace(exports.queryRE, '');

package/dist/vue/transforms/index.js

@@ -37,12 +37,6 @@ exports.transformMatchMedia = (0, transformTag_1.createTransformTag)({
     'match-media': 'uni-match-media',
 });
 exports.transformTapToClick = (0, transformEvent_1.createTransformEvent)({
-    tap: (node) => {
-        // 地图组件有自己特定的 tap 事件
-        if (node.tag === 'map' || node.tag === 'v-uni-map') {
-            return 'tap';
-        }
-        return 'click';
-    },
+    tap: 'click',
 });
 exports.transformComponentLink = (0, transformComponent_1.createTransformComponentLink)(constants_1.COMPONENT_BIND_LINK);

package/dist/vue/transforms/transformEvent.d.ts

@@ -1,2 +1,2 @@
-import { DirectiveNode, ElementNode, NodeTransform } from '@vue/compiler-core';
-export declare function createTransformEvent(options: Record<string, string | ((node: ElementNode, dir: DirectiveNode) => string)>): NodeTransform;
+import { NodeTransform } from '@vue/compiler-core';
+export declare function createTransformEvent(options: Record<string, string>): NodeTransform;

package/dist/vue/transforms/transformEvent.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTransformEvent = void 0;
-const shared_1 = require("@vue/shared");
 const ast_1 = require("../../vite/utils/ast");
 function createTransformEvent(options) {
     return function transformEvent(node) {
@@ -14,12 +13,7 @@ function createTransformEvent(options) {
                 const eventType = options[arg.content];
                 if (eventType) {
                     // e.g tap => click
-                    if ((0, shared_1.isFunction)(eventType)) {
-                        arg.content = eventType(node, prop);
-                    }
-                    else {
-                        arg.content = eventType;
-                    }
+                    arg.content = eventType;
                 }
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3030820220114004",
+  "version": "3.0.0-alpha-3031020220124001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,15 +21,16 @@
     "@babel/core": "^7.16.5",
     "@babel/parser": "^7.16.4",
     "@babel/types": "^7.16.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3030820220114004",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3030820220114004",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3031020220124001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3031020220124001",
     "@rollup/pluginutils": "^4.1.2",
-    "@vue/compiler-core": "3.2.27",
-    "@vue/compiler-dom": "3.2.27",
-    "@vue/compiler-sfc": "3.2.27",
-    "@vue/server-renderer": "3.2.27",
-    "@vue/shared": "3.2.27",
+    "@vue/compiler-core": "3.2.26",
+    "@vue/compiler-dom": "3.2.26",
+    "@vue/compiler-sfc": "3.2.26",
+    "@vue/server-renderer": "3.2.26",
+    "@vue/shared": "3.2.26",
     "base64url": "^3.0.1",
+    "chalk": "^4.1.1",
     "chokidar": "^3.5.2",
     "compare-versions": "^3.6.0",
     "debug": "^4.3.2",
@@ -44,7 +45,6 @@
     "merge": "^2.1.1",
     "mime": "^3.0.0",
     "module-alias": "^2.2.2",
-    "picocolors": "^1.0.0",
     "postcss-import": "^14.0.2",
     "postcss-load-config": "^3.1.0",
     "postcss-modules": "^4.2.2",