@tuya-sat/micro-script 3.0.0-beta.13 → 3.0.0-beta.15

package/dist/config/webpack.common.js

@@ -191,7 +191,9 @@ function getCommonConfig({ isDev, isBuild, }) {
             multiAppsWebpackConfig.entry[app.name] = `${path_1.default.join(process.cwd(), app.dir)}/index.tsx`;
             multiAppsWebpackConfig.plugins.push(new html_webpack_plugin_1.default({
                 inject: true,
-                filename: `${app.name}.html`,
+                filename: app.htmlContentHash
+                    ? `${app.name}-[contenthash].html`
+                    : `${app.name}.html`,
                 template: paths_1.default.spaHtml,
                 chunks: [app.name],
             }));

package/dist/module/main/fakeSaasInfo.js

@@ -33,68 +33,70 @@ const uid_1 = require("uid");
 const path = __importStar(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 function mockSaasInfo(app, microPort) {
-    const { multiApps } = require(paths_1.default.microConfig);
+    const { multiApps, isMainApp } = require(paths_1.default.microConfig);
     const idsMap = new Map();
     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 (multiApps && multiApps.length > 0) {
-            const result = {
-                apps: [],
-                entry_info: { entries: [], entry_mode: 'normal' },
-                permissions: {},
-                saas_id_info_list: [],
-            };
-            multiApps.forEach((app) => {
-                const entry_id = idsMap.get(app.name).entry_id;
-                const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), `${app.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: '',
+    if (!isMainApp) {
+        app.get('/api/saas-info', (req, res) => {
+            const lang = parseCookie(req.headers['cookie'], 'main-i18next');
+            if (multiApps && multiApps.length > 0) {
+                const result = {
+                    apps: [],
+                    entry_info: { entries: [], entry_mode: 'normal' },
+                    permissions: {},
+                    saas_id_info_list: [],
+                };
+                multiApps.forEach((app) => {
+                    const entry_id = idsMap.get(app.name).entry_id;
+                    const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), `${app.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: '',
+                    });
+                    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, app.dir);
+                    const permission = consturctPermissions();
+                    result.apps.push(micoApp);
+                    result.entry_info.entries.push(entryInfo);
+                    result.permissions[oem_micro_app_id] = permission;
+                });
+                res.send({
+                    code: null,
+                    errorMsg: null,
+                    msg: null,
+                    result,
+                    success: true,
                 });
-                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, app.dir);
+            }
+            else {
+                const manifest = (0, micro_utils_1.parseManifest)();
+                const entry_id = (0, uuid_1.v4)();
+                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 permission = consturctPermissions();
-                result.apps.push(micoApp);
-                result.entry_info.entries.push(entryInfo);
-                result.permissions[oem_micro_app_id] = permission;
-            });
-            res.send({
-                code: null,
-                errorMsg: null,
-                msg: null,
-                result,
-                success: true,
-            });
-        }
-        else {
-            const manifest = (0, micro_utils_1.parseManifest)();
-            const entry_id = (0, uuid_1.v4)();
-            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 permission = consturctPermissions();
-            res.send({
-                code: null,
-                errorMsg: null,
-                msg: null,
-                result: {
-                    apps: [app],
-                    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: '' },
-                    ],
-                },
-                success: true,
-            });
-        }
-    });
+                res.send({
+                    code: null,
+                    errorMsg: null,
+                    msg: null,
+                    result: {
+                        apps: [app],
+                        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: '' },
+                        ],
+                    },
+                    success: true,
+                });
+            }
+        });
+    }
 }
 exports.default = mockSaasInfo;
 function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, dir) {

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

@@ -20,4 +20,4 @@ export declare type CustomConfig = {
 };
 export default function staticMain(app: Express & {
     _isLogin?: Promise<void>;
-}, debuggerConfig: DebuggerConfig): void;
+}, debuggerConfig: DebuggerConfig, microPort: number): void;

package/dist/module/main/staticMain.js

@@ -41,7 +41,7 @@ const fakeSaas_1 = __importStar(require("./fakeSaas"));
 const paths_1 = __importDefault(require("../../config/paths"));
 const webpack_common_1 = require("../../config/webpack.common");
 const defaultBase = 'https://static1.tuyacn.com/static/sdf-gw/v1.0.1.516/';
-function staticMain(app, debuggerConfig) {
+function staticMain(app, debuggerConfig, microPort) {
     app.get([
         '/',
         '/apps/:appId',
@@ -50,10 +50,13 @@ function staticMain(app, debuggerConfig) {
         '/application',
         '/application/*',
     ], (req, res) => __awaiter(this, void 0, void 0, function* () {
-        if (app._isLogin) {
+        if (!debuggerConfig.isMainApp && app._isLogin) {
             yield app._isLogin;
         }
-        const base = debuggerConfig.base || defaultBase;
+        let base = debuggerConfig.base || defaultBase;
+        if (debuggerConfig.isMainApp) {
+            base = `http://localhost:${microPort}`;
+        }
         const { data } = yield axios_1.default.get(new URL('index.html', base).href);
         const $ = cheerio_1.default.load(data);
         modifySrcAttr($, base);

package/dist/module/mainServer.js

@@ -27,7 +27,7 @@ function runMain({ port, microPort, }) {
         (0, validate_1.validateDebuggerConfig)(debuggerConfig);
         const app = (0, express_1.default)();
         mainServer && mainServer.before && mainServer.before(app);
-        (0, staticMain_1.default)(app, debuggerConfig);
+        (0, staticMain_1.default)(app, debuggerConfig, microPort);
         (0, fakeSaasInfo_1.default)(app, microPort);
         (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.0-beta.13",
+  "version": "3.0.0-beta.15",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -20,9 +20,9 @@
     "@babel/preset-react": "7.16.7",
     "@babel/preset-typescript": "7.16.7",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
-    "@tuya-sat/micro-dev-loader": "3.0.0-beta.13",
-    "@tuya-sat/micro-dev-proxy": "3.0.0-beta.13",
-    "@tuya-sat/micro-utils": "3.0.0-beta.13",
+    "@tuya-sat/micro-dev-loader": "3.0.0-beta.15",
+    "@tuya-sat/micro-dev-proxy": "3.0.0-beta.15",
+    "@tuya-sat/micro-utils": "3.0.0-beta.15",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",