@tuya-sat/micro-script 2.2.16 → 2.2.18

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:theme"];
     //获取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:theme"]
+                                        ? (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/package.json

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