Skip to content

Commit a3eb393

Browse files
authored
Merge pull request #788 from atom-minimap/dependencies [skip release]
2 parents 3c0c7f2 + de1be6e commit a3eb393

File tree

4 files changed

+479
-448
lines changed

4 files changed

+479
-448
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
Release:
7070
needs: [Test, Lint]
7171
if: github.ref == 'refs/heads/master' &&
72-
github.event.repository.fork == false
72+
github.event.repository.fork == false && !contains(github.event.head_commit.message, '[skip release]')
7373
runs-on: ubuntu-latest
7474
steps:
7575
- uses: actions/checkout@v2

package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"bump": "ncu -u",
2525
"prepare": "npm run build"
2626
},
27+
"prettier": "prettier-config-atomic",
2728
"contributors": [
2829
{
2930
"name": "Fangdun Cai",
@@ -60,24 +61,24 @@
6061
"dependencies": {
6162
"atom-utils-plus": "^0.11.0",
6263
"delegato": "^1.0.0",
63-
"element-resize-detector": "^1.2.1",
64+
"element-resize-detector": "^1.2.2",
6465
"fs-plus": "^3.1.1",
6566
"mixto": "^1.0.0"
6667
},
6768
"devDependencies": {
68-
"@types/atom": "^1.40.5",
69-
"@types/jasmine": "3.6.2",
69+
"@types/atom": "^1.40.10",
70+
"@types/jasmine": "3.6.9",
7071
"build-commit": "^0.1.4",
7172
"cross-env": "^7.0.3",
7273
"esdoc": "^1.1.0",
7374
"esdoc-es7-plugin": "^0.0.3",
74-
"eslint": "^7.13.0",
75-
"eslint-config-atomic": "^1.5.1",
75+
"eslint": "^7.23.0",
76+
"eslint-config-atomic": "^1.12.5",
7677
"jasmine-expect": "^5.0.0",
7778
"npm-check-updates": "latest",
78-
"prettier": "^2.2.1",
79-
"rollup": "2.37.0",
80-
"rollup-plugin-atomic": "^2.0.1",
79+
"prettier-config-atomic": "^1.0.1",
80+
"rollup": "2.44.0",
81+
"rollup-plugin-atomic": "^2.1.2",
8182
"shx": "^0.3.3",
8283
"underscore-plus": "^1.7.0"
8384
},

0 commit comments

Comments
 (0)