Merge branch 'next' of https://github.com/WeBankFinTech/fes.js into next

2024-11-30 02:37:52 +08:00 · 2022-08-18 10:44:03 +08:00 · 2022-08-18 10:44:03 +08:00 · 08fd3d45f7
commit 08fd3d45f7
parent 7b696e41ff fa014fdfe7
36 changed files with 2318 additions and 3001 deletions
--- a/.github/workflows/release-notes.mjs
+++ b/.github/workflows/release-notes.mjs
@ -0,0 +1,23 @@
+#!/usr/bin/env node
+
+import { readFileSync, writeFileSync } from "fs";
+const tag = process.argv[2].replace("v", "");
+const log = readFileSync("./CHANGELOG.md", { encoding: "utf-8" }).split("\n");
+let result = "";
+let inScope = false;
+const regex = new RegExp(`^#+ \\[${tag}`);
+for (let i = 0; i < log.length; i++) {
+    if (regex.test(log[i])) {
+        inScope = true;
+        result += log[i];
+        continue;
+    }
+    if (inScope && /^#+ \[/.test(log[i])) {
+        inScope = false;
+        break;
+    }
+    if(inScope){
+        result += `\n${log[i]}`;
+    }
+}
+writeFileSync(`notes-v${tag}.md`, result)
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,53 +1,30 @@
-name: Release
-
 on:
-  push:
-    tags: ["v*"]
+    push:
+        tags:
+            - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+name: Create Release

 jobs:
-  github_release:
-    name: Trigger GitHub release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the new tag
-        uses: actions/checkout@v1.0.0
-
-      - name: Get tag info
-        id: tags
-        uses: babel/actions/get-release-tags@v2
-
-      - name: Generate the changelog
-        id: changelog
-        uses: ./.github/actions/generate-changelog
-        with:
-          from: ${{ steps.tags.outputs.old }}
-          to: ${{ steps.tags.outputs.new }}
-        env:
-          GITHUB_AUTH: ${{ secrets.ACCESS_TOKEN }}
-
-      - name: Create a draft GitHub release
-        uses: babel/actions/publish-github-release@v2
-        with:
-          tag: ${{ steps.tags.outputs.new }}
-          changelog: ${{ steps.changelog.outputs.changelog }}
-          token: ${{ secrets.ACCESS_TOKEN }}
-
-      - name: Check if releasing from master
-        id: is_master
-        uses: babel/actions/ref-matches-branch@v2
-        with:
-          name: master
-
-      - name: Update CHANGELOG.md
-        if: steps.is_master.outputs.result == 1
-        uses: babel/actions/update-changelog@v2
-        with:
-          changelog: ${{ steps.changelog.outputs.changelog }}
-
-      - name: Commit CHANGELOG.md
-        if: steps.is_master.outputs.result == 1
-        run: |
-          git add CHANGELOG.md
-          git -c user.name="wanchun" -c user.email="445436867@qq.com" \
-            commit -m "Add ${{ steps.tags.outputs.new }} to CHANGELOG.md [skip ci]" --no-verify --quiet
-          git push "https://wanchun:${{ secrets.ACCESS_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git" master
+    build:
+        name: Create Release
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@master
+            - name: Get the release version from the tag
+              shell: bash
+              if: env.RELEASE_VERSION == ''
+              run: |
+                  echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+            - name: Generate Release Notes
+              run: |
+                  ./.github/workflows/release-notes.mjs ${{ env.RELEASE_VERSION }}
+                  cat notes-${{ env.RELEASE_VERSION }}.md
+            - name: Create Release for Tag
+              id: release_tag
+              uses: softprops/action-gh-release@v1
+              env:
+                  GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+              with:
+                  body_path: notes-${{ env.RELEASE_VERSION }}.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,7 @@
+# [3.0.0-beta.18](https://github.com/WeBankFinTech/fes.js/compare/v3.0.0-beta.17...v3.0.0-beta.18) (2022-08-17)
+
+
+
 # [3.0.0-beta.17](https://github.com/WeBankFinTech/fes.js/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-08-15)


--- a/docs/guide/directory-structure.md
+++ b/docs/guide/directory-structure.md
@ -68,7 +68,7 @@ fes-template
        "@fesjs/plugin-monaco-editor": "^3.0.0-beta.0",
        "@fesjs/plugin-windicss": "^3.0.0-beta.0",
        "@fesjs/fes-design": "^0.5.0",
-        "vue": "^3.0.5",
+        "vue": "^3.2.37",
        "vuex": "^4.0.0"
    },
    "private": true
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fes.js",
-  "version": "3.0.0-beta.17",
+  "version": "3.0.0-beta.18",
  "description": "一个好用的前端管理台快速开发框架",
  "preferGlobal": true,
  "private": true,
--- a/packages/create-fes-app/package.json
+++ b/packages/create-fes-app/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/create-fes-app",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-beta.7",
  "description": "create a app base on fes.js",
  "main": "lib/index.js",
  "files": [
--- a/packages/create-fes-app/templates/app/h5/package.json
+++ b/packages/create-fes-app/templates/app/h5/package.json
@ -40,7 +40,6 @@
    "access": "public"
  },
  "devDependencies": {
-    "@vue/compiler-sfc": "^3.2.6",
    "@webank/eslint-config-webank": "^1.0.2",
    "@ttou/postcss-px-to-viewport": "1.1.1"
  },
@ -49,7 +48,7 @@
    "@fesjs/plugin-icon": "^3.0.0-beta.0",
    "@fesjs/plugin-request": "^3.0.0-beta.5",
    "@fesjs/builder-webpack": "^3.0.0-beta.0",
-    "vue": "^3.2.6",
+    "vue": "^3.2.37",
    "core-js": "^3.19.2"
  },
  "private": true
--- a/packages/create-fes-app/templates/app/pc/package.json
+++ b/packages/create-fes-app/templates/app/pc/package.json
@ -43,7 +43,6 @@
    "access": "public"
  },
  "devDependencies": {
-    "@vue/compiler-sfc": "^3.2.6",
    "@webank/eslint-config-webank": "^1.0.2"
  },
  "dependencies": {
@ -54,7 +53,7 @@
    "@fesjs/plugin-enums": "^3.0.0-beta.0",
    "@fesjs/fes-design": "^0.5.0",
    "@fesjs/builder-webpack": "^3.0.0-beta.0",
-    "vue": "^3.2.6",
+    "vue": "^3.2.37",
    "core-js": "^3.19.2"
  },
  "private": true
--- a/packages/create-fes-app/templates/plugin/package.json.tpl
+++ b/packages/create-fes-app/templates/plugin/package.json.tpl
@ -32,7 +32,7 @@
  },
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "lint-staged": {
    "*.{js,jsx,vue,ts}": [
--- a/packages/fes-builder-vite/package.json
+++ b/packages/fes-builder-vite/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/builder-vite",
-  "version": "3.0.0-beta.10",
+  "version": "3.0.0-beta.11",
  "description": "@fesjs/builder-vite",
  "main": "lib/index.js",
  "files": [
@ -42,7 +42,6 @@
  },
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
-    "@vue/compiler-sfc": "^3.0.5",
    "core-js": "^3.19.2"
  },
  "typings": "./types.d.ts"
--- a/packages/fes-builder-webpack/package.json
+++ b/packages/fes-builder-webpack/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/builder-webpack",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
  "description": "@fesjs/builder-webpack",
  "main": "lib/index.js",
  "types": "lib/index.d.ts",
@ -64,7 +64,6 @@
  },
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
-    "@vue/compiler-sfc": "^3.0.5",
    "core-js": "^3.19.2"
  }
 }
--- a/packages/fes-plugin-access/package.json
+++ b/packages/fes-plugin-access/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-access",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
  "description": "@fesjs/plugin-access",
  "main": "lib/index.js",
  "files": [
@ -33,7 +33,7 @@
  },
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
-    "vue": "^3.0.5",
+    "vue": "^3.2.37",
    "vue-router": "^4.0.1"
  },
  "typings": "./types.d.ts"
--- a/packages/fes-plugin-enums/package.json
+++ b/packages/fes-plugin-enums/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-enums",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
  "description": "@fesjs/plugin-enums",
  "main": "lib/index.js",
  "files": [
@ -29,7 +29,7 @@
  },
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "typings": "./types.d.ts"
 }
--- a/packages/fes-plugin-icon/package.json
+++ b/packages/fes-plugin-icon/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-icon",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
  "description": "@fesjs/plugin-icon",
  "main": "lib/index.js",
  "files": [
@ -28,7 +28,7 @@
    "access": "public"
  },
  "peerDependencies": {
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "dependencies": {
    "svgo": "^2.3.1"
--- a/packages/fes-plugin-layout/package.json
+++ b/packages/fes-plugin-layout/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-layout",
-  "version": "5.0.0-beta.10",
+  "version": "5.0.0-beta.11",
  "description": "@fesjs/plugin-layout",
  "main": "lib/index.js",
  "files": [
@ -33,7 +33,7 @@
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
    "@fesjs/fes-design": "^0.5.0",
-    "vue": "^3.0.5",
+    "vue": "^3.2.37",
    "vue-router": "^4.0.1"
  },
  "typings": "./types.d.ts"
--- a/packages/fes-plugin-locale/package.json
+++ b/packages/fes-plugin-locale/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-locale",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.6",
  "description": "@fesjs/plugin-locale",
  "main": "lib/index.js",
  "files": [
@ -34,7 +34,7 @@
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
    "@fesjs/fes-design": "^0.5.0",
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "typings": "./types.d.ts"
 }
--- a/packages/fes-plugin-model/package.json
+++ b/packages/fes-plugin-model/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-model",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
  "description": "@fesjs/plugin-model",
  "main": "lib/index.js",
  "files": [
@ -32,7 +32,7 @@
  },
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "typings": "./types.d.ts"
 }
--- a/packages/fes-plugin-monaco-editor/package.json
+++ b/packages/fes-plugin-monaco-editor/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-monaco-editor",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
  "description": "@fesjs/plugin-monaco-editor",
  "main": "lib/index.js",
  "files": [
@ -34,7 +34,7 @@
  },
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "typings": "./types.d.ts"
 }
--- a/packages/fes-plugin-pinia/package.json
+++ b/packages/fes-plugin-pinia/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-pinia",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
  "description": "@fesjs/plugin-pinia",
  "main": "lib/index.js",
  "files": [
@ -33,7 +33,7 @@
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
    "pinia": "^2.0.11",
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "typings": "./types.d.ts"
 }
--- a/packages/fes-plugin-qiankun/examples/micro/package.json
+++ b/packages/fes-plugin-qiankun/examples/micro/package.json
@ -45,7 +45,7 @@
    "dependencies": {
        "@fesjs/fes": "^2.0.0",
        "@fesjs/builder-webpack": "^1.0.0",
-        "vue": "^3.0.5",
+        "vue": "^3.2.37",
        "@fesjs/fes-design": "^0.5.0"
    },
    "private": true
--- a/packages/fes-plugin-qiankun/examples/vite-main/package.json
+++ b/packages/fes-plugin-qiankun/examples/vite-main/package.json
@ -44,7 +44,7 @@
    },
    "dependencies": {
        "@fesjs/fes": "^2.0.0",
-        "vue": "^3.0.5",
+        "vue": "^3.2.37",
        "@fesjs/fes-design": "^0.5.0"
    },
    "private": true
--- a/packages/fes-plugin-qiankun/examples/webpack-main/package.json
+++ b/packages/fes-plugin-qiankun/examples/webpack-main/package.json
@ -44,7 +44,7 @@
    },
    "dependencies": {
        "@fesjs/fes": "^2.0.0",
-        "vue": "^3.0.5",
+        "vue": "^3.2.37",
        "@fesjs/fes-design": "^0.1.10"
    },
    "private": true
--- a/packages/fes-plugin-qiankun/package.json
+++ b/packages/fes-plugin-qiankun/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-qiankun",
-  "version": "3.0.0-beta.8",
+  "version": "3.0.0-beta.9",
  "description": "@fesjs/plugin-qiankun",
  "main": "lib/index.js",
  "files": [
@ -42,7 +42,7 @@
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
    "@fesjs/fes-design": "^0.5.0",
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "typings": "./types.d.ts"
 }
--- a/packages/fes-plugin-request/package.json
+++ b/packages/fes-plugin-request/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-request",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.8",
  "description": "@fesjs/plugin-request",
  "main": "lib/index.js",
  "files": [
@ -29,7 +29,7 @@
  },
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "dependencies": {
    "@fesjs/utils": "^3.0.0-beta.0",
--- a/packages/fes-plugin-vuex/package.json
+++ b/packages/fes-plugin-vuex/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-vuex",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
  "description": "@fesjs/plugin-vuex",
  "main": "lib/index.js",
  "files": [
@ -32,7 +32,7 @@
  },
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
-    "vue": "^3.0.5",
+    "vue": "^3.2.37",
    "vuex": "^4.0.0"
  },
  "typings": "./types.d.ts"
--- a/packages/fes-plugin-watermark/package.json
+++ b/packages/fes-plugin-watermark/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-watermark",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
  "description": "@fesjs/plugin-watermark",
  "main": "lib/index.js",
  "files": [
@ -33,7 +33,7 @@
  },
  "peerDependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "typings": "./types.d.ts"
 }
--- a/packages/fes-plugin-windicss/package.json
+++ b/packages/fes-plugin-windicss/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-windicss",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
  "description": "@fesjs/plugin-windicss",
  "main": "lib/index.js",
  "files": [
@ -28,7 +28,7 @@
    "access": "public"
  },
  "peerDependencies": {
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "dependencies": {
    "vite-plugin-windicss": "^1.8.3",
--- a/packages/fes-preset-built-in/package.json
+++ b/packages/fes-preset-built-in/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/preset-built-in",
-  "version": "3.0.0-beta.10",
+  "version": "3.0.0-beta.11",
  "description": "@fesjs/preset-built-in",
  "main": "lib/index.js",
  "types": "lib/index.d.ts",
@ -33,8 +33,7 @@
    "express": "^4.17.3"
  },
  "peerDependencies": {
-    "vue": "^3.0.5",
-    "@vue/compiler-sfc": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "typings": "./types.d.ts"
 }
--- a/packages/fes-preset-built-in/src/index.js
+++ b/packages/fes-preset-built-in/src/index.js
@ -15,7 +15,6 @@ export default function () {
            // bundle configs
            require.resolve('./plugins/features/alias'),
            require.resolve('./plugins/features/autoprefixer'),
-            require.resolve('./plugins/features/checkVuePackage'),
            require.resolve('./plugins/features/define'),
            require.resolve('./plugins/features/dynamicImport'),
            require.resolve('./plugins/features/globalCSS'),
--- a/packages/fes-preset-built-in/src/plugins/features/checkVuePackage.js
+++ b/packages/fes-preset-built-in/src/plugins/features/checkVuePackage.js
@ -1,27 +0,0 @@
-import { chalk, semver } from '@fesjs/utils';
-
-export default (api) => {
-    api.describe({
-        key: 'checkVuePackage',
-        config: {
-            schema(joi) {
-                return joi.object();
-            },
-            default: {},
-        },
-    });
-
-    api.onStart(() => {
-        // eslint-disable-next-line import/no-extraneous-dependencies
-        const vuePkg = require('vue/package.json');
-        const vueCompilerPkg = require('@vue/compiler-sfc/package.json');
-        if (!semver.satisfies(vuePkg.version, `~${vueCompilerPkg.version.replace(/\d+$/, '0')}`, { includePrerelease: true })) {
-            console.log(
-                chalk.red(
-                    `You are using vue@${vuePkg.version}, requires @vue/compiler-sfc@${vuePkg.version}.\nPlease upgrade your @vue/compiler-sfc@${vueCompilerPkg.version} version.`,
-                ),
-            );
-            process.exit(1);
-        }
-    });
-};
--- a/packages/fes-runtime/package.json
+++ b/packages/fes-runtime/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/runtime",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.4",
  "description": "@fesjs/runtime",
  "main": "es/index.js",
  "module": "es/index.js",
@ -27,7 +27,7 @@
    "access": "public"
  },
  "peerDependencies": {
-    "vue": "^3.0.5"
+    "vue": "^3.2.37"
  },
  "dependencies": {
    "vue-router": "^4.0.1"
--- a/packages/fes-template-h5/package.json
+++ b/packages/fes-template-h5/package.json
@ -40,15 +40,14 @@
    "access": "public"
  },
  "devDependencies": {
-    "@ttou/postcss-px-to-viewport": "1.1.4",
-    "@vue/compiler-sfc": "^3.2.2"
+    "@ttou/postcss-px-to-viewport": "1.1.4"
  },
  "dependencies": {
    "@fesjs/fes": "^3.0.0-beta.0",
    "@fesjs/plugin-icon": "^3.0.0-beta.0",
    "@fesjs/plugin-request": "^3.0.0-beta.0",
    "@fesjs/builder-webpack": "^3.0.0-beta.0",
-    "vue": "^3.2.2"
+    "vue": "^3.2.37"
  },
  "private": true
 }
--- a/packages/fes-template-vite/package.json
+++ b/packages/fes-template-vite/package.json
@ -61,8 +61,8 @@
    "@fesjs/plugin-windicss": "^3.0.0-beta.0",
    "cssnano": "^5.1.12",
    "pinia": "^2.0.11",
-    "vue": "^3.0.5",
+    "vue": "^3.2.37",
    "vuex": "^4.0.0"
  },
  "private": true
-}
+}
--- a/packages/fes-template/package.json
+++ b/packages/fes-template/package.json
@ -57,9 +57,9 @@
    "@fesjs/plugin-monaco-editor": "^3.0.0-beta.0",
    "@fesjs/plugin-windicss": "^3.0.0-beta.0",
    "@fesjs/plugin-pinia": "^3.0.0-beta.0",
-    "@fesjs/plugin-watermark":  "^3.0.0-beta.0",
+    "@fesjs/plugin-watermark": "^3.0.0-beta.0",
    "@fesjs/fes-design": "^0.5.0",
-    "vue": "^3.0.5",
+    "vue": "^3.2.37",
    "vuex": "^4.0.0",
    "pinia": "^2.0.11"
  },
--- a/scripts/release.mjs
+++ b/scripts/release.mjs
@ -43,7 +43,7 @@ async function publishPackage(pkg, runIfNotDry) {
                stdio: 'pipe',
            },
        );
-        console.log(chalk.green(`Successfully published ${pkg.name}@${pkg.newVersion}`));
+        console.log('Successfully published :', chalk.green(`${pkg.name}@${pkg.newVersion}`));
    } catch (e) {
        if (e.stderr.match(/previously published/)) {
            console.log(chalk.red(`Skipping already published: ${pkg.name}`));
--- a/yarn.lock
+++ b/yarn.lock