Merge pull request #308 from bytedance/feature/PluginLightMerge

publish v0.3.38 [automated]
bytedance · Apr 11, 2024 · b39f1f8 · b39f1f8
2 parents 8d45a33 + 7d030f8
commit b39f1f8
Show file tree

Hide file tree

Showing 41 changed files with 156 additions and 181 deletions.
diff --git a/build.js b/build.js
@@ -6,7 +6,7 @@ const pkgs = {
   mini: '@bytedance/mona-client-mini',
   web: '@bytedance/mona-client-web',
   max: '@bytedance/mona-client-max',
-  plugin: '@bytedance/mona-client-plugin',
+  // plugin: '@bytedance/mona-client-plugin',
   events: '@bytedance/mona-plugin-events',
   runtime: '@bytedance/mona-runtime',
   shared: '@bytedance/mona-shared',

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.3.37",
+  "version": "0.3.38",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

diff --git a/packages/mona-cli/package.json b/packages/mona-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bytedance/mona-cli",
-  "version": "0.3.37",
+  "version": "0.3.38",
   "displayName": "mona",
   "description": "Merchant app's developing and building tools",
   "main": "./bin/mona",
@@ -20,8 +20,8 @@
   "author": "[email protected]",
   "license": "MIT",
   "dependencies": {
-    "@bytedance/mona-cli-commands": "0.3.37",
-    "@bytedance/mona-manager": "0.3.37"
+    "@bytedance/mona-cli-commands": "0.3.38",
+    "@bytedance/mona-manager": "0.3.38"
   },
   "devDependencies": {
     "@types/node": "^16.4.5"

diff --git a/packages/mona-clients/mona-client-max/package.json b/packages/mona-clients/mona-client-max/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bytedance/mona-client-max",
-  "version": "0.3.37",
+  "version": "0.3.38",
   "description": "max for mona",
   "main": "./dist/index.js",
   "files": [
@@ -19,9 +19,9 @@
     "mona"
   ],
   "dependencies": {
-    "@bytedance/mona": "0.3.37",
-    "@bytedance/mona-client-web": "0.3.37",
-    "@bytedance/mona-shared": "0.3.37",
+    "@bytedance/mona": "0.3.38",
+    "@bytedance/mona-client-web": "0.3.38",
+    "@bytedance/mona-shared": "0.3.38",
     "@bytedance/mona-speedy-components": "0.0.37",
     "axios": "^1.6.5"
   },

diff --git a/packages/mona-clients/mona-client-mini/package.json b/packages/mona-clients/mona-client-mini/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bytedance/mona-client-mini",
-  "version": "0.3.37",
+  "version": "0.3.38",
   "description": "miniapp for mona",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "sideEffects": false,
   "dependencies": {
-    "@bytedance/mona": "0.3.37",
-    "@bytedance/mona-shared": "0.3.37",
+    "@bytedance/mona": "0.3.38",
+    "@bytedance/mona-shared": "0.3.38",
     "react-reconciler": "^0.26.2",
     "scheduler": "^0.20.2"
   },

diff --git a/packages/mona-clients/mona-client-plugin/package.json b/packages/mona-clients/mona-client-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bytedance/mona-client-plugin",
-  "version": "0.3.37",
+  "version": "0.3.38",
   "description": "plugin for mona",
   "main": "./dist/index.js",
   "files": [
@@ -17,10 +17,10 @@
     "mona"
   ],
   "dependencies": {
-    "@bytedance/mona": "0.3.37",
-    "@bytedance/mona-client-web": "0.3.37",
-    "@bytedance/mona-plugin-events": "0.3.37",
-    "@bytedance/mona-shared": "0.3.37"
+    "@bytedance/mona": "0.3.38",
+    "@bytedance/mona-client-web": "0.3.38",
+    "@bytedance/mona-plugin-events": "0.3.38",
+    "@bytedance/mona-shared": "0.3.38"
   },
   "peerDependencies": {
     "react": "^17.0.2",

diff --git a/packages/mona-clients/mona-client-web/package.json b/packages/mona-clients/mona-client-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bytedance/mona-client-web",
-  "version": "0.3.37",
+  "version": "0.3.38",
   "description": "web for mona",
   "main": "./dist/index.js",
   "files": [
@@ -19,8 +19,8 @@
     "mona"
   ],
   "dependencies": {
-    "@bytedance/mona": "0.3.37",
-    "@bytedance/mona-shared": "0.3.37",
+    "@bytedance/mona": "0.3.38",
+    "@bytedance/mona-shared": "0.3.38",
     "ahooks": "^3.7.0"
   },
   "devDependencies": {

diff --git a/packages/mona-clients/mona-client-web/src/createWebApp.tsx b/packages/mona-clients/mona-client-web/src/createWebApp.tsx
@@ -109,7 +109,7 @@ export function createWebApp(
     prepareLightApp(options?.light);
 
     ReactDOM.render(
-      <Provider prefixCls={libraryConfig?.prefixCls || 'mui'} locale={libraryConfig?.zh_CN}>
+      <Provider prefixCls={libraryConfig?.prefixCls || 'auxo'} locale={libraryConfig?.zh_CN}>
         <BrowserRouter>
           <HistorySetWrapper>
             <Component>

diff --git a/packages/mona-clients/mona-client-web/src/lazy.tsx b/packages/mona-clients/mona-client-web/src/lazy.tsx
@@ -1,10 +1,10 @@
 import React, { Suspense } from 'react';
-import { Loading } from './components/Loading';
+// import { Loading } from './components/Loading';
 
 export function lazy<T>(factory: () => Promise<{ default: React.ComponentType<T> }>) {
   const Component = React.lazy(factory);
   return (props: T) => (
-    <Suspense fallback={<Loading />}>
+    <Suspense fallback={null}>
       <Component {...(props as any)} />
     </Suspense>
   );

diff --git a/packages/mona-manager-plugins/mona-cli-commands/package.json b/packages/mona-manager-plugins/mona-cli-commands/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bytedance/mona-cli-commands",
-  "version": "0.3.37",
+  "version": "0.3.38",
   "displayName": "mona-cli-commands",
   "description": "mona-cli commands plugins for mona-manager",
   "main": "./dist/index",
@@ -16,8 +16,8 @@
   "author": "[email protected]",
   "license": "MIT",
   "dependencies": {
-    "@bytedance/mona-manager": "0.3.37",
-    "@bytedance/mona-shared": "0.3.37",
+    "@bytedance/mona-manager": "0.3.38",
+    "@bytedance/mona-shared": "0.3.38",
     "@koa/cors": "^4.0.0",
     "@koa/router": "^12.0.0",
     "axios": "^1.6.5",

diff --git a/packages/mona-manager-plugins/mona-cli-commands/src/init/utils/ask.ts b/packages/mona-manager-plugins/mona-cli-commands/src/init/utils/ask.ts
@@ -4,13 +4,9 @@ import { checkChinese } from './common';
 
 const templates = [
   {
-    name: 'light（适用于微应用开发）',
+    name: 'light（适用于微应用、飞鸽插件开发）',
     value: 'light',
   },
-  {
-    name: 'plugin（适用于飞鸽插件开发）',
-    value: 'plugin',
-  },
   {
     name: 'max（适用于店铺装修模块开发）',
     value: 'max',

diff --git a/packages/mona-manager-plugins/mona-cli-commands/src/init/utils/template.ts b/packages/mona-manager-plugins/mona-cli-commands/src/init/utils/template.ts
@@ -7,7 +7,7 @@ import download from 'download-git-repo';
 import { makeDir, readAllFiles, removeEmptyDirs } from './file';
 import axios from 'axios';
 
-const branch = 'v2';
+const branch = 'v3';
 
 const TEMPLATE_SOURCE = `github:bytedance/mona-templates#${branch}`;
 const TEMPLATE_SOURCE_GITEE = `direct:[email protected]:ByteDance/mona-templates.git#${branch}`;

diff --git a/packages/mona-manager-plugins/mona-manager-plugins-shared/package.json b/packages/mona-manager-plugins/mona-manager-plugins-shared/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bytedance/mona-manager-plugins-shared",
   "displayName": "mona-manager-plugins-shared",
-  "version": "0.3.37",
+  "version": "0.3.38",
   "description": "mona-manager plugins shared utils and plugins",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,7 +17,7 @@
   "author": "[email protected]",
   "license": "MIT",
   "dependencies": {
-    "@bytedance/mona-manager": "0.3.37",
+    "@bytedance/mona-manager": "0.3.38",
     "copy-webpack-plugin": "^10.2.0",
     "webpack": "^5.58.2"
   },

diff --git a/packages/mona-manager-plugins/mona-service-commands/package.json b/packages/mona-manager-plugins/mona-service-commands/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bytedance/mona-service-commands",
-  "version": "0.3.37",
+  "version": "0.3.38",
   "displayName": "mona-service-commands",
   "description": "mona-service commands plugins for mona-manager",
   "main": "./dist/index.js",
@@ -17,8 +17,8 @@
   "author": "[email protected]",
   "license": "MIT",
   "dependencies": {
-    "@bytedance/mona-manager": "0.3.37",
-    "@bytedance/mona-shared": "0.3.37",
+    "@bytedance/mona-manager": "0.3.38",
+    "@bytedance/mona-shared": "0.3.38",
     "archiver": "^5.3.0",
     "assert": "^2.0.0",
     "axios": "^1.6.5",

diff --git a/packages/mona-manager-plugins/mona-service-targets/mona-service-target-lynx/package.json b/packages/mona-manager-plugins/mona-service-targets/mona-service-target-lynx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bytedance/mona-service-target-lynx",
-  "version": "0.3.37",
+  "version": "0.3.38",
   "displayName": "mona-service-target-lynx",
   "description": "mona-service lynx target plugin for mona-manager",
   "main": "./dist/index.js",
@@ -24,8 +24,8 @@
     "@babel/preset-typescript": "^7.16.5",
     "@babel/traverse": "^7.16.5",
     "@babel/types": "^7.16.0",
-    "@bytedance/mona-manager": "0.3.37",
-    "@bytedance/mona-manager-plugins-shared": "0.3.37",
+    "@bytedance/mona-manager": "0.3.38",
+    "@bytedance/mona-manager-plugins-shared": "0.3.38",
     "@bytedance/mona-speedy": "0.0.37",
     "@bytedance/mona-speedy-components": "0.0.37",
     "@bytedance/mona-speedy-runtime": "0.0.37",

diff --git a/packages/mona-manager-plugins/mona-service-targets/mona-service-target-mini/package.json b/packages/mona-manager-plugins/mona-service-targets/mona-service-target-mini/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bytedance/mona-service-target-mini",
-  "version": "0.3.37",
+  "version": "0.3.38",
   "displayName": "mona-service-target-mini",
   "description": "mona-service mini target plugin for mona-manager",
   "main": "./dist/index.js",
@@ -25,10 +25,10 @@
     "@babel/preset-typescript": "^7.16.5",
     "@babel/traverse": "^7.16.5",
     "@babel/types": "^7.16.0",
-    "@bytedance/mona": "0.3.37",
-    "@bytedance/mona-manager-plugins-shared": "0.3.37",
-    "@bytedance/mona-runtime": "0.3.37",
-    "@bytedance/mona-shared": "0.3.37",
+    "@bytedance/mona": "0.3.38",
+    "@bytedance/mona-manager-plugins-shared": "0.3.38",
+    "@bytedance/mona-runtime": "0.3.38",
+    "@bytedance/mona-shared": "0.3.38",
     "@teamsupercell/typings-for-css-modules-loader": "^2.5.1",
     "acorn-walk": "^8.2.0",
     "babel-loader": "^8.2.2",

diff --git a/packages/mona-manager-plugins/mona-service-targets/mona-service-target-web/package.json b/packages/mona-manager-plugins/mona-service-targets/mona-service-target-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bytedance/mona-service-target-web",
-  "version": "0.3.37",
+  "version": "0.3.38",
   "displayName": "mona-service-target-web",
   "description": "mona-service web target plugin for mona-manager",
   "main": "./dist/index.js",
@@ -24,9 +24,9 @@
     "@babel/preset-react": "^7.16.5",
     "@babel/preset-typescript": "^7.16.5",
     "@babel/types": "^7.16.0",
-    "@bytedance/mona-manager-plugins-shared": "0.3.37",
-    "@bytedance/mona-runtime": "0.3.37",
-    "@bytedance/mona-shared": "0.3.37",
+    "@bytedance/mona-manager-plugins-shared": "0.3.38",
+    "@bytedance/mona-runtime": "0.3.38",
+    "@bytedance/mona-shared": "0.3.38",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
     "@svgr/webpack": "^8.1.0",
     "@teamsupercell/typings-for-css-modules-loader": "^2.5.1",

diff --git a/packages/mona-manager-plugins/mona-service-targets/mona-service-target-web/src/index.ts b/packages/mona-manager-plugins/mona-service-targets/mona-service-target-web/src/index.ts
@@ -1,6 +1,6 @@
 const h5 = require('./target/h5');
 const light = require('./target/light');
-const plugin = require('./target/plugin');
+// const plugin = require('./target/plugin');
 const web = require('./target/web');
 const mobile = require('./target/mobile');
-module.exports = [h5, light, plugin, web, mobile];
+module.exports = [h5, light, web, mobile];
diff --git a/...-plugins/mona-service-targets/mona-service-target-web/src/plugins/postcss/monaUiPrefix.ts b/...-plugins/mona-service-targets/mona-service-target-web/src/plugins/postcss/monaUiPrefix.ts