@dcloudio/vite-plugin-uni 3.0.0-5000520260324001 → 3.0.0-5000520260324002

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,11 +100,12 @@ async function runDev(options) {
                     }
                     const utsChanged = process.env.UNI_APP_UTS_CHANGED === 'true';
                     process.env.UNI_APP_UTS_CHANGED = '';
+                    let changedFiles = '';
                     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;
+                        changedFiles = pages || files;
                         process.env.UNI_APP_CHANGED_PAGES = '';
                         process.env.UNI_APP_CHANGED_FILES = '';
                         process.env.UNI_APP_UTS_CHANGED_FILES = '';
@@ -138,7 +138,10 @@ async function runDev(options) {
                             utsChanged) {
                             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文件变更，就输出无变更
+                        if (!changedFiles) {
+                            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 +177,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 {

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,12 @@ 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 (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/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"));
@@ -41,13 +41,11 @@ 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)());
@@ -63,7 +61,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 +135,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 +187,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) {
@@ -67,10 +66,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) {

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-5000520260324001",
+  "version": "3.0.0-5000520260324002",
   "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-shared": "3.0.0-5000520260324001",
-    "@dcloudio/uni-cli-shared": "3.0.0-5000520260324001",
-    "@dcloudio/uni-nvue-styler": "3.0.0-5000520260324001"
+    "@dcloudio/uni-cli-shared": "3.0.0-5000520260324002",
+    "@dcloudio/uni-nvue-styler": "3.0.0-5000520260324002",
+    "@dcloudio/uni-shared": "3.0.0-5000520260324002"
   },
   "devDependencies": {
     "@types/debug": "4.1.12",