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

package/dist/constants.d.ts

@@ -3,6 +3,8 @@ 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[];
 export declare const H5_API_STYLE_PATH = "@dcloudio/uni-h5/style/api/";

package/dist/constants.js

@@ -1,11 +1,13 @@
 "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.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/easycom.d.ts

@@ -12,7 +12,10 @@ interface EasycomMatcher {
 interface EasycomCustom {
     [key: string]: string;
 }
-export declare function initEasycoms(inputDir: string, platform: UniApp.PLATFORM): {
+export declare function initEasycoms(inputDir: string, { dirs, platform }: {
+    dirs: string[];
+    platform: UniApp.PLATFORM;
+}): {
     options: EasycomOption;
     filter: (id: unknown) => boolean;
     refresh(): void;
@@ -20,4 +23,7 @@ export declare function initEasycoms(inputDir: string, platform: UniApp.PLATFORM
 };
 export declare const initEasycomsOnce: typeof initEasycoms;
 export declare function matchEasycom(tag: string): string | false | undefined;
+export declare function addImportDeclaration(importDeclarations: string[], local: string, source: string, imported?: string): string;
+export declare function genResolveEasycomCode(importDeclarations: string[], code: string, name: string): string;
+export declare const UNI_EASYCOM_EXCLUDE: RegExp[];
 export {};

package/dist/easycom.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.matchEasycom = exports.initEasycomsOnce = exports.initEasycoms = void 0;
+exports.UNI_EASYCOM_EXCLUDE = exports.genResolveEasycomCode = exports.addImportDeclaration = exports.matchEasycom = exports.initEasycomsOnce = exports.initEasycoms = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
@@ -13,7 +13,7 @@ const uni_shared_1 = require("@dcloudio/uni-shared");
 const utils_1 = require("./utils");
 const pages_1 = require("./json/pages");
 const messages_1 = require("./messages");
-const debugEasycom = (0, debug_1.default)('uni:easycom');
+const debugEasycom = (0, debug_1.default)('vite:uni:easycom');
 const easycoms = [];
 const easycomsCache = new Map();
 const easycomsInvalidCache = new Set();
@@ -23,8 +23,7 @@ function clearEasycom() {
     easycomsCache.clear();
     easycomsInvalidCache.clear();
 }
-function initEasycoms(inputDir, platform) {
-    const buildInComponentsDir = path_1.default.resolve(require.resolve('@dcloudio/uni-components'), '../lib');
+function initEasycoms(inputDir, { dirs, platform }) {
     const componentsDir = path_1.default.resolve(inputDir, 'components');
     const uniModulesDir = path_1.default.resolve(inputDir, 'uni_modules');
     const initEasycomOptions = (pagesJson) => {
@@ -32,9 +31,9 @@ function initEasycoms(inputDir, platform) {
         const { easycom } = pagesJson || (0, pages_1.parsePagesJson)(inputDir, platform, false);
         const easycomOptions = {
             dirs: easycom && easycom.autoscan === false
-                ? [buildInComponentsDir] // 禁止自动扫描
+                ? [...dirs] // 禁止自动扫描
                 : [
-                    buildInComponentsDir,
+                    ...dirs,
                     componentsDir,
                     ...initUniModulesEasycomDirs(uniModulesDir),
                 ],
@@ -178,3 +177,23 @@ function initAutoScanEasycoms(dirs, rootDir, extensions) {
 function normalizeCompath(compath, rootDir) {
     return (0, utils_1.normalizePath)(path_1.default.relative(rootDir, compath));
 }
+function addImportDeclaration(importDeclarations, local, source, imported) {
+    importDeclarations.push(createImportDeclaration(local, source, imported));
+    return local;
+}
+exports.addImportDeclaration = addImportDeclaration;
+function createImportDeclaration(local, source, imported) {
+    if (imported) {
+        return `import {${imported} as ${local}} from '${source}';`;
+    }
+    return `import ${local} from '${source}';`;
+}
+const RESOLVE_EASYCOM_IMPORT_CODE = `import { resolveDynamicComponent as __resolveDynamicComponent } from 'vue';import { resolveEasycom } from '@dcloudio/uni-app';`;
+function genResolveEasycomCode(importDeclarations, code, name) {
+    if (!importDeclarations.includes(RESOLVE_EASYCOM_IMPORT_CODE)) {
+        importDeclarations.push(RESOLVE_EASYCOM_IMPORT_CODE);
+    }
+    return `resolveEasycom(${code.replace('_resolveComponent', '__resolveDynamicComponent')}, ${name})`;
+}
+exports.genResolveEasycomCode = genResolveEasycomCode;
+exports.UNI_EASYCOM_EXCLUDE = [/App.vue$/, /@dcloudio\/uni-h5/];

package/dist/env/define.d.ts

@@ -1,8 +1,10 @@
 export declare function initDefine(stringifyBoolean?: boolean): {
     'process.env.NODE_ENV': string;
+    'process.env.UNI_DEBUG': string | boolean;
     'process.env.UNI_APP_ID': string;
     'process.env.UNI_APP_NAME': string;
     'process.env.UNI_PLATFORM': string;
+    'process.env.UNI_COMPILER_VERSION': string;
     'process.env.RUN_BY_HBUILDERX': string | boolean;
     'process.env.UNI_AUTOMATOR_WS_ENDPOINT': string;
     'process.env.UNI_CLOUD_PROVIDER': string;

package/dist/env/define.js

@@ -6,11 +6,16 @@ const json_1 = require("../json");
 function initDefine(stringifyBoolean = false) {
     const manifestJson = (0, json_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
     const isRunByHBuilderX = (0, env_1.runByHBuilderX)();
+    const isDebug = !!manifestJson.debug;
     return {
         'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+        'process.env.UNI_DEBUG': stringifyBoolean
+            ? JSON.stringify(isDebug)
+            : isDebug,
         'process.env.UNI_APP_ID': JSON.stringify(manifestJson.appid || ''),
         'process.env.UNI_APP_NAME': JSON.stringify(manifestJson.name || ''),
         'process.env.UNI_PLATFORM': JSON.stringify(process.env.UNI_PLATFORM),
+        'process.env.UNI_COMPILER_VERSION': JSON.stringify(process.env.UNI_COMPILER_VERSION),
         'process.env.RUN_BY_HBUILDERX': stringifyBoolean
             ? JSON.stringify(isRunByHBuilderX)
             : isRunByHBuilderX,

package/dist/exports.d.ts

@@ -0,0 +1 @@
+export { default as chokidar } from 'chokidar';

package/dist/exports.js

@@ -0,0 +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.chokidar = void 0;
+var chokidar_1 = require("chokidar");
+Object.defineProperty(exports, "chokidar", { enumerable: true, get: function () { return __importDefault(chokidar_1).default; } });

package/dist/filter.d.ts

@@ -0,0 +1,16 @@
+export declare function isWxs(id: string): boolean;
+export declare function isSjs(id: string): boolean;
+export declare function isRenderjs(id: string): boolean;
+declare type FilterType = 'wxs' | 'renderjs' | 'sjs';
+export declare function parseRenderjs(id: string): {
+    type: FilterType;
+    name: string;
+    filename: string;
+} | {
+    readonly type: "";
+    readonly name: "";
+    readonly filename: "";
+};
+export declare function missingModuleName(type: FilterType, code: string): string;
+export declare function parseFilterNames(lang: string, code: string): string[];
+export {};

package/dist/filter.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseFilterNames = exports.missingModuleName = exports.parseRenderjs = exports.isRenderjs = exports.isSjs = exports.isWxs = void 0;
+const url_1 = require("./vite/utils/url");
+const WXS_RE = /vue&type=wxs/;
+function isWxs(id) {
+    return WXS_RE.test(id);
+}
+exports.isWxs = isWxs;
+const SJS_RE = /vue&type=sjs/;
+function isSjs(id) {
+    return SJS_RE.test(id);
+}
+exports.isSjs = isSjs;
+const RENDERJS_RE = /vue&type=renderjs/;
+function isRenderjs(id) {
+    return RENDERJS_RE.test(id);
+}
+exports.isRenderjs = isRenderjs;
+function parseRenderjs(id) {
+    if (isWxs(id) || isRenderjs(id) || isSjs(id)) {
+        const { query, filename } = (0, url_1.parseVueRequest)(id);
+        return {
+            type: query.type,
+            name: query.name,
+            filename,
+        };
+    }
+    return {
+        type: '',
+        name: '',
+        filename: '',
+    };
+}
+exports.parseRenderjs = parseRenderjs;
+function missingModuleName(type, code) {
+    return `<script module="missing module name" lang="${type}">
+${code}
+</script>`;
+}
+exports.missingModuleName = missingModuleName;
+const moduleRE = /module=["'](.*?)["']/;
+function parseFilterNames(lang, code) {
+    const names = [];
+    const scriptTags = code.match(/<script\b[^>]*>/gm);
+    if (!scriptTags) {
+        return names;
+    }
+    const langRE = new RegExp(`lang=["']${lang}["']`);
+    scriptTags.forEach((scriptTag) => {
+        if (langRE.test(scriptTag)) {
+            const matches = scriptTag.match(moduleRE);
+            if (matches) {
+                names.push(matches[1]);
+            }
+        }
+    });
+    return names;
+}
+exports.parseFilterNames = parseFilterNames;

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

@@ -2,8 +2,9 @@ export * from './fs';
 export * from './mp';
 export * from './env';
 export * from './hbx';
-export * from './logs';
 export * from './ssr';
+export * from './vue';
+export * from './logs';
 export * from './i18n';
 export * from './deps';
 export * from './json';
@@ -13,7 +14,8 @@ export * from './easycom';
 export * from './constants';
 export * from './preprocess';
 export * from './postcss';
-export * from './renderjs';
+export * from './filter';
 export * from './esbuild';
 export { M } from './messages';
+export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/index.js

@@ -15,8 +15,9 @@ __exportStar(require("./fs"), exports);
 __exportStar(require("./mp"), exports);
 __exportStar(require("./env"), exports);
 __exportStar(require("./hbx"), exports);
-__exportStar(require("./logs"), exports);
 __exportStar(require("./ssr"), exports);
+__exportStar(require("./vue"), exports);
+__exportStar(require("./logs"), exports);
 __exportStar(require("./i18n"), exports);
 __exportStar(require("./deps"), exports);
 __exportStar(require("./json"), exports);
@@ -26,9 +27,10 @@ __exportStar(require("./easycom"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./preprocess"), exports);
 __exportStar(require("./postcss"), exports);
-__exportStar(require("./renderjs"), exports);
+__exportStar(require("./filter"), exports);
 __exportStar(require("./esbuild"), exports);
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
+__exportStar(require("./exports"), exports);
 var checkUpdate_1 = require("./checkUpdate");
 Object.defineProperty(exports, "checkUpdate", { enumerable: true, get: function () { return checkUpdate_1.checkUpdate; } });

package/dist/json/app/manifest/nvue.d.ts

@@ -1,4 +1,4 @@
 export declare function initNVue(manifestJson: Record<string, any>, pagesJson: UniApp.PagesJson): void;
-export declare function getNVueCompiler(manifestJson: Record<string, any>): "weex" | "vue" | "uni-app";
-export declare function getNVueStyleCompiler(manifestJson: Record<string, any>): "weex" | "uni-app";
-export declare function getNVueFlexDirection(manifestJson: Record<string, any>): "column" | "column-reverse" | "row" | "row-reverse";
+export declare function getNVueCompiler(manifestJson: Record<string, any>): "uni-app" | "weex" | "vue";
+export declare function getNVueStyleCompiler(manifestJson: Record<string, any>): "uni-app" | "weex";
+export declare function getNVueFlexDirection(manifestJson: Record<string, any>): "row" | "row-reverse" | "column" | "column-reverse";

package/dist/json/app/pages/index.d.ts

@@ -1,3 +1,2 @@
-export * from './nvue';
 export declare function normalizeAppPagesJson(pagesJson: Record<string, any>): string;
 export declare function normalizeAppConfigService(pagesJson: UniApp.PagesJson, manifestJson: Record<string, any>): string;

package/dist/json/app/pages/index.js

@@ -1,21 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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.normalizeAppConfigService = exports.normalizeAppPagesJson = void 0;
 const code_1 = require("./code");
 const definePage_1 = require("./definePage");
 const uniConfig_1 = require("./uniConfig");
 const uniRoutes_1 = require("./uniRoutes");
-__exportStar(require("./nvue"), exports);
 function normalizeAppPagesJson(pagesJson) {
     return code_1.polyfillCode + code_1.restoreGlobalCode + (0, definePage_1.definePageCode)(pagesJson);
 }

package/dist/json/manifest.d.ts

@@ -1,6 +1,6 @@
 export declare const parseManifestJson: (inputDir: string) => any;
 export declare const parseManifestJsonOnce: (inputDir: string) => any;
-export declare const parseRpx2UnitOnce: (inputDir: string) => any;
+export declare const parseRpx2UnitOnce: (inputDir: string, platform?: UniApp.PLATFORM) => any;
 interface CompilerCompatConfig {
     MODE?: 2 | 3;
 }

package/dist/json/manifest.js

@@ -14,9 +14,15 @@ const parseManifestJson = (inputDir) => {
 };
 exports.parseManifestJson = parseManifestJson;
 exports.parseManifestJsonOnce = (0, uni_shared_1.once)(exports.parseManifestJson);
-exports.parseRpx2UnitOnce = (0, uni_shared_1.once)((inputDir) => {
-    const { h5 } = (0, exports.parseManifestJsonOnce)(inputDir);
-    return (0, shared_1.extend)({}, uni_shared_1.defaultRpx2Unit, (h5 && h5.rpx) || {});
+exports.parseRpx2UnitOnce = (0, uni_shared_1.once)((inputDir, platform = 'h5') => {
+    const rpx2unit = platform === 'h5' || platform === 'app'
+        ? uni_shared_1.defaultRpx2Unit
+        : uni_shared_1.defaultMiniProgramRpx2Unit;
+    const platformOptions = (0, exports.parseManifestJsonOnce)(inputDir)[platform];
+    if (platformOptions && platformOptions.rpx) {
+        return (0, shared_1.extend)({}, rpx2unit, platformOptions);
+    }
+    return (0, shared_1.extend)({}, rpx2unit);
 });
 function parseCompatConfig(_inputDir) {
     // 不支持 mode:2

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

@@ -1,3 +1,4 @@
+export * from './jsonFile';
 export { AppJson } from './types';
 export { parseMiniProgramPagesJson } from './pages';
 export { parseMiniProgramProjectJson } from './project';

package/dist/json/mp/index.js

@@ -1,6 +1,17 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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.parseMiniProgramProjectJson = exports.parseMiniProgramPagesJson = void 0;
+__exportStar(require("./jsonFile"), exports);
 var pages_1 = require("./pages");
 Object.defineProperty(exports, "parseMiniProgramPagesJson", { enumerable: true, get: function () { return pages_1.parseMiniProgramPagesJson; } });
 var project_1 = require("./project");

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

@@ -1,7 +1,8 @@
 import { ComponentJson, PageWindowOptions, UsingComponents } from './types';
-export declare const jsonPagesCache: Map<string, PageWindowOptions>;
-export declare const jsonComponentsCache: Map<string, ComponentJson>;
-export declare const jsonUsingComponentsCache: Map<string, UsingComponents>;
-export declare function addPageJson(filename: string, json: PageWindowOptions): void;
-export declare function addComponentJson(filename: string, json: ComponentJson): void;
-export declare function addUsingComponents(filename: string, json: UsingComponents): void;
+export declare function hasJsonFile(filename: string): boolean;
+export declare function normalizeJsonFilename(filename: string): string;
+export declare function findChangedJsonFiles(): Map<string, string>;
+export declare function addMiniProgramAppJson(appJson: Record<string, any>): void;
+export declare function addMiniProgramPageJson(filename: string, json: PageWindowOptions): void;
+export declare function addMiniProgramComponentJson(filename: string, json: ComponentJson): void;
+export declare function addMiniProgramUsingComponents(filename: string, json: UsingComponents): void;

package/dist/json/mp/jsonFile.js

@@ -1,18 +1,61 @@
 "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.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.hasJsonFile = 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 hasJsonFile(filename) {
+    return (filename === 'app' ||
+        jsonPagesCache.has(filename) ||
+        jsonComponentsCache.has(filename));
 }
-exports.addPageJson = addPageJson;
-function addComponentJson(filename, json) {
-    exports.jsonComponentsCache.set(filename, json);
+exports.hasJsonFile = hasJsonFile;
+function normalizeJsonFilename(filename) {
+    return (0, utils_1.normalizeNodeModules)(filename);
 }
-exports.addComponentJson = addComponentJson;
-function addUsingComponents(filename, json) {
-    exports.jsonUsingComponentsCache.set(filename, json);
+exports.normalizeJsonFilename = normalizeJsonFilename;
+function findChangedJsonFiles() {
+    const changedJsonFiles = new Map();
+    function findChangedFile(name, json) {
+        const newJson = (0, shared_1.extend)({}, json);
+        if (!newJson.usingComponents) {
+            newJson.usingComponents = {};
+        }
+        (0, shared_1.extend)(newJson.usingComponents, jsonUsingComponentsCache.get(name));
+        const jsonStr = JSON.stringify(newJson, null, 2);
+        if (jsonFilesCache.get(name) !== jsonStr) {
+            changedJsonFiles.set(name, jsonStr);
+            jsonFilesCache.set(name, 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.addUsingComponents = addUsingComponents;
+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