@dcloudio/vite-plugin-uni 3.0.0-4010420240430002 → 3.0.0-4020320240708001

package/bin/uni.js

@@ -28,7 +28,13 @@ if (
   process.argv[2] === 'build' &&
   !process.argv.some((arg) => /^(?:-w|--watch)$/.test(arg))
 ) {
-  process.env.NODE_ENV = 'production'
+  if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+    if (!process.env.NODE_ENV) {
+      process.env.NODE_ENV = 'production'
+    }
+  } else {
+    process.env.NODE_ENV = 'production'
+  }
 }
 
 function initDebug() {

package/dist/cli/build.js

@@ -48,7 +48,7 @@ async function buildSSR(options) {
     const ssrClientDir = path_1.default.resolve(outputDir, 'client');
     process.env.UNI_OUTPUT_DIR = ssrClientDir;
     const ssrBuildClientOptions = (0, utils_1.cleanOptions)(options);
-    ssrBuildClientOptions.ssrManifest = true;
+    ssrBuildClientOptions.ssrManifest = 'ssr-manifest.json';
     ssrBuildClientOptions.outDir = process.env.UNI_OUTPUT_DIR;
     process.env.UNI_SSR_CLIENT = 'true';
     await buildByVite((0, utils_1.addConfigFile)(initBuildOptions(options, ssrBuildClientOptions)));
@@ -56,6 +56,12 @@ async function buildSSR(options) {
     process.env.UNI_OUTPUT_DIR = ssrServerDir;
     const ssrBuildServerOptions = (0, utils_1.cleanOptions)(options);
     ssrBuildServerOptions.ssr = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'entry-server.js');
+    // 强制 cjs 输出
+    ssrBuildServerOptions.rollupOptions = {
+        output: {
+            format: 'cjs',
+        },
+    };
     ssrBuildServerOptions.outDir = process.env.UNI_OUTPUT_DIR;
     process.env.UNI_SSR_CLIENT = '';
     process.env.UNI_SSR_SERVER = 'true';
@@ -121,6 +127,10 @@ async function buildApp(options) {
     // 指定为 vue 方便 App 插件初始化 vue 所需插件列表
     process.env.UNI_COMPILER = 'vue';
     const vueBuilder = await buildByVite((0, utils_1.addConfigFile)(initBuildOptions(options, (0, utils_1.cleanOptions)(options))));
+    if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+        // 不需要 nvue 编译器
+        return vueBuilder;
+    }
     if (appWatcher) {
         appWatcher.setFirstWatcher(vueBuilder);
     }

package/dist/cli/nvue.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initNVueEnv = void 0;
 const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared");
 function initNVueEnv() {
+    if (process.env.UNI_APP_X === 'true') {
+        return;
+    }
     const manifestJson = (0, uni_cli_shared_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
     if ((0, uni_cli_shared_1.getAppRenderer)(manifestJson) === 'native') {
         process.env.UNI_RENDERER = 'native';

package/dist/cli/server.js

@@ -141,7 +141,7 @@ async function createSSRServer(options) {
                 }
                 else {
                     logger.info(`Port ${port} is in use, trying another one...`);
-                    app.listen(++port, hostname, onSuccess).on('error', onError);
+                    server = app.listen(++port, hostname, onSuccess).on('error', onError);
                 }
             }
             else {
@@ -149,7 +149,7 @@ async function createSSRServer(options) {
                 reject(e);
             }
         };
-        const server = app.listen(port, hostname, onSuccess).on('error', onError);
+        let server = app.listen(port, hostname, onSuccess).on('error', onError);
     });
 }
 exports.createSSRServer = createSSRServer;

package/dist/cli/utils.js

@@ -68,7 +68,14 @@ function initEnv(type, options) {
             process.env.NODE_ENV = 'development';
         }
         else {
-            process.env.NODE_ENV = 'production';
+            if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+                if (!process.env.NODE_ENV) {
+                    process.env.NODE_ENV = 'production';
+                }
+            }
+            else {
+                process.env.NODE_ENV = 'production';
+            }
         }
     }
     if (!options.mode) {
@@ -98,6 +105,15 @@ function initEnv(type, options) {
         process.env.UNI_INPUT_DIR || path_1.default.resolve(process.cwd(), 'src');
     initCustomScripts(options);
     process.env.UNI_PLATFORM = options.platform;
+    if (process.env.UNI_PLATFORM === 'app-harmony') {
+        const manifestJson = (0, uni_cli_shared_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
+        const projectPath = manifestJson['app-harmony']?.projectPath;
+        if (projectPath) {
+            process.env.UNI_APP_HARMONY_PROJECT_PATH = path_1.default.resolve(projectPath);
+            // 指定了鸿蒙项目根目录
+            process.env.UNI_OUTPUT_DIR = path_1.default.resolve(process.env.UNI_APP_HARMONY_PROJECT_PATH, `entry/src/main/resources/rawfile/apps/HBuilder/www`);
+        }
+    }
     const hasOutputDir = !!process.env.UNI_OUTPUT_DIR;
     if (hasOutputDir) {
         ;
@@ -122,6 +138,14 @@ function initEnv(type, options) {
                 path_1.default.resolve(process.env.UNI_OUTPUT_DIR, options.subpackage);
         }
     }
+    const baseOutDir = path_1.default.basename(process.env.UNI_OUTPUT_DIR);
+    process.env.UNI_APP_X_CACHE_DIR =
+        process.env.UNI_APP_X_CACHE_DIR ||
+            path_1.default.resolve(process.env.UNI_OUTPUT_DIR, '../cache/.' + baseOutDir);
+    process.env.HX_DEPENDENCIES_DIR =
+        process.env.HX_DEPENDENCIES_DIR ||
+            path_1.default.resolve(process.env.UNI_OUTPUT_DIR, '../hx/' + baseOutDir);
+    process.env.UNI_MODULES_ENCRYPT_CACHE_DIR = path_1.default.resolve(process.env.UNI_APP_X_CACHE_DIR, '.encrypt', process.env.NODE_ENV === 'development' ? 'dev' : 'build', process.env.UNI_UTS_PLATFORM);
     initAutomator(options);
     initDevtools(options);
     if (process.env.UNI_PLATFORM === 'app') {
@@ -204,6 +228,9 @@ function initUTSPlatform(options) {
     else if (process.env.UNI_UTS_PLATFORM === 'app-ios') {
         process.env.UNI_UTS_TARGET_LANGUAGE = 'swift';
     }
+    else if (process.env.UNI_UTS_PLATFORM === 'app-harmony') {
+        process.env.UNI_UTS_TARGET_LANGUAGE = 'arkts';
+    }
 }
 function initDevtools({ devtools, devtoolsHost, devtoolsPort }) {
     if (!devtools) {

package/dist/cli/uvue.js

@@ -13,14 +13,17 @@ function initUVueEnv() {
     if (process.env.UNI_APP_X === 'false') {
         return;
     }
-    const manifestJson = (0, uni_cli_shared_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
-    const isNVueEnabled = (0, shared_1.hasOwn)(manifestJson, 'uni-app-x');
-    if (!isNVueEnabled) {
-        return;
-    }
-    process.env.UNI_APP_X = 'true';
-    if (manifestJson['uni-app-x']?.singleThread === false) {
-        process.env.UNI_APP_X_SINGLE_THREAD = 'false';
+    // 没有手动指定时，才需要动态读取 manifest.json
+    if (process.env.UNI_APP_X !== 'true') {
+        const manifestJson = (0, uni_cli_shared_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
+        const isNVueEnabled = (0, shared_1.hasOwn)(manifestJson, 'uni-app-x');
+        if (!isNVueEnabled) {
+            return;
+        }
+        process.env.UNI_APP_X = 'true';
+        if (manifestJson['uni-app-x']?.singleThread === false) {
+            process.env.UNI_APP_X_SINGLE_THREAD = 'false';
+        }
     }
     if (process.env.UNI_PLATFORM === 'app') {
         process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE = 'native';

package/dist/config/resolve.js

@@ -7,7 +7,7 @@ exports.createResolve = exports.customResolver = void 0;
 const path_1 = __importDefault(require("path"));
 const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared");
 function resolveUTSModuleProxyFile(id, importer) {
-    const file = (0, uni_cli_shared_1.resolveUTSAppModule)(id, importer);
+    const file = (0, uni_cli_shared_1.resolveUTSAppModule)(process.env.UNI_UTS_PLATFORM, id, importer);
     if (file) {
         // app-js 会返回完整路径，不需要 uts-proxy
         if (file.endsWith('.uts')) {
@@ -20,12 +20,17 @@ const customResolver = (updatedId, importer) => {
     const utsImporter = importer
         ? path_1.default.dirname(importer)
         : process.env.UNI_INPUT_DIR;
-    const utsModuleFile = process.env.UNI_PLATFORM === 'app'
+    const utsModuleFile = process.env.UNI_PLATFORM === 'app' ||
+        process.env.UNI_PLATFORM === 'app-harmony'
         ? 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;
     }
+    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;
+    }
     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));
     }
@@ -34,6 +39,13 @@ const customResolver = (updatedId, importer) => {
 exports.customResolver = customResolver;
 function createResolve(options, _config) {
     const alias = [];
+    if (process.env.UNI_COMPILE_TARGET !== 'uni_modules') {
+        // 加密组件内部使用的 vue export helper，需要重新映射回来
+        alias.push({
+            find: 'plugin-vue:export-helper',
+            replacement: '\0plugin-vue:export-helper',
+        });
+    }
     return {
         // 必须使用alias解析，插件定制的resolveId，不会被应用到css等预处理器中
         alias: [
@@ -49,6 +61,7 @@ function createResolve(options, _config) {
             ...alias,
         ],
         extensions: process.env.UNI_APP_X === 'true' ? uni_cli_shared_1.uni_app_x_extensions : uni_cli_shared_1.extensions,
+        preserveSymlinks: true,
     };
 }
 exports.createResolve = createResolve;

package/dist/configResolved/options.js

@@ -1,14 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initOptions = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const jsonc_parser_1 = require("jsonc-parser");
+const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared");
 function resolveBase() {
-    const manifest = (0, jsonc_parser_1.parse)(fs_1.default.readFileSync(path_1.default.join(process.env.UNI_INPUT_DIR, 'manifest.json'), 'utf8'));
+    const manifest = (0, uni_cli_shared_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
     return (manifest.h5 && manifest.h5.router && manifest.h5.router.base) || '/';
 }
 function initOptions(options, config) {

package/dist/configResolved/plugins/index.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initPlugins = void 0;
-const path_1 = __importDefault(require("path"));
 // import debug from 'debug'
 const shared_1 = require("@vue/shared");
 const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared");
@@ -28,14 +24,17 @@ function initPlugins(config, options) {
     addPlugin(plugins, (0, pre_1.uniPrePlugin)(config, (0, shared_1.extend)(uniPrePluginOptions, options)), 0, 'pre');
     addPlugin(plugins, (0, preCss_1.uniPreCssPlugin)(config, (0, shared_1.extend)(uniPreCssPluginOptions, options)), 'vite:css');
     addPlugin(plugins, (0, preVue_1.uniPreVuePlugin)(), 'vite:vue', 'pre');
-    addPlugin(plugins, (0, ssr_1.uniSSRPlugin)(config, (0, shared_1.extend)({ exclude: [...uni_cli_shared_1.COMMON_EXCLUDE, /\/@dcloudio\/uni-app/] }, options)), 'vite:vue');
+    addPlugin(plugins, (0, ssr_1.uniSSRPlugin)(config, (0, shared_1.extend)({ exclude: [...uni_cli_shared_1.COMMON_EXCLUDE, /\/@dcloudio\/uni-app/] }, options)), process.env.UNI_APP_X === 'true' ? 'uts' : 'vite:vue');
     addPlugin(plugins, (0, json_1.uniJsonPlugin)(options), 'vite:json', 'pre');
     addPlugin(plugins, (0, static_1.uniStaticPlugin)(options, config), 'vite:asset', 'pre');
-    if ((0, uni_cli_shared_1.isInHBuilderX)()) {
+    if (process.env.UNI_HBUILDERX_PLUGINS &&
+        process.env.UNI_COMPILE_TARGET !== 'uni_modules') {
         try {
-            require(path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers/lib/bytenode'));
-            const { V } = require(path_1.default.join(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers'));
-            addPlugin(plugins, V({ dir: process.env.UNI_INPUT_DIR }), 0, 'pre');
+            const { V } = (0, uni_cli_shared_1.requireUniHelpers)();
+            addPlugin(plugins, V({
+                dir: process.env.UNI_INPUT_DIR,
+                cacheDir: process.env.UNI_MODULES_ENCRYPT_CACHE_DIR,
+            }), 0, 'pre');
         }
         catch (e) { }
     }

package/dist/index.js

@@ -82,7 +82,6 @@ function createPlugins(options) {
     plugins.push({
         name: 'uni',
         config: (0, config_1.createConfig)(options, uniPlugins),
-        // resolveId: createResolveId(options),
         configResolved: (0, configResolved_1.createConfigResolved)(options),
     });
     plugins.push(...uniPlugins);
@@ -102,7 +101,7 @@ function createPlugins(options) {
     }
     else {
         // 仅在 vue 或 纯原生 App.vue 编译时做 copy
-        if (process.env.UNI_COMPILER === 'vue' ||
+        if (process.env.UNI_COMPILER !== 'nvue' ||
             (process.env.UNI_RENDERER === 'native' &&
                 process.env.UNI_RENDERER_NATIVE === 'appService')) {
             addCopyPlugin = true;
@@ -112,6 +111,9 @@ function createPlugins(options) {
             addCopyPlugin = true;
         }
     }
+    if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+        addCopyPlugin = false;
+    }
     if (addCopyPlugin) {
         plugins.push((0, copy_1.uniCopyPlugin)({
             outputDir: process.env.UNI_OUTPUT_DIR,
@@ -157,9 +159,11 @@ function createUVueAndroidPlugins(options) {
         process.env.UNI_NODE_ENV !== process.env.NODE_ENV) {
         process.env.NODE_ENV = process.env.UNI_NODE_ENV;
     }
-    plugins.push((0, copy_1.uniCopyPlugin)({
-        outputDir: process.env.UNI_OUTPUT_DIR,
-        copyOptions: options.copyOptions,
-    }));
+    if (process.env.UNI_COMPILE_TARGET !== 'uni_modules') {
+        plugins.push((0, copy_1.uniCopyPlugin)({
+            outputDir: process.env.UNI_OUTPUT_DIR,
+            copyOptions: options.copyOptions,
+        }));
+    }
     return plugins;
 }

package/dist/plugins/copy.js

@@ -39,6 +39,7 @@ function uniCopyPlugin({ outputDir, copyOptions, }) {
             src: assets,
             dest: outputDir,
             watchOptions: {
+                followSymlinks: false, // 不设置为false的话，如果uni_modules软链了，会拷贝所有的不匹配文件
                 ignored(path) {
                     const normalizedPath = (0, uni_cli_shared_1.normalizePath)(path);
                     if (ignorePlatformStaticDirs.find((dir) => normalizedPath.includes(dir))) {

package/dist/vue/options.js

@@ -87,14 +87,26 @@ function initPluginVueOptions(options, UniVitePlugins, uniPluginOptions) {
     if (!compilerOptions.nodeTransforms) {
         compilerOptions.nodeTransforms = [];
     }
-    if (options.platform === 'h5' || options.platform === 'web') {
-        templateOptions.transformAssetUrls = (0, uni_cli_shared_1.createUniVueTransformAssetUrls)((0, uni_cli_shared_1.isExternalUrl)(options.base) ? options.base : '');
-    }
-    else {
-        // 替换内置的 transformAssetUrls 逻辑
+    // 合并 transformAssetUrls
+    // 内置配置
+    const builtInTransformAssetUrls = (0, uni_cli_shared_1.createUniVueTransformAssetUrls)((0, uni_cli_shared_1.isExternalUrl)(options.base) ? options.base : '');
+    // 用户传递配置 eg: transformAssetUrls.tags = {'my-image': ['src']}
+    // docs: https://github.com/vitejs/vite-plugin-vue/tree/main/packages/plugin-vue
+    const userOptionsTransformAssetUrls = templateOptions.transformAssetUrls;
+    templateOptions.transformAssetUrls = builtInTransformAssetUrls;
+    if (typeof userOptionsTransformAssetUrls !== 'boolean' &&
+        !!userOptionsTransformAssetUrls?.tags &&
+        !Array.isArray(userOptionsTransformAssetUrls.tags)) {
         templateOptions.transformAssetUrls = {
-            tags: {},
+            ...builtInTransformAssetUrls,
+            ...userOptionsTransformAssetUrls,
+            tags: {
+                ...builtInTransformAssetUrls.tags,
+                ...userOptionsTransformAssetUrls.tags,
+            },
         };
+    }
+    if (options.platform !== 'h5' && options.platform !== 'web') {
         compilerOptions.nodeTransforms.push(...(0, uni_cli_shared_1.getBaseNodeTransforms)(options.base));
     }
     if (nodeTransforms) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vite-plugin-uni",
-  "version": "3.0.0-4010420240430002",
+  "version": "3.0.0-4020320240708001",
   "description": "uni-app vite plugin",
   "bin": {
     "uni": "bin/uni.js"
@@ -27,8 +27,8 @@
     "@babel/core": "^7.23.3",
     "@babel/plugin-syntax-import-meta": "^7.10.4",
     "@babel/plugin-transform-typescript": "^7.23.3",
-    "@dcloudio/uni-cli-shared": "3.0.0-4010420240430002",
-    "@dcloudio/uni-shared": "3.0.0-4010420240430002",
+    "@dcloudio/uni-cli-shared": "3.0.0-4020320240708001",
+    "@dcloudio/uni-shared": "3.0.0-4020320240708001",
     "@rollup/pluginutils": "^5.0.5",
     "@vitejs/plugin-legacy": "^5.3.2",
     "@vitejs/plugin-vue": "^5.0.4",
@@ -65,7 +65,7 @@
     "vite": "^5.2.8"
   },
   "uni-app": {
-    "compilerVersion": "4.14"
+    "compilerVersion": "4.23"
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da"
 }

package/dist/resolveId/index.d.ts

@@ -1,3 +0,0 @@
-import type { Plugin } from 'vite';
-import type { VitePluginUniResolvedOptions } from '..';
-export declare function createResolveId(options: VitePluginUniResolvedOptions): Plugin['resolveId'];

package/dist/resolveId/index.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createResolveId = void 0;
-const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared");
-function createResolveId(options) {
-    const inputDir = (0, uni_cli_shared_1.normalizePath)(options.inputDir);
-    return function (id) {
-        if (id.startsWith('@/')) {
-            return inputDir + id.slice(1);
-        }
-        else if (id.startsWith('~@/')) {
-            return inputDir + id.slice(2);
-        }
-    };
-}
-exports.createResolveId = createResolveId;