Merge pull request #123 from mokinzhao/master

update1.4.0

lerna.json

@@ -0,0 +1,6 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "version": "0.0.0"
+}

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "h5-dooring",
-  "version": "1.3.0",
+"name": "h5-dooring",
+  "version": "1.4.0",
   "description": "H5-Dooring是一款功能强大，开源免费的H5可视化页面配置解决方案，致力于提供一套简单方便、专业可靠、无限可能的H5落地页最佳实践。技术栈以react为主， 后台采用nodejs开发。",
   "private": false,
   "author": {
@@ -18,15 +18,20 @@
   ],
   "contributors": [
     "徐小夕 <xujiang156@qq.com> (https://github.com/MrXujiang))",
+    "mokinzhao <37622852@qq.com> (https://github.com/mokinzhao))",
     "yehuozhili <yehuozhili@outlook.com> (https://github.com/yehuozhili))"
   ],
   "scripts": {
-    "start": "umi dev",
-    "build": "umi build",
+    "start": "npm run start:ui & npm run start:editor",
+    "start:editor": "npx lerna exec --scope @h5-dooring/editor -- npm run start",
+    "start:ui": "npx lerna exec --scope @h5-dooring/ui -- npm run start",
+    "build": "npm run build:ui && npm run build:editor",
+    "build:editor": "npx lerna exec --scope @h5-dooring/editor -- npm run build",
+    "build:ui": "npx lerna exec --scope @h5-dooring/ui -- npm run build",
+    "docs:dev": "npx lerna exec --scope @h5-dooring/doc -- npm run dev",
+    "docs:build": "npx lerna exec --scope @h5-dooring/doc -- npm run build",
     "server": "node server.js",
     "dev": "http-server dist",
-    "docs:dev": "vuepress dev doc",
-    "docs:build": "vuepress build doc",
     "test-demo": "http-server dist",
     "postinstall": "umi generate tmp",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
@@ -34,17 +39,7 @@
     "test:coverage": "umi-test --coverage",
     "nocompress": "cross-env RM_TMPDIR=none COMPRESS=none umi build"
   },
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
+
   "homepage": "http://h5.dooring.cn",
   "repository": {
     "type": "git",
@@ -53,82 +48,7 @@
   "bugs": {
     "url": "https://github.com/MrXujiang/h5-Dooring/issues"
   },
-  "dependencies": {
-    "@alex_xu/react-slider-vertify": "^1.1.7",
-    "@ant-design/icons": "^4.2.1",
-    "@antv/f2": "^3.7.7",
-    "@uiw/react-baidu-map": "^1.17.3",
-    "@umijs/plugin-esbuild": "^1.0.1",
-    "@umijs/plugin-sass": "^1.1.1",
-    "@umijs/preset-react": "1.x",
-    "@umijs/test": "^3.2.19",
-    "antd": "^4.7.0",
-    "antd-img-crop": "^3.10.0",
-    "axios": "^0.19.2",
-    "braft-editor": "^2.3.9",
-    "chatbot-antd": "^0.6.0",
-    "codemirror": "^5.57.0",
-    "dom-to-image": "^2.6.0",
-    "file-saver": "^2.0.2",
-    "http-server": "^0.12.3",
-    "keymaster": "^1.6.2",
-    "qrcode.react": "^1.0.0",
-    "react": "^16.12.0",
-    "react-audio-player": "^0.14.0",
-    "react-codemirror2": "^7.2.1",
-    "react-color": "^2.18.1",
-    "react-contexify": "^4.1.1",
-    "react-dnd": "^11.1.3",
-    "react-dnd-html5-backend": "^11.1.3",
-    "react-dom": "^16.12.0",
-    "react-draggable": "^4.4.3",
-    "react-draggable-ball": "^0.1.0",
-    "react-grid-layout": "^1.0.0",
-    "react-hotkeys-hook": "^2.3.1",
-    "react-text-loop": "^2.3.0",
-    "redux-undo": "^1.0.1",
-    "socket.io-client": "^2.3.0",
-    "umi": "^3.2.19",
-    "video-react": "^0.14.1",
-    "xlsx": "^0.16.7",
-    "yh-react-popover": "^0.3.0",
-    "yorkie": "^2.0.0",
-    "zarm": "^2.5.1"
-  },
-  "license": "GPL-3.0",
   "devDependencies": {
-    "@types/classnames": "^2.2.10",
-    "@types/codemirror": "^0.0.98",
-    "@types/events": "^3.0.0",
-    "@types/file-saver": "^2.0.1",
-    "@types/node": "^14.6.2",
-    "@types/qrcode.react": "^1.0.1",
-    "@types/react-color": "^3.0.4",
-    "@types/react-grid-layout": "^1.1.0",
-    "@types/redux-logger": "^3.0.8",
-    "@types/xlsx": "^0.0.36",
-    "@typescript-eslint/eslint-plugin": "4.1.1",
-    "@typescript-eslint/parser": "4.1.1",
-    "babel-eslint": "10.x",
-    "babel-plugin-import": "^1.13.0",
-    "cross-env": "^7.0.2",
-    "eslint": "6.x",
-    "eslint-config-react-app": "^5.2.1",
-    "eslint-plugin-flowtype": "4.x",
-    "eslint-plugin-import": "2.x",
-    "eslint-plugin-jsx-a11y": "6.x",
-    "eslint-plugin-react": "7.x",
-    "eslint-plugin-react-hooks": "2.x",
-    "koa": "^2.13.0",
-    "koa-body": "^4.2.0",
-    "koa-logger": "^3.2.1",
-    "koa-static": "^5.0.0",
-    "koa2-cors": "^2.0.6",
-    "lint-staged": "^10.0.7",
-    "prettier": "^1.19.1",
-    "redux-logger": "^3.0.6",
-    "sass-loader": "^9.0.3",
-    "typescript": "^4.0.2",
-    "vuepress": "^1.8.0"
+    "lerna": "^4.0.0"
   }
 }

packages/doc/package.json

@@ -0,0 +1,27 @@
+{
+  "name": "@h5-dooring/doc",
+  "version": "0.0.1",
+  "description": "文档",
+  "author": "mokinzhao <zhaoyl3@yonghui.cn>",
+  "homepage": "https://github.com/mokinzhao/h5-Dooring#readme",
+  "license": "ISC",
+  "main": "index.js",
+  "scripts": {
+    "dev": "vuepress dev doc",
+    "build": "vuepress build doc"
+  },
+  "devDependencies": {
+    "vuepress": "^1.8.2",
+    "vuepress-plugin-autobar": "github:boboidream/vuepress-bar"
+  },
+  "files": [
+    "lib"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mokinzhao/h5-Dooring.git"
+  },
+  "bugs": {
+    "url": "https://github.com/mokinzhao/h5-Dooring/issues"
+  }
+}

packages/editor/.umirc.ts

@@ -1,5 +1,6 @@
 import path from 'path';
 import { defineConfig } from 'umi';
+const { ModuleFederationPlugin } = require("webpack").container;
 
 export default defineConfig({
   dynamicImport: {
@@ -46,10 +47,6 @@ export default defineConfig({
           path: '/mobileTip',
           component: '../pages/mobileTip',
         },
-        {
-          path: '/preview',
-          component: '../pages/editor/preview',
-        },
       ],
     },
   ],
@@ -64,4 +61,20 @@ export default defineConfig({
     utils: path.resolve(__dirname, 'src/utils/'),
     assets: path.resolve(__dirname, 'src/assets/'),
   },
+  fastRefresh: {},
+  webpack5: {},
+  plugins: [
+    './src/plugins/umi-msfu-plugin.ts',
+  ],
+  chainWebpack(memo) {
+    memo
+      .plugin('mf')
+      .use(ModuleFederationPlugin, [{
+        name: "dooringEditor",
+        remotes: {
+          dooringUI: "dooringUI@//localhost:8008/remoteEntry.js"
+        },
+        shared: { react: { singleton: true, eager: true, requiredVersion: '17.x' }, "react-dom": { singleton: true,eager: true, requiredVersion: '17.x' }, }
+      }])
+  },
 });

packages/editor/README.md

@@ -0,0 +1,11 @@
+# `editor`
+
+> TODO: description
+
+## Usage
+
+```
+const editor = require('editor');
+
+// TODO: DEMONSTRATE API
+```

packages/editor/package.json

@@ -0,0 +1,128 @@
+{
+  "name": "@h5-dooring/editor",
+  "version": "0.0.1",
+  "description": "编辑器",
+  "private": false,
+  "author": {
+    "name": "徐小夕",
+    "email": "xujiang156@qq.com",
+    "url": "http://h5.dooring.cn/h5_visible"
+  },
+  "keywords": [
+    "h5 editor",
+    "h5",
+    "react",
+    "antd",
+    "react-dnd",
+    "web visible"
+  ],
+  "contributors": [
+    "徐小夕 <xujiang156@qq.com> (https://github.com/MrXujiang))",
+    "yehuozhili <yehuozhili@outlook.com> (https://github.com/yehuozhili))"
+  ],
+  "scripts": {
+    "start": "umi dev",
+    "build": "umi build",
+    "server": "node server.js",
+    "dev": "http-server dist",
+    "test-demo": "http-server dist",
+    "postinstall": "umi generate tmp",
+    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage",
+    "nocompress": "cross-env RM_TMPDIR=none COMPRESS=none umi build"
+  },
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "homepage": "http://h5.dooring.cn",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MrXujiang/h5-Dooring.git"
+  },
+  "bugs": {
+    "url": "https://github.com/MrXujiang/h5-Dooring/issues"
+  },
+  "dependencies": {
+    "@ant-design/icons": "^4.2.1",
+
+    "@umijs/plugin-esbuild": "^1.0.1",
+    "@umijs/plugin-sass": "^1.1.1",
+    "@umijs/preset-react": "1.x",
+    "@umijs/test": "^3.2.19",
+    "antd": "^4.7.0",
+    "antd-img-crop": "^3.10.0",
+    "axios": "^0.19.2",
+    "braft-editor": "^2.3.9",
+    "chatbot-antd": "^0.6.0",
+    "codemirror": "^5.57.0",
+    "dom-to-image": "^2.6.0",
+    "file-saver": "^2.0.2",
+    "http-server": "^0.12.3",
+    "keymaster": "^1.6.2",
+    "qrcode.react": "^1.0.0",
+    "react": "17.x",
+    "react-dom": "17.x",
+    "react-codemirror2": "^7.2.1",
+    "react-color": "^2.18.1",
+    "react-contexify": "^4.1.1",
+    "react-dnd": "^11.1.3",
+    "react-dnd-html5-backend": "^11.1.3",
+    "react-draggable": "^4.4.3",
+    "react-draggable-ball": "^0.1.0",
+    "react-grid-layout": "^1.0.0",
+    "react-hotkeys-hook": "^2.3.1",
+    "react-text-loop": "^2.3.0",
+    "redux-undo": "^1.0.1",
+    "socket.io-client": "^2.3.0",
+    "umi": "^3.5.13",
+    "xlsx": "^0.16.7",
+    "yh-react-popover": "^0.3.0",
+    "yorkie": "^2.0.0",
+    "zarm": "^2.5.1"
+  },
+  "license": "GPL-3.0",
+  "devDependencies": {
+    "@types/classnames": "^2.2.10",
+    "@types/codemirror": "^0.0.98",
+    "@types/events": "^3.0.0",
+    "@types/file-saver": "^2.0.1",
+    "@types/node": "^14.6.2",
+    "@types/qrcode.react": "^1.0.1",
+    "@types/react-color": "^3.0.4",
+    "@types/react-grid-layout": "^1.1.0",
+    "@types/redux-logger": "^3.0.8",
+    "@types/xlsx": "^0.0.36",
+    "@typescript-eslint/eslint-plugin": "4.1.1",
+    "@typescript-eslint/parser": "4.1.1",
+    "babel-eslint": "10.x",
+    "babel-plugin-import": "^1.13.0",
+    "cross-env": "^7.0.2",
+    "eslint": "6.x",
+    "eslint-config-react-app": "^5.2.1",
+    "eslint-plugin-flowtype": "4.x",
+    "eslint-plugin-import": "2.x",
+    "eslint-plugin-jsx-a11y": "6.x",
+    "eslint-plugin-react": "7.x",
+    "eslint-plugin-react-hooks": "2.x",
+    "koa": "^2.13.0",
+    "koa-body": "^4.2.0",
+    "koa-logger": "^3.2.1",
+    "koa-static": "^5.0.0",
+    "koa2-cors": "^2.0.6",
+    "lint-staged": "^10.0.7",
+    "prettier": "^1.19.1",
+    "redux-logger": "^3.0.6",
+    "sass-loader": "^9.0.3",
+    "typescript": "^4.0.2",
+    "vuepress": "^1.8.0"
+  }
+}