@dcloudio/vite-plugin-uni 3.0.0-5000720260410001 → 3.0.0-5010520260709001

package/dist/cli/action.js

@@ -48,8 +48,7 @@ async function runDev(options) {
         options.minify = true;
     }
     (0, utils_1.initEnv)('dev', options);
-    if (process.env.UNI_APP_X === 'true' &&
-        process.env.UNI_UTS_PLATFORM === 'app-android') {
+    if ((0, uni_cli_shared_1.isUniAppXAndroidNative)()) {
         return (0, uvue_1.runUVueAndroidDev)(options);
     }
     const createLogger = await Promise.resolve().then(() => __importStar(require('vite'))).then(({ createLogger }) => createLogger);
@@ -101,18 +100,30 @@ async function runDev(options) {
                     }
                     const utsChanged = process.env.UNI_APP_UTS_CHANGED === 'true';
                     process.env.UNI_APP_UTS_CHANGED = '';
+                    const pagesJsonChanged = process.env.UNI_APP_X_DOM2_PAGES_JSON_CHANGED === 'true';
+                    process.env.UNI_APP_X_DOM2_PAGES_JSON_CHANGED = '';
+                    let changedFiles = '';
+                    let hasBinFiles = false;
                     if (options.platform === 'app') {
                         const files = process.env.UNI_APP_CHANGED_FILES;
                         const pages = process.env.UNI_APP_CHANGED_PAGES;
                         const dex = process.env.UNI_APP_UTS_CHANGED_FILES;
-                        const changedFiles = pages || files;
+                        hasBinFiles = getHasBinFiles();
+                        changedFiles = pages || files;
                         process.env.UNI_APP_CHANGED_PAGES = '';
                         process.env.UNI_APP_CHANGED_FILES = '';
                         process.env.UNI_APP_UTS_CHANGED_FILES = '';
-                        if ((changedFiles &&
+                        if (process.env.UNI_APP_X_DOM2_DYNAMIC === 'true') {
+                            process.env.UNI_APP_X_DOM2_BIN_CHANGED_FILES = '';
+                        }
+                        const hasIncrementalFiles = changedFiles &&
                             !changedFiles.includes(uni_cli_shared_1.APP_CONFIG_SERVICE) &&
-                            !changedFiles.includes(uni_cli_shared_1.APP_SERVICE_FILENAME)) ||
-                            dex) {
+                            !changedFiles.includes(uni_cli_shared_1.APP_SERVICE_FILENAME);
+                        if (
+                        // 目前动态渲染下，只要bin有变更，就需要全量同步，后续可以优化成bin变更时输出bin变更文件列表
+                        !hasBinFiles &&
+                            !pagesJsonChanged &&
+                            (hasIncrementalFiles || dex)) {
                             if (pages) {
                                 return (0, uni_cli_shared_1.output)('log', uni_cli_shared_1.M['dev.watching.end.pages'].replace('{pages}', changedFiles));
                             }
@@ -121,11 +132,39 @@ async function runDev(options) {
                     }
                     else if (options.platform === 'app-harmony' ||
                         options.platform === 'mp-harmony') {
+                        hasBinFiles = getHasBinFiles();
+                        // 动态化且没有uts插件变更时，输出变更文件列表
+                        if (process.env.UNI_APP_X_DOM2_DYNAMIC === 'true' &&
+                            !utsChanged &&
+                            !hasBinFiles) {
+                            const changed = [];
+                            const files = process.env.UNI_APP_CHANGED_FILES;
+                            process.env.UNI_APP_CHANGED_PAGES = '';
+                            if (files) {
+                                try {
+                                    changed.push(...JSON.parse(files));
+                                }
+                                catch { }
+                            }
+                            // 鸿蒙平台暂不启用 bin 文件热更新，先不合并到 changes 中。
+                            // const binFiles = process.env.UNI_APP_X_DOM2_BIN_CHANGED_FILES
+                            process.env.UNI_APP_X_DOM2_BIN_CHANGED_FILES = '';
+                            // if (binFiles) {
+                            //   try {
+                            //     changed.push(...JSON.parse(binFiles))
+                            //   } catch {}
+                            // }
+                            if (!pagesJsonChanged && changed.length) {
+                                return (0, uni_cli_shared_1.output)('log', uni_cli_shared_1.M['dev.watching.end.files'].replace('{files}', JSON.stringify(changed)));
+                            }
+                        }
                         // 鸿蒙平台cpp/uts插件变更需要整体编译
                         if (process.env.UNI_APP_X_DOM2_CPP_CHANGED !== 'true' &&
-                            !utsChanged) {
+                            !utsChanged &&
+                            !hasBinFiles) {
                             const files = process.env.UNI_APP_CHANGED_FILES;
-                            if (files) {
+                            process.env.UNI_APP_CHANGED_FILES = '';
+                            if (!pagesJsonChanged && files) {
                                 return (0, uni_cli_shared_1.output)('log', uni_cli_shared_1.M['dev.watching.end.files'].replace('{files}', files));
                             }
                         }
@@ -135,10 +174,14 @@ async function runDev(options) {
                     // 之前之所以没有增量就全量同步，是为了兼容性，怕出意外。
                     if (process.env.UNI_APP_X_DOM2 === 'true') {
                         if (process.env.UNI_APP_X_DOM2_CPP_CHANGED === 'true' ||
-                            utsChanged) {
+                            utsChanged ||
+                            pagesJsonChanged) {
                             return (0, uni_cli_shared_1.output)('log', uni_cli_shared_1.M['dev.watching.end']);
                         }
-                        return (0, uni_cli_shared_1.output)('log', uni_cli_shared_1.M['uvue.dev.watching.end.empty']);
+                        // 没有cpp/uts插件变更，且没有增量js/bin文件变更，就输出无变更
+                        if (!changedFiles && !hasBinFiles) {
+                            return (0, uni_cli_shared_1.output)('log', uni_cli_shared_1.M['uvue.dev.watching.end.empty']);
+                        }
                     }
                     return (0, uni_cli_shared_1.output)('log', uni_cli_shared_1.M['dev.watching.end']);
                 }
@@ -174,8 +217,7 @@ async function runDev(options) {
 exports.runDev = runDev;
 async function runBuild(options) {
     (0, utils_1.initEnv)('build', options);
-    if (process.env.UNI_APP_X === 'true' &&
-        process.env.UNI_UTS_PLATFORM === 'app-android') {
+    if ((0, uni_cli_shared_1.isUniAppXAndroidNative)()) {
         return (0, uvue_1.runUVueAndroidBuild)(options);
     }
     try {
@@ -230,3 +272,9 @@ const stopProfiler = (log) => {
     });
 };
 exports.stopProfiler = stopProfiler;
+function getHasBinFiles() {
+    const binFiles = process.env.UNI_APP_X_DOM2_DYNAMIC === 'true'
+        ? process.env.UNI_APP_X_DOM2_BIN_CHANGED_FILES
+        : '';
+    return !!(binFiles && binFiles !== '[]');
+}

package/dist/cli/utils.js

@@ -176,7 +176,7 @@ function initEnv(type, options) {
             manifestJson['app-plus']?.['utsCompilerVersion'] === 'v1') {
             process.env.UNI_APP_X_TSC = 'false';
         }
-        if (manifestJson['uni-app-x']?.['styleIsolationVersion'] === '2') {
+        if (manifestJson['uni-app-x']?.['styleIsolationVersion'] == 2) {
             process.env.UNI_APP_STYLE_ISOLATION_VERSION = '2';
         }
     }
@@ -226,14 +226,19 @@ function initEnv(type, options) {
             ? 'true'
             : 'false';
     (0, uni_cli_shared_1.initPreContext)(process.env.UNI_PLATFORM, process.env.UNI_CUSTOM_CONTEXT, process.env.UNI_UTS_PLATFORM, process.env.UNI_APP_X === 'true');
-    // 应该全平台都显示吧，当初为啥只在部分平台显示？
-    if (process.env.UNI_PLATFORM === 'app' ||
-        process.env.UNI_PLATFORM === 'web' ||
-        process.env.UNI_PLATFORM === 'h5' ||
-        process.env.UNI_PLATFORM === 'app-harmony') {
-        console.log(uni_cli_shared_1.M['app.compiler.version'].replace('{version}', process.env.UNI_COMPILER_VERSION +
-            `（${process.env.UNI_APP_X === 'true' ? 'uni-app x' : 'vue3'}）` +
-            (process.env.UNI_APP_X_DOM2 === 'true' ? '蒸汽模式' : '')));
+    const isX = (0, uni_cli_shared_1.isUniAppX)();
+    console.log(uni_cli_shared_1.M['app.compiler.version'].replace('{version}', process.env.UNI_COMPILER_VERSION +
+        `（${isX ? 'uni-app x' : 'vue3'}）` +
+        (process.env.UNI_APP_X_DOM2 === 'true' ? '蒸汽模式' : '')));
+    if ((0, uni_cli_shared_1.isUniAppXVapor)() &&
+        (process.env.UNI_PLATFORM === 'app' ||
+            process.env.UNI_PLATFORM === 'app-harmony')) {
+        console.log(uni_cli_shared_1.M['view.render.compiler.target'].replace('{target}', process.env.UNI_APP_X_DOM2_DYNAMIC === 'true'
+            ? uni_cli_shared_1.M['view.render.compiler.target.bytecode']
+            : uni_cli_shared_1.M['view.render.compiler.target.nativecode']));
+    }
+    if (isX && !(0, uni_cli_shared_1.isUniAppXVapor)()) {
+        console.log(uni_cli_shared_1.M['style.isolation.version'].replace('{version}', (process.env.UNI_APP_STYLE_ISOLATION_VERSION || '1') + '.0'));
     }
     console.log(uni_cli_shared_1.M['compiling']);
 }

package/dist/cli/uvue.js

@@ -26,8 +26,8 @@ function initUVueEnv() {
     }
     if (process.env.UNI_PLATFORM === 'app') {
         process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE = 'native';
-        // 如果是app-ios，目前强制使用js引擎
-        if (process.env.UNI_UTS_PLATFORM === 'app-ios') {
+        // App X iOS 与 Android Vapor 统一使用 JS 引擎
+        if ((0, uni_cli_shared_1.isUniAppXIOS)() || (0, uni_cli_shared_1.isUniAppXAndroidVapor)()) {
             process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE = 'js';
         }
     }

package/dist/config/resolve.js

@@ -17,7 +17,8 @@ function resolveUTSModuleProxyFile(id, importer) {
     }
 }
 const customResolver = (updatedId, importer) => {
-    updatedId = updatedId.split('?')[0];
+    const independentRoot = (0, uni_cli_shared_1.resolveIndependentRoot)(updatedId, importer, process.env.UNI_INPUT_DIR, process.env.UNI_PLATFORM);
+    updatedId = (0, uni_cli_shared_1.withoutIndependentRoot)(updatedId).split('?')[0];
     const utsImporter = importer
         ? path_1.default.dirname(importer)
         : process.env.UNI_INPUT_DIR;
@@ -26,16 +27,14 @@ const customResolver = (updatedId, importer) => {
         ? resolveUTSModuleProxyFile(updatedId, utsImporter)
         : (0, uni_cli_shared_1.resolveUTSModule)(updatedId, utsImporter);
     if (utsModuleFile) {
-        return uni_cli_shared_1.isWindows ? (0, uni_cli_shared_1.normalizePath)(utsModuleFile) : utsModuleFile;
+        return (0, uni_cli_shared_1.withIndependentRootIfNeeded)(uni_cli_shared_1.isWindows ? (0, uni_cli_shared_1.normalizePath)(utsModuleFile) : utsModuleFile, independentRoot, process.env.UNI_INPUT_DIR);
     }
     const resolveId = (0, uni_cli_shared_1.resolveEncryptUniModule)((0, uni_cli_shared_1.normalizePath)(updatedId), process.env.UNI_UTS_PLATFORM, process.env.UNI_APP_X === 'true');
     if (resolveId) {
-        return resolveId;
+        return (0, uni_cli_shared_1.withIndependentRootIfNeeded)(resolveId, independentRoot, process.env.UNI_INPUT_DIR);
     }
-    if (uni_cli_shared_1.isWindows) {
-        return (0, uni_cli_shared_1.normalizePath)((0, uni_cli_shared_1.requireResolve)(updatedId, importer || process.env.UNI_INPUT_DIR));
-    }
-    return (0, uni_cli_shared_1.requireResolve)(updatedId, importer || process.env.UNI_INPUT_DIR);
+    const resolvedId = (0, uni_cli_shared_1.requireResolve)(updatedId, importer || process.env.UNI_INPUT_DIR);
+    return (0, uni_cli_shared_1.withIndependentRootIfNeeded)(uni_cli_shared_1.isWindows ? (0, uni_cli_shared_1.normalizePath)(resolvedId) : resolvedId, independentRoot, process.env.UNI_INPUT_DIR);
 };
 exports.customResolver = customResolver;
 function createResolve(options, _config) {

package/dist/configResolved/plugins/preVue.js

@@ -23,6 +23,13 @@ function uniPreVuePlugin() {
             }
             // 清空当前页面已缓存的 filter 信息
             (0, uni_cli_shared_1.clearMiniProgramTemplateFilter)((0, uni_cli_shared_1.removeExt)((0, uni_cli_shared_1.normalizeMiniProgramFilename)(id, process.env.UNI_INPUT_DIR)));
+            if (process.env.UNI_APP_X_DOM2 === 'true' &&
+                process.env.UNI_INPUT_DIR &&
+                (0, uni_cli_shared_1.isUniPageFile)(filename)) {
+                // dom2 页面模板编译会读取 pages.json 中的页面配置，
+                // 需要让 pages.json 变更时重新 transform 页面，避免复用旧模板产物。
+                this.addWatchFile(path_1.default.resolve(process.env.UNI_INPUT_DIR, 'pages.json'));
+            }
             return {
                 code: (0, uni_cli_shared_1.parseVueCode)(code, isNVue).code, // 暂不提供sourcemap,意义不大
                 map: null,

package/dist/index.d.ts

@@ -25,3 +25,4 @@ export interface VitePluginUniResolvedOptions extends VitePluginUniOptions {
 }
 export { runDev, runBuild } from './cli/action';
 export default function uniPlugin(rawOptions?: VitePluginUniOptions): Plugin[];
+export declare function shouldMoveSourceMapFromCache(): boolean | "";

package/dist/index.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.runBuild = exports.runDev = void 0;
+exports.shouldMoveSourceMapFromCache = exports.runBuild = exports.runDev = void 0;
 const fs_1 = __importDefault(require("fs"));
 const vite_1 = __importDefault(require("unplugin-auto-import/vite"));
 const plugin_vue_jsx_1 = __importDefault(require("@vitejs/plugin-vue-jsx"));
@@ -18,6 +18,7 @@ const vue_1 = require("./vue");
 const utils_2 = require("./cli/utils");
 const plugins_1 = require("./uvue/plugins");
 const path_1 = __importDefault(require("path"));
+const rewriteImportVue_1 = require("./uvue/plugins/rewriteImportVue");
 var action_1 = require("./cli/action");
 Object.defineProperty(exports, "runDev", { enumerable: true, get: function () { return action_1.runDev; } });
 Object.defineProperty(exports, "runBuild", { enumerable: true, get: function () { return action_1.runBuild; } });
@@ -41,16 +42,17 @@ function uniPlugin(rawOptions = {}) {
     };
     options.platform = process.env.UNI_PLATFORM || 'h5';
     options.inputDir = process.env.UNI_INPUT_DIR;
-    const plugins = process.env.UNI_APP_X === 'true' &&
-        process.env.UNI_UTS_PLATFORM === 'app-android'
+    const plugins = (0, uni_cli_shared_1.isUniAppXAndroidNative)()
         ? createUVueAndroidPlugins(options)
         : createPlugins(options);
     // x 提供 auto import（非android、android自行处理）
-    if (process.env.UNI_APP_X === 'true' &&
-        process.env.UNI_UTS_PLATFORM !== 'app-android') {
+    if (process.env.UNI_APP_X === 'true' && !(0, uni_cli_shared_1.isUniAppXAndroidNative)()) {
         plugins.unshift((0, vite_1.default)((0, uni_cli_shared_1.initAutoImportOptions)(process.env.UNI_UTS_PLATFORM, options.autoImportOptions || {})));
     }
     plugins.unshift((0, uni_cli_shared_1.uniJsonPlugin)());
+    if (process.env.UNI_APP_OUTPUT_FORMAT === 'esm') {
+        plugins.push((0, rewriteImportVue_1.rewriteImportVuePlugin)());
+    }
     return plugins;
 }
 exports.default = uniPlugin;
@@ -63,7 +65,9 @@ function createPlugins(options) {
             // iOS 暂不使用该机制
             process.env.UNI_UTS_PLATFORM !== 'app-ios' &&
             // harmony 同 iOS
-            process.env.UNI_UTS_PLATFORM !== 'app-harmony') {
+            process.env.UNI_UTS_PLATFORM !== 'app-harmony' &&
+            // Android Vapor 暂不使用该机制(只有 Android Native 会进入该方法，不需要额外判断)
+            process.env.UNI_UTS_PLATFORM !== 'app-android') {
             plugins.push((0, uni_cli_shared_1.uniUTSExtApiReplace)());
         }
         else {
@@ -135,10 +139,7 @@ function createPlugins(options) {
             if (fs_1.default.existsSync(sourceMapPath)) {
                 (0, uni_cli_shared_1.emptyDir)(sourceMapPath);
             }
-            if (process.env.UNI_APP_X === 'true' &&
-                process.env.UNI_UTS_PLATFORM === 'app-ios' &&
-                process.env.UNI_APP_X_CACHE_DIR &&
-                process.env.NODE_ENV !== 'development') {
+            if (shouldMoveSourceMapFromCache()) {
                 plugins.push((0, move_1.uniMovePlugin)({
                     apply: 'build',
                     enforce: 'post',
@@ -190,3 +191,10 @@ function createUVueAndroidPlugins(options) {
 function resolveSourceMapDirByCacheDir() {
     return path_1.default.resolve(process.env.UNI_APP_X_CACHE_DIR, 'sourcemap');
 }
+function shouldMoveSourceMapFromCache() {
+    return (process.env.UNI_APP_X === 'true' &&
+        process.env.UNI_APP_X_CACHE_DIR &&
+        process.env.NODE_ENV !== 'development' &&
+        ((0, uni_cli_shared_1.isUniAppXIOS)() || (0, uni_cli_shared_1.isUniAppXAndroidJsEngine)()));
+}
+exports.shouldMoveSourceMapFromCache = shouldMoveSourceMapFromCache;

package/dist/plugins/copy.js

@@ -12,9 +12,8 @@ const debugCopy = (0, debug_1.default)('uni:copy');
 function uniCopyPlugin({ outputDir, copyOptions, }) {
     const staticDir = uni_cli_shared_1.PUBLIC_DIR + '/**/*';
     const uniModulesStaticDir = 'uni_modules/*/' + uni_cli_shared_1.PUBLIC_DIR + '/**/*';
-    const isDom2Harmony = process.env.UNI_APP_X_DOM2 === 'true' &&
-        process.env.UNI_PLATFORM === 'app-harmony';
-    const uniModulesCppDir = isDom2Harmony ? 'uni_modules/*/cppsdk/**/*' : '';
+    const isDom2 = process.env.UNI_APP_X_DOM2 === 'true';
+    const uniModulesCppDir = isDom2 ? 'uni_modules/*/cppsdk/**/*' : '';
     const assets = [staticDir, uniModulesStaticDir];
     const cppAssets = [];
     if (uniModulesCppDir) {
@@ -32,10 +31,17 @@ function uniCopyPlugin({ outputDir, copyOptions, }) {
         assets.push(asset);
     });
     const inputDir = (0, uni_cli_shared_1.normalizePath)(process.env.UNI_INPUT_DIR);
+    const normalizedInputDir = normalizePathForCompare(inputDir);
     const platform = process.env.UNI_PLATFORM;
     const utsPlatform = process.env.UNI_UTS_PLATFORM;
     // 非当前平台 static 目录
     const ignorePlatformStaticDirs = createIgnorePlatformDirs(uni_cli_shared_1.PUBLIC_DIR, platform, utsPlatform);
+    // app 资源包导出时，如果 uni_modules 的 utssdk 不支持当前原生平台，则连同 static 一起忽略
+    const ignoreUniModulesStaticDirs = createIgnoreUniModulesStaticDirs(inputDir, subpackages, utsPlatform);
+    const ignoreStaticDirs = [
+        ...ignorePlatformStaticDirs,
+        ...ignoreUniModulesStaticDirs,
+    ];
     // 非当前平台 cppsdk 目录
     const ignorePlatformCppDirs = uniModulesCppDir
         ? createIgnorePlatformDirs('cppsdk', platform, utsPlatform)
@@ -48,15 +54,17 @@ function uniCopyPlugin({ outputDir, copyOptions, }) {
                 readyTimeout: getReadyTimeout(),
                 ignored(path) {
                     const normalizedPath = (0, uni_cli_shared_1.normalizePath)(path);
-                    if (ignorePlatformStaticDirs.find((dir) => 
-                    // dir都是以 / 结尾，所以这里也要以 / 结尾
-                    (normalizedPath + '/').includes(dir))) {
+                    const comparablePath = normalizePathForCompare(normalizedPath);
+                    if (ignoreUniModulesStaticDirs.find((dir) => 
+                    // 忽略整个 static 目录及其子文件，避免无效资源进入资源包
+                    (comparablePath + '/').includes(dir))) {
+                        return true;
+                    }
+                    if (ignorePlatformStaticDirs.find((dir) => (comparablePath + '/').includes(dir))) {
                         return fs_1.default.statSync(normalizedPath).isDirectory();
                     }
-                    // 应该是软链
-                    if (!normalizedPath.startsWith(inputDir)) {
-                        // 目前仅简单处理static
-                        if (normalizedPath.includes('/static/')) {
+                    if (!comparablePath.startsWith(normalizedInputDir)) {
+                        if (comparablePath.includes('/static/')) {
                             return false;
                         }
                         return true;
@@ -67,10 +75,10 @@ function uniCopyPlugin({ outputDir, copyOptions, }) {
         },
     ];
     targets.push(...copyOptions.targets);
-    if (process.env.UNI_APP_HARMONY_DOM2_CPP_DIR && cppAssets.length) {
+    if (process.env.UNI_APP_X_DOM2_CPP_DIR && cppAssets.length) {
         targets.push({
             src: cppAssets,
-            dest: process.env.UNI_APP_HARMONY_DOM2_CPP_DIR,
+            dest: process.env.UNI_APP_X_DOM2_CPP_DIR,
             watchOptions: {
                 readyTimeout: getReadyTimeout(),
                 ignored(path) {
@@ -86,7 +94,7 @@ function uniCopyPlugin({ outputDir, copyOptions, }) {
         });
     }
     debugCopy(targets);
-    checkIgnoreStatic(ignorePlatformStaticDirs.map((dir) => dir.substring(1).split('/')));
+    checkIgnoreStatic(ignoreStaticDirs.map((dir) => dir.substring(1).split('/')));
     return (0, uni_cli_shared_1.uniViteCopyPlugin)({
         targets,
     });
@@ -143,5 +151,38 @@ function createIgnorePlatformDirs(dir, platform, utsPlatform) {
         return p !== platform;
     })
         // 在最后增加 / 是为了避免误判以 platform 开头的目录，比如 app-test
-        .map((p) => '/' + dir + '/' + p + '/'));
+        .map((p) => normalizePathForCompare('/' + dir + '/' + p + '/')));
+}
+function createIgnoreUniModulesStaticDirs(inputDir, subpackages, utsPlatform) {
+    if (utsPlatform !== 'app-android' && utsPlatform !== 'app-ios') {
+        return [];
+    }
+    const ignoreDirs = [];
+    const roots = [
+        inputDir,
+        ...subpackages.map((root) => path_1.default.resolve(inputDir, root)),
+    ];
+    roots.forEach((rootDir) => {
+        const uniModulesDir = path_1.default.resolve(rootDir, 'uni_modules');
+        if (!fs_1.default.existsSync(uniModulesDir)) {
+            return;
+        }
+        fs_1.default.readdirSync(uniModulesDir).forEach((uniModuleDir) => {
+            const uniModuleRootDir = path_1.default.resolve(uniModulesDir, uniModuleDir);
+            const utssdkDir = path_1.default.resolve(uniModuleRootDir, 'utssdk');
+            const staticDir = path_1.default.resolve(uniModuleRootDir, uni_cli_shared_1.PUBLIC_DIR);
+            if (!fs_1.default.existsSync(utssdkDir) || !fs_1.default.existsSync(staticDir)) {
+                return;
+            }
+            if ((0, uni_cli_shared_1.hasUTSModulePlatformFile)(uniModuleRootDir, utsPlatform)) {
+                return;
+            }
+            ignoreDirs.push(normalizePathForCompare('/' + (0, uni_cli_shared_1.normalizePath)(path_1.default.relative(inputDir, staticDir)) + '/'));
+        });
+    });
+    return ignoreDirs;
+}
+function normalizePathForCompare(id) {
+    const normalizedPath = (0, uni_cli_shared_1.normalizePath)(id);
+    return uni_cli_shared_1.isWindows ? normalizedPath.toLowerCase() : normalizedPath;
 }

package/dist/uvue/plugins/rewriteImportVue.d.ts

@@ -0,0 +1,19 @@
+import { type ImportSpecifier } from 'es-module-lexer';
+import MagicString from 'magic-string';
+import type { Plugin } from 'vite';
+/**
+ * 如下情况会生成import vue的代码：
+ * 1. uvue页面编译产物通过helpers方式导入的vue相关api，defineComponent、unref等
+ * 2. 用户代码script中的ref、reactive、computed等
+ * 3. onLoad等从@dcloudio/uni-app导入的api等
+ * 4. 用户代码script中import vue的api
+ *
+ * 如果在transform中处理，需要确保此插件在autoImport之后，否则此时2、3尚未生成import vue的代码。
+ * 如果在renderChunk中处理，能保证所有代码都已经生成import vue的代码，但是此时热更新会触发所有文件重新处理import vue。
+ */
+export declare function rewriteImportVuePlugin(): Plugin;
+/**
+ * import { xx as yy, zz } from 'vue' =>
+ * const { xx: yy, zz } = globalThis.Vue
+ */
+export declare function rewriteImportVue(input: string, importRanges?: Pick<ImportSpecifier, 'ss' | 'se'>[]): MagicString;

package/dist/uvue/plugins/rewriteImportVue.js

@@ -0,0 +1,108 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rewriteImportVue = exports.rewriteImportVuePlugin = void 0;
+const parser_1 = require("@babel/parser");
+const es_module_lexer_1 = require("es-module-lexer");
+const magic_string_1 = __importDefault(require("magic-string"));
+/**
+ * 如下情况会生成import vue的代码：
+ * 1. uvue页面编译产物通过helpers方式导入的vue相关api，defineComponent、unref等
+ * 2. 用户代码script中的ref、reactive、computed等
+ * 3. onLoad等从@dcloudio/uni-app导入的api等
+ * 4. 用户代码script中import vue的api
+ *
+ * 如果在transform中处理，需要确保此插件在autoImport之后，否则此时2、3尚未生成import vue的代码。
+ * 如果在renderChunk中处理，能保证所有代码都已经生成import vue的代码，但是此时热更新会触发所有文件重新处理import vue。
+ */
+function rewriteImportVuePlugin() {
+    return {
+        name: 'uni:rewrite-import-vue',
+        enforce: 'post',
+        async transform(source, id) {
+            await es_module_lexer_1.init;
+            const [imports] = (0, es_module_lexer_1.parse)(source);
+            const vueImportRanges = imports.filter((specifier) => specifier.n === 'vue' && specifier.d === -1);
+            if (!vueImportRanges.length) {
+                return;
+            }
+            const rewritten = rewriteImportVue(source, vueImportRanges);
+            if (rewritten.hasChanged()) {
+                return {
+                    code: rewritten.toString(),
+                    // 必须指定hires，不然部分情况可能会无法正确映射行号。
+                    map: rewritten.generateMap({ hires: 'boundary' }),
+                };
+            }
+        },
+    };
+}
+exports.rewriteImportVuePlugin = rewriteImportVuePlugin;
+/**
+ * import { xx as yy, zz } from 'vue' =>
+ * const { xx: yy, zz } = globalThis.Vue
+ */
+function rewriteImportVue(input, importRanges) {
+    const s = new magic_string_1.default(input);
+    if (importRanges) {
+        importRanges.forEach(({ ss, se }) => {
+            const rewritten = rewriteImportVueStatement(input.slice(ss, se));
+            if (rewritten !== undefined) {
+                s.overwrite(ss, se, rewritten);
+            }
+        });
+    }
+    else {
+        const ast = (0, parser_1.parse)(input, {
+            sourceType: 'module',
+        }).program.body;
+        ast.forEach((node) => {
+            if (node.type === 'ImportDeclaration' && node.source.value === 'vue') {
+                const rewritten = createImportVueReplacement(node);
+                if (rewritten !== undefined) {
+                    s.overwrite(node.start, node.end, rewritten);
+                }
+            }
+        });
+    }
+    return s;
+}
+exports.rewriteImportVue = rewriteImportVue;
+function rewriteImportVueStatement(input) {
+    const node = (0, parser_1.parse)(input, {
+        sourceType: 'module',
+    }).program.body[0];
+    if (node?.type === 'ImportDeclaration' && node.source.value === 'vue') {
+        return createImportVueReplacement(node);
+    }
+}
+function createImportVueReplacement(node) {
+    const imports = [];
+    const declarations = [];
+    node.specifiers.forEach((specifier) => {
+        if (specifier.type === 'ImportSpecifier') {
+            const imported = specifier.imported.name;
+            const local = specifier.local.name;
+            if (imported === local) {
+                imports.push(imported);
+            }
+            else {
+                imports.push(`${imported}: ${local}`);
+            }
+        }
+        else if (specifier.type === 'ImportDefaultSpecifier') {
+            const local = specifier.local.name;
+            imports.push(`default: ${local}`);
+        }
+        else if (specifier.type === 'ImportNamespaceSpecifier') {
+            const local = specifier.local.name;
+            declarations.push(`const ${local} = globalThis.Vue`);
+        }
+    });
+    if (imports.length > 0) {
+        declarations.push(`const { ${imports.join(', ')} } = globalThis.Vue`);
+    }
+    return declarations.join(';');
+}

package/dist/vue/options.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initPluginViteLegacyOptions = exports.initPluginVueJsxOptions = exports.initPluginVueOptions = exports.createPluginVueInstance = void 0;
-const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const shared_1 = require("@vue/shared");
 const uni_shared_1 = require("@dcloudio/uni-shared");
@@ -53,10 +52,9 @@ function initPluginVueOptions(options, UniVitePlugins, uniPluginOptions) {
     }
     const templateOptions = vueOptions.template || (vueOptions.template = {});
     const compilerOptions = templateOptions.compilerOptions || (templateOptions.compilerOptions = {});
-    const isDom2Harmony = process.env.UNI_APP_X_DOM2 === 'true' &&
-        process.env.UNI_PLATFORM === 'app-harmony';
+    const isDom2 = process.env.UNI_APP_X_DOM2 === 'true';
     compilerOptions.isX = process.env.UNI_APP_X === 'true';
-    compilerOptions.dom2 = isDom2Harmony;
+    compilerOptions.dom2 = isDom2;
     // 默认就移除comments节点
     compilerOptions.comments = false;
     const { compiler, styleOptions: { postcssPlugins }, compilerOptions: { miniProgram, isNativeTag, isVoidTag, isCustomElement, nodeTransforms, directiveTransforms, whitespace, }, } = uniPluginOptions;
@@ -145,7 +143,7 @@ function initPluginVueOptions(options, UniVitePlugins, uniPluginOptions) {
         };
     }
     if (options.platform !== 'h5' && options.platform !== 'web') {
-        compilerOptions.nodeTransforms.push(...(0, uni_cli_shared_1.getBaseNodeTransforms)(options.base, isDom2Harmony ? (0, uni_cli_shared_1.createResolveStaticAsset)(options.inputDir) : undefined));
+        compilerOptions.nodeTransforms.push(...(0, uni_cli_shared_1.getBaseNodeTransforms)(options.base, isDom2 ? (0, uni_cli_shared_1.createResolveStaticAsset)(options.inputDir) : undefined));
     }
     if (nodeTransforms) {
         compilerOptions.nodeTransforms.push(...nodeTransforms);
@@ -216,7 +214,7 @@ function initPluginVueOptions(options, UniVitePlugins, uniPluginOptions) {
         if (!vueOptions.script.babelParserPlugins.includes('decorators')) {
             vueOptions.script.babelParserPlugins.push('decorators');
         }
-        if (isDom2Harmony) {
+        if (isDom2) {
             const appVue = (0, uni_cli_shared_1.resolveAppVue)(process.env.UNI_INPUT_DIR);
             function isAppVue(id) {
                 return (0, uni_cli_shared_1.normalizePath)(id) === appVue;
@@ -231,6 +229,8 @@ function initPluginVueOptions(options, UniVitePlugins, uniPluginOptions) {
             vueOptions.script.extraOptions = (descriptor) => {
                 return {
                     isWatch: process.env.NODE_ENV === 'development',
+                    // TODO 目前使用全局开关，后续可能是页面级别的开关？
+                    dynamicSharedData: process.env.UNI_APP_X_DOM2_DYNAMIC === 'true',
                     helper: (0, uni_cli_shared_1.requireUniHelpers)(),
                     componentType: (0, uni_cli_shared_1.isUniPageFile)(descriptor.filename)
                         ? 'page'
@@ -239,31 +239,8 @@ function initPluginVueOptions(options, UniVitePlugins, uniPluginOptions) {
                             : 'component',
                 };
             };
-            let disableStaticStyle = false;
-            if (isDevX && process.env.NODE_ENV === 'development') {
-                if (process.env.UNI_UTS_PLATFORM === 'app-harmony') {
-                    // 开发版本、开发模式下，非鸿蒙release模式打包
-                    disableStaticStyle =
-                        process.env.UNI_APP_HARMONY_RUN_MODE !== 'release';
-                }
-            }
-            ;
             vueOptions.template.compilerOptions.extraOptions = (descriptor) => {
-                const filename = (0, uni_cli_shared_1.normalizePath)(descriptor.filename.split('?')[0]);
-                const relativeFilename = (0, uni_cli_shared_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, filename));
-                return {
-                    root: (0, uni_cli_shared_1.normalizePath)(process.env.UNI_INPUT_DIR),
-                    platform: process.env.UNI_UTS_PLATFORM,
-                    componentType: (0, uni_cli_shared_1.isUniPageFile)(filename) ? 'page' : 'component',
-                    relativeFilename,
-                    helper: (0, uni_cli_shared_1.requireUniHelpers)(),
-                    scriptCppBlocks: descriptor.scriptCppBlocks,
-                    genVueId: !!process.env.UNI_AUTOMATOR_WS_ENDPOINT,
-                    disableStaticStyle,
-                    onVueTemplateCompileLog(type, error) {
-                        return (0, uni_cli_shared_1.onVueTemplateCompileLog)(type, error, descriptor.source, relativeFilename);
-                    },
-                };
+                return (0, uni_cli_shared_1.initVueTemplateCompilerExtraOptions)(descriptor);
             };
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vite-plugin-uni",
-  "version": "3.0.0-5000720260410001",
+  "version": "3.0.0-5010520260709001",
   "description": "uni-app vite plugin",
   "bin": {
     "uni": "bin/uni.js"
@@ -44,9 +44,9 @@
     "picocolors": "1.1.0",
     "terser": "^5.4.0",
     "unplugin-auto-import": "19.1.0",
-    "@dcloudio/uni-cli-shared": "3.0.0-5000720260410001",
-    "@dcloudio/uni-shared": "3.0.0-5000720260410001",
-    "@dcloudio/uni-nvue-styler": "3.0.0-5000720260410001"
+    "@dcloudio/uni-cli-shared": "3.0.0-5010520260709001",
+    "@dcloudio/uni-nvue-styler": "3.0.0-5010520260709001",
+    "@dcloudio/uni-shared": "3.0.0-5010520260709001"
   },
   "devDependencies": {
     "@types/debug": "4.1.12",
@@ -63,7 +63,7 @@
     "vite": "5.2.8"
   },
   "uni-app": {
-    "compilerVersion": "5.07"
+    "compilerVersion": "5.15"
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "scripts": {