@tuya-sat/micro-script 2.3.5 → 3.0.0-beta.10

package/dist/config/webpack.common.d.ts

@@ -1,5 +1,9 @@
-import { Configuration } from "webpack";
+import { Configuration } from 'webpack';
+import { ThemeCat } from '@tuya-sat/micro-dev-loader/dist/less/utils/index';
+declare type ThemeEnv = ThemeCat | undefined;
+export declare const validateMicroTheme: () => ThemeEnv;
 export default function getCommonConfig({ isDev, isBuild, }: {
     isDev: boolean;
     isBuild: boolean;
 }): Configuration;
+export {};

package/dist/config/webpack.common.js

@@ -12,7 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
+exports.validateMicroTheme = void 0;
+const webpack_merge_1 = require("webpack-merge");
 //@ts-ignore
 const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
 //@ts-ignore
@@ -20,140 +21,188 @@ const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plug
 const html_webpack_plugin_1 = __importDefault(require("html-webpack-plugin"));
 const css_minimizer_webpack_plugin_1 = __importDefault(require("css-minimizer-webpack-plugin"));
 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 micro_utils_1 = require("@tuya-sat/micro-utils");
 const paths_1 = __importDefault(require("./paths"));
-const theme_1 = require("../utils/theme");
-const DYNAMIC_CHUNK_PREFIX = "micro_app_lazy";
+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];
 };
+const validateMicroTheme = () => {
+    const microTheme = process.env.MICRO_THEME;
+    if (microTheme && ![index_1.DARK_THEME, index_1.LIGHT_THEME].includes(microTheme)) {
+        console.error(`请设置正确的MICRO_THEME环境变量,当前值为${microTheme},请修改为${index_1.LIGHT_THEME}或${index_1.DARK_THEME}`);
+        return process.exit(1);
+    }
+    return microTheme;
+};
+exports.validateMicroTheme = validateMicroTheme;
 function getCommonConfig({ isDev, isBuild, }) {
     const { name: packageName } = require(paths_1.default.appPkg);
-    const { annotations } = (0, micro_utils_1.parseManifest)();
-    const enableThemeCompile = annotations["sdf.feat:colorTheme"];
+    const devMicroTheme = (0, exports.validateMicroTheme)();
+    const enableThemeCompile = isDev
+        ? !!devMicroTheme
+        : (0, utils_1.getAnnotations)()['sdf.feat:colorTheme'];
     //获取style处理的loader
     const getStyleLoaders = (extraLoader = []) => {
         extraLoader = toArray(extraLoader);
         const loadersBeforeCssLoader = [
-            isDev && require("@tuya-sat/micro-dev-loader").filterCssVariableLoader,
-            require.resolve("postcss-loader"),
+            isDev && require('@tuya-sat/micro-dev-loader').filterCssVariableLoader,
+            require.resolve('postcss-loader'),
             ...extraLoader,
         ].filter(Boolean);
         const loaders = [
-            isBuild ? mini_css_extract_plugin_1.default.loader : require.resolve("style-loader"),
+            isBuild ? mini_css_extract_plugin_1.default.loader : require.resolve('style-loader'),
             {
-                loader: require.resolve("css-loader"),
+                loader: require.resolve('css-loader'),
                 options: {
                     modules: {
                         auto: true,
-                        localIdentName: isDev ? "[path][name]__[local]" : "[hash:base64]",
+                        localIdentName: isDev ? '[path][name]__[local]' : '[hash:base64]',
                     },
                     importLoaders: loadersBeforeCssLoader.length,
                 },
             },
-            ...loadersBeforeCssLoader
+            ...loadersBeforeCssLoader,
         ].filter(Boolean);
         return loaders;
     };
-    return {
-        mode: isBuild ? "production" : "development",
-        output: {
-            filename: isBuild
-                ? "static/js/[name].[contenthash:8].js"
-                : "static/js/[name].bundle.js",
-            chunkFilename: isBuild
-                ? `static/js/${DYNAMIC_CHUNK_PREFIX}-[name].[contenthash:8].chunk.js`
-                : "static/js/[name].chunk.js",
-            path: paths_1.default.dist,
-            clean: true,
-            library: {
-                name: packageName,
-                type: "umd",
-            },
-        },
-        module: {
-            rules: [
-                {
-                    test: /\.css$/,
-                    use: getStyleLoaders(),
+    const { multiApps } = require(paths_1.default.microConfig);
+    const multiAppsWebpackConfig = {
+        plugins: [],
+        entry: {},
+    };
+    function getWebpackConfig(htmlplugins) {
+        const baseConfig = {
+            mode: isBuild ? 'production' : 'development',
+            output: {
+                filename: isBuild
+                    ? 'static/js/[name].[contenthash:8].js'
+                    : 'static/js/[name].bundle.js',
+                chunkFilename: isBuild
+                    ? 'static/js/[name].[contenthash:8].chunk.js'
+                    : 'static/js/[name].chunk.js',
+                path: paths_1.default.dist,
+                clean: true,
+                library: {
+                    name: packageName,
+                    type: 'umd',
                 },
-                {
-                    test: /\.less$/,
-                    use: getStyleLoaders([
-                        {
-                            loader: require.resolve("less-loader"),
-                            options: {
-                                lessOptions: Object.assign(Object.assign({}, (enableThemeCompile
-                                    ? isDev
-                                        ? (0, index_1.getLessOptions)((0, theme_1.getBaseTheme)())
-                                        : (0, index_1.getLessOptions)(index_1.LIGHT_THEME)
-                                    : {})), { javascriptEnabled: true }),
+            },
+            module: {
+                rules: [
+                    {
+                        test: /\.css$/,
+                        use: getStyleLoaders(),
+                    },
+                    {
+                        test: /\.less$/,
+                        use: getStyleLoaders([
+                            {
+                                loader: require.resolve('less-loader'),
+                                options: {
+                                    lessOptions: Object.assign(Object.assign({}, (isDev
+                                        ? enableThemeCompile
+                                            ? (0, index_1.getLessOptions)(devMicroTheme)
+                                            : {}
+                                        : (0, utils_1.getAnnotations)()['sdf.feat:colorTheme']
+                                            ? (0, index_1.getLessOptions)(index_1.LIGHT_THEME)
+                                            : {})), { javascriptEnabled: true }),
+                                },
+                            },
+                            enableThemeCompile &&
+                                require('@tuya-sat/micro-dev-loader').changeAntdGlobalImport,
+                            enableThemeCompile &&
+                                require('@tuya-sat/micro-dev-loader')
+                                    .changeTuyaSatComponentImport,
+                        ].filter(Boolean)),
+                    },
+                    {
+                        test: /\.(scss|sass)$/,
+                        use: getStyleLoaders(require.resolve('sass-loader')),
+                    },
+                    {
+                        test: /\.(bmp|png|svg|jpg|jpeg|gif)$/i,
+                        type: 'asset',
+                        parser: {
+                            dataUrlCondition: {
+                                maxSize: 10 * 1024,
                             },
                         },
-                        enableThemeCompile &&
-                            require("@tuya-sat/micro-dev-loader").changeAntdGlobalImport,
-                        enableThemeCompile &&
-                            require("@tuya-sat/micro-dev-loader")
-                                .changeTuyaSatComponentImport,
-                    ].filter(Boolean)),
-                },
-                {
-                    test: /\.(scss|sass)$/,
-                    use: getStyleLoaders(require.resolve("sass-loader")),
-                },
-                {
-                    test: /\.(bmp|png|svg|jpg|jpeg|gif)$/i,
-                    type: "asset",
-                    parser: {
-                        dataUrlCondition: {
-                            maxSize: 10 * 1024,
+                        generator: {
+                            filename: 'static/img/[hash][ext][query]',
                         },
                     },
-                    generator: {
-                        filename: "static/img/[hash][ext][query]",
-                    },
+                ].filter(Boolean),
+            },
+            optimization: {
+                runtimeChunk: 'single',
+                splitChunks: {
+                    cacheGroups: Object.assign(Object.assign({}, (enableThemeCompile
+                        ? {
+                            vendorCss: {
+                                test: /([\\/]node_modules[\\/][\s\S]+(\.less|\.css)$)|([\\/]src[\\/]styles[\\/]global\.less)/,
+                                name: 'light',
+                                chunks: 'all',
+                                priority: 2,
+                            },
+                        }
+                        : {})), { vendor: {
+                            test: /[\\/]node_modules[\\/]/,
+                            name: 'vendors-others',
+                            chunks: 'all',
+                            priority: 0,
+                        }, react: {
+                            test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/,
+                            name: 'react-related',
+                            chunks: 'all',
+                            priority: 1,
+                        } }),
                 },
-            ].filter(Boolean),
-        },
-        optimization: {
-            splitChunks: {
-                cacheGroups: Object.assign({}, (enableThemeCompile
-                    ? {
-                        vendorCss: {
-                            test: /([\\/]node_modules[\\/][\s\S]+(\.less|\.css)$)|([\\/]src[\\/]styles[\\/]global\.less)/,
-                            name: "light",
-                            chunks: "all",
-                            minSize: 0,
-                            priority: 2,
-                        },
-                    }
-                    : {})),
+                minimizer: ['...', new css_minimizer_webpack_plugin_1.default()],
             },
-            minimizer: ["...", new css_minimizer_webpack_plugin_1.default()],
-        },
-        plugins: [
-            new html_webpack_plugin_1.default({
+            plugins: [
+                new html_webpack_plugin_1.default({
+                    inject: true,
+                    template: paths_1.default.spaHtml,
+                }),
+                ...htmlplugins,
+                new copy_webpack_plugin_1.default({
+                    patterns: [
+                        {
+                            from: paths_1.default.publicDir,
+                            filter: (resourcePath) => __awaiter(this, void 0, void 0, function* () { return resourcePath !== paths_1.default.spaHtml; }),
+                            noErrorOnMissing: true,
+                        },
+                    ],
+                }),
+                isBuild &&
+                    new mini_css_extract_plugin_1.default({
+                        filename: 'static/css/[name].[contenthash:8].css',
+                        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;
+    }
+    if (multiApps && multiApps.length > 0) {
+        multiApps.forEach((app) => {
+            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`,
                 template: paths_1.default.spaHtml,
-            }),
-            new copy_webpack_plugin_1.default({
-                patterns: [
-                    {
-                        from: paths_1.default.publicDir,
-                        // 使用path.resolve纠正resourcePath，因为这个resourcePath值在windows平台显示的是POSIX值；
-                        filter: (resourcePath) => __awaiter(this, void 0, void 0, function* () { return path_1.default.resolve(resourcePath) !== paths_1.default.spaHtml; }),
-                        noErrorOnMissing: true,
-                    },
-                ],
-            }),
-            isBuild &&
-                new mini_css_extract_plugin_1.default({
-                    filename: "static/css/[name].[contenthash:8].css",
-                    chunkFilename: `static/css/${DYNAMIC_CHUNK_PREFIX}-[name].[contenthash:8].chunk.css`,
-                }),
-            isBuild && enableThemeCompile && new micro_dev_loader_1.ThemePlugin(),
-        ].filter((value) => Boolean(value)),
-    };
+                chunks: [app.name],
+            }));
+        });
+        console.log('multiAppsWebpackConfig', multiAppsWebpackConfig);
+        return (0, webpack_merge_1.merge)(getWebpackConfig(multiAppsWebpackConfig.plugins), {
+            entry: multiAppsWebpackConfig.entry,
+        });
+    }
+    return getWebpackConfig([]);
 }
 exports.default = getCommonConfig;

package/dist/config/webpack.config.d.ts

@@ -1,4 +1,4 @@
-import { Configuration } from "webpack";
+import { Configuration } from 'webpack';
 export interface BaseParams {
     isDev: boolean;
     isBuild: boolean;

package/dist/config/webpack.config.js

@@ -7,14 +7,13 @@ const webpack_merge_1 = require("webpack-merge");
 const paths_1 = __importDefault(require("./paths"));
 const framework_1 = __importDefault(require("../framework"));
 const webpack_common_1 = __importDefault(require("./webpack.common"));
-const micro_utils_1 = require("@tuya-sat/micro-utils");
+const utils_1 = require("../utils");
 exports.default = () => {
-    const isBuild = process.env.NODE_ENV === "production";
-    const isDev = process.env.NODE_ENV === "development";
-    const { annotations: { ["sdf.cli:microFramework"]: currentFramework }, } = (0, micro_utils_1.parseManifest)();
+    const isBuild = process.env.NODE_ENV === 'production';
+    const isDev = process.env.NODE_ENV === 'development';
     //框架的webpack配置
     const frameworkConfig = (0, framework_1.default)({
-        currentFramework,
+        currentFramework: (0, utils_1.getAnnotations)()['sdf.cli:microFramework'],
         isDev,
         isBuild,
     });
@@ -23,7 +22,7 @@ exports.default = () => {
     const baseConfig = (0, webpack_merge_1.merge)(frameworkConfig, commonConfig);
     //额外的webpack结合function
     const webpackCombineFunction = require(paths_1.default.microConfig).webpack;
-    if (webpackCombineFunction && typeof webpackCombineFunction === "function") {
+    if (webpackCombineFunction && typeof webpackCombineFunction === 'function') {
         return webpackCombineFunction(baseConfig, { isDev, isBuild });
     }
     return baseConfig;

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

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

package/dist/module/main/fakeSaasInfo.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,33 +29,68 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const micro_utils_1 = require("@tuya-sat/micro-utils");
 const uuid_1 = require("uuid");
 const paths_1 = __importDefault(require("../../config/paths"));
+const uid_1 = require("uid");
+const path = __importStar(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 function mockSaasInfo(app, microPort) {
-    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}`;
-    app.get("/api/saas-info", (req, res) => {
-        const lang = parseCookie(req.headers["cookie"], "main-i18next");
-        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,
-        });
+    const { multiApps } = 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;
+                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 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,
+            });
+        }
     });
-    return baseUrl;
 }
 exports.default = mockSaasInfo;
-function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang) {
-    const fakeMenu = (0, micro_utils_1.getFakeMenu)(manifest);
+function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, dir) {
+    const fakeMenu = (0, micro_utils_1.getFakeMenu)(manifest, dir);
     let stack = [fakeMenu];
     while (stack.length) {
         const menu = stack.shift();
@@ -49,17 +107,17 @@ function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang) {
     }
     return fakeMenu;
 }
-function consturctApp(manifest, oem_micro_app_id, baseUrl, lang, port) {
+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: `${packageInfo.name}`,
-        micro_app_name: `${pickText((0, micro_utils_1.nameProcesser2)("name"), lang)}-dev`,
-        micro_app_version: "0.0.0-x",
+        micro_app_code: code || `${packageInfo.name}`,
+        micro_app_name: code ? `${code}-dev` : `${packageInfo.name}-dev`,
+        micro_app_version: '0.0.0-x',
         oem_micro_app_id,
-        resource: `http://localhost:${port}`,
+        resource: `http://localhost:${port}/${code || 'index'}.html`,
         schema: null,
         universal_id: manifest.universalId,
         isAuth: true,
@@ -71,15 +129,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/module/main/staticMain.js

@@ -39,7 +39,7 @@ const cheerio_1 = __importDefault(require("cheerio"));
 const axios_1 = __importDefault(require("axios"));
 const fakeSaas_1 = __importStar(require("./fakeSaas"));
 const paths_1 = __importDefault(require("../../config/paths"));
-const theme_1 = require("../../utils/theme");
+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) {
     app.get([
@@ -95,11 +95,15 @@ function insertScript($, debuggerConfig) {
         let themeConfig = saas.custom_configs.find((item) => {
             return item.config_key === "dynamic_theme";
         }) || initalCustom_configs(saas);
-        const theme = (0, theme_1.getBaseTheme)();
-        themeConfig.config_value_json = JSON.stringify(Object.assign(Object.assign(Object.assign({}, JSON.parse(themeConfig.config_value_json)), (theme ? {
-            supportedTheme: theme,
-        } : {})), readThemeConfig()));
+        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
+            ? {
+                supportedTheme: theme,
+            }
+            : {})), 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)};
       localStorage.setItem('theme',${JSON.stringify(process.env.MICRO_THEME)});
       localStorage.setItem('isDebugger','true')

package/dist/module/mainServer.js

@@ -23,13 +23,15 @@ const proxy_1 = __importDefault(require("../module/proxy"));
 const validate_1 = require("../utils/validate");
 function runMain({ port, microPort, }) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { debuggerConfig } = require(paths_1.default.microConfig);
+        const { debuggerConfig, mainServer } = require(paths_1.default.microConfig);
         (0, validate_1.validateDebuggerConfig)(debuggerConfig);
         const app = (0, express_1.default)();
+        mainServer && mainServer.before && mainServer.before(app);
         (0, staticMain_1.default)(app, debuggerConfig);
         (0, fakeSaasInfo_1.default)(app, microPort);
         (0, mock_1.default)(app);
         (0, proxy_1.default)(app);
+        mainServer && mainServer.after && mainServer.after(app);
         const { waiting, resolve } = (0, promiser_1.promiser)();
         app.listen(port, () => {
             (0, ora_1.default)(`main server in ${port} port`).succeed();

package/dist/module/options.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="qs" />
-/// <reference types="express" />
-declare const _default: {
+import { ExpressRequestHandler } from 'webpack-dev-server';
+declare const option: {
     name: string;
     path: string;
-    middleware: import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+    middleware: ExpressRequestHandler;
 };
-export default _default;
+export default option;

package/dist/module/options.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const middleware = (req, res, next) => {
-    if (req.method === "OPTIONS") {
+    if (req.method === 'OPTIONS') {
         res.statusCode = 204;
-        res.send("ok");
+        res.send('ok');
         return;
     }
     next();
 };
-exports.default = {
-    name: "options-middleware",
-    path: "*",
+const option = {
+    name: 'options-middleware',
+    path: '*',
     middleware,
 };
+exports.default = option;

package/dist/scripts/build.js

@@ -30,16 +30,11 @@ const config = (0, webpack_config_1.default)();
         console.log(warnings.map((item) => item.message).join("\n"));
     }
     console.log(chalk_1.default.yellow(`当前打包工具:webpack@${version}`));
-    if (assets) {
-        console.log(chalk_1.default.blue("资源清单:"));
-        const assetsInfo = assets.map(({ size, name }) => {
-            return `    ${name} ${chalk_1.default.white(size > 1024 ? `~${Math.floor(size / 1024)}KB` : `${size}B`)}`;
-        });
-        assetsInfo.map((item) => {
-            console.log(chalk_1.default.blue(item));
-        });
-    }
-    else {
-        console.log(chalk_1.default.blue("无资源清单"));
-    }
+    console.log(chalk_1.default.blue("资源清单:"));
+    const assetsInfo = assets.map(({ size, name }) => {
+        return `    ${name} ${chalk_1.default.white(size > 1024 ? `~${Math.floor(size / 1024)}KB` : `${size}B`)}`;
+    });
+    assetsInfo.map((item) => {
+        console.log(chalk_1.default.blue(item));
+    });
 });

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;
     //检测端口占用情况
@@ -37,9 +38,12 @@ const bundleServer_1 = require("../module/bundleServer");
         port: bundledServerPort,
         compiler,
         internalDevConfig: {
-            allowedHosts: "all",
+            allowedHosts: 'all',
         },
     });
+    process.on('exit', () => {
+        (0, kill_port_1.default)(bundledServerPort, 'tcp').then(console.log).catch(console.log);
+    });
 }))().catch((err) => {
     console.log(err);
 });

package/dist/utils/index.d.ts

@@ -0,0 +1 @@
+export declare const getAnnotations: () => any;

package/dist/utils/index.js

@@ -0,0 +1,43 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAnnotations = void 0;
+const micro_utils_1 = require("@tuya-sat/micro-utils");
+const path = __importStar(require("path"));
+const paths_1 = __importDefault(require("../config/paths"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const getAnnotations = () => {
+    const { multiApps } = require(paths_1.default.microConfig);
+    if (multiApps && multiApps.length > 0) {
+        return fs_extra_1.default.readJSONSync(path.join(process.cwd(), multiApps[0].dir, 'manifest.json')).annotations;
+    }
+    else {
+        return (0, micro_utils_1.parseManifest)().annotations;
+    }
+};
+exports.getAnnotations = getAnnotations;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "2.3.5",
+  "version": "3.0.0-beta.10",
   "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": "2.3.5",
-    "@tuya-sat/micro-dev-proxy": "2.3.5",
-    "@tuya-sat/micro-utils": "2.3.5",
+    "@tuya-sat/micro-dev-loader": "3.0.0-beta.10",
+    "@tuya-sat/micro-dev-proxy": "3.0.0-beta.10",
+    "@tuya-sat/micro-utils": "3.0.0-beta.10",
+    "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",
     "chalk": "4.1.2",
@@ -32,9 +33,11 @@
     "css-minimizer-webpack-plugin": "3.4.1",
     "express": "4.17.3",
     "fork-ts-checker-webpack-plugin": "7.2.1",
+    "fs-extra": "^10.1.0",
     "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,6 +55,7 @@
     "style-loader": "3.3.1",
     "svg-url-loader": "7.1.1",
     "tsconfig-paths-webpack-plugin": "3.5.2",
+    "uid": "^2.0.1",
     "url-loader": "4.1.1",
     "uuid": "8.3.2",
     "vue-loader": "17.0.0",

package/dist/utils/theme.d.ts

@@ -1,2 +0,0 @@
-import { ThemeCat } from "@tuya-sat/micro-dev-loader/dist/less/utils/index";
-export declare const getBaseTheme: () => ThemeCat;

package/dist/utils/theme.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBaseTheme = void 0;
-const index_1 = require("@tuya-sat/micro-dev-loader/dist/less/utils/index");
-const getBaseTheme = () => {
-    const microTheme = process.env.MICRO_THEME;
-    if (!microTheme || ![index_1.DARK_THEME, index_1.LIGHT_THEME].includes(microTheme))
-        return index_1.LIGHT_THEME;
-    return microTheme;
-};
-exports.getBaseTheme = getBaseTheme;