@dcloudio/uni-cli-shared 3.0.0-alpha-4070120250530001 → 3.0.0-alpha-4070220250613001

package/dist/json/app/pages/definePage.js

@@ -34,7 +34,7 @@ function defineNVuePageCode(pagesJson) {
         }
         const pagePathWithExtname = (0, utils_1.normalizePagePath)(page.path, 'app');
         if (pagePathWithExtname) {
-            importNVuePagesCode.push(`import('./${pagePathWithExtname}').then((res)=>{res.length})`);
+            importNVuePagesCode.push(`import('./${pagePathWithExtname}').then((res)=>{res()})`);
         }
     });
     return importNVuePagesCode.join('\n');

package/dist/uni_modules.cloud.js

@@ -10,6 +10,7 @@ const fast_glob_1 = require("fast-glob");
 const utils_1 = require("./utils");
 const easycom_1 = require("./easycom");
 const messages_1 = require("./messages");
+const constants_1 = require("./constants");
 function genEncryptEasyComModuleIndex(platform, components) {
     const imports = [];
     const ids = [];
@@ -132,6 +133,7 @@ function parseEasyComComponents(pluginId, inputDir, detectBinary = true) {
     return components;
 }
 exports.parseEasyComComponents = parseEasyComComponents;
+const uniModulesEncryptTypes = new Map();
 /**
  * 查找所有需要云编译的加密插件 uni_modules
  * 支持云编译的插件类型
@@ -144,6 +146,7 @@ exports.parseEasyComComponents = parseEasyComComponents;
  * @returns
  */
 function findCloudEncryptUniModules(platform, inputDir, cacheDir = '') {
+    uniModulesEncryptTypes.clear();
     const uniModules = {};
     const modulesDir = path_1.default.resolve(inputDir, 'uni_modules');
     if (fs_extra_1.default.existsSync(modulesDir)) {
@@ -153,6 +156,7 @@ function findCloudEncryptUniModules(platform, inputDir, cacheDir = '') {
                 return;
             }
             const utssdkDir = path_1.default.resolve(uniModuleRootDir, 'utssdk');
+            let type = '';
             if (fs_extra_1.default.existsSync(utssdkDir)) {
                 // app-android 和 app-ios 不能云编译 utssdk 插件，而是需要自定义基座
                 // app-harmony 平台目前不支持云编译
@@ -167,6 +171,7 @@ function findCloudEncryptUniModules(platform, inputDir, cacheDir = '') {
                 if (!hasIndexUTSFile) {
                     return;
                 }
+                type = 'utssdk';
             }
             else {
                 // 前端加密组件components
@@ -174,9 +179,14 @@ function findCloudEncryptUniModules(platform, inputDir, cacheDir = '') {
                 if (!fs_extra_1.default.existsSync(componentsDir)) {
                     return;
                 }
+                type = 'easycom';
             }
             const pkg = require(path_1.default.resolve(uniModuleRootDir, 'package.json'));
-            uniModules[uniModuleDir] = findEncryptUniModuleCache(uniModuleDir, cacheDir, { version: pkg.version, env: initCheckEnv() });
+            uniModules[uniModuleDir] = findEncryptUniModuleCache(uniModuleDir, cacheDir, {
+                version: pkg.version,
+                env: initCheckEnv(),
+            });
+            uniModulesEncryptTypes.set(uniModuleDir, type);
         });
     }
     return uniModules;
@@ -305,7 +315,8 @@ function findLastIndex(array, predicate) {
 }
 let encryptUniModules = {};
 function resolveEncryptUniModule(id, platform, isX = true) {
-    const parts = id.split('?', 2)[0].split('/');
+    id = id.split('?', 2)[0];
+    const parts = id.split('/');
     const index = findLastIndex(parts, (part) => part === 'uni_modules');
     if (index !== -1) {
         const uniModuleId = parts[index + 1];
@@ -317,6 +328,16 @@ function resolveEncryptUniModule(id, platform, isX = true) {
                     .replace('{1}', uniModuleId)
                     .replace('{2}', parts.slice(index + 2).join('/')));
             }
+            // 为了避免兼容性问题，
+            // 目前排除 app-android 和 app-ios 平台，其他平台需要判断是否uvue文件，比如web端。加密utssdk插件，但同时easycom使用了非加密组件
+            if (platform !== 'app-android' && platform !== 'app-ios') {
+                if (uniModulesEncryptTypes.get(uniModuleId) === 'utssdk') {
+                    // 如果是utssdk加密插件，且是vue文件，则不走uts-proxy
+                    if (constants_1.EXTNAME_VUE_RE.test(id)) {
+                        return;
+                    }
+                }
+            }
             // 原生平台走旧的uts-proxy
             return (0, utils_1.normalizePath)(path_1.default.join(process.env.UNI_INPUT_DIR, `uni_modules/${uniModuleId}?${isX && platform === 'app-android' ? 'uts-proxy' : 'uni_helpers'}`));
         }

package/dist/vite/cloud.js

@@ -230,6 +230,7 @@ function createExternal(config) {
             'pinia',
             'vuex',
             'vue-i18n',
+            'tslib',
         ].includes(source)) {
             return true;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4070120250530001",
+  "version": "3.0.0-alpha-4070220250613001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -68,8 +68,8 @@
     "unimport": "4.1.1",
     "unplugin-auto-import": "19.1.0",
     "xregexp": "3.1.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4070120250530001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4070120250530001"
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4070220250613001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4070220250613001"
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
@@ -89,6 +89,6 @@
     "code-frame": "link:@types/@babel/code-frame",
     "postcss": "^8.4.21",
     "vue": "3.4.21",
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4070120250530001"
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4070220250613001"
   }
 }