Skip to content

Commit

Permalink
Merge branch 'master' into Slider
Browse files Browse the repository at this point in the history
  • Loading branch information
weiyongchao committed Dec 16, 2020
2 parents a5319dd + 05c5d93 commit ccf8156
Show file tree
Hide file tree
Showing 126 changed files with 142 additions and 13,252 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
- uses: actions/checkout@v2
- name: Install modules
run: yarn
- name: debugger
run: tree node_modules/element3/lib/
- name: Run Lint
run: yarn lint
UnitTest:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# [](https://github.com/hug-sun/element3/compare/v0.0.34...v) (2020-12-15)



# [](https://github.com/kkbjs/element3/compare/v0.0.28...v) (2020-12-11)


Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
"bootstrap": "yarn",
"build": "yarn workspace element3 build && yarn workspace website build",
"test": "yarn workspace element3 test",
"lint": "eslint --ext .js packages/element3/packages/** packages/*/src/** "
"lint": "eslint --ext .js packages/element3/packages/** packages/*/src/** ",
"release": "node scripts/release.js",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
},
"license": "MIT",
"gitHooks": {
Expand All @@ -19,13 +21,15 @@
"devDependencies": {
"@vue/eslint-config-prettier": "^6.0.0",
"babel-eslint": "^10.1.0",
"chalk": "^4.1.0",
"conventional-changelog-cli": "^2.1.1",
"cross-env": "^7.0.3",
"enquirer": "^2.3.6",
"eslint": "^7.15.0",
"eslint-plugin-json": "^2.1.2",
"eslint-plugin-prettier": "^3.2.0",
"eslint-plugin-vue": "^7.2.0",
"execa": "^5.0.0",
"lint-staged": "^10.5.3",
"minimist": "^1.2.5",
"prettier": "^2.2.1",
Expand Down
9 changes: 0 additions & 9 deletions packages/element3/CHANGELOG.md

This file was deleted.

6 changes: 2 additions & 4 deletions packages/element3/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "element3",
"version": "0.0.32",
"version": "0.0.34",
"description": "A Component Library for Vue3",
"main": "dist/element3-ui.cjs.js",
"module": "dist/element3-ui.esm-bundler.js",
Expand All @@ -22,9 +22,7 @@
"build:umd": "node build/bin/build-locale.js",
"i18n": "node build/bin/i18n.js",
"test": "jest --runInBand",
"dev": "rollup -wc",
"release": "node scripts/release.js",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
"dev": "rollup -wc"
},
"repository": {
"type": "git",
Expand Down
71 changes: 0 additions & 71 deletions packages/element3/scripts/release.js

This file was deleted.

1 change: 1 addition & 0 deletions packages/md-loader/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "md-loader",
"private": true,
"version": "1.0.0",
"description": "parse md to html",
"main": "src/index.js",
Expand Down
322 changes: 0 additions & 322 deletions packages/website/CHANGELOG.md

This file was deleted.

196 changes: 0 additions & 196 deletions packages/website/build/bin/build-entry.js

This file was deleted.

Loading

0 comments on commit ccf8156

Please sign in to comment.