@tuya-sat/micro-script 3.0.22 → 3.0.23

package/dist/config/webpack.common.js

@@ -1,4 +1,27 @@
 "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) {
@@ -25,6 +48,7 @@ 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 utils_1 = require("../utils");
+const fs = __importStar(require("fs"));
 const index_1 = require("@tuya-sat/micro-dev-loader/dist/less/utils/index");
 const paths_1 = __importDefault(require("./paths"));
 const utils_2 = require("../utils");
@@ -242,7 +266,7 @@ function getCommonConfig({ isDev, isBuild, }) {
             entry: multiAppsWebpackConfig.entry,
         });
     }
-    if (isMainApp) {
+    if (isMainApp || !fs.existsSync(path_1.default.join(process.cwd(), 'src/index.tsx'))) {
         return (0, webpack_merge_1.merge)(getWebpackConfig([]), {
             entry: `${path_1.default.join(process.cwd(), 'node_modules/.micro')}/index.tsx`,
         });

package/dist/template/index.js

@@ -54,16 +54,15 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         fs.copyFileSync(path.join(__dirname, './main-app/index.tsx'), path.join(microPath, 'index.tsx'));
         fs.copyFileSync(path.join(__dirname, './main-app/utils.ts'), path.join(microPath, 'utils.ts'));
     }
-    if (isMonorepo()) {
+    else if (isMonorepo()) {
         fs.readdirSync(path.join(process.cwd(), 'apps')).forEach((dir) => {
             console.log('directory ' + dir);
             const microPath = path.join(process.cwd(), 'node_modules/.micro', dir);
             !fs.existsSync(microPath) && fs.mkdirSync(microPath, { recursive: true });
-            fs.copyFileSync(path.join(__dirname, './micro-app/index.css'), path.join(microPath, 'index.css'));
-            fs.copyFileSync(path.join(__dirname, './micro-app/public-path.js'), path.join(microPath, 'public-path.js'));
-            fs.copyFileSync(path.join(__dirname, './micro-app/interfaces.ts'), path.join(microPath, 'interfaces.ts'));
-            fs.copyFileSync(path.join(__dirname, './micro-app/interfaces.ts'), path.join(path.join(process.cwd(), 'node_modules/.micro'), 'interfaces.ts'));
-            let content = fs.readFileSync(path.join(__dirname, './micro-app/index.tsx'), {
+            fs.copyFileSync(path.join(__dirname, './multi-micro-app/index.css'), path.join(microPath, 'index.css'));
+            fs.copyFileSync(path.join(__dirname, './multi-micro-app/public-path.js'), path.join(microPath, 'public-path.js'));
+            fs.copyFileSync(path.join(__dirname, './multi-micro-app/interfaces.ts'), path.join(microPath, 'interfaces.ts'));
+            let content = fs.readFileSync(path.join(__dirname, './multi-micro-app/index.tsx'), {
                 encoding: 'utf8',
             });
             content = content.replace("import App from './App';", `import App from '../../../apps/${dir}/src/App'`);
@@ -71,4 +70,18 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             fs.writeFileSync(microPath + '/index.tsx', content);
         });
     }
+    else {
+        const microPath = path.join(process.cwd(), 'node_modules/.micro');
+        !fs.existsSync(microPath) && fs.mkdirSync(microPath, { recursive: true });
+        fs.copyFileSync(path.join(__dirname, './micro-app/index.css'), path.join(microPath, 'index.css'));
+        fs.copyFileSync(path.join(__dirname, './micro-app/public-path.js'), path.join(microPath, 'public-path.js'));
+        fs.copyFileSync(path.join(__dirname, './micro-app/interfaces.ts'), path.join(microPath, 'interfaces.ts'));
+        let content = fs.readFileSync(path.join(__dirname, './micro-app/index.tsx'), {
+            encoding: 'utf8',
+        });
+        content = content.replace("import App from './App';", `import App from '../../src/App'`);
+        content = content.replace("import './lang';", `import '../../src/lang';`);
+        content = content.replace("import './styles/global.less';", `import '../../src/styles/global.less';`);
+        fs.writeFileSync(microPath + '/index.tsx', content);
+    }
 });

package/dist/template/micro-app/index.css

@@ -1,25 +1,26 @@
 body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
-    'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  background-color: transparent !important;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
-}
-
-#root {
-  height: 100%;
-}
-
-.layout {
-  margin-bottom: 20px;
-}
-
-.square {
-  width: 20px;
-  height: 20px;
-}
+    margin: 0;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
+      'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    background-color: transparent !important;
+  }
+  
+  code {
+    font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
+  }
+  
+  #root {
+    height: 100%;
+  }
+  
+  .layout {
+    margin-bottom: 20px;
+  }
+  
+  .square {
+    width: 20px;
+    height: 20px;
+  }
+  

package/dist/template/micro-app/index.tsx

@@ -3,11 +3,12 @@ import ReactDOM from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';
 import { getI18n } from 'react-i18next';
 import { message } from 'antd';
+import { CaptureContext, Event, Severity } from '@sentry/types';
 import { IQiankunProps } from './interfaces';
 import App from './App';
 import './lang';
 import './index.css';
-import 'theme';
+import './styles/global.less';
 
 export let microProps: IQiankunProps;
 

package/dist/template/multi-micro-app/index.css

@@ -0,0 +1,25 @@
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
+    'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  background-color: transparent !important;
+}
+
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
+}
+
+#root {
+  height: 100%;
+}
+
+.layout {
+  margin-bottom: 20px;
+}
+
+.square {
+  width: 20px;
+  height: 20px;
+}

package/dist/template/multi-micro-app/index.tsx

@@ -0,0 +1,63 @@
+import './public-path';
+import ReactDOM from 'react-dom';
+import { BrowserRouter } from 'react-router-dom';
+import { getI18n } from 'react-i18next';
+import { message } from 'antd';
+import { IQiankunProps } from './interfaces';
+import App from './App';
+import './lang';
+import './index.css';
+import 'theme';
+
+export let microProps: IQiankunProps;
+
+function render(props: IQiankunProps) {
+  const { base, container } = props as IQiankunProps;
+  const root = (
+    container
+      ? container.querySelector('#root')
+      : document.querySelector('#root')
+  ) as HTMLElement;
+  message.config({
+    getContainer: () => root,
+  });
+  ReactDOM.render(
+    <BrowserRouter basename={window.__POWERED_BY_QIANKUN__ ? base : '/'}>
+      <App {...props} />
+    </BrowserRouter>,
+    root
+  );
+}
+
+if (!window.__POWERED_BY_QIANKUN__) {
+  render({} as IQiankunProps);
+}
+
+export async function bootstrap() {
+  console.log('子应用启动');
+}
+
+export async function mount(props: IQiankunProps) {
+  console.log('挂载子应用', props);
+  props.langResource && replaceLangResource(props.langResource);
+  getI18n().changeLanguage(props.tyLang);
+  microProps = props;
+  render(props);
+}
+
+export async function unmount(props: IQiankunProps) {
+  const { container } = props;
+  message.destroy();
+  const root = (
+    container
+      ? container.querySelector('#root')
+      : document.querySelector('#root')
+  ) as HTMLElement;
+  ReactDOM.unmountComponentAtNode(root);
+}
+
+function replaceLangResource(langResource: any) {
+  Object.keys(langResource).forEach((langkey) => {
+    getI18n().addResourceBundle(langkey, 'translation', langResource[langkey]);
+  });
+}

package/dist/template/multi-micro-app/interfaces.ts

@@ -0,0 +1,61 @@
+import { CaptureContext, Event, Severity } from '@sentry/types';
+
+interface mainHistory {
+  push: (path, state?) => void;
+  replace: (path, state?) => void;
+  go: (n: number) => void;
+  goBack: () => void;
+  goForward: () => void;
+}
+
+interface DynamicProps {
+  setBreadcrumb: SetBreadcrumb;
+  [key: string]: any;
+}
+
+interface SetBreadcrumb {
+  (breadcrumbInfos?: BreadcrumbInfoInput[]): void;
+}
+
+type BreadcrumbInfoInput =
+  | {
+      type: 'auto' | 'root';
+      name?: never;
+      path?: never;
+    }
+  | {
+      type: 'menu';
+      name?: never;
+      path: string;
+    }
+  | {
+      type: 'c';
+      name: string;
+      path: string;
+    };
+
+export interface IQiankunProps {
+  base: string;
+  container: HTMLElement; // 子应用所在容器
+  dynamicProps: DynamicProps; // 面包屑
+  getOwnMenu: () => { entry_name: string }; // 获取当前选中菜单
+  hasPermission: (permissionCode: string) => boolean;
+  isSupportMobile: boolean; // 是否支持移动端
+  mainHistory: mainHistory; // 用于微应用间跳转
+  modifySelectedMenu: () => void; //
+  region: 'tx' | 'us' | 'eu' | 'in' | 'ueaz' | 'we' | 'sea';
+  resourcePrefix: string; // 静态资源地址
+  sentry: {
+    captureEvent: (event: Event) => string;
+    captureMessage: (
+      message: string,
+      captureContext?: CaptureContext | Severity
+    ) => string;
+    captureException: (
+      exception: any,
+      captureContext?: CaptureContext
+    ) => string;
+  };
+  tyLang: 'zh' | 'en'; // 当前语言
+  langResource: any;
+}

package/dist/template/multi-micro-app/public-path.js

@@ -0,0 +1,4 @@
+/* eslint-disable no-undef */
+if (window.__POWERED_BY_QIANKUN__) {
+  __webpack_public_path__ = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.0.22",
+  "version": "3.0.23",
   "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.22",
-    "@tuya-sat/micro-dev-proxy": "3.0.22",
-    "@tuya-sat/micro-utils": "3.0.22",
+    "@tuya-sat/micro-dev-loader": "3.0.23",
+    "@tuya-sat/micro-dev-proxy": "3.0.23",
+    "@tuya-sat/micro-utils": "3.0.23",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",
@@ -65,7 +65,7 @@
     "url-loader": "4.1.1",
     "uuid": "8.3.2",
     "vue-loader": "17.0.0",
-    "webpack": "5.76.0",
+    "webpack": "5.75.0",
     "webpack-cli": "5.0.1",
     "webpack-dev-server": "4.11.1",
     "webpack-manifest-plugin": "^5.0.0",

package/scripts/copyTemplate.js

@@ -1,11 +1,17 @@
 const fs = require('fs-extra');
 const path = require('path');
 
+
 fs.copySync(
   path.join(process.cwd(), './src/template/micro-app'),
   path.join(process.cwd(), 'dist/template/micro-app')
 );
 
+fs.copySync(
+  path.join(process.cwd(), './src/template/multi-micro-app'),
+  path.join(process.cwd(), 'dist/template/multi-micro-app')
+);
+
 fs.copySync(
   path.join(process.cwd(), './src/template/main-app'),
   path.join(process.cwd(), 'dist/template/main-app')