From e80855638507e7ccdab8a49757e060083eadd123 Mon Sep 17 00:00:00 2001
From: wanchun <445436867@qq.com>
Date: Fri, 31 Mar 2023 14:54:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20template=E6=94=B9=E4=B8=BA=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8workspace=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/fes-template-h5/package.json   |   8 +-
 packages/fes-template-vite/package.json |  28 ++--
 packages/fes-template/package.json      |  32 ++--
 pnpm-lock.yaml                          | 191 +++++-------------------
 4 files changed, 75 insertions(+), 184 deletions(-)

diff --git a/packages/fes-template-h5/package.json b/packages/fes-template-h5/package.json
index 000f1bd5..6b315ace 100644
--- a/packages/fes-template-h5/package.json
+++ b/packages/fes-template-h5/package.json
@@ -41,10 +41,10 @@
   },
   "dependencies": {
     "@ttou/postcss-px-to-viewport": "^2.0.3",
-    "@fesjs/fes": "^3.0.0-rc.0",
-    "@fesjs/plugin-icon": "^3.0.0-rc.0",
-    "@fesjs/plugin-request": "^3.0.0-rc.0",
-    "@fesjs/builder-vite": "^3.0.0-rc.1",
+    "@fesjs/fes": "workspace:*",
+    "@fesjs/plugin-icon": "workspace:*",
+    "@fesjs/plugin-request": "workspace:*",
+    "@fesjs/builder-vite": "workspace:*",
     "core-js": "^3.29.1",
     "vue": "^3.2.47"
   },
diff --git a/packages/fes-template-vite/package.json b/packages/fes-template-vite/package.json
index c300608e..0102bab7 100644
--- a/packages/fes-template-vite/package.json
+++ b/packages/fes-template-vite/package.json
@@ -43,21 +43,21 @@
     "access": "public"
   },
   "dependencies": {
-    "@fesjs/builder-vite": "^3.0.0-rc.0",
-    "@fesjs/builder-webpack": "^3.0.0-rc.0",
-    "@fesjs/fes": "^3.0.0-rc.0",
     "@fesjs/fes-design": "^0.7.0",
-    "@fesjs/plugin-access": "^3.0.0-rc.0",
-    "@fesjs/plugin-enums": "^3.0.0-rc.0",
-    "@fesjs/plugin-icon": "^3.0.0-rc.0",
-    "@fesjs/plugin-jest": "^2.0.0",
-    "@fesjs/plugin-layout": "^5.0.0-rc.0",
-    "@fesjs/plugin-locale": "^4.0.0-rc.0",
-    "@fesjs/plugin-model": "^3.0.0-rc.0",
-    "@fesjs/plugin-monaco-editor": "^3.0.0-rc.0",
-    "@fesjs/plugin-pinia": "^3.0.0-rc.0",
-    "@fesjs/plugin-request": "^3.0.0-rc.0",
-    "@fesjs/plugin-sass": "^3.0.0-rc.0",
+    "@fesjs/builder-vite": "workspace:*",
+    "@fesjs/builder-webpack": "workspace:*",
+    "@fesjs/fes": "workspace:*",
+    "@fesjs/plugin-access": "workspace:*",
+    "@fesjs/plugin-enums": "workspace:*",
+    "@fesjs/plugin-icon": "workspace:*",
+    "@fesjs/plugin-jest": "workspace:*",
+    "@fesjs/plugin-layout": "workspace:*",
+    "@fesjs/plugin-locale": "workspace:*",
+    "@fesjs/plugin-model": "workspace:*",
+    "@fesjs/plugin-monaco-editor": "workspace:*",
+    "@fesjs/plugin-pinia": "workspace:*",
+    "@fesjs/plugin-request": "workspace:*",
+    "@fesjs/plugin-sass": "workspace:*",
     "core-js": "^3.29.1",
     "cssnano": "^6.0.0",
     "pinia": "^2.0.11",
diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json
index 559c6fb6..6d44de8c 100644
--- a/packages/fes-template/package.json
+++ b/packages/fes-template/package.json
@@ -44,23 +44,23 @@
     "access": "public"
   },
   "dependencies": {
-    "@fesjs/fes": "^3.0.0-rc.0",
+    "@fesjs/fes": "workspace:*",
+    "@fesjs/plugin-login": "workspace:*",
+    "@fesjs/plugin-access": "workspace:*",
+    "@fesjs/plugin-enums": "workspace:*",
+    "@fesjs/plugin-jest": "workspace:*",
+    "@fesjs/plugin-layout": "workspace:*",
+    "@fesjs/plugin-locale": "workspace:*",
+    "@fesjs/plugin-model": "workspace:*",
+    "@fesjs/plugin-monaco-editor": "workspace:*",
+    "@fesjs/plugin-pinia": "workspace:*",
+    "@fesjs/plugin-qiankun": "workspace:*",
+    "@fesjs/plugin-request": "workspace:*",
+    "@fesjs/plugin-sass": "workspace:*",
+    "@fesjs/plugin-watermark": "workspace:*",
+    "@fesjs/plugin-windicss": "workspace:*",
+    "@fesjs/plugin-swc": "workspace:*",
     "@fesjs/fes-design": "^0.7.20",
-    "@fesjs/plugin-login": "^3.0.0-rc.0",
-    "@fesjs/plugin-access": "^3.0.0-rc.0",
-    "@fesjs/plugin-enums": "^3.0.0-rc.0",
-    "@fesjs/plugin-jest": "^2.0.0",
-    "@fesjs/plugin-layout": "^5.0.0-rc.0",
-    "@fesjs/plugin-locale": "^4.0.0-rc.0",
-    "@fesjs/plugin-model": "^3.0.0-rc.0",
-    "@fesjs/plugin-monaco-editor": "^3.0.0-rc.0",
-    "@fesjs/plugin-pinia": "^3.0.0-rc.0",
-    "@fesjs/plugin-qiankun": "^3.0.0-rc.0",
-    "@fesjs/plugin-request": "^3.0.0-rc.0",
-    "@fesjs/plugin-sass": "^3.0.0-rc.0",
-    "@fesjs/plugin-watermark": "^3.0.0-rc.0",
-    "@fesjs/plugin-windicss": "^3.0.0-rc.0",
-    "@fesjs/plugin-swc": "^3.0.0-rc.0",
     "core-js": "3.29.1",
     "pinia": "^2.0.33",
     "vue": "^3.2.47"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 83898ed3..7b252414 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -560,24 +560,24 @@ importers:
 
   packages/fes-template:
     specifiers:
-      '@fesjs/fes': ^3.0.0-rc.0
+      '@fesjs/fes': workspace:*
       '@fesjs/fes-design': ^0.7.20
-      '@fesjs/plugin-access': ^3.0.0-rc.0
-      '@fesjs/plugin-enums': ^3.0.0-rc.0
-      '@fesjs/plugin-jest': ^2.0.0
-      '@fesjs/plugin-layout': ^5.0.0-rc.0
-      '@fesjs/plugin-locale': ^4.0.0-rc.0
-      '@fesjs/plugin-login': ^3.0.0-rc.0
-      '@fesjs/plugin-model': ^3.0.0-rc.0
-      '@fesjs/plugin-monaco-editor': ^3.0.0-rc.0
-      '@fesjs/plugin-pinia': ^3.0.0-rc.0
-      '@fesjs/plugin-qiankun': ^3.0.0-rc.0
-      '@fesjs/plugin-request': ^3.0.0-rc.0
-      '@fesjs/plugin-sass': ^3.0.0-rc.0
-      '@fesjs/plugin-swc': ^3.0.0-rc.0
-      '@fesjs/plugin-watermark': ^3.0.0-rc.0
-      '@fesjs/plugin-windicss': ^3.0.0-rc.0
-      core-js: 3.27.0
+      '@fesjs/plugin-access': workspace:*
+      '@fesjs/plugin-enums': workspace:*
+      '@fesjs/plugin-jest': workspace:*
+      '@fesjs/plugin-layout': workspace:*
+      '@fesjs/plugin-locale': workspace:*
+      '@fesjs/plugin-login': workspace:*
+      '@fesjs/plugin-model': workspace:*
+      '@fesjs/plugin-monaco-editor': workspace:*
+      '@fesjs/plugin-pinia': workspace:*
+      '@fesjs/plugin-qiankun': workspace:*
+      '@fesjs/plugin-request': workspace:*
+      '@fesjs/plugin-sass': workspace:*
+      '@fesjs/plugin-swc': workspace:*
+      '@fesjs/plugin-watermark': workspace:*
+      '@fesjs/plugin-windicss': workspace:*
+      core-js: 3.29.1
       pinia: ^2.0.33
       vue: ^3.2.47
     dependencies:
@@ -585,29 +585,29 @@ importers:
       '@fesjs/fes-design': 0.7.23_vue@3.2.47
       '@fesjs/plugin-access': link:../fes-plugin-access
       '@fesjs/plugin-enums': link:../fes-plugin-enums
-      '@fesjs/plugin-jest': 2.0.5_ae7q6n2pxdofq35ibmbyyxc3lm
+      '@fesjs/plugin-jest': link:../fes-plugin-jest
       '@fesjs/plugin-layout': link:../fes-plugin-layout
       '@fesjs/plugin-locale': link:../fes-plugin-locale
       '@fesjs/plugin-login': link:../fes-plugin-login
       '@fesjs/plugin-model': link:../fes-plugin-model
       '@fesjs/plugin-monaco-editor': link:../fes-plugin-monaco-editor
       '@fesjs/plugin-pinia': link:../fes-plugin-pinia
-      '@fesjs/plugin-qiankun': 3.0.0-rc.2_upiwrfrltzfvpffgxz4zmpbq7e
+      '@fesjs/plugin-qiankun': link:../fes-plugin-qiankun
       '@fesjs/plugin-request': link:../fes-plugin-request
       '@fesjs/plugin-sass': link:../fes-plugin-sass
       '@fesjs/plugin-swc': link:../fes-plugin-swc
       '@fesjs/plugin-watermark': link:../fes-plugin-watermark
       '@fesjs/plugin-windicss': link:../fes-plugin-windicss
-      core-js: 3.27.0
-      pinia: 2.0.33_hmuptsblhheur2tugfgucj7gc4
+      core-js: 3.29.1
+      pinia: 2.0.33_vue@3.2.47
       vue: 3.2.47
 
   packages/fes-template-h5:
     specifiers:
-      '@fesjs/builder-vite': ^3.0.0-rc.1
-      '@fesjs/fes': ^3.0.0-rc.0
-      '@fesjs/plugin-icon': ^3.0.0-rc.0
-      '@fesjs/plugin-request': ^3.0.0-rc.0
+      '@fesjs/builder-vite': workspace:*
+      '@fesjs/fes': workspace:*
+      '@fesjs/plugin-icon': workspace:*
+      '@fesjs/plugin-request': workspace:*
       '@ttou/postcss-px-to-viewport': ^2.0.3
       core-js: ^3.29.1
       vue: ^3.2.47
@@ -622,21 +622,21 @@ importers:
 
   packages/fes-template-vite:
     specifiers:
-      '@fesjs/builder-vite': ^3.0.0-rc.0
-      '@fesjs/builder-webpack': ^3.0.0-rc.0
-      '@fesjs/fes': ^3.0.0-rc.0
+      '@fesjs/builder-vite': workspace:*
+      '@fesjs/builder-webpack': workspace:*
+      '@fesjs/fes': workspace:*
       '@fesjs/fes-design': ^0.7.0
-      '@fesjs/plugin-access': ^3.0.0-rc.0
-      '@fesjs/plugin-enums': ^3.0.0-rc.0
-      '@fesjs/plugin-icon': ^3.0.0-rc.0
-      '@fesjs/plugin-jest': ^2.0.0
-      '@fesjs/plugin-layout': ^5.0.0-rc.0
-      '@fesjs/plugin-locale': ^4.0.0-rc.0
-      '@fesjs/plugin-model': ^3.0.0-rc.0
-      '@fesjs/plugin-monaco-editor': ^3.0.0-rc.0
-      '@fesjs/plugin-pinia': ^3.0.0-rc.0
-      '@fesjs/plugin-request': ^3.0.0-rc.0
-      '@fesjs/plugin-sass': ^3.0.0-rc.0
+      '@fesjs/plugin-access': workspace:*
+      '@fesjs/plugin-enums': workspace:*
+      '@fesjs/plugin-icon': workspace:*
+      '@fesjs/plugin-jest': workspace:*
+      '@fesjs/plugin-layout': workspace:*
+      '@fesjs/plugin-locale': workspace:*
+      '@fesjs/plugin-model': workspace:*
+      '@fesjs/plugin-monaco-editor': workspace:*
+      '@fesjs/plugin-pinia': workspace:*
+      '@fesjs/plugin-request': workspace:*
+      '@fesjs/plugin-sass': workspace:*
       core-js: ^3.29.1
       cssnano: ^6.0.0
       pinia: ^2.0.11
@@ -649,7 +649,7 @@ importers:
       '@fesjs/plugin-access': link:../fes-plugin-access
       '@fesjs/plugin-enums': link:../fes-plugin-enums
       '@fesjs/plugin-icon': link:../fes-plugin-icon
-      '@fesjs/plugin-jest': 2.0.5_ae7q6n2pxdofq35ibmbyyxc3lm
+      '@fesjs/plugin-jest': link:../fes-plugin-jest
       '@fesjs/plugin-layout': link:../fes-plugin-layout
       '@fesjs/plugin-locale': link:../fes-plugin-locale
       '@fesjs/plugin-model': link:../fes-plugin-model
@@ -659,7 +659,7 @@ importers:
       '@fesjs/plugin-sass': link:../fes-plugin-sass
       core-js: 3.29.1
       cssnano: 6.0.0_postcss@8.4.21
-      pinia: 2.0.33_hmuptsblhheur2tugfgucj7gc4
+      pinia: 2.0.33_vue@3.2.47
       vue: 3.2.47
 
   packages/fes-utils:
@@ -2586,23 +2586,6 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@fesjs/compiler/2.0.5:
-    resolution: {integrity: sha512-zfKZcwOBRVtjnNQRvPtvffBN8gw3oSeI4+OkH9cUoh0irqpYBLX9FkaJmCMo+RlG3R1ke21Ssk/ZU/r7VyF5jA==}
-    dependencies:
-      '@babel/core': 7.21.3
-      '@babel/preset-env': 7.20.2_@babel+core@7.21.3
-      '@babel/register': 7.21.0_@babel+core@7.21.3
-      '@fesjs/utils': 2.0.4
-      commander: 7.2.0
-      dotenv: 8.2.0
-      joi: 17.3.0
-      readline: 1.3.0
-      set-value: 3.0.2
-      tapable: 2.2.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /@fesjs/fes-design/0.7.23_vue@3.2.47:
     resolution: {integrity: sha512-FCQk4+SBVmYgQLhxjUqkxT701o7LprnhrBf7o5zPLhu3wZKbhPGAc2g96reBf08nWjxV6UubAX3QpeQ5aQWxcA==}
     peerDependencies:
@@ -2626,32 +2609,6 @@ packages:
       - '@vue/composition-api'
     dev: false
 
-  /@fesjs/plugin-jest/2.0.5_ae7q6n2pxdofq35ibmbyyxc3lm:
-    resolution: {integrity: sha512-E2rEVLhevFz6SgNrM2toPNOh383m+Nlng2gZP2fa3S3pHuz1uAqAfHrRfHNLt/e8CVWMafyvXIXh6GLHYu3IdQ==}
-    dependencies:
-      '@babel/preset-env': 7.20.2_@babel+core@7.21.3
-      '@fesjs/compiler': 2.0.5
-      '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.21.3
-      babel-jest: 27.5.1_@babel+core@7.21.3
-      jest: 27.5.1
-      jest-transform-stub: 2.0.0
-      jest-watch-typeahead: 0.6.5_jest@27.5.1
-      ts-jest: 27.1.5_5dmciyzakmnmbjegs7ltqvvgua
-      typescript: 4.9.5
-      vue3-jest: 27.0.0-alpha.1_jfh2pauwv6tb4tqxutgk5exgga
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@types/jest'
-      - bufferutil
-      - canvas
-      - esbuild
-      - node-notifier
-      - supports-color
-      - ts-node
-      - utf-8-validate
-      - vue
-    dev: false
-
   /@fesjs/plugin-qiankun/3.0.0-rc.0_upiwrfrltzfvpffgxz4zmpbq7e:
     resolution: {integrity: sha512-qFQ3cDBmGJYZPbc8Mu4ZVodm+/Q8g1rIPRAg24cxVybVc1taA0YbGo8FefQayyaUTxFLtYp921TYWytzGDNJRg==}
     peerDependencies:
@@ -2670,24 +2627,6 @@ packages:
       - supports-color
     dev: false
 
-  /@fesjs/plugin-qiankun/3.0.0-rc.2_upiwrfrltzfvpffgxz4zmpbq7e:
-    resolution: {integrity: sha512-YTfoWEMeDEMOqx/Na71gw3t1h577fb+3ZapAWjxm1gVZ0HiiALPRZnboKeiAQxZHpHKiSr8s8pmoDlC2Unq5hQ==}
-    peerDependencies:
-      '@fesjs/fes': 3.0.0-rc.2
-      '@fesjs/fes-design': ^0.7.0
-      vue: ^3.2.37
-    dependencies:
-      '@fesjs/fes': link:packages/fes
-      '@fesjs/fes-design': 0.7.23_vue@3.2.47
-      '@fesjs/utils': 3.0.0-rc.2
-      address: 1.2.2
-      lodash-es: 4.17.21
-      qiankun: 2.10.4
-      vue: 3.2.47
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /@fesjs/plugin-watermark/3.0.0-rc.0_jhvc4uw43byr5dnp3elsad4qw4:
     resolution: {integrity: sha512-FSojmxY0Cmz6MryO/O+J0cw0JKE220r6evV63+NCV13eWXjxABEV+QT0YMNYT+brCFnbCSr7y4aToDBI0/RE7g==}
     peerDependencies:
@@ -2702,31 +2641,6 @@ packages:
       - supports-color
     dev: false
 
-  /@fesjs/utils/2.0.4:
-    resolution: {integrity: sha512-jnTs+ioRjYJ34LaoSzKeOQ5qgPJIYdeh+Uj9frjEJ2ZIIB+D+MyL82ciISRnnSs0XkocV5eNsb6Bs8p3/eEd4Q==}
-    dependencies:
-      '@babel/generator': 7.21.3
-      '@babel/parser': 7.21.3
-      '@babel/traverse': 7.21.3
-      chalk: 4.1.2
-      chokidar: 3.5.3
-      crequire: 1.8.1
-      debug: 4.3.4
-      deepmerge: 4.3.1
-      glob: 7.2.3
-      lodash: 4.17.21
-      mkdirp: 1.0.4
-      mustache: 4.2.0
-      pkg-up: 3.1.0
-      portfinder: 1.0.32
-      resolve: 1.22.1
-      rimraf: 3.0.2
-      semver: 7.3.8
-      yargs-parser: 20.2.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /@fesjs/utils/3.0.0-rc.2:
     resolution: {integrity: sha512-kZlFvKZtuw77Xd4gru0uHMWB13lTWvpSQzMhfD4UnPBQQhtpGZrDWX/7ik/qafdxPkZ3ovwPbirScrCMHdPvNw==}
     dependencies:
@@ -5693,11 +5607,6 @@ packages:
     dependencies:
       browserslist: 4.21.5
 
-  /core-js/3.27.0:
-    resolution: {integrity: sha512-wY6cKosevs430KRkHUIsvepDXHGjlXOZO3hYXNyqpD6JvB0X28aXyv0t1Y1vZMwE7SoKmtfa6IASHCPN52FwBQ==}
-    requiresBuild: true
-    dev: false
-
   /core-js/3.29.1:
     resolution: {integrity: sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw==}
     requiresBuild: true
@@ -10249,24 +10158,6 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
-  /pinia/2.0.33_hmuptsblhheur2tugfgucj7gc4:
-    resolution: {integrity: sha512-HOj1yVV2itw6rNIrR2f7+MirGNxhORjrULL8GWgRwXsGSvEqIQ+SE0MYt6cwtpegzCda3i+rVTZM+AM7CG+kRg==}
-    peerDependencies:
-      '@vue/composition-api': ^1.4.0
-      typescript: '>=4.4.4'
-      vue: ^2.6.14 || ^3.2.0
-    peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
-      typescript:
-        optional: true
-    dependencies:
-      '@vue/devtools-api': 6.5.0
-      typescript: 4.9.5
-      vue: 3.2.47
-      vue-demi: 0.13.11_vue@3.2.47
-    dev: false
-
   /pinia/2.0.33_vue@3.2.47:
     resolution: {integrity: sha512-HOj1yVV2itw6rNIrR2f7+MirGNxhORjrULL8GWgRwXsGSvEqIQ+SE0MYt6cwtpegzCda3i+rVTZM+AM7CG+kRg==}
     peerDependencies: