@dcloudio/uni-cli-shared 3.0.0-3090620231104002 → 3.0.0-3090920231225001

package/dist/constants.d.ts

@@ -1,5 +1,6 @@
 export declare const PUBLIC_DIR = "static";
 export declare const EXTNAME_JS: string[];
+export declare const X_EXTNAME_JS: string[];
 export declare const EXTNAME_TS: string[];
 export declare const EXTNAME_VUE: string[];
 export declare const X_EXTNAME_VUE: string[];

package/dist/constants.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEXT_STYLE = 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.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = 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_UTS = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_UTS = exports.PAGES_JSON_JS = exports.uni_app_x_extensions = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.X_EXTNAME_VUE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
+exports.TEXT_STYLE = 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.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = 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_UTS = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_UTS = exports.PAGES_JSON_JS = exports.uni_app_x_extensions = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.X_EXTNAME_VUE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.X_EXTNAME_JS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
 exports.PUBLIC_DIR = 'static';
 exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx'];
+exports.X_EXTNAME_JS = ['.uts', ...exports.EXTNAME_JS];
 exports.EXTNAME_TS = ['.ts', '.tsx'];
 exports.EXTNAME_VUE = ['.vue', '.nvue', '.uvue'];
 exports.X_EXTNAME_VUE = ['.uvue', '.vue'];
@@ -38,7 +39,7 @@ exports.BINDING_COMPONENTS = '__BINDING_COMPONENTS__';
 exports.PAGE_EXTNAME_APP = ['.nvue', '.vue', '.tsx', '.jsx', '.js'];
 // 其他平台解析页面后缀的优先级
 exports.PAGE_EXTNAME = ['.vue', '.nvue', '.tsx', '.jsx', '.js'];
-exports.X_PAGE_EXTNAME = ['.vue', '.uvue', '.tsx', '.jsx', '.js'];
+exports.X_PAGE_EXTNAME = ['.uvue', '.vue', '.tsx', '.jsx', '.js'];
 exports.X_PAGE_EXTNAME_APP = ['.uvue', '.tsx', '.jsx', '.js'];
 exports.H5_API_STYLE_PATH = '@dcloudio/uni-h5/style/api/';
 exports.H5_FRAMEWORK_STYLE_PATH = '@dcloudio/uni-h5/style/framework/';

package/dist/hbx/log.js

@@ -43,7 +43,8 @@ if (typeof console !== 'undefined') {
     // overridedConsole('error', console.error, ZERO_WIDTH_CHAR.ERROR)
 }
 function formatAtFilename(filename, line, column) {
-    return `at ${picocolors_1.default.cyan((0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, filename.replace('\x00', '').split('?')[0])) +
+    const file = path_1.default.relative(process.env.UNI_INPUT_DIR, filename.replace('\x00', '').split('?')[0]);
+    return `at ${picocolors_1.default.cyan((0, utils_1.normalizePath)(file === 'pages-json-uts' ? 'pages.json' : file) +
         ':' +
         (line || 1) +
         ':' +

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>): "uni-app" | "weex" | "vue" | "vite";
+export declare function getNVueCompiler(manifestJson: Record<string, any>): "uni-app" | "vue" | "weex" | "vite";
 export declare function getNVueStyleCompiler(manifestJson: Record<string, any>): "uni-app" | "weex";
 export declare function getNVueFlexDirection(manifestJson: Record<string, any>): "column" | "row" | "row-reverse" | "column-reverse";

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

@@ -1 +1,6 @@
 export declare function normalizeAppUniConfig(pagesJson: UniApp.PagesJson, manifestJson: Record<string, any>): string;
+export declare function parseEntryPagePath(pagesJson: UniApp.PagesJson): {
+    entryPagePath: string;
+    entryPageQuery: string;
+    realEntryPagePath: string;
+};

package/dist/json/app/pages/uniConfig.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.normalizeAppUniConfig = void 0;
+exports.parseEntryPagePath = exports.normalizeAppUniConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const i18n_1 = require("../../../i18n");
 const manifest_1 = require("../../manifest");
@@ -70,3 +70,4 @@ function parseEntryPagePath(pagesJson) {
     }
     return res;
 }
+exports.parseEntryPagePath = parseEntryPagePath;

package/dist/json/index.d.ts

@@ -4,4 +4,4 @@ export * from './json';
 export * from './pages';
 export * from './manifest';
 export * from './theme';
-export { normalizeUniAppXAppPagesJson } from './uniAppX';
+export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, checkPagesJson, parseUniXFlexDirection, parseUniXSplashScreen, } from './uni-x';

package/dist/json/index.js

@@ -14,12 +14,16 @@ 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.normalizeUniAppXAppPagesJson = void 0;
+exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = exports.checkPagesJson = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
 __exportStar(require("./mp"), exports);
 __exportStar(require("./app"), exports);
 __exportStar(require("./json"), exports);
 __exportStar(require("./pages"), exports);
 __exportStar(require("./manifest"), exports);
 __exportStar(require("./theme"), exports);
-var uniAppX_1 = require("./uniAppX");
-Object.defineProperty(exports, "normalizeUniAppXAppPagesJson", { enumerable: true, get: function () { return uniAppX_1.normalizeUniAppXAppPagesJson; } });
+var uni_x_1 = require("./uni-x");
+Object.defineProperty(exports, "normalizeUniAppXAppPagesJson", { enumerable: true, get: function () { return uni_x_1.normalizeUniAppXAppPagesJson; } });
+Object.defineProperty(exports, "normalizeUniAppXAppConfig", { enumerable: true, get: function () { return uni_x_1.normalizeUniAppXAppConfig; } });
+Object.defineProperty(exports, "checkPagesJson", { enumerable: true, get: function () { return uni_x_1.checkPagesJson; } });
+Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get: function () { return uni_x_1.parseUniXFlexDirection; } });
+Object.defineProperty(exports, "parseUniXSplashScreen", { enumerable: true, get: function () { return uni_x_1.parseUniXSplashScreen; } });

package/dist/json/mp/pages.js

@@ -24,9 +24,9 @@ const NON_APP_JSON_KEYS = [
     'usingComponents',
     'optimization',
     'scopedSlotsCompiler',
-    'usingComponents',
     'uniStatistics',
     'mergeVirtualHostAttributes',
+    'styleIsolation',
 ];
 function mergeMiniProgramAppJson(appJson, platformJson = {}) {
     Object.keys(platformJson).forEach((name) => {

package/dist/json/pages.js

@@ -194,23 +194,28 @@ function normalizeSubpackageSubNVues(root, style = { navigationBar: {} }) {
     return style;
 }
 function normalizePageStyle(pagePath, pageStyle, platform) {
-    const hasNVue = pagePath &&
-        process.env.UNI_INPUT_DIR &&
-        fs_1.default.existsSync(path_1.default.join(process.env.UNI_INPUT_DIR, pagePath + '.nvue'))
-        ? true
-        : undefined;
     let isNVue = false;
-    if (hasNVue) {
-        const hasVue = fs_1.default.existsSync(path_1.default.join(process.env.UNI_INPUT_DIR, pagePath + '.vue'));
-        if (hasVue) {
-            if (platform === 'app') {
-                if (process.env.UNI_NVUE_COMPILER !== 'vue') {
-                    isNVue = true;
+    if (process.env.UNI_APP_X === 'true') {
+        isNVue = undefined;
+    }
+    else {
+        const hasNVue = pagePath &&
+            process.env.UNI_INPUT_DIR &&
+            fs_1.default.existsSync(path_1.default.join(process.env.UNI_INPUT_DIR, pagePath + '.nvue'))
+            ? true
+            : undefined;
+        if (hasNVue) {
+            const hasVue = fs_1.default.existsSync(path_1.default.join(process.env.UNI_INPUT_DIR, pagePath + '.vue'));
+            if (hasVue) {
+                if (platform === 'app') {
+                    if (process.env.UNI_NVUE_COMPILER !== 'vue') {
+                        isNVue = true;
+                    }
                 }
             }
-        }
-        else {
-            isNVue = true;
+            else {
+                isNVue = true;
+            }
         }
     }
     if (pageStyle) {

package/dist/json/uni-x/index.d.ts

@@ -0,0 +1,10 @@
+export { parseUniXFlexDirection, parseUniXSplashScreen } from './manifest';
+export declare function checkPagesJson(jsonStr: string, inputDir: string): boolean;
+export declare function normalizeUniAppXAppPagesJson(jsonStr: string): UniApp.PagesJson;
+/**
+ * TODO 应该闭包，通过globalThis赋值？
+ * @param pagesJson
+ * @param manifestJson
+ * @returns
+ */
+export declare function normalizeUniAppXAppConfig(pagesJson: UniApp.PagesJson, manifestJson: Record<string, any>): string;

package/dist/json/uni-x/index.js

@@ -0,0 +1,209 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = exports.checkPagesJson = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const shared_1 = require("@vue/shared");
+const jsonc_parser_1 = require("jsonc-parser");
+const json_1 = require("../json");
+const pages_1 = require("../pages");
+const utils_1 = require("../../utils");
+const uniRoutes_1 = require("../app/pages/uniRoutes");
+const uniConfig_1 = require("./uniConfig");
+const utils_2 = require("../../vite/plugins/vitejs/utils");
+var manifest_1 = require("./manifest");
+Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get: function () { return manifest_1.parseUniXFlexDirection; } });
+Object.defineProperty(exports, "parseUniXSplashScreen", { enumerable: true, get: function () { return manifest_1.parseUniXSplashScreen; } });
+function checkPagesJson(jsonStr, inputDir) {
+    if (!inputDir) {
+        return false;
+    }
+    const errors = [];
+    const root = (0, jsonc_parser_1.parseTree)(jsonStr, errors);
+    if (!root) {
+        if (errors.length) {
+            for (const error of errors) {
+                const { line, column } = (0, utils_2.offsetToLineColumn)(jsonStr, error.offset);
+                throw {
+                    name: 'SyntaxError',
+                    code: error.error,
+                    message: (0, jsonc_parser_1.printParseErrorCode)(error.error),
+                    loc: {
+                        start: { line, column },
+                    },
+                    offsetStart: error.offset,
+                    offsetEnd: error.offset + error.length,
+                };
+            }
+        }
+        return false;
+    }
+    const pagePathNodes = walkNodes(findRootNode(root, ['pages']));
+    findRootNode(root, ['subPackages', 'subpackages']).forEach((node) => {
+        const subPackageRoot = findSubPackageRoot(node);
+        if (subPackageRoot) {
+            findRootNode(node, ['pages']).forEach((subNode) => {
+                walkNodes(subNode.children ?? []).forEach((node) => {
+                    pagePathNodes.push({
+                        ...node,
+                        value: (0, utils_1.normalizePath)(path_1.default.join(subPackageRoot, node.value)),
+                    });
+                });
+            });
+        }
+    });
+    if (pagePathNodes.length) {
+        for (const node of pagePathNodes) {
+            const pagePath = node.value ?? '';
+            if (fs_1.default.existsSync(path_1.default.join(inputDir, pagePath + '.uvue')) ||
+                fs_1.default.existsSync(path_1.default.join(inputDir, pagePath + '.vue'))) {
+                continue;
+            }
+            const { line, column } = (0, utils_2.offsetToLineColumn)(jsonStr, node.offset);
+            throw {
+                name: 'CompilerError',
+                code: 'CompilerError',
+                message: `The page path "${pagePath}" does not exist`,
+                loc: {
+                    start: { line, column },
+                },
+                offsetStart: node.offset,
+                offsetEnd: node.offset + node.length,
+            };
+        }
+    }
+    return true;
+}
+exports.checkPagesJson = checkPagesJson;
+function findSubPackageRoot(node) {
+    const child = node.children?.find((child) => child.type === 'property' &&
+        child.children &&
+        child.children.find((child) => child.type === 'string' && child.value === 'root'));
+    if (child && child.children?.length === 2) {
+        return child.children[1].value;
+    }
+    return '';
+}
+function findRootNode(node, property) {
+    const { type, children } = node;
+    if (type === 'object' && children) {
+        const child = children.find((child) => child.type === 'property' &&
+            child.children &&
+            child.children.find((child) => child.type === 'string' && property.includes(child.value)));
+        if (child) {
+            const node = child.children.find((child) => child.type === 'array');
+            return node?.children ?? [];
+        }
+    }
+    return [];
+}
+function walkNodes(node) {
+    const pagePathNodes = [];
+    node.forEach((node) => walkNode(node, pagePathNodes));
+    return pagePathNodes;
+}
+function walkNode(node, pagePathNodes) {
+    const { type, children } = node;
+    if (type === 'property' && children && children.length === 2) {
+        const maybePagePathNode = children[0];
+        const maybePagePathValueNode = children[1];
+        if (maybePagePathNode.type === 'string' &&
+            maybePagePathNode.value === 'path' &&
+            maybePagePathValueNode.type === 'string' &&
+            (0, shared_1.isString)(maybePagePathValueNode.value)) {
+            pagePathNodes.push(maybePagePathValueNode);
+        }
+    }
+    if (children) {
+        children.forEach((node) => walkNode(node, pagePathNodes));
+    }
+}
+function normalizeUniAppXAppPagesJson(jsonStr) {
+    checkPagesJson(jsonStr, process.env.UNI_INPUT_DIR);
+    const pagesJson = {
+        pages: [],
+        globalStyle: {},
+    };
+    let userPagesJson = {
+        pages: [],
+        globalStyle: {},
+    };
+    // preprocess
+    try {
+        userPagesJson = (0, json_1.parseJson)(jsonStr, true);
+    }
+    catch (e) {
+        console.error(`[vite] Error: pages.json parse failed.\n`, jsonStr, e);
+    }
+    // pages
+    (0, pages_1.validatePages)(userPagesJson, jsonStr);
+    userPagesJson.subPackages =
+        userPagesJson.subPackages || userPagesJson.subpackages;
+    // subPackages
+    if (userPagesJson.subPackages) {
+        userPagesJson.pages.push(...normalizeSubPackages(userPagesJson.subPackages));
+    }
+    pagesJson.pages = userPagesJson.pages;
+    // pageStyle
+    normalizePages(pagesJson.pages);
+    // globalStyle
+    pagesJson.globalStyle = normalizePageStyle(userPagesJson.globalStyle);
+    // tabBar
+    if (userPagesJson.tabBar) {
+        pagesJson.tabBar = userPagesJson.tabBar;
+    }
+    // condition
+    if (userPagesJson.condition) {
+        pagesJson.condition = userPagesJson.condition;
+    }
+    // uniIdRouter
+    if (userPagesJson.uniIdRouter) {
+        pagesJson.uniIdRouter = userPagesJson.uniIdRouter;
+    }
+    return pagesJson;
+}
+exports.normalizeUniAppXAppPagesJson = normalizeUniAppXAppPagesJson;
+function normalizeSubPackages(subPackages) {
+    const pages = [];
+    if ((0, shared_1.isArray)(subPackages)) {
+        subPackages.forEach(({ root, pages: subPages }) => {
+            if (root && subPages.length) {
+                subPages.forEach((subPage) => {
+                    subPage.path = (0, utils_1.normalizePath)(path_1.default.join(root, subPage.path));
+                    subPage.style = subPage.style;
+                    pages.push(subPage);
+                });
+            }
+        });
+    }
+    return pages;
+}
+function normalizePages(pages) {
+    pages.forEach((page) => {
+        page.style = normalizePageStyle(page.style);
+    });
+}
+function normalizePageStyle(pageStyle) {
+    if (pageStyle) {
+        (0, shared_1.extend)(pageStyle, pageStyle['app']);
+        (0, pages_1.removePlatformStyle)(pageStyle);
+        return pageStyle;
+    }
+    return {};
+}
+/**
+ * TODO 应该闭包，通过globalThis赋值？
+ * @param pagesJson
+ * @param manifestJson
+ * @returns
+ */
+function normalizeUniAppXAppConfig(pagesJson, manifestJson) {
+    return `const __uniConfig = ${(0, uniConfig_1.normalizeAppXUniConfig)(pagesJson, manifestJson)};
+const __uniRoutes = ${(0, uniRoutes_1.normalizeAppUniRoutes)(pagesJson)}.map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+
+`;
+}
+exports.normalizeUniAppXAppConfig = normalizeUniAppXAppConfig;

package/dist/json/uni-x/manifest.d.ts

@@ -0,0 +1,2 @@
+export declare function parseUniXFlexDirection(manifestJson: Record<string, any>): any;
+export declare function parseUniXSplashScreen(manifestJson: Record<string, any>): false | object;

package/dist/json/uni-x/manifest.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = void 0;
+const shared_1 = require("@vue/shared");
+const flexDirs = ['row', 'row-reverse', 'column', 'column-reverse'];
+function parseUniXFlexDirection(manifestJson) {
+    const flexDir = manifestJson?.['uni-app-x']?.['flex-direction'];
+    if (flexDir && flexDirs.includes(flexDir)) {
+        return flexDir;
+    }
+    return 'column';
+}
+exports.parseUniXFlexDirection = parseUniXFlexDirection;
+function parseUniXSplashScreen(manifestJson) {
+    const splashScreen = manifestJson?.['app']?.['splashScreen'];
+    if ((0, shared_1.isPlainObject)(splashScreen)) {
+        return splashScreen;
+    }
+    return false;
+}
+exports.parseUniXSplashScreen = parseUniXSplashScreen;

package/dist/json/uni-x/uniConfig.d.ts

@@ -0,0 +1 @@
+export declare function normalizeAppXUniConfig(pagesJson: UniApp.PagesJson, manifestJson: Record<string, any>): string;

package/dist/json/uni-x/uniConfig.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeAppXUniConfig = void 0;
+const uniConfig_1 = require("../app/pages/uniConfig");
+function normalizeAppXUniConfig(pagesJson, manifestJson) {
+    const config = {
+        pages: [],
+        globalStyle: pagesJson.globalStyle,
+        appname: manifestJson.name || '',
+        compilerVersion: process.env.UNI_COMPILER_VERSION,
+        ...(0, uniConfig_1.parseEntryPagePath)(pagesJson),
+        tabBar: pagesJson.tabBar,
+        fallbackLocale: manifestJson.fallbackLocale,
+    };
+    // TODO 待支持分包
+    return JSON.stringify(config);
+}
+exports.normalizeAppXUniConfig = normalizeAppXUniConfig;

package/dist/preprocess/context.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initPreContext = exports.getPreUVueContext = exports.getPreNVueContext = exports.getPreVueContext = void 0;
-const shared_1 = require("@vue/shared");
+const extend = Object.assign;
+const isString = (val) => typeof val === 'string';
+const objectToString = Object.prototype.toString;
+const toTypeString = (value) => objectToString.call(value);
+const isPlainObject = (val) => toTypeString(val) === '[object Object]';
 const DEFAULT_KEYS = [
     'UNI_APP_X',
     'APP',
@@ -88,21 +92,21 @@ function initPreContext(platform, userPreContext, utsPlatform, isX) {
         defaultContext.WEB = true;
     }
     if (userPreContext) {
-        if ((0, shared_1.isString)(userPreContext)) {
+        if (isString(userPreContext)) {
             try {
                 userPreContext = JSON.parse(userPreContext);
             }
             catch (e) { }
         }
-        if ((0, shared_1.isPlainObject)(userPreContext)) {
+        if (isPlainObject(userPreContext)) {
             Object.keys(userPreContext).forEach((key) => {
                 defaultContext[normalizeKey(key)] = !!userPreContext[key];
             });
         }
     }
-    (0, shared_1.extend)(preVueContext, defaultContext, vueContext);
-    (0, shared_1.extend)(preNVueContext, defaultContext, nvueContext);
-    (0, shared_1.extend)(preUVueContext, defaultContext, uvueContext);
+    extend(preVueContext, defaultContext, vueContext);
+    extend(preNVueContext, defaultContext, nvueContext);
+    extend(preUVueContext, defaultContext, uvueContext);
 }
 exports.initPreContext = initPreContext;
 function normalizeKey(name) {

package/dist/uni_modules.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseInjects = exports.parseUniExtApis = void 0;
+// 重要：此文件编译后的js，需同步至 vue2 编译器中 uni-cli-shared/lib/uts/uni_modules.js
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 function parseUniExtApis(vite = true, platform, language = 'javascript') {
@@ -63,6 +64,9 @@ exports.parseUniExtApis = parseUniExtApis;
  * @returns
  */
 function parseInjects(vite = true, platform, language, source, uniModuleRootDir, exports = {}) {
+    if (platform === 'app-plus') {
+        platform = 'app';
+    }
     let rootDefines = {};
     Object.keys(exports).forEach((name) => {
         if (name.startsWith('uni')) {
@@ -71,10 +75,17 @@ function parseInjects(vite = true, platform, language, source, uniModuleRootDir,
     });
     const injects = {};
     if (Object.keys(rootDefines).length) {
-        const hasPlatformFile = uniModuleRootDir
+        let hasPlatformFile = uniModuleRootDir
             ? fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'index.uts')) ||
                 fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', platform))
             : true;
+        if (!hasPlatformFile) {
+            if (platform === 'app') {
+                hasPlatformFile =
+                    fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-android')) ||
+                        fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-ios'));
+            }
+        }
         for (const key in rootDefines) {
             Object.assign(injects, parseInject(vite, platform, language, source, 'uni', rootDefines[key], hasPlatformFile));
         }

package/dist/utils.d.ts

@@ -2,6 +2,7 @@ export { default as hash } from 'hash-sum';
 import { ElementNode, RootNode, TemplateChildNode } from '@vue/compiler-core';
 import { ParserPlugin } from '@babel/parser';
 export declare const version: any;
+export { camelize, capitalize, isArray } from '@vue/shared';
 export declare let isRunningWithYarnPnp: boolean;
 export declare const isWindows: boolean;
 export declare function normalizePath(id: string): string;
@@ -20,3 +21,5 @@ export declare function resolveSourceMapPath(outputDir?: string, platform?: UniA
 export declare function installDepTips(type: 'dependencies' | 'devDependencies', module: string, version?: string): string;
 export declare function isAppVue(filename: string): boolean;
 export declare function resolveAppVue(inputDir: string): string;
+export declare function parseImporter(importer: string): string;
+export declare function createResolveErrorMsg(source: string, importer: string): string;

package/dist/utils.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.resolveAppVue = exports.isAppVue = exports.installDepTips = exports.resolveSourceMapPath = exports.pathToGlob = exports.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isRunningWithYarnPnp = exports.version = exports.hash = void 0;
+exports.createResolveErrorMsg = exports.parseImporter = exports.resolveAppVue = exports.isAppVue = exports.installDepTips = exports.resolveSourceMapPath = exports.pathToGlob = exports.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isRunningWithYarnPnp = exports.isArray = exports.capitalize = exports.camelize = exports.version = exports.hash = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -14,6 +14,11 @@ Object.defineProperty(exports, "hash", { enumerable: true, get: function () { re
 const constants_1 = require("./constants");
 const platform_1 = require("./platform");
 exports.version = require('../package.json').version;
+// 专为 uts.ts 服务
+var shared_2 = require("@vue/shared");
+Object.defineProperty(exports, "camelize", { enumerable: true, get: function () { return shared_2.camelize; } });
+Object.defineProperty(exports, "capitalize", { enumerable: true, get: function () { return shared_2.capitalize; } });
+Object.defineProperty(exports, "isArray", { enumerable: true, get: function () { return shared_2.isArray; } });
 try {
     exports.isRunningWithYarnPnp = Boolean(require('pnpapi'));
 }
@@ -124,3 +129,15 @@ function resolveAppVue(inputDir) {
     return normalizePath(path_1.default.resolve(inputDir, 'App.vue'));
 }
 exports.resolveAppVue = resolveAppVue;
+function parseImporter(importer) {
+    importer = importer.split('?')[0];
+    if (path_1.default.isAbsolute(importer)) {
+        return normalizePath(path_1.default.relative(process.env.UNI_INPUT_DIR, importer));
+    }
+    return importer;
+}
+exports.parseImporter = parseImporter;
+function createResolveErrorMsg(source, importer) {
+    return `Could not resolve "${source}" from "${parseImporter(importer)}"`;
+}
+exports.createResolveErrorMsg = createResolveErrorMsg;

package/dist/uts.js

@@ -7,11 +7,20 @@ exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce =
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
-const shared_1 = require("@vue/shared");
 const hbx_1 = require("./hbx");
 const utils_1 = require("./utils");
-const uni_shared_1 = require("@dcloudio/uni-shared");
 const uni_modules_1 = require("./uni_modules");
+// 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
+function once(fn, ctx = null) {
+    let res;
+    return ((...args) => {
+        if (fn) {
+            res = fn.apply(ctx, args);
+            fn = null;
+        }
+        return res;
+    });
+}
 /**
  * 解析 app 平台的 uts 插件，任意平台（android|ios）存在即可
  * @param id
@@ -114,7 +123,7 @@ function parseUTSComponent(name, type) {
     const meta = utsComponents.get(name);
     if (meta) {
         const namespace = meta[type === 'swift' ? 'swiftModule' : 'kotlinPackage'] || '';
-        const className = (0, shared_1.capitalize)((0, shared_1.camelize)(name)) + 'Component';
+        const className = (0, utils_1.capitalize)((0, utils_1.camelize)(name)) + 'Component';
         return {
             className,
             namespace,
@@ -209,16 +218,16 @@ function prefix(id) {
     return id;
 }
 function parseKotlinPackageWithPluginId(id, is_uni_modules) {
-    return 'uts.sdk.' + (is_uni_modules ? 'modules.' : '') + (0, shared_1.camelize)(prefix(id));
+    return 'uts.sdk.' + (is_uni_modules ? 'modules.' : '') + (0, utils_1.camelize)(prefix(id));
 }
 exports.parseKotlinPackageWithPluginId = parseKotlinPackageWithPluginId;
 function parseSwiftPackageWithPluginId(id, is_uni_modules) {
     return ('UTSSDK' +
         (is_uni_modules ? 'Modules' : '') +
-        (0, shared_1.capitalize)((0, shared_1.camelize)(prefix(id))));
+        (0, utils_1.capitalize)((0, utils_1.camelize)(prefix(id))));
 }
 exports.parseSwiftPackageWithPluginId = parseSwiftPackageWithPluginId;
-exports.parseUniExtApiNamespacesOnce = (0, uni_shared_1.once)((platform, language) => {
+exports.parseUniExtApiNamespacesOnce = once((platform, language) => {
     const extApis = (0, exports.parseUniExtApiNamespacesJsOnce)(platform, language);
     const namespaces = {};
     Object.keys(extApis).forEach((name) => {
@@ -235,12 +244,12 @@ exports.parseUniExtApiNamespacesOnce = (0, uni_shared_1.once)((platform, languag
     });
     return namespaces;
 });
-exports.parseUniExtApiNamespacesJsOnce = (0, uni_shared_1.once)((platform, language) => {
+exports.parseUniExtApiNamespacesJsOnce = once((platform, language) => {
     const extApis = (0, uni_modules_1.parseUniExtApis)(true, platform, language);
     const namespaces = {};
     Object.keys(extApis).forEach((name) => {
         const options = extApis[name];
-        if ((0, shared_1.isArray)(options) && options.length >= 2) {
+        if ((0, utils_1.isArray)(options) && options.length >= 2) {
             namespaces[name.replace('uni.', '')] = [options[0], options[1]];
         }
     });

package/dist/vite/autoImport.d.ts

@@ -0,0 +1,3 @@
+import { Options } from 'unplugin-auto-import/types';
+export type AutoImportOptions = Options;
+export declare function initAutoImportOptions(platform: typeof process.env.UNI_UTS_PLATFORM, { imports, ...userOptions }: AutoImportOptions): AutoImportOptions;