@dcloudio/uni-cli-shared 3.0.0-alpha-3031220220222001 → 3.0.0-alpha-3031120220221001

package/dist/constants.d.ts

@@ -7,6 +7,12 @@ export declare const EXTNAME_VUE_RE: RegExp;
 export declare const EXTNAME_JS_RE: RegExp;
 export declare const EXTNAME_TS_RE: RegExp;
 export declare const extensions: string[];
+export declare const PAGES_JSON_JS = "pages-json-js";
+export declare const MANIFEST_JSON_JS = "manifest-json-js";
+export declare const JSON_JS_MAP: {
+    readonly 'pages.json': "pages-json-js";
+    readonly 'manifest.json': "manifest-json-js";
+};
 export declare const ASSETS_INLINE_LIMIT: number;
 export declare const APP_SERVICE_FILENAME = "app-service.js";
 export declare const BINDING_COMPONENTS = "__BINDING_COMPONENTS__";

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_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = 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.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_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'];
@@ -17,6 +17,12 @@ exports.extensions = [
     '.tsx',
     '.json',
 ].concat(exports.EXTNAME_VUE);
+exports.PAGES_JSON_JS = 'pages-json-js';
+exports.MANIFEST_JSON_JS = 'manifest-json-js';
+exports.JSON_JS_MAP = {
+    'pages.json': exports.PAGES_JSON_JS,
+    'manifest.json': exports.MANIFEST_JSON_JS,
+};
 exports.ASSETS_INLINE_LIMIT = 40 * 1024;
 exports.APP_SERVICE_FILENAME = 'app-service.js';
 exports.BINDING_COMPONENTS = '__BINDING_COMPONENTS__';

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 chalk_1 = __importDefault(require("chalk"));
+const picocolors_1 = __importDefault(require("picocolors"));
 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(`${chalk_1.default.magenta('[plugin:' + err.plugin + ']')} ${chalk_1.default.red(err.message)}`);
+        args.push(`${picocolors_1.default.magenta('[plugin:' + err.plugin + ']')} ${picocolors_1.default.red(err.message)}`);
     }
     else {
-        args.push(chalk_1.default.red(err.message));
+        args.push(picocolors_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])) +
+        args.push(`at ${picocolors_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)));
+        args.push(picocolors_1.default.yellow(pad(err.frame)));
     }
     if (includeStack && err.stack) {
         args.push(pad(cleanStack(err.stack)));

package/dist/json/manifest.d.ts

@@ -19,6 +19,8 @@ export declare function normalizeNetworkTimeout(networkTimeout?: Partial<typeof
     downloadFile: number;
 };
 export declare function getUniStatistics(inputDir: string, platform: UniApp.PLATFORM): any;
+export declare function getUniPush(inputDir: string, platform: UniApp.PLATFORM): any;
+export declare function isUniPushOffline(inputDir: string): boolean;
 export declare function getRouterOptions(manifestJson: Record<string, any>): {
     mode?: 'history' | 'hash';
     base?: string;

package/dist/json/manifest.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.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
+exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.getUniPush = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -47,6 +47,18 @@ function getUniStatistics(inputDir, platform) {
     return (0, shared_1.extend)({}, manifest.uniStatistics, manifest[platform] && manifest[platform].uniStatistics);
 }
 exports.getUniStatistics = getUniStatistics;
+function getUniPush(inputDir, platform) {
+    const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
+    return (0, shared_1.extend)({}, manifest.unipush, manifest[platform] && manifest[platform].unipush);
+}
+exports.getUniPush = getUniPush;
+function isUniPushOffline(inputDir) {
+    var _a, _b, _c, _d, _e;
+    const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
+    return (((_e = (_d = (_c = (_b = (_a = manifest === null || manifest === void 0 ? void 0 : manifest['app-plus']) === null || _a === void 0 ? void 0 : _a.distribute) === null || _b === void 0 ? void 0 : _b.sdkConfigs) === null || _c === void 0 ? void 0 : _c.push) === null || _d === void 0 ? void 0 : _d.unipush) === null || _e === void 0 ? void 0 : _e.enable) ===
+        true);
+}
+exports.isUniPushOffline = isUniPushOffline;
 function getRouterOptions(manifestJson) {
     var _a;
     return (0, shared_1.extend)({}, (_a = manifestJson.h5) === null || _a === void 0 ? void 0 : _a.router);

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

@@ -16,8 +16,12 @@ export declare function isMiniProgramUsingComponent(name: string, options: {
     inputDir: string;
     componentsDir?: string;
 }): boolean;
+interface MiniProgramComponents {
+    [name: string]: 'plugin' | 'component';
+}
 export declare function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }: {
     filename: string;
     inputDir: string;
     componentsDir?: string;
-}): string[];
+}): MiniProgramComponents;
+export {};

package/dist/json/mp/jsonFile.js

@@ -60,12 +60,15 @@ function findChangedJsonFiles() {
         (0, shared_1.extend)(newJson.usingComponents, jsonUsingComponentsCache.get(filename));
         const usingComponents = newJson.usingComponents;
         // 格式化为相对路径，这样作为分包也可以直接运行
-        Object.keys(usingComponents).forEach((name) => {
-            const componentFilename = usingComponents[name];
-            if (componentFilename.startsWith('/')) {
-                usingComponents[name] = (0, resolve_1.relativeFile)(filename, componentFilename.slice(1));
-            }
-        });
+        // app.json mp-baidu 在 win 不支持相对路径。所有平台改用绝对路径
+        if (filename !== 'app') {
+            Object.keys(usingComponents).forEach((name) => {
+                const componentFilename = usingComponents[name];
+                if (componentFilename.startsWith('/')) {
+                    usingComponents[name] = (0, resolve_1.relativeFile)(filename, componentFilename.slice(1));
+                }
+            });
+        }
         const jsonStr = JSON.stringify(newJson, null, 2);
         if (jsonFilesCache.get(filename) !== jsonStr) {
             changedJsonFiles.set(filename, jsonStr);
@@ -100,28 +103,31 @@ function addMiniProgramUsingComponents(filename, json) {
 }
 exports.addMiniProgramUsingComponents = addMiniProgramUsingComponents;
 function isMiniProgramUsingComponent(name, options) {
-    return findMiniProgramUsingComponents(options).includes(name);
+    return !!findMiniProgramUsingComponents(options)[name];
 }
 exports.isMiniProgramUsingComponent = isMiniProgramUsingComponent;
 function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }) {
-    if (!componentsDir) {
-        return [];
-    }
     const globalUsingComponents = appJsonCache && appJsonCache.usingComponents;
-    const miniProgramComponents = [];
+    const miniProgramComponents = {};
     if (globalUsingComponents) {
-        miniProgramComponents.push(...findMiniProgramUsingComponent(globalUsingComponents, componentsDir));
+        (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(globalUsingComponents, componentsDir));
     }
     const jsonFile = findJsonFile((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(filename, inputDir)));
     if (jsonFile === null || jsonFile === void 0 ? void 0 : jsonFile.usingComponents) {
-        miniProgramComponents.push(...findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir));
+        (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir));
     }
     return miniProgramComponents;
 }
 exports.findMiniProgramUsingComponents = findMiniProgramUsingComponents;
 function findMiniProgramUsingComponent(usingComponents, componentsDir) {
-    return Object.keys(usingComponents).filter((name) => {
+    return Object.keys(usingComponents).reduce((res, name) => {
         const path = usingComponents[name];
-        return path.includes(componentsDir + '/');
-    });
+        if (componentsDir && path.includes(componentsDir + '/')) {
+            res[name] = 'component';
+        }
+        else if (path.includes('plugin://')) {
+            res[name] = 'plugin';
+        }
+        return res;
+    }, {});
 }

package/dist/json/pages.js

@@ -169,6 +169,12 @@ function normalizePageStyle(pagePath, pageStyle, platform) {
                 pageStyle.enablePullDownRefresh = true;
                 pageStyle.pullToRefresh = normalizePullToRefresh(pageStyle);
             }
+            if (platform === 'app') {
+                pageStyle.disableSwipeBack === true
+                    ? (pageStyle.popGesture = 'none')
+                    : delete pageStyle.popGesture;
+                delete pageStyle.disableSwipeBack;
+            }
         }
         pageStyle.isNVue = isNVue;
         removePlatformStyle(pageStyle);

package/dist/mp/event.js

@@ -1,7 +1,12 @@
 "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/index.d.ts

@@ -1,4 +1,5 @@
 export * from './ast';
+export * from './wxs';
 export * from './nvue';
 export * from './event';
 export * from './style';

package/dist/mp/index.js

@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateMiniProgramComponentExternalClasses = exports.findMiniProgramComponentExternalClasses = exports.parseExternalClasses = exports.hasExternalClasses = exports.updateMiniProgramComponentsByTemplateFilename = exports.updateMiniProgramComponentsByScriptFilename = exports.updateMiniProgramComponentsByMainFilename = exports.updateMiniProgramGlobalComponents = exports.transformDynamicImports = exports.parseTemplateDescriptor = exports.parseScriptDescriptor = exports.parseMainDescriptor = exports.copyMiniProgramPluginJson = exports.HTML_TO_MINI_PROGRAM_TAGS = void 0;
 __exportStar(require("./ast"), exports);
+__exportStar(require("./wxs"), exports);
 __exportStar(require("./nvue"), exports);
 __exportStar(require("./event"), exports);
 __exportStar(require("./style"), exports);

package/dist/mp/usingComponents.js

@@ -130,8 +130,22 @@ 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 = { ...templateBindingComponents };
+    const bindingComponents = {};
+    Object.keys(templateBindingComponents).forEach((id) => {
+        bindingComponents[normalizeComponentId(id)] = templateBindingComponents[id];
+    });
     Object.keys(scriptBindingComponents).forEach((id) => {
         const { tag } = scriptBindingComponents[id];
         const name = findBindingComponent(tag, templateBindingComponents);

package/dist/mp/wxs.d.ts

@@ -0,0 +1,2 @@
+export declare function parseWxsCallMethods(code: string): string[];
+export declare function genWxsCallMethodsCode(code: string): string;

package/dist/mp/wxs.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genWxsCallMethodsCode = exports.parseWxsCallMethods = void 0;
+const types_1 = require("@babel/types");
+const estree_walker_1 = require("estree-walker");
+const ast_1 = require("./ast");
+function parseWxsCallMethods(code) {
+    if (!code.includes('callMethod')) {
+        return [];
+    }
+    const ast = (0, ast_1.parseProgram)(code, '', {});
+    const wxsCallMethods = new Set();
+    estree_walker_1.walk(ast, {
+        enter(child) {
+            if (!(0, types_1.isCallExpression)(child)) {
+                return;
+            }
+            const { callee } = child;
+            // .callMethod
+            if (!(0, types_1.isMemberExpression)(callee) ||
+                !(0, types_1.isIdentifier)(callee.property) ||
+                callee.property.name !== 'callMethod') {
+                return;
+            }
+            // .callMethod('test',...)
+            const args = child.arguments;
+            if (!args.length) {
+                return;
+            }
+            const [name] = args;
+            if (!(0, types_1.isStringLiteral)(name)) {
+                return;
+            }
+            wxsCallMethods.add(name.value);
+        },
+    });
+    return [...wxsCallMethods];
+}
+exports.parseWxsCallMethods = parseWxsCallMethods;
+function genWxsCallMethodsCode(code) {
+    const wxsCallMethods = parseWxsCallMethods(code);
+    if (!wxsCallMethods.length) {
+        return `export default {}`;
+    }
+    return `export default (Component) => {
+  if(!Component.wxsCallMethods){
+    Component.wxsCallMethods = []
+  }
+  Component.wxsCallMethods.push(${wxsCallMethods
+        .map((m) => `'${m}'`)
+        .join(', ')})
+}
+`;
+}
+exports.genWxsCallMethodsCode = genWxsCallMethodsCode;

package/dist/postcss/index.d.ts

@@ -1,4 +1,10 @@
+import type { Plugin } from 'postcss';
+import type { Options } from 'autoprefixer';
 import uniPostcssScopedPlugin from './plugins/stylePluginScoped';
-import uniPostcssPlugin from './plugins/uniapp';
+import uniPostcssPlugin, { UniAppCssProcessorOptions } from './plugins/uniapp';
 export { uniPostcssPlugin };
 export { uniPostcssScopedPlugin };
+export declare function initPostcssPlugin({ uniApp, autoprefixer, }?: {
+    uniApp?: UniAppCssProcessorOptions;
+    autoprefixer?: Options | false;
+}): Plugin[];

package/dist/postcss/index.js

@@ -3,8 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uniPostcssScopedPlugin = exports.uniPostcssPlugin = void 0;
+exports.initPostcssPlugin = exports.uniPostcssScopedPlugin = exports.uniPostcssPlugin = void 0;
 const stylePluginScoped_1 = __importDefault(require("./plugins/stylePluginScoped"));
 exports.uniPostcssScopedPlugin = stylePluginScoped_1.default;
 const uniapp_1 = __importDefault(require("./plugins/uniapp"));
 exports.uniPostcssPlugin = uniapp_1.default;
+function initPostcssPlugin({ uniApp, autoprefixer, } = {}) {
+    const plugins = [(0, uniapp_1.default)(uniApp)];
+    // nvue 不需要 autoprefixer
+    if (autoprefixer !== false) {
+        plugins.push(require('autoprefixer')(autoprefixer));
+    }
+    return plugins;
+}
+exports.initPostcssPlugin = initPostcssPlugin;

package/dist/postcss/plugins/uniapp.d.ts

@@ -1,6 +1,5 @@
 import type { Plugin } from 'postcss';
-interface UniAppCssProcessorOptions {
-    page?: string;
+export interface UniAppCssProcessorOptions {
     unit?: string;
     unitRatio?: number;
     unitPrecision?: number;

package/dist/postcss/plugins/uniapp.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const shared_1 = require("@vue/shared");
 const postcss_selector_parser_1 = __importDefault(require("postcss-selector-parser"));
 const uni_shared_1 = require("@dcloudio/uni-shared");
-const manifest_1 = require("../../json/manifest");
 const defaultUniAppCssProcessorOptions = (0, shared_1.extend)({}, uni_shared_1.defaultRpx2Unit);
 const BG_PROPS = [
     'background',
@@ -88,11 +87,7 @@ const transforms = {
 };
 const uniapp = (opts) => {
     const platform = process.env.UNI_PLATFORM;
-    if (!opts) {
-        const inputDir = process.env.UNI_INPUT_DIR;
-        opts = (0, shared_1.extend)((0, manifest_1.parseRpx2UnitOnce)(inputDir, platform));
-    }
-    const { unit, unitRatio, unitPrecision } = (0, shared_1.extend)({}, defaultUniAppCssProcessorOptions, opts || {});
+    const { unit, unitRatio, unitPrecision } = (0, shared_1.extend)({}, defaultUniAppCssProcessorOptions, opts);
     const rpx2unit = (0, uni_shared_1.createRpx2Unit)(unit, unitRatio, unitPrecision);
     return {
         postcssPlugin: 'uni-app',

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/jsonJs.js

@@ -6,11 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineUniManifestJsonPlugin = exports.defineUniPagesJsonPlugin = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const constants_1 = require("../../constants");
 const utils_1 = require("../../utils");
 exports.defineUniPagesJsonPlugin = createDefineJsonJsPlugin('pages.json');
 exports.defineUniManifestJsonPlugin = createDefineJsonJsPlugin('manifest.json');
 function createDefineJsonJsPlugin(name) {
-    const JSON_JS = name + '.js';
+    const JSON_JS = constants_1.JSON_JS_MAP[name];
     return function (createVitePlugin) {
         const opts = {
             resolvedConfig: {},
@@ -23,18 +24,20 @@ function createDefineJsonJsPlugin(name) {
         const origResolveId = plugin.resolveId;
         const origConfigResolved = plugin.configResolved;
         let jsonPath = '';
+        let jsonJsPath = '';
         plugin.resolveId = function (id, importer, options) {
             const res = origResolveId && origResolveId.call(this, id, importer, options);
             if (res) {
                 return res;
             }
             if (id.endsWith(JSON_JS)) {
-                return jsonPath + '.js';
+                return jsonJsPath;
             }
         };
         plugin.configResolved = function (config) {
             opts.resolvedConfig = config;
             jsonPath = (0, utils_1.normalizePath)(path_1.default.join(process.env.UNI_INPUT_DIR, name));
+            jsonJsPath = (0, utils_1.normalizePath)(path_1.default.join(process.env.UNI_INPUT_DIR, JSON_JS));
             return origConfigResolved && origConfigResolved(config);
         };
         plugin.load = function (id, ssr) {

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

@@ -26,13 +26,14 @@ 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 chalk_1 = __importDefault(require("chalk"));
+const picocolors_1 = __importDefault(require("picocolors"));
 const postcss_load_config_1 = __importDefault(require("postcss-load-config"));
 const pluginutils_1 = require("@rollup/pluginutils");
 const utils_1 = require("../utils");
 const asset_1 = require("./asset");
 const esbuild_1 = require("esbuild");
 const preprocess_1 = require("../../../../preprocess");
+const constants_1 = require("../../../../constants");
 const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`;
 exports.cssLangRE = new RegExp(cssLangs);
 const cssModuleRE = new RegExp(`\\.module${cssLangs}`);
@@ -114,7 +115,7 @@ function findCssModuleIds(moduleId, cssModuleIds, seen) {
     const moduleInfo = this.getModuleInfo(moduleId);
     if (moduleInfo) {
         moduleInfo.importedIds.forEach((id) => {
-            if (id.includes('pages.json.js')) {
+            if (id.includes(constants_1.PAGES_JSON_JS)) {
                 // 查询main.js时，需要忽略pages.json.js，否则会把所有页面样式加进来
                 return;
             }
@@ -396,7 +397,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
                     column: message.column,
                 })}`;
             }
-            config.logger.warn(chalk_1.default.yellow(msg));
+            config.logger.warn(picocolors_1.default.yellow(msg));
         }
     }
     return {
@@ -505,7 +506,7 @@ async function minifyCSS(css, config) {
     });
     if (warnings.length) {
         const msgs = await (0, esbuild_1.formatMessages)(warnings, { kind: 'warning' });
-        config.logger.warn(chalk_1.default.yellow(`warnings when minifying css:\n${msgs.join('\n')}`));
+        config.logger.warn(picocolors_1.default.yellow(`warnings when minifying css:\n${msgs.join('\n')}`));
     }
     return code;
 }

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

@@ -11,6 +11,17 @@ 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.isImportRequest = exports.parseVueRequest = void 0;
+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;
 const path_1 = __importDefault(require("path"));
 const querystring_1 = __importDefault(require("querystring"));
 const constants_1 = require("../../constants");
@@ -28,9 +28,28 @@ 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/vite/utils/utils.d.ts

@@ -1,2 +1,4 @@
-import type { ResolvedConfig } from 'vite';
+import type { ConfigEnv, ResolvedConfig, UserConfig } from 'vite';
 export declare function withSourcemap(config: ResolvedConfig): boolean;
+export declare function isInHybridNVue(config: UserConfig | ResolvedConfig): boolean;
+export declare function isSsr(command: ConfigEnv['command'], config: UserConfig | ResolvedConfig): boolean;

package/dist/vite/utils/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSourcemap = void 0;
+exports.isSsr = exports.isInHybridNVue = exports.withSourcemap = void 0;
 function withSourcemap(config) {
     if (config.command === 'serve') {
         return true;
@@ -8,3 +8,17 @@ function withSourcemap(config) {
     return !!config.build.sourcemap;
 }
 exports.withSourcemap = withSourcemap;
+function isInHybridNVue(config) {
+    return config.nvue && process.env.UNI_RENDERER !== 'native';
+}
+exports.isInHybridNVue = isInHybridNVue;
+function isSsr(command, config) {
+    if (command === 'serve') {
+        return !!(config.server && config.server.middlewareMode);
+    }
+    if (command === 'build') {
+        return !!(config.build && config.build.ssr);
+    }
+    return false;
+}
+exports.isSsr = isSsr;

package/dist/vue/transforms/index.js

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

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

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

package/dist/vue/transforms/transformEvent.js

@@ -1,6 +1,7 @@
 "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) {
@@ -13,7 +14,12 @@ function createTransformEvent(options) {
                 const eventType = options[arg.content];
                 if (eventType) {
                     // e.g tap => click
-                    arg.content = eventType;
+                    if ((0, shared_1.isFunction)(eventType)) {
+                        arg.content = eventType(node, prop);
+                    }
+                    else {
+                        arg.content = eventType;
+                    }
                 }
             }
         });

package/dist/watcher.d.ts

@@ -18,8 +18,8 @@ export declare class FileWatcher {
     watch(watchOptions: WatchOptions & {
         cwd: string;
     }, onReady?: (watcher: FSWatcher) => void, onChange?: () => void): FSWatcher;
-    add(paths: string | ReadonlyArray<string>): void;
-    unwatch(paths: string | ReadonlyArray<string>): void;
+    add(paths: string | ReadonlyArray<string>): FSWatcher;
+    unwatch(paths: string | ReadonlyArray<string>): FSWatcher;
     close(): Promise<void>;
     copy(from: string): Promise<void | undefined>;
     remove(from: string): Promise<void | undefined>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3031220220222001",
+  "version": "3.0.0-alpha-3031120220221001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,26 +18,26 @@
     "url": "https://github.com/dcloudio/uni-app/issues"
   },
   "dependencies": {
-    "@babel/core": "^7.16.5",
+    "@babel/core": "^7.17.2",
     "@babel/parser": "^7.16.4",
-    "@babel/types": "^7.16.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3031220220222001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3031220220222001",
+    "@babel/types": "^7.16.8",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3031120220221001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3031120220221001",
     "@rollup/pluginutils": "^4.1.2",
-    "@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",
+    "@vue/compiler-core": "3.2.31",
+    "@vue/compiler-dom": "3.2.31",
+    "@vue/compiler-sfc": "3.2.31",
+    "@vue/server-renderer": "3.2.31",
+    "@vue/shared": "3.2.31",
+    "autoprefixer": "^10.4.2",
     "base64url": "^3.0.1",
-    "chalk": "^4.1.1",
-    "chokidar": "^3.5.2",
+    "chokidar": "^3.5.3",
     "compare-versions": "^3.6.0",
-    "debug": "^4.3.2",
+    "debug": "^4.3.3",
     "es-module-lexer": "^0.9.3",
-    "esbuild": "^0.13.12",
+    "esbuild": "^0.14.14",
     "estree-walker": "^2.0.2",
-    "fast-glob": "^3.2.7",
+    "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.0",
     "hash-sum": "^2.0.0",
     "jsonc-parser": "^3.0.0",
@@ -45,11 +45,12 @@
     "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",
+    "postcss-load-config": "^3.1.1",
+    "postcss-modules": "^4.3.0",
     "postcss-selector-parser": "^6.0.6",
-    "resolve": "^1.20.0",
+    "resolve": "^1.22.0",
     "tapable": "^2.2.0",
     "xregexp": "3.1.0"
   },
@@ -62,6 +63,6 @@
     "@types/mime": "^2.0.3",
     "@types/module-alias": "^2.0.1",
     "@types/stylus": "^0.48.36",
-    "postcss": "^8.4.5"
+    "postcss": "^8.4.6"
   }
 }