@tuya-sat/micro-script 3.0.27-beta.3 → 3.0.27-beta.30

package/dist/config/paths.js

@@ -4,7 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const cwd = process.cwd();
+const spaHtmlPath = path_1.default.resolve(cwd, "public/index.html");
+const spaEjsPath = path_1.default.resolve(cwd, "public/index.ejs");
 exports.default = {
     microConfig: path_1.default.resolve(cwd, "micro.config.js"),
     dist: path_1.default.resolve(cwd, "dist/"),
@@ -12,7 +15,7 @@ exports.default = {
     appSrc: path_1.default.resolve(cwd, "src/"),
     mockDir: path_1.default.resolve(cwd, "mock/index.json"),
     publicDir: path_1.default.resolve(cwd, "public/"),
-    spaHtml: path_1.default.resolve(cwd, "public/index.html"),
+    spaHtml: fs_extra_1.default.existsSync(spaEjsPath) ? spaEjsPath : spaHtmlPath,
     manifest: path_1.default.resolve(cwd, "manifest.json"),
     vueTsEntryFile: path_1.default.resolve(cwd, "src/index.ts"),
     vueJsEntryFile: path_1.default.resolve(cwd, "src/index.js"),

package/dist/framework/react.config.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactJsConfig = exports.reactTsConfig = void 0;
 const react_refresh_webpack_plugin_1 = __importDefault(require("@pmmmwh/react-refresh-webpack-plugin"));
 const tsconfig_paths_webpack_plugin_1 = __importDefault(require("tsconfig-paths-webpack-plugin"));
-const fork_ts_checker_webpack_plugin_1 = __importDefault(require("fork-ts-checker-webpack-plugin"));
 const paths_1 = __importDefault(require("../config/paths"));
 const reactConfig = ({ isDev, isBuild, currentFramework, isTs, }) => {
     return {
@@ -56,17 +55,17 @@ const reactConfig = ({ isDev, isBuild, currentFramework, isTs, }) => {
         },
         plugins: [
             isDev && new react_refresh_webpack_plugin_1.default(),
-            isTs &&
-                new fork_ts_checker_webpack_plugin_1.default({
-                    //https://github.com/TypeStrong/fork-ts-checker-webpack-plugin#typescript-options
-                    typescript: {
-                        diagnosticOptions: {
-                            semantic: true,
-                            syntactic: true,
-                        },
-                        mode: 'write-references',
-                    },
-                }),
+            // isTs &&
+            //   new ForkTsCheckerWebpackPlugin({
+            //     //https://github.com/TypeStrong/fork-ts-checker-webpack-plugin#typescript-options
+            //     typescript: {
+            //       diagnosticOptions: {
+            //         semantic: true,
+            //         syntactic: true,
+            //       },
+            //       mode: 'write-references',
+            //     },
+            //   }),
         ].filter((value) => Boolean(value)),
     };
 };

package/dist/module/bundleServer.js

@@ -27,7 +27,6 @@ exports.runBundleServer = exports.createServerCompiler = void 0;
 const webpack_1 = __importDefault(require("webpack"));
 const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
 const ora_1 = __importDefault(require("ora"));
-const chalk_1 = __importDefault(require("chalk"));
 const paths_1 = __importDefault(require("../config/paths"));
 const webpack_config_1 = __importDefault(require("../config/webpack.config"));
 const options_1 = __importDefault(require("./options"));
@@ -67,11 +66,9 @@ function runBundleServer({ port, compiler, internalDevConfig = {}, }) {
             console.log(`compiled time ~${endTime - startTime}ms`);
         });
         //临时提示
-        compiler.hooks.done.tap('once-tip', (0, onceFactory_1.onceFactory)(() => {
-            console.log(chalk_1.default.yellow(`Tip: 如果HMR失效且保存文件时造成多次compile，请考虑调高aggregateTimeout参数(可以尝试100)`));
-        }));
+        compiler.hooks.done.tap('once-tip', (0, onceFactory_1.onceFactory)(() => { }));
         yield server.start();
-        console.log('本地应用服务已启动');
+        console.log('\n The local application server has started');
     });
 }
 exports.runBundleServer = runBundleServer;

package/dist/module/main/fakeSaas.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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -15,37 +38,79 @@ 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-extra"));
+const path = __importStar(require("path"));
 function parse_SDF_CONFIG(html) {
     var _a;
-    const REGEX = /(?<=window._SDF_CONFIG=).*?(?=;)/;
+    const REGEX = /(?<=window._SDF_CONFIG=).*?(?=(;|<\/script>))/;
     return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || '';
 }
 function parse_SDF(html) {
     var _a;
-    const REGEX = /(?<=window._SDF=).*?}(?=;)/;
+    const REGEX = /(?<=window._SDF=).*?}(?=(;|<\/script>))/;
     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=).*?(?=;)/;
+    const REGEX = /(?<=window.__MAIN_APP_PUBLIC_PATH=).*?(?=(;|<\/script>))/;
     return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || '';
 }
 function getFakeSaas(config) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (!config.target) {
             console.log(chalk_1.default.red('没有配置target'));
             process.exit(1);
         }
-        const { data } = yield axios_1.default.get(new URL('/login?disable_third_login=true', 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;
+        if (config.isMainApp && fs.existsSync(path.join(process.cwd(), 'apps'))) {
+            const saasInfo = fs.readJSONSync(path.join(process.cwd(), 'saas-info.config.json'));
+            let saas = {
+                _SDF: {
+                    base: '',
+                    env: '',
+                    region: '',
+                    isOpenCode: true,
+                    saas: {
+                        background_image: 'https://images.tuyacn.com/rms-static/537a3fd0-1b5a-11ec-b7af-2d39f353debc-1632283530317.jpg?tyName=login.jpg',
+                        charge_status: 'TRIAL',
+                        entries: { entry_mode: 'normal' },
+                        favicon: 'https://images.tuyacn.com/rms-static/ae9ba1b0-41d4-11ec-89bb-d7b7de210e4b-1636514225995.png?tyName=favicon.png',
+                        host_filing: '备案:fast-cn.wgine',
+                        is_custom: false,
+                        is_need_jiyan: true,
+                        is_support_mobile: true,
+                        message_switch: true,
+                        label: '',
+                        legal_notice: 'https://ruomu-abc-001.fast-cn.wgine.com/policies/legal',
+                        logo: 'https://images.tuyacn.com/rms-static/bc42adb0-6f86-11ec-b5fa-7deb2a111a61-1641538501643.png?tyName=%E9%BB%98%E8%AE%A4logo%2056X56%20.png',
+                        privacy_policy: 'https://ruomu-abc-001.fast-cn.wgine.com/policies/privacy',
+                        service_terms: 'https://ruomu-abc-001.fast-cn.wgine.com/policies/service',
+                        supported_language: { en: 'English', zh: '简体中文' },
+                        tenant_register_support: false,
+                        tenant_type: 'SINGLE_TENANT',
+                        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 {
+            const { data } = yield axios_1.default.get(new URL('/login?disable_third_login=true', 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: Object.assign(Object.assign({}, JSON.parse(_SDF)), { isOpenCode: !!((_a = process.env) === null || _a === void 0 ? void 0 : _a.IS_OPEN_CODE) }),
+                __MAIN_APP_PUBLIC_PATH: JSON.parse(__MAIN_APP_PUBLIC_PATH),
+            };
+            return saas;
+        }
     });
 }
 exports.default = getFakeSaas;

package/dist/module/main/fakeSaasInfo.js

@@ -34,13 +34,55 @@ 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);
-    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 = ((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';
+            const result = {
+                apps: [],
+                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 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: '',
+                });
+                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) => {
+                    return { permission_group: item.code };
+                })) || [];
+                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,
+            });
+        });
+    }
     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)) {
@@ -103,7 +145,17 @@ function mockSaasInfo(app, microPort) {
 }
 exports.default = mockSaasInfo;
 function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, dir) {
-    const fakeMenu = (0, micro_utils_1.getFakeMenu)(manifest, dir);
+    var _a;
+    let fakeMenu;
+    if (dir === 'apps/iot-suite-device') {
+        fakeMenu = (0, micro_utils_1.getFakeMenu)(Object.assign(Object.assign({}, manifest), { entries: [] }), dir);
+    }
+    else if ((_a = process.env) === null || _a === void 0 ? void 0 : _a.IS_OPEN_CODE) {
+        fakeMenu = (0, micro_utils_1.getFakeMenu)(Object.assign(Object.assign({}, manifest), { entries: manifest === null || manifest === void 0 ? void 0 : manifest.entries.filter((item) => item.type !== 'DynamicMenu') }), dir);
+    }
+    else {
+        fakeMenu = (0, micro_utils_1.getFakeMenu)(manifest, dir);
+    }
     let stack = [fakeMenu];
     while (stack.length) {
         const menu = stack.shift();
@@ -121,6 +173,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';
     }
     return fakeMenu;
 }

package/dist/module/main/staticMain.js

@@ -41,9 +41,11 @@ 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=).*?}(?=;)/;
+    const REGEX = /(?<=window._SDF=).*?}(?=(;|<\/script>))/;
     return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || '';
 }
 function staticMain(app, debuggerConfig, microPort) {
@@ -117,6 +119,18 @@ function insertScript($, debuggerConfig) {
             }
             : {})), readThemeConfig()));
         overrideNotification(saas);
+        if (fs.existsSync(path.join(process.cwd(), 'saas-info.config.json'))) {
+            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/module/mainServer.js

@@ -103,7 +103,7 @@ function runMain({ port, microPort, }) {
             resolve();
         });
         yield waiting;
-        console.log('代理服务已启动');
+        console.log('The proxy server has started');
     });
 }
 exports.default = runMain;

package/dist/module/proxy.d.ts

@@ -1,2 +1,2 @@
-import { Application } from "express";
+import { Application } from 'express';
 export default function useProxy(app: Application): void;

package/dist/module/proxy.js

@@ -4,11 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const paths_1 = __importDefault(require("../config/paths"));
+const http_proxy_middleware_1 = require("http-proxy-middleware");
 function useProxy(app) {
-    const isProxy = process.env.MICRO_PROXY === "true";
+    const isProxy = process.env.MICRO_PROXY === 'true';
+    const { debuggerConfig } = require(paths_1.default.microConfig);
+    const customApiUrl = debuggerConfig === null || debuggerConfig === void 0 ? void 0 : debuggerConfig.customApiUrl;
+    if (customApiUrl) {
+        app.use('/custom-api', (0, http_proxy_middleware_1.createProxyMiddleware)({
+            target: customApiUrl,
+            pathRewrite: { '^/custom-api': '' },
+            changeOrigin: true,
+        }));
+    }
     if (isProxy) {
-        const createProxy = require("@tuya-sat/micro-dev-proxy").default;
-        const { debuggerConfig } = require(paths_1.default.microConfig);
+        const createProxy = require('@tuya-sat/micro-dev-proxy').default;
         createProxy(debuggerConfig)(app);
     }
 }

package/dist/scripts/build.js

@@ -17,13 +17,16 @@ 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* () {
-    yield (0, apis_1.default)();
     yield (0, template_1.default)();
+    // await apis();
     (0, webpack_1.default)(config).run((err, stats) => {
         if (err) {
             spinner.fail();
@@ -39,6 +42,19 @@ 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) => {
+                if (file) {
+                    const key = file.split('.')[0];
+                    acc[key] = `static/img/${file}`;
+                }
+                return acc;
+            }, {});
+            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

@@ -12,36 +12,50 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk_1 = __importDefault(require("chalk"));
 const portfinder_1 = __importDefault(require("portfinder"));
 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* () {
-    yield (0, apis_1.default)();
     yield (0, template_1.default)();
+    // await apis();
     let defaultPort = 9000;
-    console.log(chalk_1.default.yellow('如果是pc端的微应用调试，请勿使用该命令，考虑使用`start --main`或`start --main --proxy`'));
     //检测端口占用情况
-    const port = yield portfinder_1.default.getPortPromise({
-        port: defaultPort,
-        stopPort: defaultPort + 100,
-    });
-    const compiler = (0, bundleServer_1.createServerCompiler)();
-    (0, bundleServer_1.runBundleServer)({
-        port,
-        compiler,
-        internalDevConfig: {
-            open: true,
-            setupMiddlewares(middleware, { app }) {
-                (0, mock_1.default)(app);
-                (0, proxy_1.default)(app);
-                return middleware;
+    if (process.env.PROT) {
+        const compiler = (0, bundleServer_1.createServerCompiler)();
+        (0, bundleServer_1.runBundleServer)({
+            port: Number(process.env.PROT),
+            compiler,
+            internalDevConfig: {
+                open: false,
+                setupMiddlewares(middleware, { app }) {
+                    (0, mock_1.default)(app);
+                    (0, proxy_1.default)(app);
+                    return middleware;
+                },
             },
-        },
-    });
+        });
+    }
+    else {
+        const port = yield portfinder_1.default.getPortPromise({
+            port: defaultPort,
+            stopPort: defaultPort + 100,
+        });
+        const compiler = (0, bundleServer_1.createServerCompiler)();
+        (0, bundleServer_1.runBundleServer)({
+            port,
+            compiler,
+            internalDevConfig: {
+                open: true,
+                setupMiddlewares(middleware, { app }) {
+                    (0, mock_1.default)(app);
+                    (0, proxy_1.default)(app);
+                    return middleware;
+                },
+            },
+        });
+    }
 }))().catch((err) => {
     console.log(err);
 });

package/dist/scripts/startInMain.js

@@ -18,10 +18,9 @@ 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* () {
-    yield (0, apis_1.default)();
     yield (0, template_1.default)();
+    // await apis();
     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.3",
+  "version": "3.0.27-beta.30",
   "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.3",
-    "@tuya-sat/micro-dev-proxy": "3.0.27-beta.3",
-    "@tuya-sat/micro-utils": "3.0.27-beta.3",
+    "@tuya-sat/micro-dev-loader": "3.0.27-beta.30",
+    "@tuya-sat/micro-dev-proxy": "3.0.27-beta.30",
+    "@tuya-sat/micro-utils": "3.0.27-beta.30",
     "@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",