Skip to content

Commit f30474a

Browse files
committed
Merge branch 'master' into Terminus
1 parent 1ad29d3 commit f30474a

Some content is hidden

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

68 files changed

+7182
-2034
lines changed

.eslintignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

.eslintrc.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"extends": "eslint-config-atomic",
3+
"ignorePatterns": ["dist/", "node_modules/", "spec/fixtures", "examples", "lib/grammars/*.coffee"]
4+
}

.eslintrc.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/CI.yml

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,40 +41,48 @@ jobs:
4141
with:
4242
fetch-depth: 0
4343
- name: Commit lint ✨
44-
uses: wagoid/commitlint-github-action@v1
45-
- uses: actions/setup-node@v2
44+
uses: wagoid/commitlint-github-action@v2
45+
46+
- uses: UziTech/action-setup-atom@v1
47+
- name: Setup PNPM
48+
uses: pnpm/[email protected]
4649
with:
47-
node-version: "12.x"
48-
- name: Install NPM dependencies
49-
run: |
50-
npm install
50+
version: latest
51+
52+
- name: Install dependencies
53+
run: pnpm install
54+
55+
- name: Format ✨
56+
run: pnpm test.format
57+
5158
- name: Lint ✨
52-
run: npm run lint
59+
run: pnpm test.lint
60+
61+
Release:
62+
needs: [Test, Lint]
63+
if: github.ref == 'refs/heads/master' &&
64+
github.event.repository.fork == false
65+
runs-on: ubuntu-latest
66+
steps:
67+
- uses: actions/checkout@v2
68+
- uses: UziTech/action-setup-atom@v1
69+
- uses: actions/setup-node@v1
70+
with:
71+
node-version: "12.x"
72+
- name: NPM install
73+
run: npm install
5374

54-
# Release:
55-
# needs: [Test, Lint]
56-
# if: github.ref == 'refs/heads/master' &&
57-
# github.event.repository.fork == false
58-
# runs-on: ubuntu-latest
59-
# steps:
60-
# - uses: actions/checkout@v2
61-
# - uses: UziTech/action-setup-atom@v1
62-
# - uses: actions/setup-node@v1
63-
# with:
64-
# node-version: "12.x"
65-
# - name: NPM install
66-
# run: npm install
67-
# - name: Build and Commit
68-
# run: npm run build-commit
69-
# # NOTE: uncomment when ready
70-
# # - name: Release 🎉
71-
# # uses: cycjimmy/semantic-release-action@v2
72-
# # with:
73-
# # extends: |
74-
# # @semantic-release/apm-config
75-
# # env:
76-
# # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77-
# # ATOM_ACCESS_TOKEN: ${{ secrets.ATOM_ACCESS_TOKEN }}
75+
# - name: Build and Commit
76+
# run: npm run build-commit
77+
78+
- name: Release 🎉
79+
uses: cycjimmy/semantic-release-action@v2
80+
with:
81+
extends: |
82+
@semantic-release/apm-config
83+
env:
84+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
85+
ATOM_ACCESS_TOKEN: ${{ secrets.ATOM_ACCESS_TOKEN }}
7886

7987
Skip:
8088
if: contains(github.event.head_commit.message, '[skip ci]')

.github/workflows/bump_deps.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,27 @@ name: Bump_Dependencies
22

33
on:
44
schedule:
5-
- cron: "0 0 * * *"
5+
- cron: "5 8 * * Sun" # 8:05 every Sunday
66

77
jobs:
88
Bump_Dependencies:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v2
12-
- uses: actions/setup-node@v2-beta
12+
- uses: actions/setup-node@v2
1313
with:
1414
node-version: "12"
15+
- name: Setup PNPM
16+
uses: pnpm/action-setup@master
17+
with:
18+
version: latest
1519

1620
- name: setup npm-check-updates
17-
run: npm install -g npm-check-updates
21+
run: pnpm install -g npm-check-updates
1822

1923
- run: |
2024
ncu -u --dep prod
21-
npm install
22-
25+
pnpm install
2326
2427
- uses: tibdex/github-app-token@v1
2528
id: generate-token
@@ -29,26 +32,29 @@ jobs:
2932
- uses: peter-evans/create-pull-request@v3
3033
with:
3134
token: ${{ steps.generate-token.outputs.token }}
32-
commit-message: Update Dependencies
33-
title: "fix: Update Dependencies"
35+
commit-message: "fix: update Dependencies"
36+
title: "fix: update Dependencies"
3437
labels: Dependencies
3538
branch: "Bump_Dependencies"
3639

37-
3840
Bump_devDependencies:
3941
runs-on: ubuntu-latest
4042
steps:
4143
- uses: actions/checkout@v2
42-
- uses: actions/setup-node@v2-beta
44+
- uses: actions/setup-node@v2
4345
with:
4446
node-version: "12"
47+
- name: Setup PNPM
48+
uses: pnpm/action-setup@master
49+
with:
50+
version: latest
4551

4652
- name: setup npm-check-updates
47-
run: npm install -g npm-check-updates
53+
run: pnpm install -g npm-check-updates
4854

4955
- run: |
5056
ncu -u --dep dev
51-
npm install
57+
pnpm install
5258
5359
- uses: tibdex/github-app-token@v1
5460
id: generate-token
@@ -58,7 +64,7 @@ jobs:
5864
- uses: peter-evans/create-pull-request@v3
5965
with:
6066
token: ${{ steps.generate-token.outputs.token }}
61-
commit-message: Update devDependencies
62-
title: "chore: Update devDependencies"
67+
commit-message: "chore: update devDependencies"
68+
title: "chore: update devDependencies"
6369
labels: Dependencies
6470
branch: "Bump_devDependencies"

.mailmap

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
Alexey Slaykovsky <[email protected]> Alexey Slaykovsky <[email protected]>
2-
Andy Hayden <[email protected]> Andy Hayden <[email protected]>
3-
Ash Wilson <[email protected]> Ash Wilson <[email protected]>
4-
Calvin Bottoms <[email protected]> Calvin Bottoms <[email protected]>
5-
6-
Christian Kjaer Laustsen <[email protected]> Christian Kjaer Laustsen <[email protected]>
7-
Ciaran Downey <[email protected]> Ciaran Downey <[email protected]>
8-
9-
Daniel Bayley <[email protected]> Daniel Bayley <[email protected]>
10-
Daniel Chatfield <[email protected]> Daniel Chatfield <[email protected]>
11-
Dustin Blackman <[email protected]> Dustin Blackman <[email protected]>
12-
Erran Carey <[email protected]> Erran Carey <[email protected]>
13-
Florian Lefèvre <[email protected]> Florian Lefèvre <[email protected]>
14-
Hans Rødtang <[email protected]> Hans Rødtang <[email protected]>
15-
Hikaru Ojima <[email protected]> Hikaru Ojima <[email protected]>
16-
Ilya Palkin <[email protected]> Ilya Palkin <[email protected]>
17-
Ivan Storck <[email protected]> Ivan Storck <[email protected]>
18-
Jake Sankey <[email protected]> Jake Sankey <[email protected]>
19-
Johan Bruning <[email protected]> Johan Bruning <[email protected]>
1+
Alexey Slaykovsky <[email protected]> Alexey Slaykovsky <[email protected]>
2+
Andy Hayden <[email protected]> Andy Hayden <[email protected]>
3+
Ash Wilson <[email protected]> Ash Wilson <[email protected]>
4+
Calvin Bottoms <[email protected]> Calvin Bottoms <[email protected]>
5+
6+
Christian Kjaer Laustsen <[email protected]> Christian Kjaer Laustsen <[email protected]>
7+
Ciaran Downey <[email protected]> Ciaran Downey <[email protected]>
8+
9+
Daniel Bayley <[email protected]> Daniel Bayley <[email protected]>
10+
Daniel Chatfield <[email protected]> Daniel Chatfield <[email protected]>
11+
Dustin Blackman <[email protected]> Dustin Blackman <[email protected]>
12+
Erran Carey <[email protected]> Erran Carey <[email protected]>
13+
Florian Lefèvre <[email protected]> Florian Lefèvre <[email protected]>
14+
Hans Rødtang <[email protected]> Hans Rødtang <[email protected]>
15+
Hikaru Ojima <[email protected]> Hikaru Ojima <[email protected]>
16+
Ilya Palkin <[email protected]> Ilya Palkin <[email protected]>
17+
Ivan Storck <[email protected]> Ivan Storck <[email protected]>
18+
Jake Sankey <[email protected]> Jake Sankey <[email protected]>
19+
Johan Bruning <[email protected]> Johan Bruning <[email protected]>
2020
Kyle Kelley <[email protected]> Kyle Kelley <[email protected]>
21-
Kyle Kelley <[email protected]> Kyle Kelley <[email protected]>
22-
Kyle Kelley <[email protected]> rgbkrk <[email protected]>
23-
Lance Batson <[email protected]> Lance Batson <[email protected]>
24-
Lance Batson <[email protected]> Lance Batson <[email protected]>
25-
Lance Batson <[email protected]> Lance Batson <[email protected]>
26-
Liam Dawson <[email protected]> Liam Dawson <[email protected]>
27-
Lucas Magno <[email protected]> Lucas Magno <[email protected]>
28-
Marek Piechut <[email protected]> Marek Piechut <[email protected]>
29-
Mirek Rusin <[email protected]> Mirek Rusin <[email protected]>
30-
Otto Robba <[email protected]> Otto Robba <[email protected]>
31-
Pedro Rodriguez <[email protected]> Pedro Rodriguez <[email protected]>
32-
Rafael Belvederese <[email protected]> Rafael Belvederese <[email protected]>
33-
34-
Rodolfo Carvalho <[email protected]> Rodolfo Carvalho <[email protected]>
35-
36-
Sergey Koshelev <[email protected]> Sergey Koshelev <[email protected]>
37-
38-
39-
Tomasz Grodzki <[email protected]> Tomasz Grodzki <[email protected]>
40-
Will Sahatdjian <[email protected]> Will Sahatdjian <[email protected]>
41-
Yeonghoon Park <[email protected]> Yeonghoon Park <[email protected]>
42-
benjamin <[email protected]> benjamin <[email protected]>
43-
bryanweatherly <[email protected]> bryanweatherly <[email protected]>
44-
cdingpeng <[email protected]> cdingpeng <[email protected]>
45-
cormullion <[email protected]> cormullion <[email protected]>
46-
dev <dev@debian7devel> dev <dev@debian7devel>
47-
elclanrs <[email protected]> elclanrs <[email protected]>
48-
49-
50-
51-
52-
liamdawson <[email protected]> liamdawson <[email protected]>
53-
morinmorin <[email protected]> morinmorin <[email protected]>
21+
Kyle Kelley <[email protected]> Kyle Kelley <[email protected]>
22+
Kyle Kelley <[email protected]> rgbkrk <[email protected]>
23+
Lance Batson <[email protected]> Lance Batson <[email protected]>
24+
Lance Batson <[email protected]> Lance Batson <[email protected]>
25+
Lance Batson <[email protected]> Lance Batson <[email protected]>
26+
Liam Dawson <[email protected]> Liam Dawson <[email protected]>
27+
Lucas Magno <[email protected]> Lucas Magno <[email protected]>
28+
Marek Piechut <[email protected]> Marek Piechut <[email protected]>
29+
Mirek Rusin <[email protected]> Mirek Rusin <[email protected]>
30+
Otto Robba <[email protected]> Otto Robba <[email protected]>
31+
Pedro Rodriguez <[email protected]> Pedro Rodriguez <[email protected]>
32+
Rafael Belvederese <[email protected]> Rafael Belvederese <[email protected]>
33+
34+
Rodolfo Carvalho <[email protected]> Rodolfo Carvalho <[email protected]>
35+
36+
Sergey Koshelev <[email protected]> Sergey Koshelev <[email protected]>
37+
38+
39+
Tomasz Grodzki <[email protected]> Tomasz Grodzki <[email protected]>
40+
Will Sahatdjian <[email protected]> Will Sahatdjian <[email protected]>
41+
Yeonghoon Park <[email protected]> Yeonghoon Park <[email protected]>
42+
43+
bryanweatherly <[email protected]> bryanweatherly <[email protected]>
44+
cdingpeng <[email protected]> cdingpeng <[email protected]>
45+
cormullion <[email protected]> cormullion <[email protected]>
46+
dev <dev@debian7devel> dev <dev@debian7devel>
47+
48+
49+
50+
51+
52+
liamdawson <[email protected]> liamdawson <[email protected]>
53+
morinmorin <[email protected]> morinmorin <[email protected]>
5454

.npmrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
public-hoist-pattern[]=*
2+
package-lock=false
3+
lockfile=true
4+
prefer-frozen-lockfile=false

.prettierignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
node_modules
2+
pnpm-lock.yaml
3+
package-lock.json
4+
CHANGELOG.md
5+
dist
6+
.mypy_cache

0 commit comments

Comments
 (0)