@tuya-sat/micro-script 2.2.14 → 2.2.15

package/dist/config/webpack.common.js

@@ -20,25 +20,41 @@ 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 micro_utils_1 = require("@tuya-sat/micro-utils");
+const index_1 = require("@tuya-sat/micro-dev-loader/dist/less/utils/index");
 const paths_1 = __importDefault(require("./paths"));
 const isExistPostcssFile = () => {
     return fs_extra_1.default.existsSync("postcss.config.js");
 };
+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}`);
+        return process.exit(1);
+    }
+    return MICRO_THEME;
+};
 function getCommonConfig({ isDev, isBuild, }) {
     const { name: packageName } = require(paths_1.default.appPkg);
+    const MICRO_THEME = validateMicroTheme();
     //获取style处理的loader
-    const getStyleLoaders = (cssOptions, extraLoader) => {
-        isBuild && cssOptions.importLoaders++;
+    const getStyleLoaders = (extraLoader = []) => {
+        extraLoader = toArray(extraLoader);
         const loaders = [
             isBuild ? mini_css_extract_plugin_1.default.loader : require.resolve("style-loader"),
             {
                 loader: require.resolve("css-loader"),
-                options: Object.assign({ modules: {
+                options: {
+                    modules: {
                         auto: true,
                         localIdentName: isDev ? "[path][name]__[local]" : "[hash:base64]",
-                    } }, cssOptions),
+                    },
+                    importLoaders: extraLoader.length + 1,
+                },
             },
+            isDev && require("@tuya-sat/micro-dev-loader").filterCssVariableLoader,
             /**
              * 优化运行时速度
              * dev环境就不需要postcss-loader了
@@ -55,7 +71,7 @@ function getCommonConfig({ isDev, isBuild, }) {
                         },
                     };
             })()),
-            extraLoader,
+            ...extraLoader,
         ].filter(Boolean);
         return loaders;
     };
@@ -79,30 +95,26 @@ function getCommonConfig({ isDev, isBuild, }) {
             rules: [
                 {
                     test: /\.css$/,
-                    use: getStyleLoaders({
-                        importLoaders: 0,
-                    }),
+                    use: getStyleLoaders(),
                 },
                 {
                     test: /\.less$/,
-                    use: getStyleLoaders({
-                        importLoaders: 1,
-                    }, {
-                        loader: require.resolve("less-loader"),
-                        options: {
-                            lessOptions: Object.assign(Object.assign({}, (process.env.MICRO_THEME
-                                ? {
-                                    modifyVars: Object.assign(Object.assign({}, micro_utils_1.theme.getAntdOverWriteFile().light), { "root-entry-name": "variable" }),
-                                }
-                                : {})), { javascriptEnabled: true }),
+                    use: getStyleLoaders([
+                        {
+                            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 }),
+                            },
                         },
-                    }),
+                        MICRO_THEME &&
+                            require("@tuya-sat/micro-dev-loader").changeAntdGlobalImport,
+                    ].filter(Boolean)),
                 },
                 {
                     test: /\.(scss|sass)$/,
-                    use: getStyleLoaders({
-                        importLoaders: 1,
-                    }, require.resolve("sass-loader")),
+                    use: getStyleLoaders(require.resolve("sass-loader")),
                 },
                 {
                     test: /\.(bmp|png|svg|jpg|jpeg|gif)$/i,
@@ -121,7 +133,7 @@ function getCommonConfig({ isDev, isBuild, }) {
         optimization: {
             runtimeChunk: "single",
             splitChunks: {
-                cacheGroups: Object.assign(Object.assign({}, (process.env.MICRO_THEME
+                cacheGroups: Object.assign(Object.assign({}, (MICRO_THEME
                     ? {
                         vendorCss: {
                             test: /([\\/]node_modules[\\/][\s\S]+(.less|.css)$)|([\\/]src[\\/]styles[\\/]global.less)/,
@@ -163,7 +175,7 @@ function getCommonConfig({ isDev, isBuild, }) {
                     filename: "static/css/[name].[contenthash:8].css",
                     chunkFilename: "static/css/[name].[contenthash:8].chunk.css",
                 }),
-            isBuild && process.env.MICRO_THEME && new micro_dev_loader_1.ThemePlugin(),
+            isBuild && MICRO_THEME && new micro_dev_loader_1.ThemePlugin(),
         ].filter((value) => Boolean(value)),
     };
 }

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

@@ -1,7 +1,21 @@
 import { Express } from "express";
 import type { Config } from "@tuya-sat/micro-dev-proxy";
 export interface DebuggerConfig extends Config {
+    themeConfig?: {
+        primaryColor: string;
+    };
     mockPermissions?: string[];
     base?: string;
 }
+export declare type CustomConfig = {
+    config_group: string;
+    config_key: string;
+    config_value: string;
+    config_label: string;
+    config_value_json: string;
+    config_name_zh: string;
+    config_name_en: string;
+    platform: string;
+    config_id: string;
+};
 export default function staticMain(app: Express, debuggerConfig: DebuggerConfig): void;

package/dist/module/main/staticMain.js

@@ -15,7 +15,7 @@ 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 defaultBase = "https://static1.tuyacn.com/static/sdf-gw/v1.0.1.22/";
+const defaultBase = "https://static1.tuyacn.com/static/sdf-gw/v1.0.1.293/";
 function staticMain(app, debuggerConfig) {
     app.get([
         "/",
@@ -44,9 +44,28 @@ function insertLocalStorage($) {
     `));
 }
 function insertScript($, debuggerConfig) {
+    var _a;
+    var _b;
     return __awaiter(this, void 0, void 0, function* () {
         const { _SDF_CONFIG, _SDF, __MAIN_APP_PUBLIC_PATH } = yield (0, fakeSaas_1.default)(debuggerConfig);
+        (_a = (_b = _SDF.saas).custom_configs) !== null && _a !== void 0 ? _a : (_b.custom_configs = []);
+        let themeConfig = _SDF.saas.custom_configs.find((item) => {
+            return item.config_key === "dynamic_theme";
+        }) || {
+            config_group: "",
+            config_key: "",
+            config_value: "",
+            config_label: "",
+            config_value_json: "",
+            config_name_zh: "",
+            config_name_en: "",
+            platform: "",
+            config_id: "",
+        };
+        themeConfig.config_value_json = JSON.stringify(debuggerConfig.themeConfig);
         $("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/package.json

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