Skip to content

Commit c82c2f7

Browse files
committed
format files
1 parent 9c50df1 commit c82c2f7

File tree

7 files changed

+109
-89
lines changed

7 files changed

+109
-89
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
/explorer-v2/build-system/shim/eslint-scope.*
1313
/explorer-v2/build-system/shim/eslint-plugin-svelte3.*
1414
/explorer-v2/build-system/shim/eslint.*
15+
!/.vscode
16+
!/.github

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ module.exports = {
1414
"plugin:@ota-meshi/+prettier",
1515
"plugin:@ota-meshi/+package-json",
1616
"plugin:@ota-meshi/+json",
17+
"plugin:@ota-meshi/+yaml",
1718
],
1819
rules: {
1920
"no-lonely-if": "off",

.github/workflows/GHPages.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ jobs:
99
deploy-docs:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
13-
- uses: actions/setup-node@v3
14-
- name: Install And Build
15-
run: |+
16-
yarn install
17-
yarn build
18-
cd explorer-v2
19-
yarn install
20-
yarn pre-build
21-
yarn build
22-
- name: Deploy
23-
uses: peaceiris/actions-gh-pages@v3
24-
with:
25-
github_token: ${{ secrets.GITHUB_TOKEN }}
26-
publish_dir: ./explorer-v2/build
27-
force_orphan: true
12+
- uses: actions/checkout@v3
13+
- uses: actions/setup-node@v3
14+
- name: Install And Build
15+
run: |+
16+
yarn install
17+
yarn build
18+
cd explorer-v2
19+
yarn install
20+
yarn pre-build
21+
yarn build
22+
- name: Deploy
23+
uses: peaceiris/actions-gh-pages@v3
24+
with:
25+
github_token: ${{ secrets.GITHUB_TOKEN }}
26+
publish_dir: ./explorer-v2/build
27+
force_orphan: true

.github/workflows/NodeCI.yml

Lines changed: 66 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -10,75 +10,90 @@ jobs:
1010
lint:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
14-
- uses: actions/setup-node@v3
15-
- name: Install Packages
16-
run: yarn install
17-
- name: Lint
18-
run: yarn lint
13+
- uses: actions/checkout@v3
14+
- uses: actions/setup-node@v3
15+
- name: Install Packages
16+
run: yarn install
17+
- name: Lint
18+
run: yarn lint
1919
test:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
2323
node-version: [12.x, 14.x, 16.x, 17.x]
2424
steps:
25-
- uses: actions/checkout@v3
26-
- name: Use Node.js ${{ matrix.node-version }}
27-
uses: actions/setup-node@v3
28-
with:
29-
node-version: ${{ matrix.node-version }}
30-
- name: Install Packages
31-
run: yarn install --ignore-engines
32-
- name: Test
33-
run: yarn test
25+
- uses: actions/checkout@v3
26+
- name: Use Node.js ${{ matrix.node-version }}
27+
uses: actions/setup-node@v3
28+
with:
29+
node-version: ${{ matrix.node-version }}
30+
- name: Install Packages
31+
run: yarn install --ignore-engines
32+
- name: Test
33+
run: yarn test
3434
test-for-ts-eslint-v4:
3535
runs-on: ubuntu-latest
3636
strategy:
3737
matrix:
3838
node-version: [14.x]
3939
steps:
40-
- uses: actions/checkout@v3
41-
- name: Use Node.js ${{ matrix.node-version }}
42-
uses: actions/setup-node@v3
43-
with:
44-
node-version: ${{ matrix.node-version }}
45-
- name: Install @typescript-eslint v4
46-
run: |+
47-
yarn add -D @typescript-eslint/parser@4 @typescript-eslint/eslint-plugin@4 eslint@7 --ignore-engines
48-
rm -rf node_modules
49-
- name: Install Packages
50-
run: yarn install --ignore-engines
51-
- name: Test
52-
run: yarn test
40+
- uses: actions/checkout@v3
41+
- name: Use Node.js ${{ matrix.node-version }}
42+
uses: actions/setup-node@v3
43+
with:
44+
node-version: ${{ matrix.node-version }}
45+
- name: Install @typescript-eslint v4
46+
run: |+
47+
yarn add -D @typescript-eslint/parser@4 @typescript-eslint/eslint-plugin@4 eslint@7 --ignore-engines
48+
rm -rf node_modules
49+
- name: Install Packages
50+
run: yarn install --ignore-engines
51+
- name: Test
52+
run: yarn test
5353
test-for-eslint-v7:
5454
runs-on: ubuntu-latest
5555
strategy:
5656
matrix:
5757
node-version: [14.x]
5858
steps:
59-
- uses: actions/checkout@v3
60-
- name: Use Node.js ${{ matrix.node-version }}
61-
uses: actions/setup-node@v3
62-
with:
63-
node-version: ${{ matrix.node-version }}
64-
- name: Install eslint v7
65-
run: |+
66-
yarn add -D eslint@7 --ignore-engines
67-
rm -rf node_modules
68-
- name: Install Packages
69-
run: yarn install --ignore-engines
70-
- name: Test
71-
run: yarn test
59+
- uses: actions/checkout@v3
60+
- name: Use Node.js ${{ matrix.node-version }}
61+
uses: actions/setup-node@v3
62+
with:
63+
node-version: ${{ matrix.node-version }}
64+
- name: Install eslint v7
65+
run: |+
66+
yarn add -D eslint@7 --ignore-engines
67+
rm -rf node_modules
68+
- name: Install Packages
69+
run: yarn install --ignore-engines
70+
- name: Test
71+
run: yarn test
72+
update-fixtures:
73+
runs-on: ubuntu-latest
74+
steps:
75+
- uses: actions/checkout@v3
76+
- uses: actions/setup-node@v3
77+
with:
78+
node-version: 18
79+
- name: Install Packages
80+
run: yarn install --ignore-engines
81+
- name: Update fixtures
82+
run: yarn update-fixtures
83+
- name: Check changes
84+
run: |
85+
git add --all && \
86+
git diff-index --cached HEAD --stat --exit-code
7287
test-and-coverage:
7388
runs-on: ubuntu-latest
7489
steps:
75-
- uses: actions/checkout@v3
76-
- uses: actions/setup-node@v3
77-
- name: Install Packages
78-
run: yarn install --ignore-engines
79-
- name: Test
80-
run: yarn cover
81-
- name: Coveralls GitHub Action
82-
uses: coverallsapp/github-action@1.1.3
83-
with:
84-
github-token: ${{ secrets.GITHUB_TOKEN }}
90+
- uses: actions/checkout@v3
91+
- uses: actions/setup-node@v3
92+
- name: Install Packages
93+
run: yarn install --ignore-engines
94+
- name: Test
95+
run: yarn cover
96+
- name: Coveralls GitHub Action
97+
uses: coverallsapp/github-action@1.1.3
98+
with:
99+
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/NpmPublish.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ jobs:
88
name: check version, and release
99
runs-on: ubuntu-latest
1010
steps:
11-
- name: checkout
12-
uses: actions/checkout@v3
13-
- name: setup Node
14-
uses: actions/setup-node@v3
15-
with:
16-
registry-url: 'https://registry.npmjs.org'
17-
- name: Install Packages
18-
run: yarn install
19-
- name: test and build
20-
run: |
21-
yarn build
22-
yarn test
23-
- name: check can npm-publish
24-
run: npx can-npm-publish
25-
- name: release
26-
run: npm publish
27-
env:
28-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
11+
- name: checkout
12+
uses: actions/checkout@v3
13+
- name: setup Node
14+
uses: actions/setup-node@v3
15+
with:
16+
registry-url: "https://registry.npmjs.org"
17+
- name: Install Packages
18+
run: yarn install
19+
- name: test and build
20+
run: |
21+
yarn build
22+
yarn test
23+
- name: check can npm-publish
24+
run: npx can-npm-publish
25+
- name: release
26+
run: npm publish
27+
env:
28+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.vscode/settings.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
"typescript",
77
"json",
88
"jsonc",
9-
"svelte"
9+
"svelte",
10+
"yaml"
1011
],
1112
"typescript.validate.enable": true,
1213
"javascript.validate.enable": false,
1314
"typescript.tsdk": "node_modules/typescript/lib",
1415
"editor.codeActionsOnSave": {
15-
"source.fixAll.eslint": true,
16+
"source.fixAll.eslint": true
1617
},
1718
"vetur.validation.template": false
18-
}
19+
}

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"debug": "yarn mocha \"tests/src/**/*.ts\" --reporter dot --timeout 60000",
3333
"eslint-fix": "yarn lint --fix",
3434
"eslint-playground": "eslint tests/fixtures --ext .svelte --config .eslintrc-for-playground.js --format codeframe",
35-
"lint": "eslint . --ext .js,.ts,.json,.svelte",
35+
"lint": "eslint . --ext .js,.ts,.json,.yaml,.yml,.svelte",
3636
"mocha": "yarn ts ./node_modules/mocha/bin/mocha.js",
3737
"prebuild": "yarn clean",
3838
"preversion": "yarn lint && yarn test",
@@ -77,6 +77,7 @@
7777
"eslint-plugin-svelte": "^2.0.0",
7878
"eslint-plugin-svelte3": "^4.0.0",
7979
"eslint-plugin-vue": "^9.0.0",
80+
"eslint-plugin-yml": "^1.0.0",
8081
"estree-walker": "^3.0.0",
8182
"locate-character": "^2.0.5",
8283
"magic-string": "^0.26.0",

0 commit comments

Comments
 (0)