@dcloudio/uni-cli-shared 3.0.0-alpha-3050020220622002 → 3.0.0-alpha-3050020220623002

package/dist/constants.d.ts

@@ -25,3 +25,5 @@ export declare const H5_FRAMEWORK_STYLE_PATH = "@dcloudio/uni-h5/style/framework
 export declare const H5_COMPONENTS_STYLE_PATH = "@dcloudio/uni-h5/style/";
 export declare const BASE_COMPONENTS_STYLE_PATH = "@dcloudio/uni-components/style/";
 export declare const COMMON_EXCLUDE: RegExp[];
+export declare const KNOWN_ASSET_TYPES: string[];
+export declare const DEFAULT_ASSETS_RE: RegExp;

package/dist/constants.js

@@ -1,6 +1,6 @@
 "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.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_JS = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
+exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = 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.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_JS = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
 exports.PUBLIC_DIR = 'static';
 exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx'];
 exports.EXTNAME_TS = ['.ts', '.tsx'];
@@ -49,3 +49,30 @@ exports.COMMON_EXCLUDE = [
     /\/@dcloudio\/uni-h5\/style/,
     /\/@dcloudio\/uni-components\/style/,
 ];
+exports.KNOWN_ASSET_TYPES = [
+    // images
+    'png',
+    'jpe?g',
+    'gif',
+    'svg',
+    'ico',
+    'webp',
+    'avif',
+    // media
+    'mp4',
+    'webm',
+    'ogg',
+    'mp3',
+    'wav',
+    'flac',
+    'aac',
+    // fonts
+    'woff2?',
+    'eot',
+    'ttf',
+    'otf',
+    // other
+    'pdf',
+    'txt',
+];
+exports.DEFAULT_ASSETS_RE = new RegExp(`\\.(` + exports.KNOWN_ASSET_TYPES.join('|') + `)(\\?.*)?$`);

package/dist/fs.d.ts

@@ -1 +1 @@
-export declare function emptyDir(dir: string, skip?: string[]): void;
+export declare function emptyDir(dir: string): void;

package/dist/fs.js

@@ -1,25 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.emptyDir = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-function emptyDir(dir, skip) {
-    for (const file of fs_1.default.readdirSync(dir)) {
-        if (skip === null || skip === void 0 ? void 0 : skip.includes(file)) {
-            continue;
-        }
-        const abs = path_1.default.resolve(dir, file);
-        // baseline is Node 12 so can't use rmSync :(
-        if (fs_1.default.lstatSync(abs).isDirectory()) {
-            emptyDir(abs);
-            fs_1.default.rmdirSync(abs);
-        }
-        else {
-            fs_1.default.unlinkSync(abs);
-        }
-    }
+const fs_extra_1 = require("fs-extra");
+function emptyDir(dir) {
+    return (0, fs_extra_1.emptyDirSync)(dir);
 }
 exports.emptyDir = emptyDir;

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

@@ -5,7 +5,7 @@ export * from './transformEvent';
 export * from './transformTag';
 export { createAssetUrlTransformWithOptions } from './templateTransformAssetUrl';
 export { createSrcsetTransformWithOptions } from './templateTransformSrcset';
-export { ATTR_DATASET_EVENT_OPTS, createTransformOn, defaultMatch as matchTransformOn, } from './vOn';
+export { STRINGIFY_JSON, ATTR_DATASET_EVENT_OPTS, createTransformOn, defaultMatch as matchTransformOn, } from './vOn';
 export { createTransformModel, defaultMatch as matchTransformModel, } from './vModel';
 export declare const transformH5BuiltInComponents: import("@vue/compiler-core").NodeTransform;
 export declare const transformMatchMedia: import("@vue/compiler-core").NodeTransform;

package/dist/vue/transforms/index.js

@@ -14,7 +14,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 = exports.transformH5BuiltInComponents = exports.matchTransformModel = exports.createTransformModel = exports.matchTransformOn = exports.createTransformOn = exports.ATTR_DATASET_EVENT_OPTS = exports.createSrcsetTransformWithOptions = exports.createAssetUrlTransformWithOptions = void 0;
+exports.transformComponentLink = exports.transformTapToClick = exports.transformMatchMedia = exports.transformH5BuiltInComponents = exports.matchTransformModel = exports.createTransformModel = exports.matchTransformOn = exports.createTransformOn = exports.ATTR_DATASET_EVENT_OPTS = exports.STRINGIFY_JSON = exports.createSrcsetTransformWithOptions = exports.createAssetUrlTransformWithOptions = void 0;
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const transformTag_1 = require("./transformTag");
 const transformEvent_1 = require("./transformEvent");
@@ -30,6 +30,7 @@ Object.defineProperty(exports, "createAssetUrlTransformWithOptions", { enumerabl
 var templateTransformSrcset_1 = require("./templateTransformSrcset");
 Object.defineProperty(exports, "createSrcsetTransformWithOptions", { enumerable: true, get: function () { return templateTransformSrcset_1.createSrcsetTransformWithOptions; } });
 var vOn_1 = require("./vOn");
+Object.defineProperty(exports, "STRINGIFY_JSON", { enumerable: true, get: function () { return vOn_1.STRINGIFY_JSON; } });
 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; } });

package/dist/vue/transforms/vModel.js

@@ -24,7 +24,7 @@ function createTransformModel(baseTransformModel, { match } = {
         if (props[1]) {
             // input,textarea 的 v-model 事件可能会被合并到已有的 input 中
             const { arg, exp } = props[1];
-            (0, vOn_1.addEventOpts)(arg.content, exp, node);
+            (0, vOn_1.addEventOpts)(arg.content, exp, node, context);
             props[1].exp = (0, vOn_1.createCustomEventExpr)();
         }
         return res;

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

@@ -10,6 +10,7 @@ interface CreateTransformOnOptions {
  */
 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 function addEventOpts(event: string, value: ExpressionNode, node: ElementNode, context: TransformContext): void;
 export declare const ATTR_DATASET_EVENT_OPTS = "data-e-o";
+export declare const STRINGIFY_JSON: unique symbol;
 export {};

package/dist/vue/transforms/vOn.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ATTR_DATASET_EVENT_OPTS = exports.addEventOpts = exports.createCustomEventExpr = exports.createTransformOn = exports.defaultMatch = void 0;
+exports.STRINGIFY_JSON = exports.ATTR_DATASET_EVENT_OPTS = exports.addEventOpts = exports.createCustomEventExpr = exports.createTransformOn = exports.defaultMatch = void 0;
+const uni_shared_1 = require("@dcloudio/uni-shared");
 const compiler_core_1 = require("@vue/compiler-core");
 const utils_1 = require("../utils");
 function defaultMatch(name, node, context) {
@@ -26,7 +27,9 @@ function createTransformOn(baseTransformOn, { match } = {
         }
         const value = res.props[0].value;
         res.props[0].value = createCustomEventExpr();
-        addEventOpts(arg.content, value, node);
+        addEventOpts(node.tagType === 1 /* COMPONENT */
+            ? (0, uni_shared_1.customizeEvent)(arg.content)
+            : arg.content, value, node, context);
         return res;
     };
 }
@@ -35,13 +38,13 @@ function createCustomEventExpr() {
     return (0, compiler_core_1.createSimpleExpression)('__e', true);
 }
 exports.createCustomEventExpr = createCustomEventExpr;
-function addEventOpts(event, value, node) {
+function addEventOpts(event, value, node, context) {
     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));
+        node.props.push(createDataEventOptsProp(attrName, event, value, context));
     }
     else {
         const children = opts.exp.children;
@@ -54,18 +57,24 @@ 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) {
+exports.STRINGIFY_JSON = Symbol(`stringifyJson`);
+function createDataEventOptsProp(name, event, exp, context) {
+    const children = [];
+    const stringify = name === ATTR_DATA_EVENT_OPTS;
+    if (stringify) {
+        children.push(context.helperString(exports.STRINGIFY_JSON) + '(');
+    }
+    children.push('{', createDataEventOptsProperty(event, exp), '}');
+    if (stringify) {
+        children.push(')');
+    }
     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),
-            '}',
-        ]),
+        exp: (0, compiler_core_1.createCompoundExpression)(children),
     };
 }
 const builtInEvents = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3050020220622002",
+  "version": "3.0.0-alpha-3050020220623002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,8 +22,8 @@
     "@babel/core": "^7.17.9",
     "@babel/parser": "^7.17.9",
     "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3050020220622002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3050020220622002",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3050020220623002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3050020220623002",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",