@dcloudio/uni-cli-shared 3.0.0-alpha-5000520260323001 → 3.0.0-alpha-5000720260416001

package/dist/json/utils.js

@@ -64,30 +64,6 @@ function checkPagesJson(jsonStr, inputDir) {
             });
         }
     });
-    const tabBarNode = root.children?.find((child) => child.type === 'property' &&
-        child.children?.length === 2 &&
-        child.children[0].value === 'tabBar');
-    if (process.env.UNI_APP_X_DOM2 !== 'true' && tabBarNode) {
-        // dom2下不支持tabBar配置项，这里先不校验
-        let allPages = []; // 收集全部页面,包含分包页面
-        let tabBarPages = []; // 收集 tabBar 页面
-        allPages.push(...pagePathNodes.map((node) => node.value));
-        findRootNode(tabBarNode.children[1], ['list']).forEach((node) => {
-            const pagePathNode = node.type === 'object' &&
-                node.children?.find((child) => child.type === 'property' &&
-                    child.children?.length === 2 &&
-                    child.children[0].value === 'pagePath');
-            if (pagePathNode) {
-                const pagePathValueNode = pagePathNode.children[1];
-                const pagePath = pagePathValueNode.value;
-                tabBarPages.push(pagePath);
-                if (!allPages.includes(pagePath) &&
-                    !allPages.includes(pagePath.substring(1))) {
-                    throwCompilerError(jsonStr, pagePathValueNode, messages_1.M['pages.json.tabbar.page.notfound'].replace('{pagePath}', pagePath));
-                }
-            }
-        });
-    }
     for (const node of pagePathNodes) {
         const pagePath = node.value ?? '';
         if (!pageExistsWithCaseSync(path_1.default.join(inputDir, pagePath))) {

package/dist/messages/en.d.ts

@@ -48,6 +48,5 @@ declare const _default: {
     readonly 'uni_modules.import': "Plug-in [{0}] only supports @/uni_modules/{1}.";
     readonly 'pages.json.page.notfound': "The page \"{pagePath}\" does not exist.";
     readonly 'pages.json.page.slash': "The Path \"{pagePath}\" cannot start with \"/\"";
-    readonly 'pages.json.tabbar.page.notfound': "The tabBar page \"{pagePath}\" is not declared in \"pages.json\".";
 };
 export default _default;

package/dist/messages/en.js

@@ -50,5 +50,4 @@ exports.default = {
     'uni_modules.import': 'Plug-in [{0}] only supports @/uni_modules/{1}.',
     'pages.json.page.notfound': 'The page "{pagePath}" does not exist.',
     'pages.json.page.slash': 'The Path "{pagePath}" cannot start with "/"',
-    'pages.json.tabbar.page.notfound': 'The tabBar page "{pagePath}" is not declared in "pages.json".',
 };

package/dist/messages/index.d.ts

@@ -48,7 +48,6 @@ export declare const M: {
     readonly 'uni_modules.import': "插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。";
     readonly 'pages.json.page.notfound': "页面\"{pagePath}\"不存在，请确保填写的页面路径不包含文件后缀，且必须与真实的文件路径大小写保持一致。";
     readonly 'pages.json.page.slash': "路径 \"{pagePath}\" 不能以 \"/\" 开头";
-    readonly 'pages.json.tabbar.page.notfound': "tabBar 中配置的页面 \"{pagePath}\" 未在 pages.json 中注册。";
 } | {
     readonly 'app.compiler.version': "Compiler version: {version}";
     readonly compiling: "Compiling...";
@@ -99,5 +98,4 @@ export declare const M: {
     readonly 'uni_modules.import': "Plug-in [{0}] only supports @/uni_modules/{1}.";
     readonly 'pages.json.page.notfound': "The page \"{pagePath}\" does not exist.";
     readonly 'pages.json.page.slash': "The Path \"{pagePath}\" cannot start with \"/\"";
-    readonly 'pages.json.tabbar.page.notfound': "The tabBar page \"{pagePath}\" is not declared in \"pages.json\".";
 };

package/dist/messages/zh_CN.d.ts

@@ -48,6 +48,5 @@ declare const _default: {
     readonly 'uni_modules.import': "插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。";
     readonly 'pages.json.page.notfound': "页面\"{pagePath}\"不存在，请确保填写的页面路径不包含文件后缀，且必须与真实的文件路径大小写保持一致。";
     readonly 'pages.json.page.slash': "路径 \"{pagePath}\" 不能以 \"/\" 开头";
-    readonly 'pages.json.tabbar.page.notfound': "tabBar 中配置的页面 \"{pagePath}\" 未在 pages.json 中注册。";
 };
 export default _default;

package/dist/messages/zh_CN.js

@@ -51,5 +51,4 @@ exports.default = {
     'uni_modules.import': '插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。',
     'pages.json.page.notfound': '页面"{pagePath}"不存在，请确保填写的页面路径不包含文件后缀，且必须与真实的文件路径大小写保持一致。',
     'pages.json.page.slash': '路径 "{pagePath}" 不能以 "/" 开头',
-    'pages.json.tabbar.page.notfound': 'tabBar 中配置的页面 "{pagePath}" 未在 pages.json 中注册。',
 };

package/dist/vite/plugins/json.js

@@ -9,19 +9,86 @@ const json_1 = require("../../json");
 const preprocess_1 = require("../../preprocess");
 const utils_1 = require("../utils");
 function uniJsonPlugin() {
+    const UTS_CAST_ARRAY_MARKER = '/*__UTS_CAST_UTSJSON_ARRAY__*/';
+    const UTS_CAST_OBJECT_MARKER = '/*__UTS_CAST_UTSJSON_OBJECT__*/';
+    const IS_UNI_X_ANDROID = process.env.UNI_APP_X === 'true' &&
+        process.env.UNI_UTS_PLATFORM === 'app-android';
     return {
         name: 'uni:json',
         enforce: 'pre',
+        generateBundle(options, bundle) {
+            if (IS_UNI_X_ANDROID) {
+                for (const [fileName, file] of Object.entries(bundle)) {
+                    if (fileName.endsWith('.json.ts')) {
+                        if (file.type === 'asset' && file.source) {
+                            const source = file.source.toString();
+                            if (source.includes(UTS_CAST_ARRAY_MARKER) ||
+                                source.includes(UTS_CAST_OBJECT_MARKER)) {
+                                file.source = source
+                                    .replace(new RegExp(UTS_CAST_ARRAY_MARKER.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), ' as UTSJSONObject[]')
+                                    .replace(new RegExp(UTS_CAST_OBJECT_MARKER.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), ' as UTSJSONObject');
+                            }
+                        }
+                    }
+                }
+            }
+        },
         transform(code, id) {
             // 如果已经被其他插件处理过了，就不再处理，比如 commonjs 插件，ICAPRegistrar.json?commonjs-external
             if (id.startsWith('\0')) {
                 return;
             }
-            if (path_1.default.extname((0, utils_1.parseVueRequest)(id).filename) !== '.json') {
+            const { filename } = (0, utils_1.parseVueRequest)(id);
+            if (path_1.default.extname(filename) !== '.json') {
                 return;
             }
+            let codeObj = (0, json_1.parseJson)((0, preprocess_1.preJson)(code, id), false, id);
+            let codeJson = '';
+            if (IS_UNI_X_ANDROID) {
+                if (Array.isArray(codeObj)) {
+                    codeJson +=
+                        'export default JSON.parseArray(`' +
+                            JSON.stringify(codeObj, null, 2) +
+                            '`)' +
+                            UTS_CAST_ARRAY_MARKER +
+                            ';\n';
+                }
+                else {
+                    codeJson +=
+                        'let __jsonObj = JSON.parseObject(`' +
+                            JSON.stringify(codeObj, null, 2) +
+                            '`);\n';
+                    for (const key in codeObj) {
+                        if (!Object.hasOwn(codeObj, key))
+                            continue;
+                        const element = codeObj[key];
+                        if (Array.isArray(element)) {
+                            codeJson += `export const ${key} = __jsonObj?.getArray("${key}")${UTS_CAST_ARRAY_MARKER};\n`;
+                        }
+                        else if (typeof element === 'object' && element !== null) {
+                            codeJson += `export const ${key} = __jsonObj?.get("${key}")${UTS_CAST_OBJECT_MARKER};\n`;
+                        }
+                        else if (typeof element === 'string') {
+                            codeJson += `export const ${key} = __jsonObj?.getString("${key}") ?? '';\n`;
+                        }
+                        else if (typeof element === 'number') {
+                            codeJson += `export const ${key} = __jsonObj?.getNumber("${key}") ?? 0;\n`;
+                        }
+                        else if (typeof element === 'boolean') {
+                            codeJson += `export const ${key} = __jsonObj?.getBoolean("${key}") ?? false;\n`;
+                        }
+                        else {
+                            codeJson += `export const ${key} = __jsonObj?.get("${key}")${UTS_CAST_OBJECT_MARKER};\n`;
+                        }
+                    }
+                    codeJson += `export default __jsonObj;`;
+                }
+            }
+            else {
+                codeJson = JSON.stringify(codeObj, null, 2);
+            }
             return {
-                code: JSON.stringify((0, json_1.parseJson)((0, preprocess_1.preJson)(code, id), false, id), null, 2),
+                code: codeJson,
                 map: {
                     mappings: '',
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-5000520260323001",
+  "version": "3.0.0-alpha-5000720260416001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -69,9 +69,9 @@
     "unimport": "4.1.1",
     "unplugin-auto-import": "19.1.0",
     "xregexp": "5.1.2",
-    "@dcloudio/uni-nvue-styler": "3.0.0-alpha-5000520260323001",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-5000520260323001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-5000520260323001"
+    "@dcloudio/uni-nvue-styler": "3.0.0-alpha-5000720260416001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-5000720260416001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-5000720260416001"
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
@@ -91,6 +91,6 @@
     "code-frame": "link:@types/@babel/code-frame",
     "postcss": "8.4.45",
     "vue": "3.4.21",
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-5000520260323001"
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-5000720260416001"
   }
 }