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

.github/actions/generate-changelog/action.yml

@@ -0,0 +1,21 @@
+
+name: Generate changelog
+description: Uses conventional-changelog to generate the changelog from a tag to another
+
+inputs:
+  from:
+    description: Old tag
+  to:
+    description: New tag
+
+outputs:
+  changelog:
+    description: The new changelog, formatted as a JSON string
+
+runs:
+  using: node12
+  main: main.js
+
+branding:
+  icon: clock
+  color: yellow

.github/actions/generate-changelog/main.js

@@ -0,0 +1,14 @@
+
+const cp = require("child_process");
+cp.execSync(`cd ${__dirname}; npm ci`);
+
+const path = require("path");
+const core = require("@actions/core");
+const lernaChangelog = path.resolve(__dirname, "node_modules/.bin/conventional-changelog");
+
+const exec = cmd => cp.execSync(cmd).toString().trim();
+
+const changelog = exec(`node ${lernaChangelog}  -p cmyr-config -r 2`);
+console.log(changelog);
+
+core.setOutput("changelog", JSON.stringify(changelog.split('\n').slice(4).join('\n')));

.github/actions/generate-changelog/package.json

@@ -0,0 +1,12 @@
+{
+    "private": true,
+    "name": "update-changelog",
+    "version": "1.0.0",
+    "license": "MIT",
+    "dependencies": {
+        "@actions/core": "^1.0.0",
+        "conventional-changelog-cli": "^2.1.0",
+        "conventional-changelog-cmyr-config": "^1.2.3",
+        "cz-conventional-changelog": "^3.3.0"
+    }
+}

.github/workflows/release.yml

@@ -0,0 +1,53 @@
+name: Release
+
+on:
+  push:
+    tags: ["v*"]
+
+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

.gitignore

@@ -4,8 +4,10 @@
 .vscode
 .history
 .cache
+*.log
 node_modules
 npm-debug.log
 /packages/fes-template/dist
 /packages/fes-doc/docs/.vuepress/dist
-package-lock.json
+
+/.changelog

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+<!-- DO NOT CHANGE THESE COMMENTS - See .github/actions/trigger-github-release/update-changelog.js -->
+<!-- insert-new-changelog-here -->
+## [0.2.1](https://github.com/WeBankFinTech/fes/compare/v0.2.0...v0.2.1) (2020-09-20)
+
+
+### 🐛 Bug Fixes
+
+* **fes-template:** solve the corejs3.x dependency problem ([e3e43c3](https://github.com/WeBankFinTech/fes/commit/e3e43c3))
+
+## 0.2.0
+
+### 🚀 New Feature
+
+1. fes-cli 构架支持 gzip
+2. fes-cli 支持路由懒加载
+3. 添加在线[demo](http://webank.gitee.io/fes-pro/#/home)
+
+### 🐛 Bug Fix
+
+1. fes-cli 支持 global 全局安装，关闭[issues/17](https://github.com/WeBankFinTech/fes.js/issues/17) 
+2. 解决 layout布局的FesHeader和FesLeft不生效问题
+3. 更新文档中描述不准备的地方。
+
 ## 0.1.0
 
 ### 功能改进

commitlint.config.js

@@ -0,0 +1 @@
+module.exports = { extends: ['@commitlint/config-conventional'] };

lerna.json

@@ -1,7 +1,35 @@
 {
+  "version": "0.2.1",
+  "changelog": {
+    "repo": "WeBankFinTech/fes.js",
+    "cacheDir": ".changelog",
+    "labels": {
+      "PR: Spec Compliance :eyeglasses:": ":eyeglasses: Spec Compliance",
+      "PR: Breaking Change :boom:": ":boom: Breaking Change",
+      "PR: New Feature :rocket:": ":rocket: New Feature",
+      "PR: Bug Fix :bug:": ":bug: Bug Fix",
+      "PR: Polish :nail_care:": ":nail_care: Polish",
+      "PR: Docs :memo:": ":memo: Documentation",
+      "PR: Internal :house:": ":house: Internal",
+      "PR: Performance :running_woman:": ":running_woman: Performance",
+      "PR: Revert :leftwards_arrow_with_hook:": ":leftwards_arrow_with_hook: Revert"
+    }
+  },
+  "command": {
+    "publish": {
+      "ignoreChanges": [
+        "*.md",
+        "**/test/**"
+      ],
+      "message": "chore(release): publish"
+    }
+  },
   "packages": [
     "packages/*"
   ],
-  "version": "independent",
-  "npmClient": "npm"
+  "npmClient": "npm",
+  "ignoreChanges": [
+    "**/test/**",
+    "**/*.md"
+  ]
 }

package.json

@@ -4,7 +4,9 @@
   "description": "一个好用的前端管理台快速开发框架",
   "preferGlobal": true,
   "scripts": {
-    "bootstrap": "lerna bootstrap"
+    "bootstrap": "lerna bootstrap",
+    "version": "lerna version --no-changelog --no-commit-hooks --no-private",
+    "publish": "lerna publish from-git"
   },
   "author": "harrywan qlin",
   "license": "MIT",
@@ -23,6 +25,28 @@
     "lerna": "^3.18.4"
   },
   "devDependencies": {
-    "@webank/eslint-config-webank": "^0.1.7"
+    "@commitlint/cli": "^11.0.0",
+    "@commitlint/config-conventional": "^11.0.0",
+    "@webank/eslint-config-webank": "^0.1.7",
+    "commitizen": "^4.2.1",
+    "cz-conventional-changelog": "^3.3.0",
+    "husky": "^4.3.0",
+    "lint-staged": "^10.4.0"
+  },
+  "lint-staged": {
+    "*.{js,fes,jsx,vue,ts}": [
+      "eslint --format=codeframe"
+    ]
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+    }
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
   }
 }

packages/fes-cli/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webank/fes-cli",
-    "version": "0.1.4",
+    "version": "0.2.0",
     "description": "一个好用的前端管理台快速开发框架",
     "preferGlobal": true,
     "scripts": {

packages/fes-core/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@webank/fes-core",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "description": "一个好用的前端管理台快速开发框架",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "harrywan,qlin",
   "repository": {
-      "type": "git",
-      "url": "https://github.com/WeBankFinTech/fes.js.git"
+    "type": "git",
+    "url": "https://github.com/WeBankFinTech/fes.js.git"
   },
   "license": "MIT",
   "keywords": [
@@ -27,7 +27,6 @@
     "vue-template-compiler": "^2.6.10"
   },
   "peerDependencies": {
-    "@webank/fes-core": "^0.1.0",
     "@webank/fes-ui": "^0.1.0"
   }
 }

packages/fes-doc/package.json

@@ -25,5 +25,6 @@
     },
     "dependencies": {
         "@webank/fes-ui": "^0.1.1"
-    }
+    },
+    "private": true
 }

packages/fes-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webank/fes-template",
-  "version": "0.1.4",
+  "version": "0.2.1",
   "description": "fes项目模版",
   "main": "index.js",
   "scripts": {
@@ -29,12 +29,12 @@
   "author": "harrywan qlin",
   "license": "MIT",
   "devDependencies": {
-    "csp-html-webpack-plugin": "^4.0.0",
-    "@webank/eslint-config-webank": "^0.1.4"
+    "@babel/runtime-corejs3": "^7.11.2",
+    "@webank/eslint-config-webank": "^0.1.4",
+    "csp-html-webpack-plugin": "^4.0.0"
   },
   "dependencies": {
-    "@webank/fes-core": "^0.1.1",
-    "@webank/fes-ui": "^0.1.1"
-  },
-  "peerDependencies": {}
+    "@webank/fes-core": "^0.2.1",
+    "@webank/fes-ui": "^0.2.0"
+  }
 }

packages/fes-ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webank/fes-ui",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "description": "基于Vue2.0，适用于PC管理端的组件库",
     "main": "dist/fes-ui.js",
     "scripts": {