@tuya-sat/micro-script 3.0.21-beta.5 → 3.0.21-beta.6

package/dist/config/webpack.common.js

@@ -1,27 +1,4 @@
 "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) {
@@ -47,10 +24,10 @@ const webpack_manifest_plugin_1 = require("webpack-manifest-plugin");
 const webpack_stats_plugin_1 = require("webpack-stats-plugin");
 const micro_dev_loader_1 = require("@tuya-sat/micro-dev-loader");
 const path_1 = __importDefault(require("path"));
-const fs = __importStar(require("fs"));
+const utils_1 = require("../utils");
 const index_1 = require("@tuya-sat/micro-dev-loader/dist/less/utils/index");
 const paths_1 = __importDefault(require("./paths"));
-const utils_1 = require("../utils");
+const utils_2 = require("../utils");
 const toArray = (value) => {
     return Array.isArray(value) ? value : [value];
 };
@@ -68,7 +45,7 @@ function getCommonConfig({ isDev, isBuild, }) {
     const devMicroTheme = (0, exports.validateMicroTheme)();
     const enableThemeCompile = isDev
         ? !!devMicroTheme
-        : (0, utils_1.getAnnotations)()['sdf.feat:colorTheme'];
+        : (0, utils_2.getAnnotations)()['sdf.feat:colorTheme'];
     //获取style处理的loader
     const getStyleLoaders = (extraLoader = []) => {
         extraLoader = toArray(extraLoader);
@@ -94,6 +71,7 @@ function getCommonConfig({ isDev, isBuild, }) {
         return loaders;
     };
     let { multiApps, debuggerConfig: { isMainApp }, } = require(paths_1.default.microConfig);
+    (0, utils_1.processMultiApps)(multiApps);
     const multiAppsWebpackConfig = {
         plugins: [],
         entry: {},
@@ -136,7 +114,7 @@ function getCommonConfig({ isDev, isBuild, }) {
                                         ? enableThemeCompile
                                             ? (0, index_1.getLessOptions)(devMicroTheme)
                                             : {}
-                                        : (0, utils_1.getAnnotations)()['sdf.feat:colorTheme']
+                                        : (0, utils_2.getAnnotations)()['sdf.feat:colorTheme']
                                             ? (0, index_1.getLessOptions)(index_1.LIGHT_THEME)
                                             : {})), { javascriptEnabled: true }),
                                 },
@@ -242,15 +220,9 @@ function getCommonConfig({ isDev, isBuild, }) {
         };
         return baseConfig;
     }
-    if ((0, utils_1.isMonorepo)() || (multiApps && multiApps.length > 0)) {
-        if (!multiApps) {
-            multiApps = [];
-            fs.readdirSync(path_1.default.join(process.cwd(), 'apps')).forEach((dir) => {
-                multiApps = [...multiApps, { name: dir }];
-            });
-        }
+    if ((0, utils_2.isMonorepo)() || (multiApps && multiApps.length > 0)) {
         multiApps.forEach((app) => {
-            if ((0, utils_1.isMonorepo)()) {
+            if ((0, utils_2.isMonorepo)()) {
                 multiAppsWebpackConfig.entry[app.name] = `${path_1.default.join(process.cwd(), 'node_modules/.micro')}/${app.name}/index.tsx`;
             }
             else {

package/dist/module/main/fakeSaasInfo.js

@@ -36,12 +36,7 @@ const utils_1 = require("../../utils");
 function mockSaasInfo(app, microPort) {
     let { multiApps, debuggerConfig: { isMainApp }, } = require(paths_1.default.microConfig);
     const idsMap = new Map();
-    if (!multiApps) {
-        multiApps = [];
-        fs_extra_1.default.readdirSync(path.join(process.cwd(), 'apps')).forEach((dir) => {
-            multiApps = [...multiApps, { name: dir }];
-        });
-    }
+    (0, utils_1.processMultiApps)(multiApps);
     multiApps === null || multiApps === void 0 ? void 0 : multiApps.forEach((app) => {
         idsMap.set(app.name, { entry_id: (0, uuid_1.v4)(), oem_micro_app_id: (0, uid_1.uid)(16) });
     });

package/dist/utils/index.d.ts

@@ -1,2 +1,8 @@
 export declare const getAnnotations: () => any;
 export declare const isMonorepo: () => boolean;
+export declare type IMultiApp = {
+    name: string;
+    dir?: string;
+    htmlContentHash?: boolean;
+};
+export declare const processMultiApps: (multiApps: IMultiApp[]) => void;

package/dist/utils/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMonorepo = exports.getAnnotations = void 0;
+exports.processMultiApps = exports.isMonorepo = exports.getAnnotations = void 0;
 const micro_utils_1 = require("@tuya-sat/micro-utils");
 const path = __importStar(require("path"));
 const paths_1 = __importDefault(require("../config/paths"));
@@ -52,3 +52,12 @@ const isMonorepo = () => {
     return false;
 };
 exports.isMonorepo = isMonorepo;
+const processMultiApps = (multiApps) => {
+    if (!multiApps && (0, exports.isMonorepo)()) {
+        multiApps = [];
+        fs_extra_1.default.readdirSync(path.join(process.cwd(), 'apps')).forEach((dir) => {
+            multiApps = [...multiApps, { name: dir }];
+        });
+    }
+};
+exports.processMultiApps = processMultiApps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.0.21-beta.5",
+  "version": "3.0.21-beta.6",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -23,9 +23,9 @@
     "@babel/preset-typescript": "7.16.7",
     "@babel/traverse": "^7.20.13",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
-    "@tuya-sat/micro-dev-loader": "3.0.21-beta.5",
-    "@tuya-sat/micro-dev-proxy": "3.0.21-beta.5",
-    "@tuya-sat/micro-utils": "3.0.21-beta.5",
+    "@tuya-sat/micro-dev-loader": "3.0.21-beta.6",
+    "@tuya-sat/micro-dev-proxy": "3.0.21-beta.6",
+    "@tuya-sat/micro-utils": "3.0.21-beta.6",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",