@tuya-sat/micro-script 3.0.27-beta.7 → 3.0.27-beta.9

package/dist/module/main/fakeSaasInfo.d.ts

@@ -1,2 +1,2 @@
-import { Express } from 'express';
+import { Express } from "express";
 export default function mockSaasInfo(app: Express, microPort: number): void;

package/dist/module/main/fakeSaasInfo.js

@@ -34,35 +34,36 @@ const path = __importStar(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const utils_1 = require("../../utils");
 function mockSaasInfo(app, microPort) {
-    let { multiApps, debuggerConfig: { isMainApp }, } = require(paths_1.default.microConfig);
+    let { multiApps, microApps, debuggerConfig: { isMainApp }, } = require(paths_1.default.microConfig);
     const idsMap = new Map();
     multiApps = (0, utils_1.processMultiApps)(multiApps);
-    if (isMainApp && fs_extra_1.default.existsSync(path.join(process.cwd(), 'apps'))) {
-        const dirs = fs_extra_1.default.readdirSync(path.join(process.cwd(), 'apps'));
-        dirs === null || dirs === void 0 ? void 0 : dirs.forEach(dir => {
+    if (isMainApp && fs_extra_1.default.existsSync(path.join(process.cwd(), "apps"))) {
+        const dirs = ((microApps === null || microApps === void 0 ? void 0 : microApps.length) > 0 && microApps) ||
+            fs_extra_1.default.readdirSync(path.join(process.cwd(), "apps"));
+        dirs === null || dirs === void 0 ? void 0 : dirs.forEach((dir) => {
             idsMap.set(dir, { entry_id: (0, uuid_1.v4)(), oem_micro_app_id: (0, uid_1.uid)(16) });
         });
-        app.get('/api/saas-info', (req, res) => {
-            const lang = 'zh';
+        app.get("/api/saas-info", (req, res) => {
+            const lang = "zh";
             const result = {
                 apps: [],
-                entry_info: { entries: [], entry_mode: 'normal' },
+                entry_info: { entries: [], entry_mode: "normal" },
                 permissions: {},
                 saas_id_info_list: [],
             };
             dirs.forEach((dir) => {
                 const entry_id = idsMap.get(dir).entry_id;
-                const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), 'apps', dir, 'manifest.json'), 'utf-8');
+                const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), "apps", dir, "manifest.json"), "utf-8");
                 const oem_micro_app_id = idsMap.get(dir).oem_micro_app_id;
                 const baseUrl = `/apps/${oem_micro_app_id}`;
                 result.saas_id_info_list.push({
                     oem_micro_app_id: oem_micro_app_id,
-                    universal_id: '',
+                    universal_id: "",
                 });
-                const appConfig = fs_extra_1.default.readJSONSync(path.join(process.cwd(), 'node_modules', '.micro', 'app.config.json'));
+                const appConfig = fs_extra_1.default.readJSONSync(path.join(process.cwd(), "node_modules", ".micro", "app.config.json"));
                 const micoApp = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, appConfig[dir]);
                 const entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, `apps/${dir}`);
-                const permission = (manifest === null || manifest === void 0 ? void 0 : manifest.privileges.map(item => {
+                const permission = (manifest === null || manifest === void 0 ? void 0 : manifest.privileges.map((item) => {
                     return { permission_group: item.code };
                 })) || [];
                 result.apps.push(micoApp);
@@ -82,24 +83,24 @@ function mockSaasInfo(app, microPort) {
         multiApps === null || multiApps === void 0 ? void 0 : multiApps.forEach((app) => {
             idsMap.set(app.name, { entry_id: (0, uuid_1.v4)(), oem_micro_app_id: (0, uid_1.uid)(16) });
         });
-        app.get('/api/saas-info', (req, res) => {
-            const lang = parseCookie(req.headers['cookie'], 'main-i18next');
+        app.get("/api/saas-info", (req, res) => {
+            const lang = parseCookie(req.headers["cookie"], "main-i18next");
             if ((0, utils_1.isMonorepo)() || (multiApps && multiApps.length > 0)) {
                 const result = {
                     apps: [],
-                    entry_info: { entries: [], entry_mode: 'normal' },
+                    entry_info: { entries: [], entry_mode: "normal" },
                     permissions: {},
                     saas_id_info_list: [],
                 };
                 multiApps.forEach((app) => {
                     const entry_id = idsMap.get(app.name).entry_id;
                     const dir = (0, utils_1.isMonorepo)() ? `apps/${app.name}` : `${app.dir}`;
-                    const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), dir, 'manifest.json'), 'utf-8');
+                    const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), dir, "manifest.json"), "utf-8");
                     const oem_micro_app_id = idsMap.get(app.name).oem_micro_app_id;
                     const baseUrl = `/apps/${oem_micro_app_id}`;
                     result.saas_id_info_list.push({
                         oem_micro_app_id: oem_micro_app_id,
-                        universal_id: '',
+                        universal_id: "",
                     });
                     const micoApp = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, microPort, app.name);
                     const entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, dir);
@@ -122,7 +123,7 @@ function mockSaasInfo(app, microPort) {
                 const oem_micro_app_id = manifest.universalId;
                 const baseUrl = `/apps/${oem_micro_app_id}`;
                 const app = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, microPort);
-                const entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, '');
+                const entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, "");
                 const permission = consturctPermissions();
                 res.send({
                     code: null,
@@ -130,10 +131,10 @@ function mockSaasInfo(app, microPort) {
                     msg: null,
                     result: {
                         apps: [app],
-                        entry_info: { entries: [entryInfo], entry_mode: 'normal' },
+                        entry_info: { entries: [entryInfo], entry_mode: "normal" },
                         permissions: { [oem_micro_app_id]: permission },
                         saas_id_info_list: [
-                            { oem_micro_app_id: oem_micro_app_id, universal_id: '' },
+                            { oem_micro_app_id: oem_micro_app_id, universal_id: "" },
                         ],
                     },
                     success: true,
@@ -151,9 +152,9 @@ function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, dir
         menu.oem_micro_app_id = oem_micro_app_id;
         menu.entry_id = entry_id;
         //@ts-ignore
-        menu.entry_name_zh = pickText(menu.entry_name, 'zh');
+        menu.entry_name_zh = pickText(menu.entry_name, "zh");
         //@ts-ignore
-        menu.entry_name_en = pickText(menu.entry_name, 'en');
+        menu.entry_name_en = pickText(menu.entry_name, "en");
         //@ts-ignore
         menu.entry_name = pickText(menu.entry_name, lang);
         //@ts-ignore
@@ -162,7 +163,8 @@ function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, dir
         if (menu.sub_entry_list.length) {
             stack.push(...menu.sub_entry_list);
         }
-        menu.icon = 'https://images.tuyacn.com/rms-static/5d202fa0-e909-11eb-815d-e39234ce96ff-1626751199130.png?tyName=space-manage.png';
+        menu.icon =
+            "https://images.tuyacn.com/rms-static/5d202fa0-e909-11eb-815d-e39234ce96ff-1626751199130.png?tyName=space-manage.png";
     }
     return fakeMenu;
 }
@@ -170,13 +172,13 @@ function consturctApp(manifest, oem_micro_app_id, baseUrl, lang, port, code) {
     const packageInfo = (0, micro_utils_1.getPackage)();
     return {
         active_rule: baseUrl,
-        dependencies: [''],
+        dependencies: [""],
         ext_info: null,
         micro_app_code: code || `${packageInfo.name}`,
         micro_app_name: code ? `${code}-dev` : `${packageInfo.name}-dev`,
-        micro_app_version: '0.0.0-x',
+        micro_app_version: "0.0.0-x",
         oem_micro_app_id,
-        resource: `http://localhost:${port}/${code || 'index'}.html`,
+        resource: `http://localhost:${port}/${code || "index"}.html`,
         schema: null,
         universal_id: manifest.universalId,
         isAuth: true,
@@ -188,15 +190,15 @@ function consturctPermissions() {
     return mockPermissions.map((code) => ({ permission_group: code }));
 }
 function pickText(texts, lang) {
-    return lang === 'en' ? texts[1] : texts[0];
+    return lang === "en" ? texts[1] : texts[0];
 }
 function parseCookie(cookie, key) {
-    const cookies = (cookie || '').split(';');
+    const cookies = (cookie || "").split(";");
     for (let cookieItem of cookies) {
-        const [cookieKey, value] = cookieItem.split('=');
+        const [cookieKey, value] = cookieItem.split("=");
         if (cookieKey.trim() === key) {
             return value;
         }
     }
-    return '';
+    return "";
 }

package/dist/scripts/build.js

@@ -17,12 +17,17 @@ const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
 const webpack_config_1 = __importDefault(require("../config/webpack.config"));
 const template_1 = __importDefault(require("../template"));
+const apis_1 = __importDefault(require("../apis"));
+const paths_1 = __importDefault(require("../config/paths"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
 const BUILD_FAIL_TIP = '糟糕：打包失败了，下面是具体信息';
 const spinner = (0, ora_1.default)('building').start();
+let { debuggerConfig: { isMainApp }, } = require(paths_1.default.microConfig);
 const config = (0, webpack_config_1.default)();
 (() => __awaiter(void 0, void 0, void 0, function* () {
-    // await apis();
     yield (0, template_1.default)();
+    yield (0, apis_1.default)();
     (0, webpack_1.default)(config).run((err, stats) => {
         if (err) {
             spinner.fail();
@@ -38,6 +43,15 @@ const config = (0, webpack_config_1.default)();
             process.exit(1);
         }
         spinner.succeed();
+        // 修复主应用 manifest.json资源丢失问题
+        if (isMainApp) {
+            const files = fs_extra_1.default.readdirSync(path_1.default.join(process.cwd(), 'dist/static/img')) || [];
+            const manifest = fs_extra_1.default.readJSONSync(path_1.default.join(process.cwd(), 'dist/manifest.json'));
+            const result = files.reduce((acc, file) => {
+                acc[file] = file;
+            }, {});
+            fs_extra_1.default.writeJSONSync(path_1.default.join(process.cwd(), 'dist/manifest.json'), Object.assign(Object.assign({}, manifest), result));
+        }
         if (stats.hasWarnings()) {
             console.log(chalk_1.default.yellow('难受：有告警信息，下面是具体信息'));
             console.log(warnings.map((item) => item.message).join('\n'));

package/dist/scripts/start.js

@@ -18,13 +18,14 @@ const mock_1 = __importDefault(require("../module/mock"));
 const bundleServer_1 = require("../module/bundleServer");
 const proxy_1 = __importDefault(require("../module/proxy"));
 const template_1 = __importDefault(require("../template"));
+const apis_1 = __importDefault(require("../apis"));
 (() => __awaiter(void 0, void 0, void 0, function* () {
-    // await apis();
     yield (0, template_1.default)();
+    yield (0, apis_1.default)();
     let defaultPort = 9000;
     console.log(chalk_1.default.yellow('如果是pc端的微应用调试，请勿使用该命令，考虑使用`start --main`或`start --main --proxy`'));
     //检测端口占用情况
-    console.log("process.env.PROT", process.env.PROT);
+    console.log('process.env.PROT', process.env.PROT);
     if (process.env.PROT) {
         const compiler = (0, bundleServer_1.createServerCompiler)();
         (0, bundleServer_1.runBundleServer)({

package/dist/scripts/startInMain.js

@@ -18,9 +18,10 @@ const mainServer_1 = __importDefault(require("../module/mainServer"));
 const bundleServer_1 = require("../module/bundleServer");
 const kill_port_1 = __importDefault(require("kill-port"));
 const template_1 = __importDefault(require("../template"));
+const apis_1 = __importDefault(require("../apis"));
 (() => __awaiter(void 0, void 0, void 0, function* () {
-    // await apis();
     yield (0, template_1.default)();
+    yield (0, apis_1.default)();
     let defaultPort = 9000;
     //检测端口占用情况
     const bundledServerPort = yield portfinder_1.default.getPortPromise({

package/dist/template/index.js

@@ -86,8 +86,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         let langContent = fs.readFileSync(path.join(__dirname, './micro-app/lang.ts'), {
             encoding: 'utf8',
         });
-        langContent = langContent.replace("import en from './en';", `import en from '../../src/lang/en'`);
-        langContent = langContent.replace("import zh from './zh';", `import zh from '../../src/lang/zh'`);
+        langContent = langContent.replace("import en from './en.json';", `import en from '../../src/lang/en.json'`);
+        langContent = langContent.replace("import zh from './zh.json';", `import zh from '../../src/lang/zh.json'`);
         fs.writeFileSync(microPath + '/lang.ts', langContent);
     }
 });

package/dist/template/micro-app/lang.ts

@@ -1,8 +1,8 @@
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import LanguageDetector from 'i18next-browser-languagedetector';
-import en from './en';
-import zh from './zh';
+import en from './en.json';
+import zh from './zh.json';
 
 i18n
   .use(LanguageDetector)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.0.27-beta.7",
+  "version": "3.0.27-beta.9",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -23,9 +23,9 @@
     "@babel/preset-typescript": "7.16.7",
     "@babel/traverse": "^7.20.13",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
-    "@tuya-sat/micro-dev-loader": "3.0.27-beta.7",
-    "@tuya-sat/micro-dev-proxy": "3.0.27-beta.7",
-    "@tuya-sat/micro-utils": "3.0.27-beta.7",
+    "@tuya-sat/micro-dev-loader": "3.0.27-beta.9",
+    "@tuya-sat/micro-dev-proxy": "3.0.27-beta.9",
+    "@tuya-sat/micro-utils": "3.0.27-beta.9",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",