@tuya-sat/micro-script 3.0.0-beta.3 → 3.0.2

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

@@ -1,9 +1,5 @@
 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 });
-exports.validateMicroTheme = void 0;
+const path_1 = __importDefault(require("path"));
 //@ts-ignore
 const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
 //@ts-ignore
@@ -23,26 +23,15 @@ 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 locales_1 = __importDefault(require("@tuya-sat/micro-dev-loader/dist/plugins/locales"));
+const theme_1 = require("../utils/theme");
+const DYNAMIC_CHUNK_PREFIX = "micro_app_lazy";
 const toArray = (value) => {
     return Array.isArray(value) ? value : [value];
 };
-const validateMicroTheme = () => {
-    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 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 = (0, exports.validateMicroTheme)();
-    const enableThemeCompile = isDev
-        ? !!devMicroTheme
-        : annotations["sdf.feat:colorTheme"];
+    const enableThemeCompile = annotations["sdf.feat:colorTheme"];
     //获取style处理的loader
     const getStyleLoaders = (extraLoader = []) => {
         extraLoader = toArray(extraLoader);
@@ -74,7 +63,7 @@ function getCommonConfig({ isDev, isBuild, }) {
                 ? "static/js/[name].[contenthash:8].js"
                 : "static/js/[name].bundle.js",
             chunkFilename: isBuild
-                ? "static/js/[name].[contenthash:8].chunk.js"
+                ? `static/js/${DYNAMIC_CHUNK_PREFIX}-[name].[contenthash:8].chunk.js`
                 : "static/js/[name].chunk.js",
             path: paths_1.default.dist,
             clean: true,
@@ -95,13 +84,11 @@ function getCommonConfig({ isDev, isBuild, }) {
                         {
                             loader: require.resolve("less-loader"),
                             options: {
-                                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 }),
+                                lessOptions: Object.assign(Object.assign({}, (enableThemeCompile
+                                    ? isDev
+                                        ? (0, index_1.getLessOptions)((0, theme_1.getBaseTheme)())
+                                        : (0, index_1.getLessOptions)(index_1.LIGHT_THEME)
+                                    : {})), { javascriptEnabled: true }),
                             },
                         },
                         enableThemeCompile &&
@@ -130,28 +117,18 @@ function getCommonConfig({ isDev, isBuild, }) {
             ].filter(Boolean),
         },
         optimization: {
-            runtimeChunk: "single",
             splitChunks: {
-                cacheGroups: Object.assign(Object.assign({}, (enableThemeCompile
+                cacheGroups: Object.assign({}, (enableThemeCompile
                     ? {
                         vendorCss: {
                             test: /([\\/]node_modules[\\/][\s\S]+(\.less|\.css)$)|([\\/]src[\\/]styles[\\/]global\.less)/,
                             name: "light",
                             chunks: "all",
+                            minSize: 0,
                             priority: 2,
                         },
                     }
-                    : {})), { vendor: {
-                        test: /[\\/]node_modules[\\/]/,
-                        name: "vendors-others",
-                        chunks: "all",
-                        priority: 0,
-                    }, react: {
-                        test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/,
-                        name: "react-related",
-                        chunks: "all",
-                        priority: 1,
-                    } }),
+                    : {})),
             },
             minimizer: ["...", new css_minimizer_webpack_plugin_1.default()],
         },
@@ -164,7 +141,8 @@ function getCommonConfig({ isDev, isBuild, }) {
                 patterns: [
                     {
                         from: paths_1.default.publicDir,
-                        filter: (resourcePath) => __awaiter(this, void 0, void 0, function* () { return !resourcePath.includes(".html"); }),
+                        // 使用path.resolve纠正resourcePath，因为这个resourcePath值在windows平台显示的是POSIX值；
+                        filter: (resourcePath) => __awaiter(this, void 0, void 0, function* () { return path_1.default.resolve(resourcePath) !== paths_1.default.spaHtml; }),
                         noErrorOnMissing: true,
                     },
                 ],
@@ -172,10 +150,9 @@ function getCommonConfig({ isDev, isBuild, }) {
             isBuild &&
                 new mini_css_extract_plugin_1.default({
                     filename: "static/css/[name].[contenthash:8].css",
-                    chunkFilename: "static/css/[name].[contenthash:8].chunk.css",
+                    chunkFilename: `static/css/${DYNAMIC_CHUNK_PREFIX}-[name].[contenthash:8].chunk.css`,
                 }),
             isBuild && enableThemeCompile && new micro_dev_loader_1.ThemePlugin(),
-            isBuild && new locales_1.default(),
         ].filter((value) => Boolean(value)),
     };
 }

package/dist/module/main/staticMain.js

@@ -39,7 +39,7 @@ 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 webpack_common_1 = require("../../config/webpack.common");
+const theme_1 = require("../../utils/theme");
 const defaultBase = "https://static1.tuyacn.com/static/sdf-gw/v1.0.1.516/";
 function staticMain(app, debuggerConfig) {
     app.get([
@@ -95,7 +95,7 @@ function insertScript($, debuggerConfig) {
         let themeConfig = saas.custom_configs.find((item) => {
             return item.config_key === "dynamic_theme";
         }) || initalCustom_configs(saas);
-        const theme = (0, webpack_common_1.validateMicroTheme)();
+        const theme = (0, theme_1.getBaseTheme)();
         themeConfig.config_value_json = JSON.stringify(Object.assign(Object.assign(Object.assign({}, JSON.parse(themeConfig.config_value_json)), (theme
             ? {
                 supportedTheme: theme,

package/dist/scripts/build.js

@@ -30,11 +30,16 @@ const config = (0, webpack_config_1.default)();
         console.log(warnings.map((item) => item.message).join("\n"));
     }
     console.log(chalk_1.default.yellow(`当前打包工具:webpack@${version}`));
-    console.log(chalk_1.default.blue("资源清单:"));
-    const assetsInfo = assets.map(({ size, name }) => {
-        return `    ${name} ${chalk_1.default.white(size > 1024 ? `~${Math.floor(size / 1024)}KB` : `${size}B`)}`;
-    });
-    assetsInfo.map((item) => {
-        console.log(chalk_1.default.blue(item));
-    });
+    if (assets) {
+        console.log(chalk_1.default.blue("资源清单:"));
+        const assetsInfo = assets.map(({ size, name }) => {
+            return `    ${name} ${chalk_1.default.white(size > 1024 ? `~${Math.floor(size / 1024)}KB` : `${size}B`)}`;
+        });
+        assetsInfo.map((item) => {
+            console.log(chalk_1.default.blue(item));
+        });
+    }
+    else {
+        console.log(chalk_1.default.blue("无资源清单"));
+    }
 });

package/dist/utils/theme.d.ts

@@ -0,0 +1,2 @@
+import { ThemeCat } from "@tuya-sat/micro-dev-loader/dist/less/utils/index";
+export declare const getBaseTheme: () => ThemeCat;

package/dist/utils/theme.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBaseTheme = void 0;
+const index_1 = require("@tuya-sat/micro-dev-loader/dist/less/utils/index");
+const getBaseTheme = () => {
+    const microTheme = process.env.MICRO_THEME;
+    if (!microTheme || ![index_1.DARK_THEME, index_1.LIGHT_THEME].includes(microTheme))
+        return index_1.LIGHT_THEME;
+    return microTheme;
+};
+exports.getBaseTheme = getBaseTheme;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.2",
   "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.3",
-    "@tuya-sat/micro-dev-proxy": "3.0.0-beta.3",
-    "@tuya-sat/micro-utils": "3.0.0-beta.3",
+    "@tuya-sat/micro-dev-loader": "3.0.2",
+    "@tuya-sat/micro-dev-proxy": "3.0.2",
+    "@tuya-sat/micro-utils": "3.0.2",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",
     "chalk": "4.1.2",
@@ -60,7 +60,7 @@
     "webpack-merge": "5.8.0"
   },
   "devDependencies": {
-    "@types/express": "4.17.13",
+    "@types/express": "4.17.14",
     "@types/jest": "27.4.1",
     "@types/uuid": "8.3.4",
     "jest": "27.5.1",