@dcloudio/uni-cli-shared 3.0.0-alpha-5000720260327001 → 3.0.0-alpha-5000720260416001

package/dist/uts.js

@@ -12,8 +12,6 @@ const unimport_1 = require("unimport");
 const hbx_1 = require("./hbx");
 const utils_1 = require("./utils");
 const uni_modules_1 = require("./uni_modules");
-const preprocess_1 = require("./preprocess");
-const x_1 = require("./x");
 function once(fn, ctx = null) {
     let res;
     return ((...args) => {
@@ -38,7 +36,7 @@ function resolveUTSAppModule(platform, id, importer, includeUTSSDK = true) {
         if (parentDir === 'uni_modules' ||
             (includeUTSSDK && parentDir === 'utssdk')) {
             const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
-            if ((0, x_1.isUniAppXJsEngine)()) {
+            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');
@@ -512,7 +510,7 @@ async function parseUniExtApiAutoImports(uniExtApiAutoImports, extApis, parseSou
                 const filename = `uni_modules/${pluginId}/utssdk/interface.uts`;
                 const interfaceFileName = path_1.default.resolve(process.env.UNI_INPUT_DIR, filename);
                 if (fs_extra_1.default.existsSync(interfaceFileName)) {
-                    const ids = await parseExportIdentifiers(interfaceFileName, preprocess_1.preUVueJs);
+                    const ids = await parseExportIdentifiers(interfaceFileName);
                     ids
                         // 过滤掉 Uni
                         .filter((id) => id !== 'Uni')

package/dist/vite/autoImport.js

@@ -9,7 +9,6 @@ const uni_shared_1 = require("@dcloudio/uni-shared");
 const uts_1 = require("../uts");
 const workers_1 = require("../workers");
 const utils_1 = require("../utils");
-const x_1 = require("../x");
 const uniWebLifeCyclePreset = {
     from: '@dcloudio/uni-app',
     imports: [
@@ -285,10 +284,8 @@ const vuePreset = {
 function initAutoImportOptions(platform, { imports = [], ...userOptions }) {
     rewriteAutoImportOnce();
     const autoImport = [vuePreset];
-    // JS 引擎的 App 平台统一走 vue 生命周期导入
-    if (platform === 'app-ios' ||
-        platform === 'app-harmony' ||
-        (0, x_1.isUniAppXAndroidJsEngine)(platform)) {
+    // 只有app-ios和app-harmony平台特殊处理
+    if (platform === 'app-ios' || platform === 'app-harmony') {
         autoImport.push(uniAppLifeCyclePreset);
     }
     else if (platform === 'web') {
@@ -320,8 +317,8 @@ function initAutoImportOptions(platform, { imports = [], ...userOptions }) {
         include: [/\.[u]?ts$/, /\.[u]?vue/],
         exclude,
         imports: imports.concat(
-        // 旧版 Android x 仍由专有编译流程处理，Android Vapor 对齐 iOS 走通用自动导入
-        (0, x_1.isUniAppXAndroidNative)(platform) ? [] : autoImport),
+        // app-android 平台暂不注入其他
+        platform === 'app-android' ? [] : autoImport),
         dts: false,
     };
 }

package/dist/vite/cloud.js

@@ -15,8 +15,6 @@ const uni_modules_1 = require("./plugins/uts/uni_modules");
 const utils_3 = require("./utils");
 const json_1 = require("../json");
 const workers_1 = require("../workers");
-const dom2_1 = require("../dom2");
-const x_1 = require("../x");
 function createEncryptCssUrlReplacer(resolve) {
     return async (url, importer) => {
         if (url.startsWith('/') && !url.startsWith('//')) {
@@ -66,7 +64,6 @@ exports.uniEncryptUniModulesAssetsPlugin = uniEncryptUniModulesAssetsPlugin;
 function uniEncryptUniModulesPlugin() {
     let resolvedConfig;
     const isMp = process.env.UNI_UTS_PLATFORM.startsWith('mp-');
-    const useUniAppXAndroidNative = (0, x_1.isUniAppXAndroidNative)();
     const encryptModuleOutputFiles = [];
     return {
         name: 'uni:encrypt-uni-modules',
@@ -95,7 +92,7 @@ function uniEncryptUniModulesPlugin() {
             resolvedConfig = config;
         },
         resolveId(id, importer) {
-            if (!useUniAppXAndroidNative) {
+            if (process.env.UNI_UTS_PLATFORM !== 'app-android') {
                 if (resolvedConfig.assetsInclude((0, utils_1.cleanUrl)(id))) {
                     id = (0, utils_2.normalizePath)(id);
                     if (importer && (id.startsWith('./') || id.startsWith('../'))) {
@@ -109,7 +106,7 @@ function uniEncryptUniModulesPlugin() {
             }
         },
         load(id) {
-            if (!useUniAppXAndroidNative) {
+            if (process.env.UNI_UTS_PLATFORM !== 'app-android') {
                 if (resolvedConfig.assetsInclude((0, utils_1.cleanUrl)(id))) {
                     return {
                         code: `export default ${JSON.stringify(id.replace(/\0/g, ''))}`,
@@ -122,8 +119,8 @@ function uniEncryptUniModulesPlugin() {
             Object.keys(bundle).forEach((fileName) => {
                 if (fileName.endsWith('.module.js')) {
                     const uniModuleId = path_1.default.basename(fileName).replace('.module.js', '');
-                    // 仅旧版 Android x 不需要 js
-                    if (!useUniAppXAndroidNative) {
+                    // app-android 不需要 js
+                    if (process.env.UNI_UTS_PLATFORM !== 'app-android') {
                         const newFileName = 'uni_modules/' +
                             fileName.replace('.module.js', '/index.module.js');
                         bundle[newFileName] = bundle[fileName];
@@ -174,13 +171,12 @@ function uniEncryptUniModulesPlugin() {
             }
         },
         async writeBundle() {
-            if (!useUniAppXAndroidNative) {
+            if (process.env.UNI_UTS_PLATFORM !== 'app-android') {
                 return;
             }
             const uniXKotlinCompiler = process.env.UNI_APP_X_TSC === 'true'
                 ? (0, uts_1.resolveUTSCompiler)().createUniXKotlinCompilerOnce({
                     resolveWorkers: () => (0, workers_1.getWorkers)(),
-                    sourceFileCallback: (0, dom2_1.initSourceFileCallback)(),
                 })
                 : null;
             if (uniXKotlinCompiler) {
@@ -397,10 +393,7 @@ function compileCloudUniModuleWithTsc(platform, pluginDir) {
     const isX = process.env.UNI_APP_X === 'true';
     const resolveWorkers = () => (0, workers_1.getWorkers)();
     return compileUniModuleWithTsc(platform, pluginDir, platform === 'app-android'
-        ? createUniXKotlinCompilerOnce({
-            resolveWorkers,
-            sourceFileCallback: (0, dom2_1.initSourceFileCallback)(),
-        })
+        ? createUniXKotlinCompilerOnce({ resolveWorkers })
         : platform === 'app-harmony'
             ? createUniXArkTSCompilerOnce({ resolveWorkers })
             : createUniXSwiftCompilerOnce({ resolveWorkers }), {

package/dist/vite/extApi.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uniUniModulesExtApiPlugin = void 0;
 const uts_1 = require("../uts");
 const resolve_1 = require("../resolve");
-const x_1 = require("../x");
 function uniUniModulesExtApiPlugin() {
     return {
         name: 'uni:uni-modules_ext-api',
@@ -22,9 +21,7 @@ function uniUniModulesExtApiPlugin() {
                 },
             };
             const build = {};
-            if (process.env.UNI_UTS_PLATFORM === 'app-ios' ||
-                process.env.UNI_UTS_PLATFORM === 'app-harmony' ||
-                (0, x_1.isUniAppXAndroidJsEngine)()) {
+            if (['app-ios', 'app-harmony'].includes(process.env.UNI_UTS_PLATFORM)) {
                 build.rollupOptions = rollupOptions;
             }
             return {

package/dist/vite/plugins/json.js

@@ -9,19 +9,86 @@ const json_1 = require("../../json");
 const preprocess_1 = require("../../preprocess");
 const utils_1 = require("../utils");
 function uniJsonPlugin() {
+    const UTS_CAST_ARRAY_MARKER = '/*__UTS_CAST_UTSJSON_ARRAY__*/';
+    const UTS_CAST_OBJECT_MARKER = '/*__UTS_CAST_UTSJSON_OBJECT__*/';
+    const IS_UNI_X_ANDROID = process.env.UNI_APP_X === 'true' &&
+        process.env.UNI_UTS_PLATFORM === 'app-android';
     return {
         name: 'uni:json',
         enforce: 'pre',
+        generateBundle(options, bundle) {
+            if (IS_UNI_X_ANDROID) {
+                for (const [fileName, file] of Object.entries(bundle)) {
+                    if (fileName.endsWith('.json.ts')) {
+                        if (file.type === 'asset' && file.source) {
+                            const source = file.source.toString();
+                            if (source.includes(UTS_CAST_ARRAY_MARKER) ||
+                                source.includes(UTS_CAST_OBJECT_MARKER)) {
+                                file.source = source
+                                    .replace(new RegExp(UTS_CAST_ARRAY_MARKER.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), ' as UTSJSONObject[]')
+                                    .replace(new RegExp(UTS_CAST_OBJECT_MARKER.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), ' as UTSJSONObject');
+                            }
+                        }
+                    }
+                }
+            }
+        },
         transform(code, id) {
             // 如果已经被其他插件处理过了，就不再处理，比如 commonjs 插件，ICAPRegistrar.json?commonjs-external
             if (id.startsWith('\0')) {
                 return;
             }
-            if (path_1.default.extname((0, utils_1.parseVueRequest)(id).filename) !== '.json') {
+            const { filename } = (0, utils_1.parseVueRequest)(id);
+            if (path_1.default.extname(filename) !== '.json') {
                 return;
             }
+            let codeObj = (0, json_1.parseJson)((0, preprocess_1.preJson)(code, id), false, id);
+            let codeJson = '';
+            if (IS_UNI_X_ANDROID) {
+                if (Array.isArray(codeObj)) {
+                    codeJson +=
+                        'export default JSON.parseArray(`' +
+                            JSON.stringify(codeObj, null, 2) +
+                            '`)' +
+                            UTS_CAST_ARRAY_MARKER +
+                            ';\n';
+                }
+                else {
+                    codeJson +=
+                        'let __jsonObj = JSON.parseObject(`' +
+                            JSON.stringify(codeObj, null, 2) +
+                            '`);\n';
+                    for (const key in codeObj) {
+                        if (!Object.hasOwn(codeObj, key))
+                            continue;
+                        const element = codeObj[key];
+                        if (Array.isArray(element)) {
+                            codeJson += `export const ${key} = __jsonObj?.getArray("${key}")${UTS_CAST_ARRAY_MARKER};\n`;
+                        }
+                        else if (typeof element === 'object' && element !== null) {
+                            codeJson += `export const ${key} = __jsonObj?.get("${key}")${UTS_CAST_OBJECT_MARKER};\n`;
+                        }
+                        else if (typeof element === 'string') {
+                            codeJson += `export const ${key} = __jsonObj?.getString("${key}") ?? '';\n`;
+                        }
+                        else if (typeof element === 'number') {
+                            codeJson += `export const ${key} = __jsonObj?.getNumber("${key}") ?? 0;\n`;
+                        }
+                        else if (typeof element === 'boolean') {
+                            codeJson += `export const ${key} = __jsonObj?.getBoolean("${key}") ?? false;\n`;
+                        }
+                        else {
+                            codeJson += `export const ${key} = __jsonObj?.get("${key}")${UTS_CAST_OBJECT_MARKER};\n`;
+                        }
+                    }
+                    codeJson += `export default __jsonObj;`;
+                }
+            }
+            else {
+                codeJson = JSON.stringify(codeObj, null, 2);
+            }
             return {
-                code: JSON.stringify((0, json_1.parseJson)((0, preprocess_1.preJson)(code, id), false, id), null, 2),
+                code: codeJson,
                 map: {
                     mappings: '',
                 },

package/dist/vite/plugins/stats.js

@@ -13,8 +13,7 @@ function uniStatsPlugin() {
     let resolvedConfig;
     let isManifestChanged = false;
     const shouldTrackManifestChange = process.env.UNI_APP_X === 'true' &&
-        (process.env.UNI_PLATFORM === 'app' ||
-            process.env.UNI_PLATFORM === 'app-harmony');
+        process.env.UNI_PLATFORM === 'app-harmony';
     let isVapor = shouldTrackManifestChange && process.env.UNI_APP_X_DOM2 === 'true';
     return {
         name: 'uni:app-stats',

package/dist/vite/plugins/uts/uni_modules.js

@@ -12,7 +12,6 @@ const uts_1 = require("../../../uts");
 const utils_1 = require("../../utils");
 const uni_modules_1 = require("../../../uni_modules");
 const uni_modules_cloud_1 = require("../../../uni_modules.cloud");
-const x_1 = require("../../../x");
 const utils_2 = require("../../../utils");
 const json_1 = require("../../../json");
 const fs_1 = require("../../../fs");
@@ -20,7 +19,6 @@ const context_1 = require("../../../preprocess/context");
 const hbx_1 = require("../../../hbx");
 const console_1 = require("../../../logs/console");
 const workers_1 = require("../../../workers");
-const dom2_1 = require("../../../dom2");
 /* eslint-disable no-restricted-globals */
 const { preprocess } = require('../../../../lib/preprocess');
 function rewriteUniModulesConsoleExpr(fileName, content) {
@@ -244,10 +242,7 @@ function uniUTSAppUniModulesPlugin(options = {}) {
     const uniXKotlinCompiler = process.env.UNI_APP_X_TSC === 'true' &&
         (process.env.UNI_UTS_PLATFORM === 'app-android' ||
             process.env.UNI_UTS_PLATFORM === 'app')
-        ? createUniXKotlinCompilerOnce({
-            resolveWorkers,
-            sourceFileCallback: (0, dom2_1.initSourceFileCallback)(),
-        })
+        ? createUniXKotlinCompilerOnce({ resolveWorkers })
         : null;
     const uniXSwiftCompiler = process.env.UNI_APP_X_TSC === 'true' &&
         (process.env.UNI_UTS_PLATFORM === 'app-ios' ||
@@ -432,7 +427,7 @@ function uniUTSAppUniModulesPlugin(options = {}) {
         for (const plugin of plugins) {
             const pluginDir = path_1.default.resolve(inputDir, 'uni_modules', plugin.plugin);
             // 如果是 app-js 环境
-            if ((0, x_1.isUniAppXJsEngine)()) {
+            if (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js') {
                 if (fs_extra_1.default.existsSync(path_1.default.resolve(pluginDir, 'utssdk', 'app-js', 'index.uts'))) {
                     continue;
                 }

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

@@ -43,7 +43,6 @@ const preprocess_1 = require("../../../../preprocess");
 const uniapp_1 = require("../../../../postcss/plugins/uniapp");
 const cleanString_1 = require("../cleanString");
 const constants_1 = require("../../../../constants");
-const fontFamily_1 = require("../../../../dom2/fontFamily");
 const utils_2 = require("../../../utils/utils");
 const compiler_core_1 = require("@vue/compiler-core");
 const utils_3 = require("../../../../utils");
@@ -224,8 +223,7 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
     // styles initialization in buildStart causes a styling loss in watch
     const styles = new Map();
     let cssChunks;
-    const isDom2 = process.env.UNI_APP_X_DOM2 === 'true';
-    const isDom2App = isDom2 && platform.startsWith('app');
+    const isDom2Harmony = process.env.UNI_APP_X_DOM2 === 'true' && platform === 'app-harmony';
     return {
         name: 'vite:css-post',
         buildStart() {
@@ -242,8 +240,8 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
             return {
                 code: modulesCode ||
                     (isJsCode
-                        ? isDom2App
-                            ? `export default ${(0, fontFamily_1.createJsStylePlaceholder)(id)}`
+                        ? isDom2Harmony
+                            ? `export default ${constants_1.JS_STYLE_PLACEHOLDER_STR}`
                             : 'export default {}'
                         : ''),
                 map: { mappings: '' },
@@ -253,7 +251,7 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
             };
         },
         async renderChunk(_code, chunk, _opts) {
-            if (isDom2) {
+            if (isDom2Harmony) {
                 // 通过 generateBundle 实现
                 return null;
             }

package/dist/workers.js

@@ -13,7 +13,6 @@ const json_1 = require("./json");
 const uts_1 = require("./uts");
 const uni_modules_1 = require("./vite/plugins/uts/uni_modules");
 const resolve_1 = require("./resolve");
-const dom2_1 = require("./dom2");
 const debugWorkers = (0, debug_1.default)('uni:workers');
 let workersRootDir = null;
 let workersRootDirs = [];
@@ -77,7 +76,6 @@ function uniWorkersPlugin() {
     const uniXKotlinCompiler = platform === 'app-android'
         ? (0, uts_1.resolveUTSCompiler)().createUniXKotlinCompilerOnce({
             resolveWorkers,
-            sourceFileCallback: (0, dom2_1.initSourceFileCallback)(),
         })
         : null;
     const uniXSwiftCompiler = platform === 'app-ios'

package/lib/dom2/app/@vitejs/plugin-vue/dist/index.cjs

@@ -320,6 +320,13 @@ function resolveTemplateCompilerOptions(descriptor, options, ssr) {
     expressionPlugins.push("typescript");
   }
   const extraOptions = options.template?.compilerOptions?.extraOptions?.(descriptor);
+  if (extraOptions.helper) {
+    extraOptions.className = extraOptions.helper.GCN(
+      descriptor.filename,
+      process.env.UNI_INPUT_DIR
+    );
+    extraOptions.r = extraOptions.helper.K;
+  }
   return {
     ...options.template,
     // @ts-expect-error TODO remove when 3.6 is out

package/lib/dom2/app/@vitejs/plugin-vue/dist/index.mjs

@@ -307,6 +307,13 @@ function resolveTemplateCompilerOptions(descriptor, options, ssr) {
     expressionPlugins.push("typescript");
   }
   const extraOptions = options.template?.compilerOptions?.extraOptions?.(descriptor);
+  if (extraOptions.helper) {
+    extraOptions.className = extraOptions.helper.GCN(
+      descriptor.filename,
+      process.env.UNI_INPUT_DIR
+    );
+    extraOptions.r = extraOptions.helper.K;
+  }
   return {
     ...options.template,
     // @ts-expect-error TODO remove when 3.6 is out

package/lib/dom2/app/@vue/compiler-core/dist/compiler-core.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-core v3.6.0-beta.7
+  * @vue/compiler-core v3.6.0-beta.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-core/dist/compiler-core.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-core v3.6.0-beta.7
+  * @vue/compiler-core v3.6.0-beta.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-core/dist/compiler-core.d.ts

@@ -348,7 +348,6 @@ export interface SimpleExpressionNode extends Node {
   */
   sharedData?: {
     ident?: string;
-    classRef?: string;
     vModel?: {
       eventIdent: string;
     };

package/lib/dom2/app/@vue/compiler-core/dist/compiler-core.esm-bundler.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-core v3.6.0-beta.7
+  * @vue/compiler-core v3.6.0-beta.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.7
+  * @vue/compiler-dom v3.6.0-beta.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.7
+  * @vue/compiler-dom v3.6.0-beta.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.7
+  * @vue/compiler-dom v3.6.0-beta.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.esm-browser.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.7
+  * @vue/compiler-dom v3.6.0-beta.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.esm-bundler.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.7
+  * @vue/compiler-dom v3.6.0-beta.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.global.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.7
+  * @vue/compiler-dom v3.6.0-beta.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/

package/lib/dom2/app/@vue/compiler-dom/dist/compiler-dom.global.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-dom v3.6.0-beta.7
+  * @vue/compiler-dom v3.6.0-beta.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/