@tuya-sat/micro-script 3.0.0-beta.8 → 3.0.0-beta.9

package/dist/config/webpack.common.js

@@ -23,9 +23,9 @@ const css_minimizer_webpack_plugin_1 = __importDefault(require("css-minimizer-we
 const micro_dev_loader_1 = require("@tuya-sat/micro-dev-loader");
 const path_1 = __importDefault(require("path"));
 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 utils_1 = require("../utils");
 const toArray = (value) => {
     return Array.isArray(value) ? value : [value];
 };
@@ -40,11 +40,10 @@ const validateMicroTheme = () => {
 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'];
+        : (0, utils_1.getAnnotations)()['sdf.feat:colorTheme'];
     //获取style处理的loader
     const getStyleLoaders = (extraLoader = []) => {
         extraLoader = toArray(extraLoader);
@@ -107,7 +106,7 @@ function getCommonConfig({ isDev, isBuild, }) {
                                         ? enableThemeCompile
                                             ? (0, index_1.getLessOptions)(devMicroTheme)
                                             : {}
-                                        : annotations['sdf.feat:colorTheme']
+                                        : (0, utils_1.getAnnotations)()['sdf.feat:colorTheme']
                                             ? (0, index_1.getLessOptions)(index_1.LIGHT_THEME)
                                             : {})), { javascriptEnabled: true }),
                                 },
@@ -189,7 +188,7 @@ function getCommonConfig({ isDev, isBuild, }) {
         };
         return baseConfig;
     }
-    if (isBuild && multiApps && multiApps.length > 0) {
+    if (multiApps && multiApps.length > 0) {
         multiApps.forEach((app) => {
             multiAppsWebpackConfig.entry[app.name] = `${path_1.default.join(process.cwd(), app.dir)}/index.tsx`;
             multiAppsWebpackConfig.plugins.push(new html_webpack_plugin_1.default({

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

@@ -6,5 +6,5 @@ export interface BaseParams {
 export interface WebpackCombineFunction {
     (arg0: Configuration, arg1: BaseParams): Configuration;
 }
-declare const _default: () => {};
+declare const _default: () => Configuration;
 export default _default;

package/dist/config/webpack.config.js

@@ -7,47 +7,19 @@ 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");
+const utils_1 = require("../utils");
 exports.default = () => {
     const isBuild = process.env.NODE_ENV === 'production';
     const isDev = process.env.NODE_ENV === 'development';
-    const { annotations: { ['sdf.cli:microFramework']: currentFramework }, } = (0, micro_utils_1.parseManifest)();
     //框架的webpack配置
     const frameworkConfig = (0, framework_1.default)({
-        currentFramework,
+        currentFramework: (0, utils_1.getAnnotations)()['sdf.cli:microFramework'],
         isDev,
         isBuild,
     });
     //公用的webpack配置
     const commonConfig = (0, webpack_common_1.default)({ isDev, isBuild });
-    let baseConfig = {};
-    // const { multiApps } = require(paths.microConfig);
-    // console.log('multiApps', multiApps, process.cwd());
-    // if (isBuild && multiApps && multiApps.length > 0) {
-    //   const multiAppsWebpackConfig: any = {
-    //     plugins: [],
-    //     entry: {},
-    //   };
-    //   multiApps.forEach((app: IMicroApp) => {
-    //     multiAppsWebpackConfig.entry[app.name] = `${path.join(
-    //       process.cwd(),
-    //       app.dir
-    //     )}/index.tsx`;
-    //     multiAppsWebpackConfig.plugins.push(
-    //       new HtmlWebpackPlugin({
-    //         inject: true,
-    //         filename: `${app.name}.html`,
-    //         template: paths.spaHtml,
-    //         chunks: [app.name],
-    //       })
-    //     );
-    //   });
-    //   console.log('multiAppsWebpackConfig', multiAppsWebpackConfig);
-    //   baseConfig = merge(frameworkConfig, commonConfig, multiAppsWebpackConfig);
-    // } else {
-    //   baseConfig = merge(frameworkConfig, commonConfig);
-    // }
-    baseConfig = (0, webpack_merge_1.merge)(frameworkConfig, commonConfig);
+    const baseConfig = (0, webpack_merge_1.merge)(frameworkConfig, commonConfig);
     //额外的webpack结合function
     const webpackCombineFunction = require(paths_1.default.microConfig).webpack;
     if (webpackCombineFunction && typeof webpackCombineFunction === 'function') {

package/dist/module/main/fakeSaasInfo.js

@@ -117,7 +117,7 @@ function consturctApp(manifest, oem_micro_app_id, baseUrl, lang, port, code) {
         micro_app_name: code ? `${code}-dev` : `${packageInfo.name}-dev`,
         micro_app_version: '0.0.0-x',
         oem_micro_app_id,
-        resource: `http://localhost:${port}`,
+        resource: `http://localhost:${port}/${code || 'index'}.html`,
         schema: null,
         universal_id: manifest.universalId,
         isAuth: true,

package/dist/utils/index.d.ts

@@ -0,0 +1 @@
+export declare const getAnnotations: () => any;

package/dist/utils/index.js

@@ -0,0 +1,43 @@
+"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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const getAnnotations = () => {
+    const { multiApps } = require(paths_1.default.microConfig);
+    if (multiApps && multiApps.length > 0) {
+        return fs_extra_1.default.readJSONSync(path.join(process.cwd(), multiApps[0].dir, 'manifest.json')).annotations;
+    }
+    else {
+        return (0, micro_utils_1.parseManifest)().annotations;
+    }
+};
+exports.getAnnotations = getAnnotations;

package/package.json

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