Skip to content

Commit 9132c2f

Browse files
woothuwoothu
committed
chore: merge branch 'dev' into v3-next
2 parents b8636c7 + c473182 commit 9132c2f

File tree

75 files changed

+4226
-3181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+4226
-3181
lines changed

‎CONTRIBUTING.md renamed to ‎.github/CONTRIBUTING.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Guidelines for bug reports:
3636

3737
1. **Use the GitHub issue search** — check if the issue has already been reported.
3838

39-
2. **Check if the issue has been fixed** — try to reproduce it using the latest `master` or development branch in the repository.
39+
2. **Check if the issue has been fixed** — try to reproduce it using the latest `master` or `dev` branch in the repository.
4040

4141
3. **Isolate the problem** — ideally create a [reduced test case](https://css-tricks.com/reduced-test-cases/) and a live example. [This JS Bin](http://jsbin.com/lefey/1/edit?html,output) is a helpful template.
4242

@@ -101,11 +101,11 @@ included in the project:
101101
2. If you cloned a while ago, get the latest changes from upstream:
102102

103103
```bash
104-
git checkout master
105-
git pull upstream master
104+
git checkout dev
105+
git pull upstream dev
106106
```
107107

108-
3. Create a new topic branch (off the main project development branch) to
108+
3. Create a new topic branch (off the development branch "dev") to
109109
contain your feature, change, or fix:
110110

111111
```bash
@@ -121,7 +121,7 @@ included in the project:
121121
5. Locally merge (or rebase) the upstream development branch into your topic branch:
122122

123123
```bash
124-
git pull [--rebase] upstream master
124+
git pull [--rebase] upstream dev
125125
```
126126

127127
6. Push your topic branch up to your fork:
@@ -130,7 +130,7 @@ included in the project:
130130
git push origin <topic-branch-name>
131131
```
132132

133-
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title and description against the `master` branch.
133+
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title and description into the `dev` branch.
134134

135135
**IMPORTANT**: By submitting a patch, you agree to allow the project owners to license your work under the terms of the [MIT License](LICENSE).
136136

@@ -144,7 +144,7 @@ Inspired by Sparkbox's awesome article on [semantic commit messages](http://sees
144144
- fix (bug fix) -> ```git commit -m 'fix: commit-message-here'```
145145
- refactor (refactoring production code) -> ```git commit -m 'refactor: commit-message-here'```
146146
- style (formatting, missing semi colons, etc; no code change) -> ```git commit -m 'style: commit-message-here'```
147-
- test (adding missing tests, refactoring tests; no production code change) -> ```git test -m 'refactor: commit-message-here'```
147+
- test (adding missing tests, refactoring tests; no production code change) -> ```git commit -m 'test: commit-message-here'```
148148

149149
## Code guidelines
150150

‎ISSUE_TEMPLATE.md renamed to ‎.github/ISSUE_TEMPLATE.md

File renamed without changes.

‎.github/workflows/daily-project-check.yml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Daily project check
2+
3+
on:
4+
schedule:
5+
# build runs everyday at 6AM UTC
6+
- cron: '0 6 * * *'
7+
8+
jobs:
9+
build:
10+
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
node-version: [8.x, 10.x, 12.x]
16+
os: [ubuntu-latest, windows-latest, macOS-latest]
17+
18+
steps:
19+
- uses: actions/checkout@v1
20+
- name: Use Node.js ${{ matrix.node-version }}
21+
uses: actions/setup-node@v1
22+
with:
23+
node-version: ${{ matrix.node-version }}
24+
- name: project check
25+
run: |
26+
npm i
27+
npm run clearCache
28+
npm run build
29+
npm run lint
30+
npm run test:unit
31+
env:
32+
CI: true
33+
34+
e2e-chrome:
35+
36+
runs-on: windows-latest
37+
38+
steps:
39+
- uses: actions/checkout@v1
40+
- name: Use Node.js 12
41+
uses: actions/setup-node@v1
42+
with:
43+
node-version: 12
44+
- name: e2e chrome test
45+
run: |
46+
npm i
47+
npm run test:e2e
48+
env:
49+
BROWSER: chrome

‎.github/workflows/project-check.yml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Project check
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
build:
9+
10+
runs-on: ubuntu-latest
11+
12+
strategy:
13+
matrix:
14+
node-version: [8.x, 10.x, 12.x]
15+
os: [ubuntu-latest, windows-latest, macOS-latest]
16+
17+
steps:
18+
- uses: actions/checkout@v1
19+
- name: Use Node.js ${{ matrix.node-version }}
20+
uses: actions/setup-node@v1
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
- name: project check
24+
run: |
25+
npm i
26+
npm run clearCache
27+
npm run build
28+
npm run lint
29+
npm run test:unit
30+
env:
31+
CI: true
32+
33+
e2e-chrome:
34+
35+
runs-on: windows-latest
36+
37+
steps:
38+
- uses: actions/checkout@v1
39+
- name: Use Node.js 12
40+
uses: actions/setup-node@v1
41+
with:
42+
node-version: 12
43+
- name: e2e chrome test
44+
run: |
45+
npm i
46+
npm run test:e2e
47+
env:
48+
BROWSER: chrome

‎README.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
[![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=CoreUI%20-%20Free%20Vue%20Admin%20Template%20&url=http://coreui.io/vue/&hashtags=bootstrap,admin,template,dashboard,panel,free,angular,react,vue)
44
[![NPM][npm-coreui-vue-badge-latest]][npm-coreui-vue]
55
[![Downloads](https://img.shields.io/npm/dm/@coreui/vue.svg?style=flat-square)][coreui]
6-
[![Jest](https://img.shields.io/badge/Jest-^24.9.0-blue.svg?style=flat-square)][coreui]
7-
[![Vue](https://img.shields.io/badge/Vue-^2.6.10-brightgreen.svg?style=flat-square)][coreui]
6+
[![Vue](https://img.shields.io/badge/Vue-^2.6.11-brightgreen.svg?style=flat-square)][coreui]
87

98
[npm-coreui-vue]: https://www.npmjs.com/package/@coreui/vue
109
[npm-coreui-vue-badge-latest]: https://img.shields.io/npm/v/@coreui/vue/latest?style=flat-square&color=brightgreen
@@ -97,7 +96,7 @@ Have a bug or a feature request? [Please open a new issue](https://github.com/co
9796

9897
### Contributing
9998

100-
Please read through our [contributing guidelines](https://github.com/coreui/coreui-free-vue-admin-template/blob/v3-next/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
99+
Please read through our [contributing guidelines](https://github.com/coreui/coreui-free-vue-admin-template/blob/v3-next/.github/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
101100

102101
### Versioning
103102

@@ -146,7 +145,7 @@ Some of projects created by community but not maintained by CoreUI team.
146145

147146
## Copyright and license
148147

149-
Copyright 2019 creativeLabs Łukasz Holeczek. Code released under [the MIT license](https://github.com/coreui/coreui-free-vue-admin-template/blob/master/LICENSE).
148+
Copyright 2020 creativeLabs Łukasz Holeczek. Code released under [the MIT license](https://github.com/coreui/coreui-free-vue-admin-template/blob/master/LICENSE).
150149
There is only one limitation - you cannot re-distribute the `CoreUI` as stock nor if you modify the `CoreUI`. In the past we faced some problems with persons who tried to sell `CoreUI` based templates.
151150

152151
## Support CoreUI Development

‎babel.config.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
module.exports = {
22
presets: [
3-
['@babel/preset-env']
3+
[
4+
'@babel/preset-env',
5+
{
6+
useBuiltIns: 'entry',
7+
corejs: 3
8+
}
9+
]
410
]
511
}

0 commit comments

Comments
 (0)