@tuya-sat/micro-script 2.2.27 → 2.2.30

package/dist/config/webpack.common.d.ts

@@ -1,5 +1,9 @@
 import { Configuration } from "webpack";
+import { ThemeCat } from "@tuya-sat/micro-dev-loader/dist/less/utils/index";
+declare type ThemeEnv = ThemeCat | undefined;
+export declare const validateMicroTheme: () => ThemeEnv;
 export default function getCommonConfig({ isDev, isBuild, }: {
     isDev: boolean;
     isBuild: boolean;
 }): Configuration;
+export {};

package/dist/config/webpack.common.js

@@ -12,7 +12,7 @@ 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"));
+exports.validateMicroTheme = void 0;
 //@ts-ignore
 const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
 //@ts-ignore
@@ -23,9 +23,6 @@ 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");
-};
 const toArray = (value) => {
     return Array.isArray(value) ? value : [value];
 };
@@ -37,16 +34,22 @@ const validateMicroTheme = () => {
     }
     return microTheme;
 };
+exports.validateMicroTheme = validateMicroTheme;
 function getCommonConfig({ isDev, isBuild, }) {
     const { name: packageName } = require(paths_1.default.appPkg);
     const { annotations } = (0, micro_utils_1.parseManifest)();
-    const devMicroTheme = validateMicroTheme();
+    const devMicroTheme = (0, exports.validateMicroTheme)();
     const enableThemeCompile = isDev
         ? !!devMicroTheme
         : annotations["sdf.feat:colorTheme"];
     //获取style处理的loader
     const getStyleLoaders = (extraLoader = []) => {
         extraLoader = toArray(extraLoader);
+        const loadersBeforeCssLoader = [
+            isDev && require("@tuya-sat/micro-dev-loader").filterCssVariableLoader,
+            require.resolve("postcss-loader"),
+            ...extraLoader,
+        ].filter(Boolean);
         const loaders = [
             isBuild ? mini_css_extract_plugin_1.default.loader : require.resolve("style-loader"),
             {
@@ -56,27 +59,10 @@ function getCommonConfig({ isDev, isBuild, }) {
                         auto: true,
                         localIdentName: isDev ? "[path][name]__[local]" : "[hash:base64]",
                     },
-                    importLoaders: extraLoader.length + 1,
+                    importLoaders: loadersBeforeCssLoader.length,
                 },
             },
-            isDev && require("@tuya-sat/micro-dev-loader").filterCssVariableLoader,
-            /**
-             * 优化运行时速度
-             * dev环境就不需要postcss-loader了
-             * 默认应该比较新的浏览器了
-             */
-            isBuild && Object.assign({ loader: require.resolve("postcss-loader") }, (() => {
-                return isExistPostcssFile()
-                    ? {}
-                    : {
-                        options: {
-                            postcssOptions: {
-                                plugins: ["postcss-preset-env"],
-                            },
-                        },
-                    };
-            })()),
-            ...extraLoader,
+            ...loadersBeforeCssLoader
         ].filter(Boolean);
         return loaders;
     };
@@ -147,7 +133,7 @@ function getCommonConfig({ isDev, isBuild, }) {
                 cacheGroups: Object.assign(Object.assign({}, (enableThemeCompile
                     ? {
                         vendorCss: {
-                            test: /([\\/]node_modules[\\/][\s\S]+(.less|.css)$)|([\\/]src[\\/]styles[\\/]global.less)/,
+                            test: /([\\/]node_modules[\\/][\s\S]+(\.less|\.css)$)|([\\/]src[\\/]styles[\\/]global\.less)/,
                             name: "light",
                             chunks: "all",
                             priority: 2,

package/dist/module/main/staticMain.js

@@ -39,7 +39,8 @@ const cheerio_1 = __importDefault(require("cheerio"));
 const axios_1 = __importDefault(require("axios"));
 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.452/";
+const webpack_common_1 = require("../../config/webpack.common");
+const defaultBase = "https://static1.tuyacn.com/static/sdf-gw/v1.0.1.516/";
 function staticMain(app, debuggerConfig) {
     app.get([
         "/",
@@ -80,6 +81,10 @@ function readThemeConfig() {
     delete require.cache[paths_1.default.microConfig];
     return require(paths_1.default.microConfig).debuggerConfig.themeConfig;
 }
+function overrideNotification(value) {
+    const isProxy = process.env.MICRO_PROXY === "true";
+    !isProxy && (value.message_switch = false);
+}
 function insertScript($, debuggerConfig) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
@@ -90,7 +95,11 @@ function insertScript($, debuggerConfig) {
         let themeConfig = saas.custom_configs.find((item) => {
             return item.config_key === "dynamic_theme";
         }) || initalCustom_configs(saas);
-        themeConfig.config_value_json = JSON.stringify(Object.assign(Object.assign({}, JSON.parse(themeConfig.config_value_json)), readThemeConfig()));
+        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 ? {
+            supportedTheme: theme,
+        } : {})), readThemeConfig()));
+        overrideNotification(saas);
         $("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.27",
+  "version": "2.2.30",
   "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.27",
-    "@tuya-sat/micro-dev-proxy": "2.2.27",
-    "@tuya-sat/micro-utils": "2.2.27",
+    "@tuya-sat/micro-dev-loader": "2.2.30",
+    "@tuya-sat/micro-dev-proxy": "2.2.30",
+    "@tuya-sat/micro-utils": "2.2.30",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",
     "chalk": "4.1.2",