@tuya-sat/micro-script 2.2.16 → 2.2.20

package/dist/config/webpack.common.js

@@ -21,6 +21,7 @@ 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 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 isExistPostcssFile = () => {
     return fs_extra_1.default.existsSync("postcss.config.js");
@@ -29,16 +30,20 @@ const toArray = (value) => {
     return Array.isArray(value) ? value : [value];
 };
 const validateMicroTheme = () => {
-    const MICRO_THEME = process.env.MICRO_THEME;
-    if (MICRO_THEME && ![index_1.DARK_THEME, index_1.LIGHT_THEME].includes(MICRO_THEME)) {
-        console.error(`请设置正确的MICRO_THEME,当前值为${MICRO_THEME},请修改为${index_1.LIGHT_THEME}或${index_1.DARK_THEME}`);
+    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 MICRO_THEME;
+    return microTheme;
 };
 function getCommonConfig({ isDev, isBuild, }) {
     const { name: packageName } = require(paths_1.default.appPkg);
-    const MICRO_THEME = validateMicroTheme();
+    const { annotations } = (0, micro_utils_1.parseManifest)();
+    const devMicroTheme = validateMicroTheme();
+    const enableThemeCompile = isDev
+        ? !!devMicroTheme
+        : annotations["sdf.feat:colorTheme"];
     //获取style处理的loader
     const getStyleLoaders = (extraLoader = []) => {
         extraLoader = toArray(extraLoader);
@@ -103,12 +108,16 @@ function getCommonConfig({ isDev, isBuild, }) {
                         {
                             loader: require.resolve("less-loader"),
                             options: {
-                                lessOptions: Object.assign(Object.assign({}, (MICRO_THEME
-                                    ? (0, index_1.getLessOptions)(isBuild ? index_1.LIGHT_THEME : MICRO_THEME)
-                                    : {})), { javascriptEnabled: true }),
+                                lessOptions: Object.assign(Object.assign({}, (isDev
+                                    ? enableThemeCompile
+                                        ? (0, index_1.getLessOptions)(devMicroTheme)
+                                        : {}
+                                    : annotations["sdf.feat:colorTheme"]
+                                        ? (0, index_1.getLessOptions)(index_1.LIGHT_THEME)
+                                        : {})), { javascriptEnabled: true }),
                             },
                         },
-                        MICRO_THEME &&
+                        enableThemeCompile &&
                             require("@tuya-sat/micro-dev-loader").changeAntdGlobalImport,
                     ].filter(Boolean)),
                 },
@@ -133,7 +142,7 @@ function getCommonConfig({ isDev, isBuild, }) {
         optimization: {
             runtimeChunk: "single",
             splitChunks: {
-                cacheGroups: Object.assign(Object.assign({}, (MICRO_THEME
+                cacheGroups: Object.assign(Object.assign({}, (enableThemeCompile
                     ? {
                         vendorCss: {
                             test: /([\\/]node_modules[\\/][\s\S]+(.less|.css)$)|([\\/]src[\\/]styles[\\/]global.less)/,
@@ -175,7 +184,7 @@ function getCommonConfig({ isDev, isBuild, }) {
                     filename: "static/css/[name].[contenthash:8].css",
                     chunkFilename: "static/css/[name].[contenthash:8].chunk.css",
                 }),
-            isBuild && MICRO_THEME && new micro_dev_loader_1.ThemePlugin(),
+            isBuild && enableThemeCompile && new micro_dev_loader_1.ThemePlugin(),
         ].filter((value) => Boolean(value)),
     };
 }

package/dist/config/webpack.config.js

@@ -3,15 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = __importDefault(require("fs-extra"));
 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");
 exports.default = () => {
     const isBuild = process.env.NODE_ENV === "production";
     const isDev = process.env.NODE_ENV === "development";
-    const { annotations: { ["sdf.cli:microFramework"]: currentFramework }, } = fs_extra_1.default.readJSONSync(paths_1.default.manifest);
+    const { annotations: { ["sdf.cli:microFramework"]: currentFramework }, } = (0, micro_utils_1.parseManifest)();
     //框架的webpack配置
     const frameworkConfig = (0, framework_1.default)({
         currentFramework,

package/dist/framework/index.d.ts

@@ -1,12 +1,12 @@
 import { Configuration } from "webpack";
 import { BaseParams } from "../config/webpack.config";
+import { MICRO_FRAMEWORKS_TYPE } from "@tuya-sat/micro-utils";
 export interface Params extends BaseParams {
     currentFramework: MICRO_FRAMEWORKS_TYPE;
 }
 export interface ParamsWithTs extends Params {
     isTs: boolean;
 }
-export declare type MICRO_FRAMEWORKS_TYPE = "REACT_TS" | "REACT_JS" | "VUE_TS" | "VUE_JS";
 export declare type FrameworkFunction = (arg0: Params) => Configuration;
 declare const _default: ({ currentFramework, isDev, isBuild }: Params) => Configuration;
 export default _default;

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

@@ -7,4 +7,11 @@ export default function getFakeSaas(config: DebuggerConfig): Promise<{
     _SDF_CONFIG: anyObject;
     __MAIN_APP_PUBLIC_PATH: string;
 }>;
+export declare function getFakeUser(config: DebuggerConfig): {
+    user_name: string;
+    roles: {
+        role_code: string;
+        role_name: string;
+    }[];
+};
 export {};

package/dist/module/main/fakeSaas.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": 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"));
@@ -38,7 +39,7 @@ function getFakeSaas(config) {
             process.exit(1);
         }
         if (!fs_extra_1.default.existsSync(paths_1.default.saasCache)) {
-            const { data } = yield axios_1.default.get(config.target);
+            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);
@@ -47,7 +48,6 @@ function getFakeSaas(config) {
                 _SDF: JSON.parse(_SDF),
                 __MAIN_APP_PUBLIC_PATH: JSON.parse(__MAIN_APP_PUBLIC_PATH),
             };
-            console.log(saas);
             fs_extra_1.default.writeJSONSync(paths_1.default.saasCache, saas);
             return saas;
         }
@@ -55,3 +55,15 @@ function getFakeSaas(config) {
     });
 }
 exports.default = getFakeSaas;
+function getFakeUser(config) {
+    return {
+        user_name: config.username || "admin@tuya.com",
+        roles: [
+            {
+                role_code: "FAKE_ROLE_CODE",
+                role_name: "FAKE_ROLE_NAME",
+            },
+        ],
+    };
+}
+exports.getFakeUser = getFakeUser;

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

@@ -18,4 +18,6 @@ export declare type CustomConfig = {
     platform: string;
     config_id: string;
 };
-export default function staticMain(app: Express, debuggerConfig: DebuggerConfig): void;
+export default function staticMain(app: Express & {
+    _isLogin?: Promise<void>;
+}, debuggerConfig: DebuggerConfig): void;

package/dist/module/main/staticMain.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) {
@@ -14,9 +37,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const cheerio_1 = __importDefault(require("cheerio"));
 const axios_1 = __importDefault(require("axios"));
-const fakeSaas_1 = __importDefault(require("./fakeSaas"));
+const fakeSaas_1 = __importStar(require("./fakeSaas"));
 const paths_1 = __importDefault(require("../../config/paths"));
-const defaultBase = "https://static1.tuyacn.com/static/sdf-gw/v1.0.1.293/";
+const defaultBase = "https://static1.tuyacn.com/static/sdf-gw/v1.0.1.352/";
 function staticMain(app, debuggerConfig) {
     app.get([
         "/",
@@ -26,24 +49,18 @@ function staticMain(app, debuggerConfig) {
         "/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 $ = cheerio_1.default.load(data);
         modifySrcAttr($, base);
-        insertLocalStorage($);
         yield insertScript($, debuggerConfig);
         res.send($.html());
     }));
 }
 exports.default = staticMain;
-function insertLocalStorage($) {
-    //可能有坑
-    $("head").append($("<script>").text(`
-      window.localStorage.setItem('isLogin','Yes');
-      window.localStorage.setItem('_USERNAME','fake_user');
-      window.localStorage.setItem('_ROLE','普通');
-    `));
-}
 function initalCustom_configs(saas) {
     const config = {
         config_group: "",
@@ -67,6 +84,7 @@ function insertScript($, debuggerConfig) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const { _SDF_CONFIG, _SDF, __MAIN_APP_PUBLIC_PATH } = yield (0, fakeSaas_1.default)(debuggerConfig);
+        _SDF.user = (0, fakeSaas_1.getFakeUser)(debuggerConfig);
         const { saas } = _SDF;
         (_a = saas.custom_configs) !== null && _a !== void 0 ? _a : (saas.custom_configs = []);
         let themeConfig = saas.custom_configs.find((item) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "2.2.16",
+  "version": "2.2.20",
   "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": "2.2.16",
-    "@tuya-sat/micro-dev-proxy": "2.2.16",
-    "@tuya-sat/micro-utils": "2.2.16",
+    "@tuya-sat/micro-dev-loader": "2.2.20",
+    "@tuya-sat/micro-dev-proxy": "2.2.20",
+    "@tuya-sat/micro-utils": "2.2.20",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",
     "chalk": "4.1.2",