@tuya-sat/micro-script 3.0.27-beta.4 → 3.0.27-beta.6

package/dist/module/main/fakeSaas.js

@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFakeUser = void 0;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const fs = __importStar(require("fs"));
+const fs = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
 function parse_SDF_CONFIG(html) {
     var _a;
@@ -62,7 +62,8 @@ function getFakeSaas(config) {
             process.exit(1);
         }
         if (config.isMainApp && fs.existsSync(path.join(process.cwd(), 'apps'))) {
-            const saas = {
+            const saasInfo = fs.readJSONSync(path.join(process.cwd(), 'saas-info.config.json'));
+            let saas = {
                 _SDF: {
                     base: '',
                     env: '',
@@ -85,12 +86,15 @@ function getFakeSaas(config) {
                         supported_language: { en: 'English', zh: '简体中文' },
                         tenant_register_support: false,
                         tenant_type: "SINGLE_TENANT",
-                        title: "SaaS  UI"
+                        title: "物联网开放平台"
                     },
                 },
                 _SDF_CONFIG: {},
                 __MAIN_APP_PUBLIC_PATH: 'https://static1.tuyacn.com/static/sdf-main-app/0.0.0-123/',
             };
+            Object.keys(saasInfo).forEach(key => {
+                saas._SDF.saas[key] = saasInfo[key] ? saasInfo[key] : saas._SDF.saas[key];
+            });
             return saas;
         }
         else {

package/dist/module/main/fakeSaasInfo.js

@@ -37,10 +37,11 @@ function mockSaasInfo(app, microPort) {
     let { multiApps, debuggerConfig: { isMainApp }, } = require(paths_1.default.microConfig);
     const idsMap = new Map();
     multiApps = (0, utils_1.processMultiApps)(multiApps);
-    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) });
-    });
     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 => {
+            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';
             const result = {
@@ -49,11 +50,10 @@ function mockSaasInfo(app, microPort) {
                 permissions: {},
                 saas_id_info_list: [],
             };
-            const dirs = fs_extra_1.default.readdirSync(path.join(process.cwd(), 'apps'));
             dirs.forEach((dir) => {
-                const entry_id = (0, uuid_1.v4)();
+                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 oem_micro_app_id = (0, uid_1.uid)(16);
+                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,
@@ -79,6 +79,9 @@ function mockSaasInfo(app, microPort) {
         });
     }
     if (!isMainApp) {
+        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');
             if ((0, utils_1.isMonorepo)() || (multiApps && multiApps.length > 0)) {
@@ -159,6 +162,7 @@ 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';
     }
     return fakeMenu;
 }

package/dist/module/main/staticMain.js

@@ -41,6 +41,8 @@ const fakeSaas_1 = __importStar(require("./fakeSaas"));
 const paths_1 = __importDefault(require("../../config/paths"));
 const webpack_common_1 = require("../../config/webpack.common");
 const undici_1 = require("undici");
+const fs = __importStar(require("fs-extra"));
+const path = __importStar(require("path"));
 function parse_SDF(html) {
     var _a;
     const REGEX = /(?<=window._SDF=).*?}(?=;)/;
@@ -117,6 +119,15 @@ function insertScript($, debuggerConfig) {
             }
             : {})), readThemeConfig()));
         overrideNotification(saas);
+        const saasInfo = fs.readJSONSync(path.join(process.cwd(), 'saas-info.config.json'));
+        let $favicon = $('link[rel="icon"]');
+        if (!$favicon.length) {
+            $('head').prepend('<link rel="icon" />');
+            $favicon = $('link[rel="icon"]');
+        }
+        const favicon = (saasInfo === null || saasInfo === void 0 ? void 0 : saasInfo.favicon) ? saasInfo.favicon : 'https://images.tuyacn.com/rms-static/ae9ba1b0-41d4-11ec-89bb-d7b7de210e4b-1636514225995.png?tyName=favicon.png';
+        $favicon
+            .attr('href', favicon);
         // 本地开发态多语言剥离多语言平台，走本地多语言兜底逻辑
         delete _SDF.saas.saas_locales;
         $('head').append($('<script>').text(`window._SDF_CONFIG=${JSON.stringify(_SDF_CONFIG)};window._SDF=${JSON.stringify(_SDF)};window.__MAIN_APP_PUBLIC_PATH=${JSON.stringify(__MAIN_APP_PUBLIC_PATH)};

package/dist/scripts/start.js

@@ -24,14 +24,14 @@ const template_1 = __importDefault(require("../template"));
     let defaultPort = 9000;
     console.log(chalk_1.default.yellow('如果是pc端的微应用调试，请勿使用该命令，考虑使用`start --main`或`start --main --proxy`'));
     //检测端口占用情况
-    console.log("process.env.PROD", process.env.PROD);
-    if (process.env.PROD) {
+    console.log("process.env.PROT", process.env.PROT);
+    if (process.env.PROT) {
         const compiler = (0, bundleServer_1.createServerCompiler)();
         (0, bundleServer_1.runBundleServer)({
-            port: Number(process.env.PROD),
+            port: Number(process.env.PROT),
             compiler,
             internalDevConfig: {
-                open: true,
+                open: false,
                 setupMiddlewares(middleware, { app }) {
                     (0, mock_1.default)(app);
                     (0, proxy_1.default)(app);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.0.27-beta.4",
+  "version": "3.0.27-beta.6",
   "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.4",
-    "@tuya-sat/micro-dev-proxy": "3.0.27-beta.4",
-    "@tuya-sat/micro-utils": "3.0.27-beta.4",
+    "@tuya-sat/micro-dev-loader": "3.0.27-beta.6",
+    "@tuya-sat/micro-dev-proxy": "3.0.27-beta.6",
+    "@tuya-sat/micro-utils": "3.0.27-beta.6",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",
@@ -44,6 +44,7 @@
     "kill-port": "^2.0.1",
     "less": "4.1.2",
     "less-loader": "10.2.0",
+    "mime": "^3.0.0",
     "mini-css-extract-plugin": "2.6.0",
     "open": "8.4.0",
     "ora": "5.4.1",