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

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];
@@ -183,7 +182,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;

package/dist/module/main/fakeSaasInfo.js

@@ -45,12 +45,17 @@ function mockSaasInfo(app, microPort) {
                 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();
@@ -82,6 +87,9 @@ function mockSaasInfo(app, microPort) {
                     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,
             });

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;

package/dist/module/main/staticMain.js

@@ -40,21 +40,21 @@ 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/";
+const defaultBase = 'https://static1.tuyacn.com/static/sdf-gw/v1.0.1.516/';
 function staticMain(app, debuggerConfig) {
     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) {
             yield app._isLogin;
         }
         const base = debuggerConfig.base || defaultBase;
-        const { data } = yield axios_1.default.get(new URL("index.html", base).href);
+        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 +64,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 +82,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 +93,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 +103,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.0.0-beta.10",
+  "version": "3.0.0-beta.13",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -20,9 +20,9 @@
     "@babel/preset-react": "7.16.7",
     "@babel/preset-typescript": "7.16.7",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
-    "@tuya-sat/micro-dev-loader": "3.0.0-beta.10",
-    "@tuya-sat/micro-dev-proxy": "3.0.0-beta.10",
-    "@tuya-sat/micro-utils": "3.0.0-beta.10",
+    "@tuya-sat/micro-dev-loader": "3.0.0-beta.13",
+    "@tuya-sat/micro-dev-proxy": "3.0.0-beta.13",
+    "@tuya-sat/micro-utils": "3.0.0-beta.13",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",