@dcloudio/uni-cli-shared 3.0.0-alpha-3021320211109002 → 3.0.0-alpha-3021320211115001

package/dist/json/mp/jsonFile.js

@@ -1,18 +1,70 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addUsingComponents = exports.addComponentJson = exports.addPageJson = exports.jsonUsingComponentsCache = exports.jsonComponentsCache = exports.jsonPagesCache = void 0;
-exports.jsonPagesCache = new Map();
-exports.jsonComponentsCache = new Map();
-exports.jsonUsingComponentsCache = new Map();
-function addPageJson(filename, json) {
-    exports.jsonPagesCache.set(filename, json);
-}
-exports.addPageJson = addPageJson;
-function addComponentJson(filename, json) {
-    exports.jsonComponentsCache.set(filename, json);
-}
-exports.addComponentJson = addComponentJson;
-function addUsingComponents(filename, json) {
-    exports.jsonUsingComponentsCache.set(filename, json);
-}
-exports.addUsingComponents = addUsingComponents;
+exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.hasJsonFile = exports.isPageFile = void 0;
+const shared_1 = require("@vue/shared");
+const utils_1 = require("../../utils");
+let appJsonCache = {};
+const jsonFilesCache = new Map();
+const jsonPagesCache = new Map();
+const jsonComponentsCache = new Map();
+const jsonUsingComponentsCache = new Map();
+function isPageFile(file) {
+    return jsonPagesCache.has((0, utils_1.removeExt)(file));
+}
+exports.isPageFile = isPageFile;
+function hasJsonFile(filename) {
+    return (filename === 'app' ||
+        jsonPagesCache.has(filename) ||
+        jsonComponentsCache.has(filename));
+}
+exports.hasJsonFile = hasJsonFile;
+function normalizeJsonFilename(filename) {
+    return (0, utils_1.normalizeNodeModules)(filename);
+}
+exports.normalizeJsonFilename = normalizeJsonFilename;
+function findChangedJsonFiles() {
+    const changedJsonFiles = new Map();
+    function findChangedFile(filename, json) {
+        const newJson = (0, shared_1.extend)({}, json);
+        if (!newJson.usingComponents) {
+            newJson.usingComponents = {};
+        }
+        (0, shared_1.extend)(newJson.usingComponents, jsonUsingComponentsCache.get(filename));
+        const usingComponents = newJson.usingComponents;
+        // 格式化为相对路径，这样作为分包也可以直接运行
+        Object.keys(usingComponents).forEach((name) => {
+            usingComponents[name] = (0, utils_1.relativeFile)(filename, usingComponents[name].slice(1));
+        });
+        const jsonStr = JSON.stringify(newJson, null, 2);
+        if (jsonFilesCache.get(filename) !== jsonStr) {
+            changedJsonFiles.set(filename, jsonStr);
+            jsonFilesCache.set(filename, jsonStr);
+        }
+    }
+    function findChangedFiles(jsonsCache) {
+        for (const name of jsonsCache.keys()) {
+            findChangedFile(name, jsonsCache.get(name));
+        }
+    }
+    findChangedFile('app', appJsonCache);
+    findChangedFiles(jsonPagesCache);
+    findChangedFiles(jsonComponentsCache);
+    return changedJsonFiles;
+}
+exports.findChangedJsonFiles = findChangedJsonFiles;
+function addMiniProgramAppJson(appJson) {
+    appJsonCache = appJson;
+}
+exports.addMiniProgramAppJson = addMiniProgramAppJson;
+function addMiniProgramPageJson(filename, json) {
+    jsonPagesCache.set(filename, json);
+}
+exports.addMiniProgramPageJson = addMiniProgramPageJson;
+function addMiniProgramComponentJson(filename, json) {
+    jsonComponentsCache.set(filename, json);
+}
+exports.addMiniProgramComponentJson = addMiniProgramComponentJson;
+function addMiniProgramUsingComponents(filename, json) {
+    jsonUsingComponentsCache.set(filename, json);
+}
+exports.addMiniProgramUsingComponents = addMiniProgramUsingComponents;

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

@@ -11,5 +11,6 @@ interface ParsePagesJsonOptions {
 export declare function parseMiniProgramPagesJson(jsonStr: string, platform: UniApp.PLATFORM, options?: ParsePagesJsonOptions): {
     appJson: AppJson;
     pageJsons: Record<string, PageWindowOptions>;
+    nvuePages: string[];
 };
 export {};

package/dist/json/mp/pages.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMiniProgramPagesJson = void 0;
+const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
 const json_1 = require("../json");
@@ -14,20 +15,32 @@ function parseMiniProgramPagesJson(jsonStr, platform, options = { subpackages: f
     return parsePagesJson(jsonStr, platform, options);
 }
 exports.parseMiniProgramPagesJson = parseMiniProgramPagesJson;
-function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, subpackages, windowOptionsMap, } = {
+function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, subpackages, windowOptionsMap, tabBarOptionsMap, tabBarItemOptionsMap, } = {
     subpackages: false,
 }) {
     const appJson = {
         pages: [],
     };
     const pageJsons = {};
+    const nvuePages = [];
     // preprocess
     const pagesJson = (0, json_1.parseJson)(jsonStr, true);
     if (!pagesJson) {
         throw new Error(`[vite] Error: pages.json parse failed.\n`);
     }
     function addPageJson(pagePath, style) {
-        pageJsons[pagePath] = (0, utils_1.parseWindowOptions)(style, platform, windowOptionsMap);
+        const filename = path_1.default.join(process.env.UNI_INPUT_DIR, pagePath);
+        if (fs_1.default.existsSync(filename + '.nvue') &&
+            !fs_1.default.existsSync(filename + '.vue')) {
+            nvuePages.push(pagePath);
+        }
+        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);
@@ -65,7 +78,7 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
     }
     // tabBar
     if (pagesJson.tabBar) {
-        const tabBar = (0, utils_1.parseTabBar)(pagesJson.tabBar, platform);
+        const tabBar = (0, utils_1.parseTabBar)(pagesJson.tabBar, platform, tabBarOptionsMap, tabBarItemOptionsMap);
         if (tabBar) {
             appJson.tabBar = tabBar;
         }
@@ -89,5 +102,6 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
     return {
         appJson,
         pageJsons,
+        nvuePages,
     };
 }

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

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

package/dist/json/pages.js

@@ -10,7 +10,6 @@ const shared_1 = require("@vue/shared");
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const utils_1 = require("../utils");
 const json_1 = require("./json");
-const pages_1 = require("./app/pages");
 const parsePagesJson = (inputDir, platform, normalize = true) => {
     const jsonStr = fs_1.default.readFileSync(path_1.default.join(inputDir, 'pages.json'), 'utf8');
     if (normalize) {
@@ -55,9 +54,6 @@ function normalizePagesJson(jsonStr, platform, { subpackages, } = { subpackages:
     }
     // pageStyle
     normalizePages(pagesJson.pages, platform);
-    if (platform === 'app' && process.env.UNI_NVUE_COMPILER !== 'vue') {
-        (0, pages_1.initWebpackNVueEntry)(pagesJson.pages);
-    }
     // globalStyle
     pagesJson.globalStyle = normalizePageStyle(null, pagesJson.globalStyle, platform);
     // tabBar

package/dist/logs/console.js

@@ -1,14 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rewriteConsoleExpr = void 0;
-const compiler_sfc_1 = require("@vue/compiler-sfc");
+const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
 const F = '__f__';
 function rewriteConsoleExpr(filename, code) {
     filename = (0, utils_1.normalizePath)(filename);
     const re = /(console\.(log|info|debug|warn|error))\(([^)]+)\)/g;
     const locate = getLocator(code);
-    const s = new compiler_sfc_1.MagicString(code);
+    const s = new magic_string_1.default(code);
     let match;
     while ((match = re.exec(code))) {
         const [, expr, type] = match;

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/messages/index.d.ts

@@ -13,4 +13,7 @@ export declare const M: {
     'i18n.fallbackLocale.default': string;
     'i18n.fallbackLocale.missing': string;
     'easycom.conflict': string;
+    'mp.component.args[0]': string;
+    'mp.component.args[1]': string;
+    'mp.360.unsupported': string;
 };

package/dist/messages/index.js

@@ -16,4 +16,7 @@ exports.M = {
     'i18n.fallbackLocale.default': '当前应用未在 manifest.json 配置 fallbackLocale，默认使用：{locale}',
     'i18n.fallbackLocale.missing': '当前应用配置的 fallbackLocale 或 locale 为：{locale}，但 locale 目录缺少该语言文件',
     'easycom.conflict': 'easycom组件冲突：',
+    'mp.component.args[0]': '{0}的第一个参数必须为静态字符串',
+    'mp.component.args[1]': '{0}需要两个参数',
+    'mp.360.unsupported': 'vue3暂不支持360小程序',
 };

package/dist/mp/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const COMPONENT_ON_LINK = "onVI";
+export declare const COMPONENT_BIND_LINK = "__l";

package/dist/mp/constants.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.COMPONENT_BIND_LINK = exports.COMPONENT_ON_LINK = void 0;
+exports.COMPONENT_ON_LINK = 'onVI';
+exports.COMPONENT_BIND_LINK = '__l';

package/dist/mp/event.d.ts

@@ -1,4 +1,5 @@
-export declare function formatMiniProgramEvent(eventName: string, { isCatch, isCapture, }: {
+export declare function formatMiniProgramEvent(eventName: string, { isCatch, isCapture, isComponent, }: {
     isCatch?: boolean;
     isCapture?: boolean;
+    isComponent?: boolean;
 }): string;

package/dist/mp/event.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatMiniProgramEvent = void 0;
-function formatMiniProgramEvent(eventName, { isCatch, isCapture, }) {
+function formatMiniProgramEvent(eventName, { isCatch, isCapture, isComponent, }) {
+    if (!isComponent && eventName === 'click') {
+        eventName = 'tap';
+    }
     let eventType = 'bind';
     if (isCatch) {
         eventType = 'catch';
@@ -9,7 +12,19 @@ function formatMiniProgramEvent(eventName, { isCatch, isCapture, }) {
     if (isCapture) {
         return `capture-${eventType}:${eventName}`;
     }
-    // 原生组件不支持 bind:input 等写法，统一使用 bindinput
-    return `${eventType}${eventName}`;
+    // bind:foo-bar
+    return eventType + (isSimpleExpr(eventName) ? '' : ':') + eventName;
 }
 exports.formatMiniProgramEvent = formatMiniProgramEvent;
+function isSimpleExpr(name) {
+    if (name.startsWith('_')) {
+        return false;
+    }
+    if (name.indexOf('-') > -1) {
+        return false;
+    }
+    if (name.indexOf(':') > -1) {
+        return false;
+    }
+    return true;
+}

package/dist/mp/imports.d.ts

@@ -0,0 +1,5 @@
+import { PluginContext } from 'rollup';
+import { ImportSpecifier } from 'es-module-lexer';
+export declare function findVueComponentImports(source: string, importer: string, resolve: PluginContext['resolve']): Promise<(ImportSpecifier & {
+    i: string;
+})[]>;

package/dist/mp/imports.js

@@ -0,0 +1,63 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findVueComponentImports = void 0;
+const path_1 = __importDefault(require("path"));
+const es_module_lexer_1 = require("es-module-lexer");
+const shared_1 = require("@vue/shared");
+const types_1 = require("@babel/types");
+const parser_1 = require("@babel/parser");
+const constants_1 = require("../constants");
+async function findVueComponentImports(source, importer, resolve) {
+    await es_module_lexer_1.init;
+    let imports = [];
+    // strip UTF-8 BOM
+    if (source.charCodeAt(0) === 0xfeff) {
+        source = source.slice(1);
+    }
+    try {
+        imports = (0, es_module_lexer_1.parse)(source)[0];
+    }
+    catch (e) {
+        console.error(e);
+    }
+    if (!imports.length) {
+        return [];
+    }
+    const rewriteImports = [];
+    for (let i = 0; i < imports.length; i++) {
+        const importSpecifier = imports[i];
+        const { n } = importSpecifier;
+        if (!n) {
+            continue;
+        }
+        const extname = path_1.default.extname(n);
+        // 仅处理没有后缀，或后缀是.vue,.nvue的文件
+        if (extname && !constants_1.EXTNAME_VUE.includes(extname)) {
+            continue;
+        }
+        const res = await resolve(n, importer);
+        if (!res) {
+            continue;
+        }
+        if (constants_1.EXTNAME_VUE_RE.test(res.id)) {
+            const expr = (0, parser_1.parse)(source.slice(importSpecifier.ss, importSpecifier.se), {
+                sourceType: 'module',
+            }).program.body[0];
+            if ((0, types_1.isImportDeclaration)(expr) && expr.specifiers.length === 1) {
+                const importDefaultSpecifier = expr.specifiers[0];
+                if (!(0, types_1.isImportDefaultSpecifier)(importDefaultSpecifier)) {
+                    continue;
+                }
+                rewriteImports.push((0, shared_1.extend)(importSpecifier, {
+                    n: res.id,
+                    i: importDefaultSpecifier.local.name,
+                }));
+            }
+        }
+    }
+    return rewriteImports;
+}
+exports.findVueComponentImports = findVueComponentImports;

package/dist/mp/index.d.ts

@@ -1 +1,6 @@
+export * from './nvue';
 export * from './event';
+export * from './style';
+export * from './template';
+export * from './constants';
+export { transformVueComponentImports } from './transformImports';

package/dist/mp/index.js

@@ -10,4 +10,11 @@ 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.transformVueComponentImports = void 0;
+__exportStar(require("./nvue"), exports);
 __exportStar(require("./event"), exports);
+__exportStar(require("./style"), exports);
+__exportStar(require("./template"), exports);
+__exportStar(require("./constants"), exports);
+var transformImports_1 = require("./transformImports");
+Object.defineProperty(exports, "transformVueComponentImports", { enumerable: true, get: function () { return transformImports_1.transformVueComponentImports; } });

package/dist/mp/nvue.d.ts

@@ -0,0 +1 @@
+export declare function genNVueCssCode(manifestJson: Record<string, any>): string;

package/dist/mp/nvue.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genNVueCssCode = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const nvue_1 = require("../json/app/manifest/nvue");
+function genNVueCssCode(manifestJson) {
+    let nvueCssCode = fs_1.default.readFileSync(path_1.default.resolve(__dirname, '../../lib/nvue.css'), 'utf8');
+    const flexDirection = (0, nvue_1.getNVueFlexDirection)(manifestJson);
+    if (flexDirection !== 'column') {
+        nvueCssCode = nvueCssCode.replace('column', flexDirection);
+    }
+    return nvueCssCode;
+}
+exports.genNVueCssCode = genNVueCssCode;

package/dist/mp/style.d.ts

@@ -0,0 +1 @@
+export declare function transformScopedCss(cssCode: string): string;

package/dist/mp/style.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformScopedCss = void 0;
+function transformScopedCss(cssCode) {
+    return cssCode.replace(/\[(data-v-[a-f0-9]{8})\]/gi, (_, scopedId) => {
+        return '.' + scopedId;
+    });
+}
+exports.transformScopedCss = transformScopedCss;

package/dist/mp/template.d.ts

@@ -0,0 +1,55 @@
+import { EmittedAsset } from 'rollup';
+export interface MiniProgramCompilerOptions {
+    /**
+     * 需要延迟渲染的组件，通常是某个组件的某个事件会立刻触发，需要延迟到首次 render 之后，比如微信 editor 的 ready 事件，快手 switch 的 change
+     */
+    lazyElement?: {
+        [name: string]: string[];
+    };
+    event?: {
+        format(name: string, opts: {
+            isCatch?: boolean;
+            isCapture?: boolean;
+            isComponent?: boolean;
+        }): string;
+    };
+    class: {
+        /**
+         * 是否支持绑定 array 类型
+         */
+        array: boolean;
+    };
+    slot: {
+        /**
+         * 是否支持 $slots.default 访问
+         */
+        $slots?: boolean;
+        /**
+         * 是否支持后备内容
+         */
+        fallbackContent?: boolean;
+        /**
+         * 是否支持动态插槽名
+         */
+        dynamicSlotNames?: boolean;
+    };
+    filter?: {
+        lang: string;
+    };
+    directive: string;
+    emitFile?: (emittedFile: EmittedAsset) => string;
+}
+export interface MiniProgramFilterOptions {
+    id: string;
+    type: string;
+    name: string;
+    src?: string;
+    code: string;
+}
+declare type GenFilterFn = (filter: MiniProgramFilterOptions, filename: string) => string | void;
+export declare function findMiniProgramTemplateFiles(genFilter?: GenFilterFn): Record<string, string>;
+export declare function clearMiniProgramTemplateFiles(): void;
+export declare function addMiniProgramTemplateFile(filename: string, code: string): void;
+export declare function clearMiniProgramTemplateFilter(filename: string): void;
+export declare function addMiniProgramTemplateFilter(filename: string, filter: MiniProgramFilterOptions): void;
+export {};

package/dist/mp/template.js

@@ -0,0 +1,73 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addMiniProgramTemplateFilter = exports.clearMiniProgramTemplateFilter = exports.addMiniProgramTemplateFile = exports.clearMiniProgramTemplateFiles = exports.findMiniProgramTemplateFiles = void 0;
+const path_1 = __importDefault(require("path"));
+const uni_shared_1 = require("@dcloudio/uni-shared");
+const utils_1 = require("../utils");
+const templateFilesCache = new Map();
+const templateFiltersCache = new Map();
+function relativeFilterFilename(filename, filter) {
+    if (!filter.src) {
+        return '';
+    }
+    return ('./' +
+        (0, utils_1.normalizeMiniProgramFilename)(path_1.default.relative(path_1.default.dirname(filename), filter.src)));
+}
+function findMiniProgramTemplateFiles(genFilter) {
+    const files = Object.create(null);
+    templateFilesCache.forEach((code, filename) => {
+        if (!genFilter) {
+            files[filename] = code;
+        }
+        else {
+            const filters = getMiniProgramTemplateFilters(filename);
+            if (filters && filters.length) {
+                files[filename] =
+                    filters
+                        .map((filter) => genFilter(filter, relativeFilterFilename(filename, filter)))
+                        .join(uni_shared_1.LINEFEED) +
+                        uni_shared_1.LINEFEED +
+                        code;
+            }
+            else {
+                files[filename] = code;
+            }
+        }
+    });
+    return files;
+}
+exports.findMiniProgramTemplateFiles = findMiniProgramTemplateFiles;
+function clearMiniProgramTemplateFiles() {
+    templateFilesCache.clear();
+}
+exports.clearMiniProgramTemplateFiles = clearMiniProgramTemplateFiles;
+function addMiniProgramTemplateFile(filename, code) {
+    templateFilesCache.set(filename, code);
+}
+exports.addMiniProgramTemplateFile = addMiniProgramTemplateFile;
+function getMiniProgramTemplateFilters(filename) {
+    return templateFiltersCache.get(filename);
+}
+function clearMiniProgramTemplateFilter(filename) {
+    templateFiltersCache.delete(filename);
+}
+exports.clearMiniProgramTemplateFilter = clearMiniProgramTemplateFilter;
+function addMiniProgramTemplateFilter(filename, filter) {
+    const filters = templateFiltersCache.get(filename);
+    if (filters) {
+        const filterIndex = filters.findIndex((f) => f.id === filter.id);
+        if (filterIndex > -1) {
+            filters.splice(filterIndex, 1, filter);
+        }
+        else {
+            filters.push(filter);
+        }
+    }
+    else {
+        templateFiltersCache.set(filename, [filter]);
+    }
+}
+exports.addMiniProgramTemplateFilter = addMiniProgramTemplateFilter;

package/dist/mp/transformImports.d.ts

@@ -0,0 +1,14 @@
+import { ParserPlugin } from '@babel/parser';
+import { PluginContext } from 'rollup';
+interface TransformVueComponentImportsOptions {
+    root: string;
+    global?: boolean;
+    resolve: PluginContext['resolve'];
+    dynamicImport: (name: string, source: string) => string;
+    babelParserPlugins?: ParserPlugin[];
+}
+export declare function transformVueComponentImports(code: string, importer: string, { root, resolve, global, dynamicImport, babelParserPlugins, }: TransformVueComponentImportsOptions): Promise<{
+    code: string;
+    usingComponents: Record<string, string>;
+}>;
+export {};