Skip to content

Commit 10eab7e

Browse files
fiskerfisker
committed
chore: update project config
1 parent c357b75 commit 10eab7e

12 files changed

+137
-59
lines changed

‎.eslintignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ignore file for `eslint`
22
#
3-
# update: wget -O .eslintignore https://git.io/fhNp3
3+
# update: wget -O .eslintignore https://git.io/fjVjo
44
# document: https://eslint.org/docs/user-guide/configuring#eslintignore
55
#
66

@@ -14,17 +14,14 @@ node_modules/**
1414
**/third-party/**
1515

1616
# build file
17-
lib/**
1817
dist/**
1918
**/*.min.*
2019

2120
# fixtures
2221
**/fixtures/**
2322

2423
# test
25-
.nyc_outputs/**
24+
.nyc_output/**
2625
coverage/**
2726

2827
# project glob
29-
**/node_modules/**
30-
**/dist/**

‎.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* config file for `eslint`
33
*
4-
* update: wget -O .eslintrc.js https://git.io/fjJKA
4+
* update: wget -O .eslintrc.js https://git.io/fjVjK
55
* document: https://eslint.org/docs/user-guide/configuring
66
*/
77

‎.github/workflows/continuous-integration.yml

Lines changed: 109 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,109 @@ on:
55
branches:
66
- master
77
pull_request:
8+
# schedule:
9+
# - cron: "0 23 * * 6"
810

911
jobs:
10-
lint:
12+
test:
1113
strategy:
12-
fail-fast: false
14+
matrix:
15+
PLATFORM:
16+
- "ubuntu-latest"
17+
# - "macos-latest"
18+
# - "windows-latest"
19+
NODE:
20+
# - "13"
21+
- "12"
22+
# - "10"
23+
# exclude:
24+
# - PLATFORM: "macos-latest"
25+
# NODE: "12"
26+
27+
name: Test on node ${{ matrix.NODE }} and ${{ matrix.PLATFORM }}
28+
runs-on: ${{ matrix.PLATFORM }}
29+
steps:
30+
- name: Checkout
31+
uses: actions/checkout@master
32+
33+
- name: Setup Node.js
34+
uses: actions/setup-node@master
35+
with:
36+
node-version: ${{ matrix.NODE }}
37+
38+
- name: Install Dependencies
39+
run: yarn
40+
41+
- name: Run Test
42+
run: yarn test
43+
44+
# - name: Upload Coverage Parallel
45+
# uses: coverallsapp/github-action@master
46+
# if: success()
47+
# with:
48+
# github-token: ${{ secrets.GITHUB_TOKEN }}
49+
# parallel: true
50+
# - name: Upload Coverage Finished
51+
# uses: coverallsapp/github-action@master
52+
# if: success()
53+
# with:
54+
# github-token: ${{ secrets.GITHUB_TOKEN }}
55+
# parallel-finished: true
56+
57+
# test-dist:
58+
# strategy:
59+
# matrix:
60+
# PLATFORM:
61+
# - "ubuntu-latest"
62+
# # - "macos-latest"
63+
# # - "windows-latest"
64+
# NODE:
65+
# # - "13"
66+
# - "12"
67+
# # - "10"
68+
# # exclude:
69+
# # - PLATFORM: "macos-latest"
70+
# # NODE: "12"
71+
72+
# name: Test on node ${{ matrix.NODE }} and ${{ matrix.PLATFORM }}
73+
# runs-on: ${{ matrix.PLATFORM }}
74+
# needs: [build]
75+
# steps:
76+
# - name: Checkout
77+
# uses: actions/checkout@master
78+
79+
# - name: Setup Node.js
80+
# uses: actions/setup-node@master
81+
# with:
82+
# node-version: ${{ matrix.NODE }}
83+
84+
# - name: Install Dependencies
85+
# run: yarn
86+
87+
# - name: Download Artifact
88+
# uses: actions/download-artifact@master
89+
# with:
90+
# name: dist
91+
# path: dist
92+
93+
# - name: Run Test
94+
# run: yarn test-coverage
95+
96+
# - name: Upload Coverage Parallel
97+
# uses: coverallsapp/github-action@master
98+
# if: success()
99+
# with:
100+
# github-token: ${{ secrets.GITHUB_TOKEN }}
101+
# parallel: true
102+
103+
# - name: Upload Coverage Finished
104+
# uses: coverallsapp/github-action@master
105+
# if: success()
106+
# with:
107+
# github-token: ${{ secrets.GITHUB_TOKEN }}
108+
# parallel-finished: true
109+
110+
lint:
13111
name: Lint
14112
runs-on: ubuntu-latest
15113
steps:
@@ -21,35 +119,17 @@ jobs:
21119
- name: Setup Node.js
22120
uses: actions/setup-node@master
23121
with:
24-
node-version: 10.x
122+
node-version: "12"
25123

26124
- name: Install Dependencies
27125
run: yarn
28126

29127
- name: Run Lint
30128
run: yarn lint
31129

32-
test:
33-
strategy:
34-
fail-fast: false
35-
matrix:
36-
PLATFORM:
37-
- ubuntu-latest
38-
# - macos-latest
39-
# - windows-latest
40-
NODE:
41-
- 12.x
42-
- 10.x
43-
# exclude:
44-
# - PLATFORM: macos-latest
45-
# NODE: 12.x
46-
# - PLATFORM: windows-latest
47-
# NODE: 12.x
48-
49-
name: Test on node ${{ matrix.NODE }} and ${{ matrix.PLATFORM }}
50-
51-
runs-on: ${{ matrix.PLATFORM }}
52-
130+
build:
131+
name: Build
132+
runs-on: ubuntu-latest
53133
steps:
54134
- name: Checkout
55135
uses: actions/checkout@master
@@ -59,20 +139,15 @@ jobs:
59139
- name: Setup Node.js
60140
uses: actions/setup-node@master
61141
with:
62-
node-version: ${{ matrix.NODE }}
63-
64-
- name: Install lerna
65-
run: npm install --global lerna
142+
node-version: "12"
66143

67144
- name: Install Dependencies
68145
run: yarn
69146

70147
- name: Build Package
71148
run: yarn build
72-
73-
- name: Run Test
74-
run: yarn test
75-
# - name: Upload Coverage
76-
# uses: coverallsapp/github-action@master
149+
# - name: Upload Artifact
150+
# uses: actions/upload-artifact@master
77151
# with:
78-
# github-token: ${{ secrets.GITHUB_TOKEN }}
152+
# name: dist
153+
# path: dist

‎.gitignore

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# ignore file for git project
2+
#
3+
# update: wget -O .gitignore https://git.io/fjXI5
4+
#
5+
16
# Base on https://www.gitignore.io/api/node
27

38
### Node ###
@@ -88,5 +93,4 @@ typings/
8893
.dynamodb/
8994

9095
# project ignore files
91-
.vscode/
92-
packages/*/dist/
96+
dist/

‎.huskyrc.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
/*!
22
* config file for `husky`
33
*
4-
* update: wget-O .huskyrc.js https://git.io/fhNpR
4+
* update: wget -O .huskyrc.js https://git.io/fjVjy
55
* document: https://git.io/fhNph
66
*/
77

8+
/* @fisker/husky-config https://git.io/fjCe9 */
9+
810
module.exports = require('@self/husky-config')

‎.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
save-prefix=""
2+
package-lock=false

‎.prettierignore

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ignore file for `prettier`
22
#
3-
# update: wget -O .prettierignore https://git.io/fhNj3
3+
# update: wget -O .prettierignore https://git.io/fjVj5
44
# document: https://prettier.io/docs/en/ignore.html#ignoring-files
55
#
66

@@ -14,18 +14,14 @@ node_modules/**
1414
**/third-party/**
1515

1616
# build file
17-
lib/**
1817
dist/**
1918
**/*.min.*
2019

2120
# fixtures
2221
**/fixtures/**
2322

2423
# test
25-
.nyc_outputs/**
24+
.nyc_output/**
2625
coverage/**
2726

2827
# project glob
29-
**/node_modules/**
30-
**/dist/**
31-

‎commitlint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* config file for `commitlint`
33
*
4-
* update: wget -O commitlint.config.js https://git.io/fhAJV
4+
* update: wget -O commitlint.config.js https://git.io/fjVj4
55
* document: https://git.io/fhAJa
66
*/
77

‎lint-staged.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* config file for `lint-staged`
33
*
4-
* update: wget -O lint-staged.config.js https://git.io/fhNpr
4+
* update: wget -O lint-staged.config.js https://git.io/fjVj9
55
* document: https://git.io/fhNpF
66
*
77
*/

‎package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@
2727
"dist": "lerna publish",
2828
"format": "run-p format:*",
2929
"format:eslint": "yarn lint:eslint --fix",
30-
"format:prettier": "prettier **/*.{css,html,js,json,less,md,scss,ts,vue,yaml,yml} --write",
30+
"format:markdown": "yarn lint:markdown --fix",
31+
"format:prettier": "yarn lint:prettier --write",
3132
"format:sort-package-json": "sort-package-json \"package.json\" \"packages/*/package.json\"",
3233
"lint": "run-p lint:*",
33-
"lint:eslint": "eslint **/*.{js,mjs,vue}",
34-
"lint:markdown": "markdownlint **/*.md --ignore \"**/node_modules/**\"",
35-
"lint:prettier": "prettier **/*.{css,html,js,json,less,md,scss,ts,vue,yaml,yml} --check",
34+
"lint:eslint": "eslint \"**/*.{js,mjs,vue}\"",
35+
"lint:markdown": "markdownlint \"**/*.md\" --ignore \"**/node_modules/**\"",
36+
"lint:prettier": "prettier \"**/*.{css,html,js,json,less,md,scss,ts,vue,yaml,yml}\" --check",
3637
"release": "run-s clean build format lint test dist",
3738
"test": "lerna run test"
3839
},
3940
"config": {
4041
"commitizen": {
41-
"path": "./node_modules/cz-conventional-changelog-emoji"
42+
"path": "./node_modules/cz-conventional-changelog"
4243
}
4344
},
4445
"devDependencies": {
@@ -49,7 +50,7 @@
4950
"@self/lint-staged-config": "npm:@fisker/[email protected]",
5051
"@self/prettier-config": "npm:@fisker/[email protected]",
5152
"ava": "2.4.0",
52-
"cz-conventional-changelog-emoji": "0.1.0",
53+
"cz-conventional-changelog": "3.0.2",
5354
"del-cli": "3.0.0",
5455
"eslint": "6.7.1",
5556
"esm": "3.2.25",

‎prettier.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* config file for `prettier`
33
*
4-
* update: wget -O prettier.config.js https://git.io/fjJKh
4+
* update: wget -O prettier.config.js https://git.io/fjVjd
55
* document: https://prettier.io/docs/en/options.html
66
*/
77

‎renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"extends": [
3-
"@fisker"
3+
"@fisker",
4+
":assignee(fisker)"
45
]
56
}

0 commit comments

Comments
 (0)