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

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/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,6 +38,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFakeUser = void 0;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 function parse_SDF_CONFIG(html) {
     var _a;
     const REGEX = /(?<=window._SDF_CONFIG=).*?(?=;)/;
@@ -36,16 +61,50 @@ function getFakeSaas(config) {
             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 saas = {
+                _SDF: {
+                    base: '',
+                    env: '',
+                    region: '',
+                    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: "SaaS  UI"
+                    },
+                },
+                _SDF_CONFIG: {},
+                __MAIN_APP_PUBLIC_PATH: 'https://static1.tuyacn.com/static/sdf-main-app/0.0.0-123/',
+            };
+            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: JSON.parse(_SDF),
+                __MAIN_APP_PUBLIC_PATH: JSON.parse(__MAIN_APP_PUBLIC_PATH),
+            };
+            return saas;
+        }
     });
 }
 exports.default = getFakeSaas;

package/dist/module/main/fakeSaasInfo.js

@@ -40,6 +40,44 @@ function mockSaasInfo(app, microPort) {
     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'))) {
+        app.get('/api/saas-info', (req, res) => {
+            const lang = 'zh';
+            const result = {
+                apps: [],
+                entry_info: { entries: [], entry_mode: 'normal' },
+                permissions: {},
+                saas_id_info_list: [],
+            };
+            const dirs = fs_extra_1.default.readdirSync(path.join(process.cwd(), 'apps'));
+            dirs.forEach((dir) => {
+                const entry_id = (0, uuid_1.v4)();
+                const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), 'apps', dir, 'manifest.json'), 'utf-8');
+                const oem_micro_app_id = (0, uid_1.uid)(16);
+                const 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) {
         app.get('/api/saas-info', (req, res) => {
             const lang = parseCookie(req.headers['cookie'], 'main-i18next');

package/dist/scripts/build.js

@@ -17,12 +17,11 @@ 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 BUILD_FAIL_TIP = '糟糕：打包失败了，下面是具体信息';
 const spinner = (0, ora_1.default)('building').start();
 const config = (0, webpack_config_1.default)();
 (() => __awaiter(void 0, void 0, void 0, function* () {
-    yield (0, apis_1.default)();
+    // await apis();
     yield (0, template_1.default)();
     (0, webpack_1.default)(config).run((err, stats) => {
         if (err) {

package/dist/scripts/start.js

@@ -18,30 +18,47 @@ 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)();
+    // await apis();
     yield (0, template_1.default)();
     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;
+    console.log("process.env.PROD", process.env.PROD);
+    if (process.env.PROD) {
+        const compiler = (0, bundleServer_1.createServerCompiler)();
+        (0, bundleServer_1.runBundleServer)({
+            port: Number(process.env.PROD),
+            compiler,
+            internalDevConfig: {
+                open: true,
+                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,9 +18,8 @@ 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)();
+    // await apis();
     yield (0, template_1.default)();
     let defaultPort = 9000;
     //检测端口占用情况

package/dist/template/micro-app/index.tsx

@@ -11,7 +11,7 @@ import './index.css';
 import './styles/global.less';
 export * from './interfaces';
 export * from './antdLang';
-export * from 'api';
+export * from './api';
 export let microProps: IQiankunProps;
 
 function render(props: IQiankunProps) {

package/dist/template/micro-app/interfaces.ts

@@ -1,8 +1,9 @@
 import { CaptureContext, Event, Severity } from '@sentry/types';
 
+type IState = { [k in string]: string | number | null };
 interface mainHistory {
-  push: (path, state?) => void;
-  replace: (path, state?) => void;
+  push: (path: string, state?: IState) => void;
+  replace: (path: string, state?: IState) => void;
   go: (n: number) => void;
   goBack: () => void;
   goForward: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.0.27-beta.2",
+  "version": "3.0.27-beta.4",
   "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.2",
-    "@tuya-sat/micro-dev-proxy": "3.0.27-beta.2",
-    "@tuya-sat/micro-utils": "3.0.27-beta.2",
+    "@tuya-sat/micro-dev-loader": "3.0.27-beta.4",
+    "@tuya-sat/micro-dev-proxy": "3.0.27-beta.4",
+    "@tuya-sat/micro-utils": "3.0.27-beta.4",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",