@dcloudio/uni-cli-shared 3.0.0-alpha-3021220211102001 → 3.0.0-alpha-3021220211105008

package/dist/constants.d.ts

@@ -3,6 +3,7 @@ export declare const EXTNAME_JS: string[];
 export declare const EXTNAME_VUE: string[];
 export declare const EXTNAME_VUE_RE: RegExp;
 export declare const EXTNAME_JS_RE: RegExp;
+export declare const ASSETS_INLINE_LIMIT: number;
 export declare const BINDING_COMPONENTS = "__BINDING_COMPONENTS__";
 export declare const PAGE_EXTNAME_APP: string[];
 export declare const PAGE_EXTNAME: string[];

package/dist/constants.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COMMON_EXCLUDE = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
+exports.COMMON_EXCLUDE = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.ASSETS_INLINE_LIMIT = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
 exports.PUBLIC_DIR = 'static';
 exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx'];
 exports.EXTNAME_VUE = ['.vue', '.nvue'];
 exports.EXTNAME_VUE_RE = /\.(vue|nvue)$/;
 exports.EXTNAME_JS_RE = /\.[jt]sx?$/;
+exports.ASSETS_INLINE_LIMIT = 40 * 1024;
 exports.BINDING_COMPONENTS = '__BINDING_COMPONENTS__';
 // APP 平台解析页面后缀的优先级
 exports.PAGE_EXTNAME_APP = ['.nvue', '.vue', '.tsx', '.jsx', '.js'];

package/dist/hbx/index.js

@@ -9,15 +9,8 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initModuleAlias = void 0;
-const path_1 = __importDefault(require("path"));
-process.env.UNI_HBUILDERX_PLUGINS =
-    process.env.UNI_HBUILDERX_PLUGINS ||
-        path_1.default.resolve(__dirname, '../../../../../../');
 __exportStar(require("./env"), exports);
 var alias_1 = require("./alias");
 Object.defineProperty(exports, "initModuleAlias", { enumerable: true, get: function () { return alias_1.initModuleAlias; } });

package/dist/hbx/log.d.ts

@@ -2,3 +2,5 @@ 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 HBuilderXFileFormatter: Formatter;

package/dist/hbx/log.js

@@ -1,6 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeWarnFormatter = exports.removeInfoFormatter = exports.h5ServeFormatter = void 0;
+exports.HBuilderXFileFormatter = 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:';
 const SIGNAL_H5_NETWORK = ' > Network:';
 const networkLogs = [];
@@ -40,7 +45,7 @@ exports.removeInfoFormatter = {
         return '';
     },
 };
-const REMOVED_WARN_MSGS = ['warnings when minifying css:'];
+const REMOVED_WARN_MSGS = [];
 exports.removeWarnFormatter = {
     test(msg) {
         return !!REMOVED_WARN_MSGS.find((m) => msg.includes(m));
@@ -49,3 +54,32 @@ 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.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);
+        }));
+    },
+};

package/dist/json/mp/pages.js

@@ -34,9 +34,13 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
             !fs_1.default.existsSync(filename + '.vue')) {
             nvuePages.push(pagePath);
         }
-        pageJsons[pagePath] = (0, shared_1.extend)({
-            component: true,
-        }, (0, utils_1.parseWindowOptions)(style, platform, windowOptionsMap));
+        const windowOptions = {};
+        if (platform === 'mp-baidu') {
+            // 仅百度小程序需要页面配置 component:true
+            // 快手小程序反而不能配置 component:true，故不能统一添加，目前硬编码处理
+            windowOptions.component = true;
+        }
+        pageJsons[pagePath] = (0, shared_1.extend)(windowOptions, (0, utils_1.parseWindowOptions)(style, platform, windowOptionsMap));
     }
     // pages
     (0, pages_1.validatePages)(pagesJson, jsonStr);

package/dist/json/mp/types.d.ts

@@ -18,7 +18,7 @@ interface ShareWindowOptions {
 declare type Style = 'v2' | string;
 declare type RestartStrategy = 'homePage' | 'homePageAndLatestPage' | string;
 export interface PageWindowOptions extends ShareWindowOptions {
-    component: true;
+    component?: true;
     disableScroll?: boolean;
     usingComponents?: UsingComponents;
     initialRenderingCache?: 'static' | string;

package/dist/logs/format.js

@@ -12,6 +12,12 @@ 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);
+    }
+    else {
+        errFormatters.push(log_1.FilenameFormatter);
+    }
 });
 const initInfoFormattersOnce = (0, uni_shared_1.once)(() => {
     if ((0, env_1.isInHBuilderX)()) {

package/dist/mp/template.d.ts

@@ -1,5 +1,11 @@
 import { EmittedAsset } from 'rollup';
 export interface MiniProgramCompilerOptions {
+    /**
+     * 需要延迟渲染的组件，通常是某个组件的某个事件会立刻触发，需要延迟到首次 render 之后，比如微信 editor 的 ready 事件，快手 switch 的 change
+     */
+    lazyElement?: {
+        [name: string]: string[];
+    };
     event?: {
         format(name: string, opts: {
             isCatch?: boolean;

package/dist/preprocess/context.js

@@ -14,6 +14,7 @@ const DEFAULT_KEYS = [
     'MP_ALIPAY',
     'MP_BAIDU',
     'MP_QQ',
+    'MP_LARK',
     'MP_TOUTIAO',
     'MP_WEIXIN',
     'MP_KUAISHOU',

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

@@ -3,6 +3,8 @@ export * from './transformPageHead';
 export * from './transformComponent';
 export * from './transformEvent';
 export * from './transformTag';
+export { ATTR_DATASET_EVENT_OPTS, createTransformOn, defaultMatch as matchTransformOn, } from './vOn';
+export { createTransformModel, defaultMatch as matchTransformModel, } from './vModel';
 export declare const transformMatchMedia: import("@vue/compiler-core").NodeTransform;
 export declare const transformTapToClick: import("@vue/compiler-core").NodeTransform;
 export declare const transformComponentLink: (node: import("@vue/compiler-core").RootNode | import("@vue/compiler-core").TemplateChildNode, context: import("@vue/compiler-core").TransformContext) => void;

package/dist/vue/transforms/index.js

@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformComponentLink = exports.transformTapToClick = exports.transformMatchMedia = void 0;
+exports.transformComponentLink = exports.transformTapToClick = exports.transformMatchMedia = exports.matchTransformModel = exports.createTransformModel = exports.matchTransformOn = exports.createTransformOn = exports.ATTR_DATASET_EVENT_OPTS = void 0;
 const transformTag_1 = require("./transformTag");
 const transformEvent_1 = require("./transformEvent");
 const transformComponent_1 = require("./transformComponent");
@@ -20,6 +20,13 @@ __exportStar(require("./transformPageHead"), exports);
 __exportStar(require("./transformComponent"), exports);
 __exportStar(require("./transformEvent"), exports);
 __exportStar(require("./transformTag"), exports);
+var vOn_1 = require("./vOn");
+Object.defineProperty(exports, "ATTR_DATASET_EVENT_OPTS", { enumerable: true, get: function () { return vOn_1.ATTR_DATASET_EVENT_OPTS; } });
+Object.defineProperty(exports, "createTransformOn", { enumerable: true, get: function () { return vOn_1.createTransformOn; } });
+Object.defineProperty(exports, "matchTransformOn", { enumerable: true, get: function () { return vOn_1.defaultMatch; } });
+var vModel_1 = require("./vModel");
+Object.defineProperty(exports, "createTransformModel", { enumerable: true, get: function () { return vModel_1.createTransformModel; } });
+Object.defineProperty(exports, "matchTransformModel", { enumerable: true, get: function () { return vModel_1.defaultMatch; } });
 exports.transformMatchMedia = (0, transformTag_1.createTransformTag)({
     'match-media': 'uni-match-media',
 });

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

@@ -0,0 +1,12 @@
+import { DirectiveTransform, ElementNode, TransformContext } from '@vue/compiler-core';
+export declare function defaultMatch(node: ElementNode, context: TransformContext): boolean;
+interface CreateTransformModelOptions {
+    match: typeof defaultMatch;
+}
+/**
+ * 百度、快手小程序的自定义组件，不支持动态事件绑定，故 v-model 也需要调整
+ * @param baseTransformModel
+ * @returns
+ */
+export declare function createTransformModel(baseTransformModel: DirectiveTransform, { match }?: CreateTransformModelOptions): DirectiveTransform;
+export {};

package/dist/vue/transforms/vModel.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTransformModel = exports.defaultMatch = void 0;
+const utils_1 = require("../utils");
+const vOn_1 = require("./vOn");
+function defaultMatch(node, context) {
+    return (0, utils_1.isUserComponent)(node, context);
+}
+exports.defaultMatch = defaultMatch;
+/**
+ * 百度、快手小程序的自定义组件，不支持动态事件绑定，故 v-model 也需要调整
+ * @param baseTransformModel
+ * @returns
+ */
+function createTransformModel(baseTransformModel, { match } = {
+    match: defaultMatch,
+}) {
+    return (dir, node, context, augmentor) => {
+        const res = baseTransformModel(dir, node, context, augmentor);
+        if (!match(node, context)) {
+            return res;
+        }
+        const props = res.props;
+        if (props[1]) {
+            // input,textarea 的 v-model 事件可能会被合并到已有的 input 中
+            const { arg, exp } = props[1];
+            (0, vOn_1.addEventOpts)(arg.content, exp, node);
+            props[1].exp = (0, vOn_1.createCustomEventExpr)();
+        }
+        return res;
+    };
+}
+exports.createTransformModel = createTransformModel;

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

@@ -0,0 +1,15 @@
+import { ExpressionNode, DirectiveTransform, ElementNode, TransformContext } from '@vue/compiler-core';
+export declare function defaultMatch(name: string, node: ElementNode, context: TransformContext): boolean;
+interface CreateTransformOnOptions {
+    match: typeof defaultMatch;
+}
+/**
+ * 百度、快手小程序的自定义组件，不支持动态事件绑定，故转换为静态事件 + dataset
+ * @param baseTransformOn
+ * @returns
+ */
+export declare function createTransformOn(baseTransformOn: DirectiveTransform, { match }?: CreateTransformOnOptions): DirectiveTransform;
+export declare function createCustomEventExpr(): import("@vue/compiler-core").SimpleExpressionNode;
+export declare function addEventOpts(event: string, value: ExpressionNode, node: ElementNode): void;
+export declare const ATTR_DATASET_EVENT_OPTS = "data-e-o";
+export {};

package/dist/vue/transforms/vOn.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ATTR_DATASET_EVENT_OPTS = exports.addEventOpts = exports.createCustomEventExpr = exports.createTransformOn = exports.defaultMatch = void 0;
+const compiler_core_1 = require("@vue/compiler-core");
+const utils_1 = require("../utils");
+function defaultMatch(name, node, context) {
+    return isCustomEvent(name) && (0, utils_1.isUserComponent)(node, context);
+}
+exports.defaultMatch = defaultMatch;
+/**
+ * 百度、快手小程序的自定义组件，不支持动态事件绑定，故转换为静态事件 + dataset
+ * @param baseTransformOn
+ * @returns
+ */
+function createTransformOn(baseTransformOn, { match } = {
+    match: defaultMatch,
+}) {
+    return (dir, node, context, augmentor) => {
+        const res = baseTransformOn(dir, node, context, augmentor);
+        const { name, arg, exp } = dir;
+        if (name !== 'on' || !arg || !exp || !(0, compiler_core_1.isStaticExp)(arg)) {
+            return res;
+        }
+        if (!match(arg.content, node, context)) {
+            return res;
+        }
+        const value = res.props[0].value;
+        res.props[0].value = createCustomEventExpr();
+        addEventOpts(arg.content, value, node);
+        return res;
+    };
+}
+exports.createTransformOn = createTransformOn;
+function createCustomEventExpr() {
+    return (0, compiler_core_1.createSimpleExpression)('__e', true);
+}
+exports.createCustomEventExpr = createCustomEventExpr;
+function addEventOpts(event, value, node) {
+    const attrName = node.tagType === 1 /* COMPONENT */
+        ? ATTR_DATA_EVENT_OPTS
+        : exports.ATTR_DATASET_EVENT_OPTS;
+    const opts = (0, compiler_core_1.findProp)(node, attrName, true);
+    if (!opts) {
+        node.props.push(createDataEventOptsProp(attrName, event, value));
+    }
+    else {
+        const children = opts.exp.children;
+        children.splice(children.length - 2, 0, createDataEventOptsProperty(event, value));
+    }
+}
+exports.addEventOpts = addEventOpts;
+const ATTR_DATA_EVENT_OPTS = 'eO';
+exports.ATTR_DATASET_EVENT_OPTS = 'data-e-o';
+function createDataEventOptsProperty(event, exp) {
+    return (0, compiler_core_1.createCompoundExpression)([`'${event}'`, ': ', exp, ',']);
+}
+function createDataEventOptsProp(name, event, exp) {
+    return {
+        type: 7 /* DIRECTIVE */,
+        name: 'bind',
+        loc: compiler_core_1.locStub,
+        modifiers: [],
+        arg: (0, compiler_core_1.createSimpleExpression)(name, true),
+        exp: (0, compiler_core_1.createCompoundExpression)([
+            '{',
+            createDataEventOptsProperty(event, exp),
+            '}',
+        ]),
+    };
+}
+const builtInEvents = [
+    '__l',
+    'tap',
+    'longtap',
+    'longpress',
+    'touchstart',
+    'touchmove',
+    'touchcancel',
+    'touchend',
+    'touchforcechange',
+    'transitionend',
+    'animationstart',
+    'animationiteration',
+    'animationend',
+];
+function isCustomEvent(name) {
+    return !builtInEvents.includes(name);
+}

package/dist/vue/utils.d.ts

@@ -1,9 +1,9 @@
-import { AttributeNode, ComponentNode, DirectiveNode, ElementNode, RootNode, TemplateChildNode, TransformContext } from '@vue/compiler-core';
+import { AttributeNode, ComponentNode, DirectiveNode, ElementNode, RootNode, ExpressionNode, TemplateChildNode, TransformContext } from '@vue/compiler-core';
 export declare const VUE_REF = "r";
 export declare const VUE_REF_IN_FOR = "r-i-f";
 export declare function isUserComponent(node: RootNode | TemplateChildNode, context: TransformContext): node is ComponentNode;
 export declare function createAttributeNode(name: string, content: string): AttributeNode;
 export declare function addStaticClass(node: ElementNode, clazz: string): string | number | undefined;
-export declare function createDirectiveNode(name: string, arg: string, exp: string): DirectiveNode;
+export declare function createDirectiveNode(name: string, arg: string, exp: string | ExpressionNode): DirectiveNode;
 export declare function createOnDirectiveNode(name: string, value: string): DirectiveNode;
-export declare function createBindDirectiveNode(name: string, value: string): DirectiveNode;
+export declare function createBindDirectiveNode(name: string, value: string | ExpressionNode): DirectiveNode;

package/dist/vue/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBindDirectiveNode = exports.createOnDirectiveNode = exports.createDirectiveNode = exports.addStaticClass = exports.createAttributeNode = exports.isUserComponent = exports.VUE_REF_IN_FOR = exports.VUE_REF = void 0;
+const shared_1 = require("@vue/shared");
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const compiler_core_1 = require("@vue/compiler-core");
 exports.VUE_REF = 'r';
@@ -51,7 +52,7 @@ function createDirectiveNode(name, arg, exp) {
         modifiers: [],
         loc: compiler_core_1.locStub,
         arg: (0, compiler_core_1.createSimpleExpression)(arg, true),
-        exp: (0, compiler_core_1.createSimpleExpression)(exp, false),
+        exp: (0, shared_1.isString)(exp) ? (0, compiler_core_1.createSimpleExpression)(exp, false) : exp,
     };
 }
 exports.createDirectiveNode = createDirectiveNode;

package/lib/nvue.css

@@ -1 +1,34 @@
-label,scroll-view,swiper-item,view{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}image,input,scroll-view,swiper,swiper-item,text,textarea,video,view{position:relative;border:0 solid #000;box-sizing:border-box}swiper-item{position:absolute}button{margin:0}
+label,
+scroll-view,
+swiper-item,
+view {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+
+image,
+input,
+scroll-view,
+swiper,
+swiper-item,
+text,
+textarea,
+video,
+view {
+  position: relative;
+  border: 0 solid #000;
+  box-sizing: border-box;
+}
+
+swiper-item {
+  position: absolute;
+}
+
+button {
+  margin: 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3021220211102001",
+  "version": "3.0.0-alpha-3021220211105008",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
     "@babel/parser": "^7.15.0",
     "@babel/types": "^7.15.0",
     "@rollup/pluginutils": "^4.1.1",
-    "@vue/compiler-core": "^3.2.20",
+    "@vue/compiler-core": "^3.2.21",
     "chokidar": "^3.5.2",
     "compare-versions": "^3.6.0",
     "debug": "^4.3.1",
@@ -37,7 +37,7 @@
     "tapable": "^2.2.0",
     "xregexp": "3.1.0"
   },
-  "gitHead": "7bcc3303c15141d377645a4995ce186f10ed6b78",
+  "gitHead": "3dee78eb8ec9e5767c6d04757d934b9f40338658",
   "devDependencies": {
     "@types/hash-sum": "^1.0.0"
   }