@dcloudio/vite-plugin-uni 3.0.0-4080720251210001 → 3.0.0-5000420260317001

package/dist/cli/action.js

@@ -80,6 +80,7 @@ async function runDev(options) {
                             options.platform === 'app-harmony' ||
                             options.platform === 'mp-harmony') {
                             process.env.UNI_APP_CHANGED_FILES = '';
+                            process.env.UNI_APP_UTS_CHANGED = '';
                         }
                         if (options.platform === 'app') {
                             process.env.UNI_APP_CHANGED_PAGES = '';
@@ -98,6 +99,8 @@ async function runDev(options) {
                         await (0, exports.stopProfiler)((message) => createLogger(options.logLevel).info(message));
                         return;
                     }
+                    const utsChanged = process.env.UNI_APP_UTS_CHANGED === 'true';
+                    process.env.UNI_APP_UTS_CHANGED = '';
                     if (options.platform === 'app') {
                         const files = process.env.UNI_APP_CHANGED_FILES;
                         const pages = process.env.UNI_APP_CHANGED_PAGES;
@@ -118,10 +121,24 @@ async function runDev(options) {
                     }
                     else if (options.platform === 'app-harmony' ||
                         options.platform === 'mp-harmony') {
-                        const files = process.env.UNI_APP_CHANGED_FILES;
-                        if (files) {
-                            return (0, uni_cli_shared_1.output)('log', uni_cli_shared_1.M['dev.watching.end.files'].replace('{files}', files));
+                        // 鸿蒙平台cpp/uts插件变更需要整体编译
+                        if (process.env.UNI_APP_X_DOM2_CPP_CHANGED !== 'true' &&
+                            !utsChanged) {
+                            const files = process.env.UNI_APP_CHANGED_FILES;
+                            if (files) {
+                                return (0, uni_cli_shared_1.output)('log', uni_cli_shared_1.M['dev.watching.end.files'].replace('{files}', files));
+                            }
+                        }
+                    }
+                    // dom2 下仅 cpp/uts插件 变更需要整体编译
+                    // 如果有changedFiles就增量输出，否则就不要输出，而是打印无变更，静态资源走额外的全量同步
+                    // 之前之所以没有增量就全量同步，是为了兼容性，怕出意外。
+                    if (process.env.UNI_APP_X_DOM2 === 'true') {
+                        if (process.env.UNI_APP_X_DOM2_CPP_CHANGED === 'true' ||
+                            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']);
                     }
                     return (0, uni_cli_shared_1.output)('log', uni_cli_shared_1.M['dev.watching.end']);
                 }

package/dist/cli/utils.js

@@ -176,6 +176,9 @@ function initEnv(type, options) {
             manifestJson['app-plus']?.['utsCompilerVersion'] === 'v1') {
             process.env.UNI_APP_X_TSC = 'false';
         }
+        if (manifestJson['uni-app-x']?.['styleIsolationVersion'] === '2') {
+            process.env.UNI_APP_STYLE_ISOLATION_VERSION = '2';
+        }
     }
     catch (e) { }
     if (!process.env.UNI_APP_X_TSC_DIR) {
@@ -218,6 +221,10 @@ function initEnv(type, options) {
     process.env.UNI_COMPILER_VERSION_TYPE = pkg.version.includes('alpha')
         ? 'a'
         : 'r';
+    process.env.UNI_HX_VERSION_DEV =
+        process.env.HX_Version && process.env.HX_Version.includes('-dev')
+            ? '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' ||
@@ -225,7 +232,8 @@ function initEnv(type, options) {
         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 === 'true' ? 'uni-app x' : 'vue3'}）` +
+            (process.env.UNI_APP_X_DOM2 === 'true' ? '蒸汽模式' : '')));
     }
     console.log(uni_cli_shared_1.M['compiling']);
 }

package/dist/configResolved/plugins/resolveId.js

@@ -31,13 +31,20 @@ const BUILT_IN_MODULES = {
 };
 function uniResolveIdPlugin(options) {
     const resolveCache = {};
-    if (process.env.UNI_APP_X === 'true') {
+    const isX = process.env.UNI_APP_X === 'true';
+    if (isX) {
         BUILT_IN_MODULES['@dcloudio/uni-app'] = 'dist-x/uni-app.es.js';
         BUILT_IN_MODULES['@dcloudio/uni-cloud'] = 'dist/uni-cloud-x.es.js';
     }
     return {
         name: 'uni:resolve-id',
         resolveId(id, importer) {
+            if (isX && process.env.UNI_UTS_PLATFORM.startsWith('mp-')) {
+                // TODO 优化此逻辑，目前unicloud-db等内置组件依赖UTSJSONObject时会自动引用tslib，此处逻辑防止内置组件引用插件内置tslib
+                if (id === 'tslib') {
+                    return '\0tslib.js';
+                }
+            }
             const cache = resolveCache[id];
             if (cache) {
                 // debugResolve('cache', id, cache)

package/dist/index.js

@@ -116,7 +116,8 @@ function createPlugins(options) {
             addCopyPlugin = true;
         }
     }
-    if (!(0, uni_cli_shared_1.isNormalCompileTarget)()) {
+    // 之前限制的是只有标准编译目标才 copy，现在 ext-api 也需要 copy 资源，暂时只排除 uni_modules
+    if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
         addCopyPlugin = false;
     }
     if (addCopyPlugin) {

package/dist/plugins/copy.js

@@ -12,11 +12,21 @@ 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 assets = [staticDir, uniModulesStaticDir];
+    const cppAssets = [];
+    if (uniModulesCppDir) {
+        cppAssets.push(uniModulesCppDir);
+    }
     const subpackages = (0, uni_cli_shared_1.parseSubpackagesRootOnce)(process.env.UNI_INPUT_DIR, process.env.UNI_PLATFORM);
     subpackages.forEach((root) => {
         assets.push((0, uni_cli_shared_1.normalizePath)(path_1.default.join(root, staticDir)));
         assets.push((0, uni_cli_shared_1.normalizePath)(path_1.default.join(root, uniModulesStaticDir)));
+        if (uniModulesCppDir) {
+            cppAssets.push((0, uni_cli_shared_1.normalizePath)(path_1.default.join(root, uniModulesCppDir)));
+        }
     });
     copyOptions.assets.forEach((asset) => {
         assets.push(asset);
@@ -25,27 +35,11 @@ function uniCopyPlugin({ outputDir, copyOptions, }) {
     const platform = process.env.UNI_PLATFORM;
     const utsPlatform = process.env.UNI_UTS_PLATFORM;
     // 非当前平台 static 目录
-    const ignorePlatformStaticDirs = (0, uni_cli_shared_1.getPlatforms)()
-        .filter((p) => {
-        if (platform === 'app') {
-            if (process.env.UNI_APP_X === 'true') {
-                if (p === 'app-android' || p === 'app-ios' || p === 'app-harmony') {
-                    return p !== utsPlatform;
-                }
-                return p !== 'app';
-            }
-            return p !== 'app' && p !== 'app-plus';
-        }
-        else if (platform === 'h5' || platform === 'web') {
-            return p !== 'h5' && p !== 'web';
-        }
-        else if (platform.startsWith('app-')) {
-            return p !== 'app' && p !== platform;
-        }
-        return p !== platform;
-    })
-        // 在最后增加 / 是为了避免误判以 platform 开头的目录，比如 app-test
-        .map((p) => '/' + uni_cli_shared_1.PUBLIC_DIR + '/' + p + '/');
+    const ignorePlatformStaticDirs = createIgnorePlatformDirs(uni_cli_shared_1.PUBLIC_DIR, platform, utsPlatform);
+    // 非当前平台 cppsdk 目录
+    const ignorePlatformCppDirs = uniModulesCppDir
+        ? createIgnorePlatformDirs('cppsdk', platform, utsPlatform)
+        : [];
     const targets = [
         {
             src: assets,
@@ -73,6 +67,24 @@ function uniCopyPlugin({ outputDir, copyOptions, }) {
         },
     ];
     targets.push(...copyOptions.targets);
+    if (process.env.UNI_APP_HARMONY_DOM2_CPP_DIR && cppAssets.length) {
+        targets.push({
+            src: cppAssets,
+            dest: process.env.UNI_APP_HARMONY_DOM2_CPP_DIR,
+            watchOptions: {
+                readyTimeout: getReadyTimeout(),
+                ignored(path) {
+                    const normalizedPath = (0, uni_cli_shared_1.normalizePath)(path);
+                    if (ignorePlatformCppDirs.find((dir) => 
+                    // dir都是以 / 结尾，所以这里也要以 / 结尾
+                    (normalizedPath + '/').includes(dir))) {
+                        return fs_1.default.statSync(normalizedPath).isDirectory();
+                    }
+                    return false;
+                },
+            },
+        });
+    }
     debugCopy(targets);
     checkIgnoreStatic(ignorePlatformStaticDirs.map((dir) => dir.substring(1).split('/')));
     return (0, uni_cli_shared_1.uniViteCopyPlugin)({
@@ -110,3 +122,26 @@ function getReadyTimeout() {
     // 仅在生产环境使用
     return 4000;
 }
+function createIgnorePlatformDirs(dir, platform, utsPlatform) {
+    return ((0, uni_cli_shared_1.getPlatforms)()
+        .filter((p) => {
+        if (platform === 'app') {
+            if (process.env.UNI_APP_X === 'true') {
+                if (p === 'app-android' || p === 'app-ios' || p === 'app-harmony') {
+                    return p !== utsPlatform;
+                }
+                return p !== 'app';
+            }
+            return p !== 'app' && p !== 'app-plus';
+        }
+        else if (platform === 'h5' || platform === 'web') {
+            return p !== 'h5' && p !== 'web';
+        }
+        else if (platform.startsWith('app-')) {
+            return p !== 'app' && p !== platform;
+        }
+        return p !== platform;
+    })
+        // 在最后增加 / 是为了避免误判以 platform 开头的目录，比如 app-test
+        .map((p) => '/' + dir + '/' + p + '/'));
+}

package/dist/vue/options.js

@@ -4,10 +4,11 @@ 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");
 const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared");
-const uni_nvue_styler_1 = require("@dcloudio/uni-nvue-styler");
 const utils_1 = require("../utils");
 const pluginVuePath = require.resolve('@vitejs/plugin-vue');
 const normalizedPluginVuePath = (0, uni_cli_shared_1.normalizePath)(pluginVuePath);
@@ -45,24 +46,19 @@ function initPluginVueOptions(options, UniVitePlugins, uniPluginOptions) {
     }
     // 解析 scoped 中 deep 等特殊语法
     styleOptions.postcssPlugins.push((0, uni_cli_shared_1.uniPostcssScopedPlugin)());
+    // 解析 :external() 语法，dom2 + 小程序平台下提升外部类选择器权重
+    if (process.env.UNI_APP_STYLE_ISOLATION_VERSION === '2' &&
+        process.env.UNI_APP_X === 'true') {
+        styleOptions.postcssPlugins.push((0, uni_cli_shared_1.uniPostcssExternalPlugin)());
+    }
     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';
     compilerOptions.isX = process.env.UNI_APP_X === 'true';
+    compilerOptions.dom2 = isDom2Harmony;
     // 默认就移除comments节点
     compilerOptions.comments = false;
-    if (process.env.UNI_PLATFORM !== 'web') {
-        // 非 web 平台，使用 factory 模式
-        ;
-        compilerOptions.templateMode = 'factory';
-        compilerOptions.disableEventDelegation = true;
-        compilerOptions.disableClassBinding = true;
-        compilerOptions.parseStaticStyle = (style) => {
-            return (0, uni_nvue_styler_1.parseInlineStyleSync)(style, {
-                type: 'uvue',
-                platform: process.env.UNI_UTS_PLATFORM,
-            });
-        };
-    }
     const { compiler, styleOptions: { postcssPlugins }, compilerOptions: { miniProgram, isNativeTag, isVoidTag, isCustomElement, nodeTransforms, directiveTransforms, whitespace, }, } = uniPluginOptions;
     if (postcssPlugins) {
         styleOptions.postcssPlugins.push(...postcssPlugins);
@@ -74,9 +70,18 @@ function initPluginVueOptions(options, UniVitePlugins, uniPluginOptions) {
         ;
         compilerOptions.miniProgram = miniProgram;
     }
+    const isDevX = process.env.UNI_HX_VERSION_DEV === 'true' &&
+        process.env.UNI_APP_X === 'true';
     if (isNativeTag) {
         const userIsNativeTag = compilerOptions.isNativeTag;
         compilerOptions.isNativeTag = (tag) => {
+            if (isDevX) {
+                const source = (0, uni_cli_shared_1.matchEasycom)(tag);
+                // 不能是uts插件的easycom组件
+                if (source && !source.includes('?uts-proxy')) {
+                    return false;
+                }
+            }
             if (isNativeTag(tag)) {
                 return true;
             }
@@ -129,7 +134,7 @@ function initPluginVueOptions(options, UniVitePlugins, uniPluginOptions) {
     templateOptions.transformAssetUrls = builtInTransformAssetUrls;
     if (typeof userOptionsTransformAssetUrls !== 'boolean' &&
         !!userOptionsTransformAssetUrls?.tags &&
-        !Array.isArray(userOptionsTransformAssetUrls.tags)) {
+        !(0, shared_1.isArray)(userOptionsTransformAssetUrls.tags)) {
         templateOptions.transformAssetUrls = {
             ...builtInTransformAssetUrls,
             ...userOptionsTransformAssetUrls,
@@ -140,9 +145,7 @@ function initPluginVueOptions(options, UniVitePlugins, uniPluginOptions) {
         };
     }
     if (options.platform !== 'h5' && options.platform !== 'web') {
-        compilerOptions.nodeTransforms.push(...(0, uni_cli_shared_1.getBaseNodeTransforms)(options.base, process.env.UNI_VUE_VAPOR === 'true'
-            ? (0, uni_cli_shared_1.createResolveStaticAsset)(options.inputDir)
-            : undefined));
+        compilerOptions.nodeTransforms.push(...(0, uni_cli_shared_1.getBaseNodeTransforms)(options.base, isDom2Harmony ? (0, uni_cli_shared_1.createResolveStaticAsset)(options.inputDir) : undefined));
     }
     if (nodeTransforms) {
         compilerOptions.nodeTransforms.push(...nodeTransforms);
@@ -213,6 +216,63 @@ function initPluginVueOptions(options, UniVitePlugins, uniPluginOptions) {
         if (!vueOptions.script.babelParserPlugins.includes('decorators')) {
             vueOptions.script.babelParserPlugins.push('decorators');
         }
+        if (isDom2Harmony) {
+            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;
+            }
+            ;
+            compilerOptions.isEasyComponent = (tag) => {
+                return (0, uni_shared_1.isDom2VueComponentTag)(tag) || !!(0, uni_cli_shared_1.matchEasycom)(tag);
+            };
+            compilerOptions.isUserComponent = (element) => {
+                return (0, uni_shared_1.isDom2AppUserVueComponentTag)(element.tag);
+            };
+            vueOptions.script.extraOptions = (descriptor) => {
+                return {
+                    isWatch: process.env.NODE_ENV === 'development',
+                    helper: (0, uni_cli_shared_1.requireUniHelpers)(),
+                    componentType: (0, uni_cli_shared_1.isUniPageFile)(descriptor.filename)
+                        ? 'page'
+                        : isAppVue(descriptor.filename)
+                            ? 'app'
+                            : '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);
+                    },
+                };
+            };
+        }
+        else {
+            // 如果是 easyComponent 组件，则不需要从setup中导入组件且不支持 self 引用
+            ;
+            compilerOptions.isEasyComponent = (tag) => {
+                return (0, uni_shared_1.isBuiltInComponent)(tag) || !!(0, uni_cli_shared_1.matchEasycom)(tag);
+            };
+        }
     }
     return vueOptions;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vite-plugin-uni",
-  "version": "3.0.0-4080720251210001",
+  "version": "3.0.0-5000420260317001",
   "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-4080720251210001",
-    "@dcloudio/uni-shared": "3.0.0-4080720251210001",
-    "@dcloudio/uni-nvue-styler": "3.0.0-4080720251210001"
+    "@dcloudio/uni-nvue-styler": "3.0.0-5000420260317001",
+    "@dcloudio/uni-cli-shared": "3.0.0-5000420260317001",
+    "@dcloudio/uni-shared": "3.0.0-5000420260317001"
   },
   "devDependencies": {
     "@types/debug": "4.1.12",
@@ -63,7 +63,7 @@
     "vite": "5.2.8"
   },
   "uni-app": {
-    "compilerVersion": "4.87"
+    "compilerVersion": "5.04"
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "scripts": {