@tuya-sat/micro-script 3.0.0-beta.9 → 3.0.3

package/dist/config/paths.d.ts

@@ -7,10 +7,10 @@ declare const _default: {
     publicDir: string;
     spaHtml: string;
     manifest: string;
-    saasCache: string;
     vueTsEntryFile: string;
     vueJsEntryFile: string;
     ReactTsEntryFile: string;
     ReactJsEntryFile: string;
+    node_modules: string;
 };
 export default _default;

package/dist/config/paths.js

@@ -14,9 +14,9 @@ exports.default = {
     publicDir: path_1.default.resolve(cwd, "public/"),
     spaHtml: path_1.default.resolve(cwd, "public/index.html"),
     manifest: path_1.default.resolve(cwd, "manifest.json"),
-    saasCache: path_1.default.resolve(cwd, ".saas-cache.json"),
     vueTsEntryFile: path_1.default.resolve(cwd, "src/index.ts"),
     vueJsEntryFile: path_1.default.resolve(cwd, "src/index.js"),
     ReactTsEntryFile: path_1.default.resolve(cwd, "src/index.tsx"),
     ReactJsEntryFile: path_1.default.resolve(cwd, "src/index.jsx"),
+    node_modules: path_1.default.resolve(cwd, "node_modules")
 };

package/dist/config/webpack.common.js

@@ -24,7 +24,6 @@ const micro_dev_loader_1 = require("@tuya-sat/micro-dev-loader");
 const path_1 = __importDefault(require("path"));
 const index_1 = require("@tuya-sat/micro-dev-loader/dist/less/utils/index");
 const paths_1 = __importDefault(require("./paths"));
-const locales_1 = __importDefault(require("@tuya-sat/micro-dev-loader/dist/plugins/locales"));
 const utils_1 = require("../utils");
 const toArray = (value) => {
     return Array.isArray(value) ? value : [value];
@@ -68,7 +67,7 @@ function getCommonConfig({ isDev, isBuild, }) {
         ].filter(Boolean);
         return loaders;
     };
-    const { multiApps } = require(paths_1.default.microConfig);
+    const { multiApps, debuggerConfig: { isMainApp } } = require(paths_1.default.microConfig);
     const multiAppsWebpackConfig = {
         plugins: [],
         entry: {},
@@ -153,13 +152,24 @@ function getCommonConfig({ isDev, isBuild, }) {
                             name: 'vendors-others',
                             chunks: 'all',
                             priority: 0,
+                        }, main: {
+                            test: /[\\/]node_modules[\\/](@tuya-sat\/sdf-main-sdk)[\\/]/,
+                            name: 'main-related',
+                            chunks: 'all',
+                            priority: 1,
+                        }, antd: {
+                            test: /[\\/]node_modules[\\/](antd|@tuya-sat\/galaxy)[\\/]/,
+                            name: 'antd-related',
+                            chunks: 'all',
+                            priority: 2,
                         }, react: {
-                            test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/,
+                            test: /[\\/]node_modules[\\/](react|react-dom|react-router-dom)[\\/]/,
                             name: 'react-related',
                             chunks: 'all',
-                            priority: 1,
+                            priority: 3,
                         } }),
                 },
+                minimize: isBuild,
                 minimizer: ['...', new css_minimizer_webpack_plugin_1.default()],
             },
             plugins: [
@@ -175,7 +185,13 @@ function getCommonConfig({ isDev, isBuild, }) {
                             filter: (resourcePath) => __awaiter(this, void 0, void 0, function* () { return resourcePath !== paths_1.default.spaHtml; }),
                             noErrorOnMissing: true,
                         },
-                    ],
+                        isMainApp && {
+                            from: `${paths_1.default.node_modules}/@tuya-sat/sdf-main-sdk/dist/**/*.png`,
+                            to() {
+                                return "static/img/[name][ext]";
+                            },
+                        },
+                    ].filter((value) => Boolean(value)),
                 }),
                 isBuild &&
                     new mini_css_extract_plugin_1.default({
@@ -183,7 +199,6 @@ function getCommonConfig({ isDev, isBuild, }) {
                         chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
                     }),
                 isBuild && enableThemeCompile && new micro_dev_loader_1.ThemePlugin(),
-                isBuild && new locales_1.default(),
             ].filter((value) => Boolean(value)),
         };
         return baseConfig;
@@ -193,7 +208,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/framework/react.config.d.ts

@@ -1,4 +1,4 @@
-import { FrameworkFunction } from "./index";
+import { FrameworkFunction } from './index';
 declare const reactTsConfig: FrameworkFunction;
 declare const reactJsConfig: FrameworkFunction;
 export { reactTsConfig, reactJsConfig };

package/dist/framework/react.config.js

@@ -17,26 +17,26 @@ const reactConfig = ({ isDev, isBuild, currentFramework, isTs, }) => {
                     include: paths_1.default.appSrc,
                     use: [
                         {
-                            loader: require.resolve("babel-loader"),
+                            loader: require.resolve('babel-loader'),
                             options: {
                                 presets: [
                                     [
-                                        require.resolve("@babel/preset-env"),
+                                        require.resolve('@babel/preset-env'),
                                         {
-                                            useBuiltIns: "entry",
+                                            useBuiltIns: 'entry',
                                             corejs: 3,
                                         },
                                     ],
                                     [
-                                        require.resolve("@babel/preset-react"),
+                                        require.resolve('@babel/preset-react'),
                                         {
-                                            runtime: "automatic",
+                                            runtime: 'automatic',
                                         },
                                     ],
-                                    isTs && require.resolve("@babel/preset-typescript"),
+                                    isTs && require.resolve('@babel/preset-typescript'),
                                 ].filter(Boolean),
                                 plugins: [
-                                    isDev && require.resolve("react-refresh/babel"),
+                                    isDev && require.resolve('react-refresh/babel'),
                                 ].filter(Boolean),
                             },
                         },
@@ -48,7 +48,7 @@ const reactConfig = ({ isDev, isBuild, currentFramework, isTs, }) => {
                     exclude: paths_1.default.appSrc,
                     use: [
                         {
-                            loader: require.resolve("babel-loader"),
+                            loader: require.resolve('babel-loader'),
                         },
                     ],
                 },
@@ -64,18 +64,18 @@ const reactConfig = ({ isDev, isBuild, currentFramework, isTs, }) => {
                             semantic: true,
                             syntactic: true,
                         },
-                        mode: "write-references",
+                        mode: 'write-references',
                     },
                 }),
         ].filter((value) => Boolean(value)),
     };
 };
 const reactTsConfig = ({ isDev, isBuild, currentFramework, }) => (Object.assign({ entry: paths_1.default.ReactTsEntryFile, resolve: {
-        extensions: [".tsx", ".ts", ".js"],
+        extensions: ['.tsx', '.ts', '.js'],
         plugins: [new tsconfig_paths_webpack_plugin_1.default()],
     } }, reactConfig({ isDev, isBuild, currentFramework, isTs: true })));
 exports.reactTsConfig = reactTsConfig;
 const reactJsConfig = ({ isDev, isBuild, currentFramework, }) => (Object.assign({ entry: paths_1.default.ReactJsEntryFile, resolve: {
-        extensions: [".jsx", ".js"],
+        extensions: ['.jsx', '.js'],
     } }, reactConfig({ isDev, isBuild, currentFramework, isTs: false })));
 exports.reactJsConfig = reactJsConfig;

package/dist/module/bundleServer.d.ts

@@ -1,9 +1,9 @@
-import webpack, { Compiler } from "webpack";
-import { Configuration } from "webpack-dev-server";
+import webpack, { Compiler } from 'webpack';
+import { Configuration } from 'webpack-dev-server';
 export declare type CustomDevServer = (value: Configuration) => typeof value;
 export declare function createServerCompiler(): webpack.Compiler;
 export declare function runBundleServer({ port, compiler, internalDevConfig, }: {
     port: number;
     compiler: Compiler;
-    internalDevConfig?: Pick<Configuration, "open" | "setupMiddlewares" | "allowedHosts">;
+    internalDevConfig?: Pick<Configuration, 'open' | 'setupMiddlewares' | 'allowedHosts'>;
 }): Promise<void>;

package/dist/module/bundleServer.js

@@ -36,8 +36,8 @@ function createServerCompiler() {
     const config = Object.assign(Object.assign({}, (0, webpack_config_1.default)()), { 
         //下面所有配置都是为了精简terminal输出
         infrastructureLogging: {
-            level: "warn",
-        }, stats: "errors-warnings" });
+            level: 'warn',
+        }, stats: 'errors-warnings' });
     return (0, webpack_1.default)(config);
 }
 exports.createServerCompiler = createServerCompiler;
@@ -47,8 +47,8 @@ function runBundleServer({ port, compiler, internalDevConfig = {}, }) {
         const { devServer = (value) => value } = require(paths_1.default.microConfig);
         const { setupMiddlewares: startDevSetupMiddlewares } = internalDevConfig, restServerConfig = __rest(internalDevConfig, ["setupMiddlewares"]);
         const server = new webpack_dev_server_1.default(devServer(Object.assign({ hot: true, liveReload: false, port, headers: {
-                "Access-Control-Allow-Origin": "*",
-                "Access-Control-Allow-Headers": "*",
+                'Access-Control-Allow-Origin': '*',
+                'Access-Control-Allow-Headers': '*',
             }, historyApiFallback: true, setupMiddlewares(middleware, devServer) {
                 //可能会有问题
                 middleware.push(options_1.default);
@@ -56,21 +56,22 @@ function runBundleServer({ port, compiler, internalDevConfig = {}, }) {
                     ? startDevSetupMiddlewares(middleware, devServer)
                     : middleware;
             } }, restServerConfig)), compiler);
-        compiler.hooks.watchRun.tap("MyPlugin", () => {
+        compiler.hooks.watchRun.tap('MyPlugin', () => {
             spinner.isSpinning && spinner.succeed();
-            spinner.color = "yellow";
-            spinner.text = "webpack compiling";
+            spinner.color = 'yellow';
+            spinner.text = 'webpack compiling';
             spinner.start();
         });
-        compiler.hooks.done.tap("MyPlugin", ({ endTime, startTime }) => {
+        compiler.hooks.done.tap('MyPlugin', ({ endTime, startTime }) => {
             spinner.isSpinning && spinner.succeed();
             console.log(`compiled time ~${endTime - startTime}ms`);
         });
         //临时提示
-        compiler.hooks.done.tap("once-tip", (0, onceFactory_1.onceFactory)(() => {
+        compiler.hooks.done.tap('once-tip', (0, onceFactory_1.onceFactory)(() => {
             console.log(chalk_1.default.yellow(`Tip: 如果HMR失效且保存文件时造成多次compile，请考虑调高aggregateTimeout参数(可以尝试100)`));
         }));
-        server.start();
+        yield server.start();
+        console.log('本地应用服务已启动');
     });
 }
 exports.runBundleServer = runBundleServer;

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

@@ -1,4 +1,4 @@
-import { DebuggerConfig } from "./staticMain";
+import { DebuggerConfig } from './staticMain';
 interface anyObject {
     [key: string]: any;
 }

package/dist/module/main/fakeSaas.js

@@ -13,55 +13,49 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFakeUser = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const paths_1 = __importDefault(require("../../config/paths"));
 function parse_SDF_CONFIG(html) {
     var _a;
     const REGEX = /(?<=window._SDF_CONFIG=).*?(?=;)/;
-    return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || "";
+    return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || '';
 }
 function parse_SDF(html) {
     var _a;
     const REGEX = /(?<=window._SDF=).*?(?=;)/;
-    return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || "";
+    return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || '';
 }
 function parse__MAIN_APP_PUBLIC_PATH(html) {
     var _a;
     const REGEX = /(?<=window.__MAIN_APP_PUBLIC_PATH=).*?(?=;)/;
-    return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || "";
+    return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || '';
 }
 function getFakeSaas(config) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!fs_extra_1.default.existsSync(paths_1.default.saasCache) && !config.target) {
-            console.log(chalk_1.default.red("不存在缓存文件，且没有配置target"));
+        if (!config.target) {
+            console.log(chalk_1.default.red('没有配置target'));
             process.exit(1);
         }
-        if (!fs_extra_1.default.existsSync(paths_1.default.saasCache)) {
-            const { data } = yield axios_1.default.get(new URL("/login", config.target).href);
-            const _SDF_CONFIG = parse_SDF_CONFIG(data);
-            const _SDF = parse_SDF(data);
-            const __MAIN_APP_PUBLIC_PATH = parse__MAIN_APP_PUBLIC_PATH(data);
-            const saas = {
-                _SDF_CONFIG: JSON.parse(_SDF_CONFIG),
-                _SDF: JSON.parse(_SDF),
-                __MAIN_APP_PUBLIC_PATH: JSON.parse(__MAIN_APP_PUBLIC_PATH),
-            };
-            fs_extra_1.default.writeJSONSync(paths_1.default.saasCache, saas);
-            return saas;
-        }
-        return fs_extra_1.default.readJSONSync(paths_1.default.saasCache);
+        const { data } = yield axios_1.default.get(new URL('/login', config.target).href);
+        const _SDF_CONFIG = parse_SDF_CONFIG(data);
+        const _SDF = parse_SDF(data);
+        const __MAIN_APP_PUBLIC_PATH = parse__MAIN_APP_PUBLIC_PATH(data);
+        const saas = {
+            _SDF_CONFIG: JSON.parse(_SDF_CONFIG),
+            _SDF: JSON.parse(_SDF),
+            __MAIN_APP_PUBLIC_PATH: JSON.parse(__MAIN_APP_PUBLIC_PATH),
+        };
+        return saas;
     });
 }
 exports.default = getFakeSaas;
 function getFakeUser(config) {
     return {
-        user_name: config.username || "admin@tuya.com",
+        user_name: config.username || 'admin@tuya.com',
         roles: [
             {
-                role_code: "FAKE_ROLE_CODE",
-                role_name: "FAKE_ROLE_NAME",
+                role_code: 'FAKE_ROLE_CODE',
+                role_name: 'FAKE_ROLE_NAME',
             },
         ],
     };

package/dist/module/main/fakeSaasInfo.js

@@ -33,60 +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, debuggerConfig: { 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: {},
-            };
-            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;
+    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,
+                });
+            }
+            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 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 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 },
-                },
-                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

@@ -1,5 +1,5 @@
-import { Express } from "express";
-import type { Config } from "@tuya-sat/micro-dev-proxy";
+import { Express } from 'express';
+import type { Config } from '@tuya-sat/micro-dev-proxy';
 export interface DebuggerConfig extends Config {
     themeConfig?: {
         primaryColor: string;
@@ -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

@@ -40,21 +40,24 @@ const axios_1 = __importDefault(require("axios"));
 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) {
+const defaultBase = 'https://static1.tuyacn.com/static/sdf-gw/v1.0.1.516/';
+function staticMain(app, debuggerConfig, microPort) {
     app.get([
-        "/",
-        "/apps/:appId",
-        "/login",
-        "/apps/:appId/*",
-        "/application",
-        "/application/*",
+        '/',
+        '/apps/:appId',
+        '/login',
+        '/apps/:appId/*',
+        '/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;
-        const { data } = yield axios_1.default.get(new URL("index.html", base).href);
+        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);
         yield insertScript($, debuggerConfig);
@@ -64,15 +67,15 @@ function staticMain(app, debuggerConfig) {
 exports.default = staticMain;
 function initalCustom_configs(saas) {
     const config = {
-        config_group: "",
-        config_key: "dynamic_theme",
-        config_value: "",
-        config_label: "",
-        config_value_json: "{}",
-        config_name_zh: "",
-        config_name_en: "",
-        platform: "",
-        config_id: "",
+        config_group: '',
+        config_key: 'dynamic_theme',
+        config_value: '',
+        config_label: '',
+        config_value_json: '{}',
+        config_name_zh: '',
+        config_name_en: '',
+        platform: '',
+        config_id: '',
     };
     saas.custom_configs.push(config);
     return config;
@@ -82,7 +85,7 @@ function readThemeConfig() {
     return require(paths_1.default.microConfig).debuggerConfig.themeConfig;
 }
 function overrideNotification(value) {
-    const isProxy = process.env.MICRO_PROXY === "true";
+    const isProxy = process.env.MICRO_PROXY === 'true';
     !isProxy && (value.message_switch = false);
 }
 function insertScript($, debuggerConfig) {
@@ -93,7 +96,7 @@ function insertScript($, debuggerConfig) {
         const { saas } = _SDF;
         (_a = saas.custom_configs) !== null && _a !== void 0 ? _a : (saas.custom_configs = []);
         let themeConfig = saas.custom_configs.find((item) => {
-            return item.config_key === "dynamic_theme";
+            return item.config_key === 'dynamic_theme';
         }) || initalCustom_configs(saas);
         const theme = (0, webpack_common_1.validateMicroTheme)();
         themeConfig.config_value_json = JSON.stringify(Object.assign(Object.assign(Object.assign({}, JSON.parse(themeConfig.config_value_json)), (theme
@@ -103,17 +106,17 @@ function insertScript($, debuggerConfig) {
             : {})), readThemeConfig()));
         overrideNotification(saas);
         // 本地开发态多语言剥离多语言平台，走本地多语言兜底逻辑
-        _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)};
+        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)};
       localStorage.setItem('theme',${JSON.stringify(process.env.MICRO_THEME)});
       localStorage.setItem('isDebugger','true')
       `));
     });
 }
 function modifySrcAttr($, base) {
-    const tags = ["img src", "link href", "script src"];
+    const tags = ['img src', 'link href', 'script src'];
     tags.forEach((p) => {
-        const [tagName, attr] = p.split(" ");
+        const [tagName, attr] = p.split(' ');
         $(tagName).map(function () {
             const origin = $(this).attr(attr);
             if (/^(\/|http:|https:)/.test(origin))

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);
@@ -38,6 +38,7 @@ function runMain({ port, microPort, }) {
             resolve();
         });
         yield waiting;
+        console.log('代理服务已启动');
     });
 }
 exports.default = runMain;

package/dist/scripts/startInMain.js

@@ -16,6 +16,7 @@ const portfinder_1 = __importDefault(require("portfinder"));
 const open_1 = __importDefault(require("open"));
 const mainServer_1 = __importDefault(require("../module/mainServer"));
 const bundleServer_1 = require("../module/bundleServer");
+const kill_port_1 = __importDefault(require("kill-port"));
 (() => __awaiter(void 0, void 0, void 0, function* () {
     let defaultPort = 9000;
     //检测端口占用情况
@@ -28,17 +29,20 @@ const bundleServer_1 = require("../module/bundleServer");
         stopPort: bundledServerPort + 100,
     });
     const compiler = (0, bundleServer_1.createServerCompiler)();
+    yield (0, bundleServer_1.runBundleServer)({
+        port: bundledServerPort,
+        compiler,
+        internalDevConfig: {
+            allowedHosts: 'all',
+        },
+    });
     yield (0, mainServer_1.default)({
         port: mainServerPort,
         microPort: bundledServerPort,
     });
     (0, open_1.default)(`http://localhost:${mainServerPort}`);
-    (0, bundleServer_1.runBundleServer)({
-        port: bundledServerPort,
-        compiler,
-        internalDevConfig: {
-            allowedHosts: "all",
-        },
+    process.on('exit', () => {
+        (0, kill_port_1.default)(bundledServerPort, 'tcp').then(console.log).catch(console.log);
     });
 }))().catch((err) => {
     console.log(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.0.0-beta.9",
+  "version": "3.0.3",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -20,9 +20,10 @@
     "@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.9",
-    "@tuya-sat/micro-dev-proxy": "3.0.0-beta.9",
-    "@tuya-sat/micro-utils": "3.0.0-beta.9",
+    "@tuya-sat/micro-dev-loader": "3.0.3",
+    "@tuya-sat/micro-dev-proxy": "3.0.3",
+    "@tuya-sat/micro-utils": "3.0.3",
+    "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",
     "chalk": "4.1.2",
@@ -36,6 +37,7 @@
     "html-webpack-plugin": "5.5.0",
     "http-proxy-middleware": "2.0.4",
     "joi": "17.6.0",
+    "kill-port": "^2.0.1",
     "less": "4.1.2",
     "less-loader": "10.2.0",
     "mini-css-extract-plugin": "2.6.0",
@@ -52,13 +54,14 @@
     "sass-loader": "12.6.0",
     "style-loader": "3.3.1",
     "svg-url-loader": "7.1.1",
-    "tsconfig-paths-webpack-plugin": "3.5.2",
+    "tsconfig-paths-webpack-plugin": "^4.0.0",
     "uid": "^2.0.1",
     "url-loader": "4.1.1",
     "uuid": "8.3.2",
     "vue-loader": "17.0.0",
-    "webpack": "5.70.0",
-    "webpack-dev-server": "4.7.4",
+    "webpack": "5.75.0",
+    "webpack-cli": "5.0.1",
+    "webpack-dev-server": "4.11.1",
     "webpack-merge": "5.8.0"
   },
   "devDependencies": {
@@ -66,6 +69,7 @@
     "@types/jest": "27.4.1",
     "@types/uuid": "8.3.4",
     "jest": "27.5.1",
+    "terser-webpack-plugin": "^5.3.6",
     "ts-jest": "27.1.3",
     "typescript": "4.6.2"
   },