@dcloudio/uni-cli-shared 3.0.0-alpha-4000320240311001 → 3.0.0-alpha-4000620240320001

package/dist/deps.d.ts

@@ -16,4 +16,6 @@ export declare const COMPONENT_DEPS_CSS: {
     textarea: string[];
     'web-view': string[];
     picker: string[];
+    'scroll-view': string[];
+    'list-view': string[];
 };

package/dist/deps.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.COMPONENT_DEPS_CSS = exports.API_DEPS_CSS = void 0;
 const constants_1 = require("./constants");
 const RESIZE_SENSOR_CSS = constants_1.BASE_COMPONENTS_STYLE_PATH + 'resize-sensor.css';
+const REFRESHER_CSS = constants_1.BASE_COMPONENTS_STYLE_PATH + 'refresher.css';
 exports.API_DEPS_CSS = {
     showModal: [`${constants_1.H5_API_STYLE_PATH}modal.css`],
     showToast: [`${constants_1.H5_API_STYLE_PATH}toast.css`],
@@ -36,4 +37,6 @@ exports.COMPONENT_DEPS_CSS = {
         `${constants_1.BASE_COMPONENTS_STYLE_PATH}picker-view.css`,
         `${constants_1.BASE_COMPONENTS_STYLE_PATH}picker-view-column.css`,
     ],
+    'scroll-view': [REFRESHER_CSS],
+    'list-view': [RESIZE_SENSOR_CSS, REFRESHER_CSS],
 };

package/dist/easycom.js

@@ -14,6 +14,7 @@ const utils_1 = require("./utils");
 const pages_1 = require("./json/pages");
 const messages_1 = require("./messages");
 const uts_1 = require("./uts");
+const utsUtils_1 = require("./utsUtils");
 const debugEasycom = (0, debug_1.default)('uni:easycom');
 const easycoms = [];
 const easycomsCache = new Map();
@@ -265,8 +266,8 @@ function genUTSComponentPublicInstanceImported(root, fileName) {
         fileName = (0, utils_1.normalizePath)(path_1.default.relative(root, fileName));
     }
     if (fileName.startsWith('@/')) {
-        return ((0, uts_1.genUTSClassName)(fileName.replace('@/', '')) + 'ComponentPublicInstance');
+        return ((0, utsUtils_1.genUTSClassName)(fileName.replace('@/', '')) + 'ComponentPublicInstance');
     }
-    return (0, uts_1.genUTSClassName)(fileName) + 'ComponentPublicInstance';
+    return (0, utsUtils_1.genUTSClassName)(fileName) + 'ComponentPublicInstance';
 }
 exports.genUTSComponentPublicInstanceImported = genUTSComponentPublicInstanceImported;

package/dist/hbx/alias.js

@@ -34,8 +34,21 @@ function initModuleAlias() {
     }
     if ((0, env_1.isInHBuilderX)()) {
         // 又是为了复用 HBuilderX 的插件逻辑，硬编码映射
-        Object.keys(hbxPlugins).forEach((name) => {
-            module_alias_1.default.addAlias(name, path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, hbxPlugins[name]));
+        Object.keys(hbxPlugins).forEach((lang) => {
+            const realPath = path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, hbxPlugins[lang]);
+            module_alias_1.default.addAlias(lang, 
+            // @ts-expect-error
+            () => {
+                try {
+                    require.resolve(realPath);
+                }
+                catch (e) {
+                    const msg = exports.moduleAliasFormatter.format(`Preprocessor dependency "${lang}" not found. Did you install it?`);
+                    console.error(msg);
+                    process.exit(0);
+                }
+                return realPath;
+            });
         });
         // web 平台用了 vite 内置 css 插件，该插件会加载预编译器如scss、less等，需要转向到 HBuilderX 的对应编译器插件
         if (process.env.UNI_PLATFORM === 'h5' ||
@@ -91,7 +104,11 @@ exports.moduleAliasFormatter = {
     format(msg) {
         let lang = '';
         let preprocessor = '';
-        if (msg.includes(`"sass"`)) {
+        if (msg.includes(`"pug"`)) {
+            lang = 'pug';
+            preprocessor = 'compile-pug-cli';
+        }
+        else if (msg.includes(`"sass"`)) {
             lang = 'sass';
             preprocessor = 'compile-dart-sass';
         }

package/dist/hbx/log.js

@@ -7,6 +7,7 @@ exports.errorFormatter = exports.removeWarnFormatter = exports.removeInfoFormatt
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("picocolors"));
+const compiler_core_1 = require("@vue/compiler-core");
 const shared_1 = require("@vue/shared");
 const utils_1 = require("../utils");
 const constants_1 = require("../constants");
@@ -117,7 +118,7 @@ function buildErrorMessage(err, args = [], includeStack = true) {
             constants_1.EXTNAME_VUE_RE.test(err.id)) {
             try {
                 const ast = (0, ast_1.parseVue)(fs_1.default.readFileSync(err.id, 'utf8'), []);
-                const scriptNode = ast.children.find((node) => node.type === 1 /* NodeTypes.ELEMENT */ && node.tag === 'script');
+                const scriptNode = ast.children.find((node) => node.type === compiler_core_1.NodeTypes.ELEMENT && node.tag === 'script');
                 if (scriptNode) {
                     const scriptLoc = scriptNode.loc;
                     args.push(picocolors_1.default.yellow(pad((0, utils_2.generateCodeFrame)(scriptLoc.source, err.loc))));

package/dist/index.d.ts

@@ -21,7 +21,8 @@ export * from './esbuild';
 export * from './resolve';
 export * from './scripts';
 export * from './platform';
-export { parseUniExtApis, parseInjects, Define, DefineOptions, Defines, } from './uni_modules';
+export * from './utsUtils';
+export { parseUniExtApis, parseInjects, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, } from './uni_modules';
 export { M } from './messages';
 export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkUpdate = exports.M = exports.parseInjects = exports.parseUniExtApis = void 0;
+exports.checkUpdate = exports.M = exports.getUniExtApiProviderRegisters = exports.parseInjects = exports.parseUniExtApis = void 0;
 __exportStar(require("./fs"), exports);
 __exportStar(require("./mp"), exports);
 __exportStar(require("./url"), exports);
@@ -38,9 +38,11 @@ __exportStar(require("./esbuild"), exports);
 __exportStar(require("./resolve"), exports);
 __exportStar(require("./scripts"), exports);
 __exportStar(require("./platform"), exports);
+__exportStar(require("./utsUtils"), exports);
 var uni_modules_1 = require("./uni_modules");
 Object.defineProperty(exports, "parseUniExtApis", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApis; } });
 Object.defineProperty(exports, "parseInjects", { enumerable: true, get: function () { return uni_modules_1.parseInjects; } });
+Object.defineProperty(exports, "getUniExtApiProviderRegisters", { enumerable: true, get: function () { return uni_modules_1.getUniExtApiProviderRegisters; } });
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
 __exportStar(require("./exports"), exports);

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

@@ -1,4 +1,4 @@
 export declare const arrayBufferCode = "\nif (typeof uni !== 'undefined' && uni && uni.requireGlobal) {\n  const global = uni.requireGlobal()\n  ArrayBuffer = global.ArrayBuffer\n  Int8Array = global.Int8Array\n  Uint8Array = global.Uint8Array\n  Uint8ClampedArray = global.Uint8ClampedArray\n  Int16Array = global.Int16Array\n  Uint16Array = global.Uint16Array\n  Int32Array = global.Int32Array\n  Uint32Array = global.Uint32Array\n  Float32Array = global.Float32Array\n  Float64Array = global.Float64Array\n  BigInt64Array = global.BigInt64Array\n  BigUint64Array = global.BigUint64Array\n};\n";
-export declare const polyfillCode: string;
+export declare const polyfillCode = "\nif (typeof Promise !== 'undefined' && !Promise.prototype.finally) {\n  Promise.prototype.finally = function(callback) {\n    const promise = this.constructor\n    return this.then(\n      value => promise.resolve(callback()).then(() => value),\n      reason => promise.resolve(callback()).then(() => {\n        throw reason\n      })\n    )\n  }\n};\n\nif (typeof uni !== 'undefined' && uni && uni.requireGlobal) {\n  const global = uni.requireGlobal()\n  ArrayBuffer = global.ArrayBuffer\n  Int8Array = global.Int8Array\n  Uint8Array = global.Uint8Array\n  Uint8ClampedArray = global.Uint8ClampedArray\n  Int16Array = global.Int16Array\n  Uint16Array = global.Uint16Array\n  Int32Array = global.Int32Array\n  Uint32Array = global.Uint32Array\n  Float32Array = global.Float32Array\n  Float64Array = global.Float64Array\n  BigInt64Array = global.BigInt64Array\n  BigUint64Array = global.BigUint64Array\n};\n\n";
 export declare const restoreGlobalCode = "\nif(uni.restoreGlobal){\n  uni.restoreGlobal(Vue,weex,plus,setTimeout,clearTimeout,setInterval,clearInterval)\n}\n";
 export declare const globalCode: string;

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

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

package/dist/json/mp/project.js

@@ -83,8 +83,8 @@ function parseMiniProgramCondition(pagesJson) {
             list: [
                 {
                     id: 0,
-                    name: launchPagePath,
-                    pathName: launchPagePath,
+                    name: launchPagePath, // 模式名称
+                    pathName: launchPagePath, // 启动页面，必选
                     query: process.env.UNI_CLI_LAUNCH_PAGE_QUERY || '', // 启动参数，在页面的onLoad函数里面得到。
                 },
             ],

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

@@ -2,7 +2,7 @@ export interface ComponentJson {
     component: true;
     usingComponents?: UsingComponents;
     usingSwanComponents?: UsingComponents;
-    styleIsolation?: 'apply-shared' | 'shared';
+    styleIsolation?: 'apply-shared' | 'shared' | 'isolated';
 }
 interface ShareWindowOptions {
     navigationBarBackgroundColor?: string;

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

@@ -12,6 +12,10 @@ function normalizeAppXUniConfig(pagesJson, manifestJson) {
         tabBar: pagesJson.tabBar,
         fallbackLocale: manifestJson.fallbackLocale,
     };
+    if (config.realEntryPagePath) {
+        config.conditionUrl = config.entryPagePath;
+        config.entryPagePath = config.realEntryPagePath;
+    }
     // TODO 待支持分包
     return JSON.stringify(config);
 }

package/dist/mp/tags.js

@@ -103,12 +103,12 @@ exports.HTML_TO_MINI_PROGRAM_TAGS = {
     dialog: 'view',
     summary: 'view',
     // progress: 'progress',
-    meter: 'progress',
-    head: 'view',
-    meta: 'view',
-    base: 'text',
+    meter: 'progress', // todo
+    head: 'view', // todo
+    meta: 'view', // todo
+    base: 'text', // todo
     // 'map': 'image', // TODO不是很恰当
-    area: 'navigator',
+    area: 'navigator', // j结合map使用
     script: 'view',
     noscript: 'view',
     embed: 'view',

package/dist/uni_modules.d.ts

@@ -21,6 +21,11 @@ export declare function getUniExtApiProviders(): {
     name?: string | undefined;
     servicePlugin?: string | undefined;
 }[];
+export declare function getUniExtApiProviderRegisters(): {
+    name: string;
+    service: string;
+    class: string;
+}[];
 export declare function parseUniExtApis(vite: boolean | undefined, platform: typeof process.env.UNI_UTS_PLATFORM, language?: UTSTargetLanguage): Injects;
 export type Injects = {
     [name: string]: string | [string, string] | [string, string, DefineOptions['app']] | false;
@@ -47,3 +52,18 @@ export type Injects = {
  * @returns
  */
 export declare function parseInjects(vite: boolean | undefined, platform: typeof process.env.UNI_UTS_PLATFORM, language: UTSTargetLanguage, source: string, uniModuleRootDir: string, exports?: Exports): Injects;
+/**
+ * @private
+ */
+export declare const camelize: (str: string) => string;
+/**
+ * @private
+ */
+export declare const capitalize: (str: string) => string;
+/**
+ * 解析 UTS 类型的模块依赖列表
+ * @param deps
+ * @param inputDir
+ * @returns
+ */
+export declare function parseUTSModuleDeps(deps: string[], inputDir: string): string[];

package/dist/uni_modules.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.parseInjects = exports.parseUniExtApis = exports.getUniExtApiProviders = void 0;
+exports.parseUTSModuleDeps = exports.capitalize = exports.camelize = exports.parseInjects = exports.parseUniExtApis = exports.getUniExtApiProviderRegisters = exports.getUniExtApiProviders = 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"));
@@ -12,6 +12,24 @@ function getUniExtApiProviders() {
     return extApiProviders;
 }
 exports.getUniExtApiProviders = getUniExtApiProviders;
+function getUniExtApiProviderRegisters() {
+    const result = [];
+    extApiProviders.forEach((provider) => {
+        if (provider.name && provider.service) {
+            result.push({
+                name: provider.name,
+                service: provider.service,
+                class: `uts.sdk.modules.${(0, exports.camelize)(provider.plugin)}.${(0, exports.capitalize)((0, exports.camelize)('uni-ext-api-' +
+                    provider.service +
+                    '-' +
+                    provider.name +
+                    '-provider'))}`,
+            });
+        }
+    });
+    return result;
+}
+exports.getUniExtApiProviderRegisters = getUniExtApiProviderRegisters;
 function parseUniExtApis(vite = true, platform, language = 'javascript') {
     if (!process.env.UNI_INPUT_DIR) {
         return {};
@@ -109,6 +127,11 @@ function parseInjects(vite = true, platform, language, source, uniModuleRootDir,
                 source = `${source}/utssdk/index.uts`;
             }
         }
+        else if (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js') {
+            if (fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-js', 'index.uts'))) {
+                source = `${source}/utssdk/app-js/index.uts`;
+            }
+        }
         for (const key in rootDefines) {
             Object.assign(injects, parseInject(vite, platform, language, source, 'uni', rootDefines[key], hasPlatformFile));
         }
@@ -157,19 +180,24 @@ function parseInject(vite = true, platform, language, source, globalObject, defi
                         if (p === 'app') {
                             const appOptions = defineOptions.app;
                             if (isPlainObject(appOptions)) {
-                                if (language === 'javascript') {
-                                    if (appOptions.js === false) {
-                                        return;
+                                // js engine 下且存在 app-js，不检查
+                                const skipCheck = process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js' &&
+                                    source.includes('app-js');
+                                if (!skipCheck) {
+                                    if (language === 'javascript') {
+                                        if (appOptions.js === false) {
+                                            return;
+                                        }
                                     }
-                                }
-                                else if (language === 'kotlin') {
-                                    if (appOptions.kotlin === false) {
-                                        return;
+                                    else if (language === 'kotlin') {
+                                        if (appOptions.kotlin === false) {
+                                            return;
+                                        }
                                     }
-                                }
-                                else if (language === 'swift') {
-                                    if (appOptions.swift === false) {
-                                        return;
+                                    else if (language === 'swift') {
+                                        if (appOptions.swift === false) {
+                                            return;
+                                        }
                                     }
                                 }
                             }
@@ -197,3 +225,34 @@ const toTypeString = (value) => objectToString.call(value);
 function isPlainObject(val) {
     return toTypeString(val) === '[object Object]';
 }
+const cacheStringFunction = (fn) => {
+    const cache = Object.create(null);
+    return ((str) => {
+        const hit = cache[str];
+        return hit || (cache[str] = fn(str));
+    });
+};
+const camelizeRE = /-(\w)/g;
+/**
+ * @private
+ */
+exports.camelize = cacheStringFunction((str) => {
+    return str.replace(camelizeRE, (_, c) => (c ? c.toUpperCase() : ''));
+});
+/**
+ * @private
+ */
+exports.capitalize = cacheStringFunction((str) => str.charAt(0).toUpperCase() + str.slice(1));
+/**
+ * 解析 UTS 类型的模块依赖列表
+ * @param deps
+ * @param inputDir
+ * @returns
+ */
+function parseUTSModuleDeps(deps, inputDir) {
+    const modulesDir = path_1.default.resolve(inputDir, 'uni_modules');
+    return deps.filter((dep) => {
+        return fs_extra_1.default.existsSync(path_1.default.resolve(modulesDir, dep, 'utssdk'));
+    });
+}
+exports.parseUTSModuleDeps = parseUTSModuleDeps;

package/dist/utils.d.ts

@@ -1,9 +1,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;
 export declare function checkElementNodeTag(node: RootNode | TemplateChildNode | null | undefined, tag: string): node is ElementNode;

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.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;
+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.isArray = exports.capitalize = exports.camelize = exports.hash = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -12,25 +12,25 @@ const shared_1 = require("@vue/shared");
 var hash_sum_1 = require("hash-sum");
 Object.defineProperty(exports, "hash", { enumerable: true, get: function () { return __importDefault(hash_sum_1).default; } });
 const constants_1 = require("./constants");
+const compiler_core_1 = require("@vue/compiler-core");
 const platform_1 = require("./platform");
 const hbx_1 = require("./hbx");
-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'));
-}
-catch { }
+// export let isRunningWithYarnPnp: boolean
+// try {
+//   isRunningWithYarnPnp = Boolean(require('pnpapi'))
+// } catch {}
 exports.isWindows = os_1.default.platform() === 'win32';
 function normalizePath(id) {
     return exports.isWindows ? id.replace(/\\/g, '/') : id;
 }
 exports.normalizePath = normalizePath;
 function checkElementNodeTag(node, tag) {
-    return !!node && node.type === 1 /* NodeTypes.ELEMENT */ && node.tag === tag;
+    return !!node && node.type === compiler_core_1.NodeTypes.ELEMENT && node.tag === tag;
 }
 exports.checkElementNodeTag = checkElementNodeTag;
 function normalizeIdentifier(str) {

package/dist/uts.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import * as UTSCompiler from '@dcloudio/uni-uts-v1';
-import { type EasycomMatcher } from './easycom';
+import type { EasycomMatcher } from './easycom';
 /**
  * 解析 app 平台的 uts 插件，任意平台（android|ios）存在即可
  * @param id
@@ -23,5 +23,3 @@ export declare function parseSwiftPackageWithPluginId(id: string, is_uni_modules
 export type UTSTargetLanguage = typeof process.env.UNI_UTS_TARGET_LANGUAGE;
 export declare const parseUniExtApiNamespacesOnce: (platform: typeof process.env.UNI_UTS_PLATFORM, language: UTSTargetLanguage) => Record<string, [string, string]>;
 export declare const parseUniExtApiNamespacesJsOnce: (platform: typeof process.env.UNI_UTS_PLATFORM, language: UTSTargetLanguage) => Record<string, [string, string]>;
-export declare function matchUTSComponent(tag: string): boolean;
-export declare function genUTSClassName(fileName: string, prefix?: string): string;

package/dist/uts.js

@@ -3,15 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genUTSClassName = exports.matchUTSComponent = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.initUTSComponents = exports.parseUTSComponent = exports.isUTSComponent = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
+exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.initUTSComponents = exports.parseUTSComponent = exports.isUTSComponent = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
+// 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const hbx_1 = require("./hbx");
 const utils_1 = require("./utils");
-const easycom_1 = require("./easycom");
 const uni_modules_1 = require("./uni_modules");
-// 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
 function once(fn, ctx = null) {
     let res;
     return ((...args) => {
@@ -36,6 +35,15 @@ function resolveUTSAppModule(id, importer, includeUTSSDK = true) {
         if (parentDir === 'uni_modules' ||
             (includeUTSSDK && parentDir === 'utssdk')) {
             const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
+            if (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js') {
+                // js engine
+                if (parentDir === 'uni_modules') {
+                    const appJsIndex = path_1.default.resolve(id, basedir, 'app-js', 'index.uts');
+                    if (fs_1.default.existsSync(appJsIndex)) {
+                        return appJsIndex;
+                    }
+                }
+            }
             if (fs_1.default.existsSync(path_1.default.resolve(id, basedir, 'index.uts'))) {
                 return id;
             }
@@ -104,8 +112,18 @@ function resolveUTSCompiler() {
             });
         }
         catch (e) {
-            let utsCompilerVersion = utils_1.version;
-            if (utils_1.version.startsWith('2.0.')) {
+            let utsCompilerVersion = '';
+            try {
+                utsCompilerVersion = require('../package.json').version;
+            }
+            catch (e) {
+                try {
+                    // vue2
+                    utsCompilerVersion = require('../../package.json').version;
+                }
+                catch (e) { }
+            }
+            if (utsCompilerVersion.startsWith('2.0.')) {
                 utsCompilerVersion = '^3.0.0-alpha-3060920221117001';
             }
             console.error((0, utils_1.installDepTips)('devDependencies', '@dcloudio/uni-uts-v1', utsCompilerVersion));
@@ -254,42 +272,3 @@ exports.parseUniExtApiNamespacesJsOnce = once((platform, language) => {
     });
     return namespaces;
 });
-function matchUTSComponent(tag) {
-    const source = (0, easycom_1.matchEasycom)(tag);
-    return !!(source && source.includes('uts-proxy'));
-}
-exports.matchUTSComponent = matchUTSComponent;
-function genUTSClassName(fileName, prefix = 'Gen') {
-    return (prefix +
-        (0, utils_1.capitalize)((0, utils_1.camelize)(verifySymbol((0, utils_1.removeExt)((0, utils_1.normalizeNodeModules)(fileName)
-            .replace(/[\/|_]/g, '-')
-            .replace(/-+/g, '-'))))));
-}
-exports.genUTSClassName = genUTSClassName;
-function isValidStart(c) {
-    return !!c.match(/^[A-Za-z_-]$/);
-}
-function isValidContinue(c) {
-    return !!c.match(/^[A-Za-z0-9_-]$/);
-}
-function verifySymbol(s) {
-    const chars = Array.from(s);
-    if (isValidStart(chars[0]) && chars.slice(1).every(isValidContinue)) {
-        return s;
-    }
-    const buf = [];
-    let hasStart = false;
-    for (const c of chars) {
-        if (!hasStart && isValidStart(c)) {
-            hasStart = true;
-            buf.push(c);
-        }
-        else if (isValidContinue(c)) {
-            buf.push(c);
-        }
-    }
-    if (buf.length === 0) {
-        buf.push('_');
-    }
-    return buf.join('');
-}

package/dist/utsUtils.d.ts

@@ -0,0 +1,2 @@
+export declare function matchUTSComponent(tag: string): boolean;
+export declare function genUTSClassName(fileName: string, prefix?: string): string;

package/dist/utsUtils.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genUTSClassName = exports.matchUTSComponent = void 0;
+const easycom_1 = require("./easycom");
+const utils_1 = require("./utils");
+function matchUTSComponent(tag) {
+    const source = (0, easycom_1.matchEasycom)(tag);
+    return !!(source && source.includes('uts-proxy'));
+}
+exports.matchUTSComponent = matchUTSComponent;
+function genUTSClassName(fileName, prefix = 'Gen') {
+    return (prefix +
+        (0, utils_1.capitalize)((0, utils_1.camelize)(verifySymbol((0, utils_1.removeExt)((0, utils_1.normalizeNodeModules)(fileName)
+            .replace(/[\/|_]/g, '-')
+            .replace(/-+/g, '-'))))));
+}
+exports.genUTSClassName = genUTSClassName;
+function isValidStart(c) {
+    return !!c.match(/^[A-Za-z_-]$/);
+}
+function isValidContinue(c) {
+    return !!c.match(/^[A-Za-z0-9_-]$/);
+}
+function verifySymbol(s) {
+    const chars = Array.from(s);
+    if (isValidStart(chars[0]) && chars.slice(1).every(isValidContinue)) {
+        return s;
+    }
+    const buf = [];
+    let hasStart = false;
+    for (const c of chars) {
+        if (!hasStart && isValidStart(c)) {
+            hasStart = true;
+            buf.push(c);
+        }
+        else if (isValidContinue(c)) {
+            buf.push(c);
+        }
+    }
+    if (buf.length === 0) {
+        buf.push('_');
+    }
+    return buf.join('');
+}

package/dist/vite/autoImport.js

@@ -36,7 +36,47 @@ const uniPreset = {
 };
 const uniH5Preset = {
     from: '@dcloudio/uni-h5',
-    imports: ['UniElement', 'UniElementImpl'],
+    imports: [
+        'UniElement',
+        'UniElementImpl',
+        'UniButtonElement',
+        'UniCanvasElement',
+        'UniCheckboxElement',
+        'UniCheckboxGroupElement',
+        'UniEditorElement',
+        'UniFormElement',
+        'UniIconElement',
+        'UniImageElement',
+        'UniInputElement',
+        'UniLabelElement',
+        'UniMovableAreaElement',
+        'UniMovableViewElement',
+        'UniNavigatorElement',
+        'UniPickerViewElement',
+        'UniPickerViewColumnElement',
+        'UniProgressElement',
+        'UniRadioElement',
+        'UniRadioGroupElement',
+        'UniRichTextElement',
+        'UniScrollViewElement',
+        'UniSliderElement',
+        'UniSwiperElement',
+        'UniSwiperItemElement',
+        'UniSwitchElement',
+        'UniTextElement',
+        'UniTextareaElement',
+        'UniViewElement',
+        'UniListViewElement',
+        'UniListItemElement',
+        'UniStickySectionElement',
+        'UniStickyHeaderElement',
+        'UniVideoElement',
+        'UniWebViewElement',
+        'UniMapElement',
+        'UniCoverViewElement',
+        'UniCoverImageElement',
+        'UniPickerElement',
+    ],
 };
 const cloudPreset = {
     '@dcloudio/uni-cloud': [['default', 'uniCloud']],