Skip to content

Commit 2d42966

Browse files
authored
Merge pull request #74 from atom-community/common-ui-fix
2 parents 39517b4 + 01a0202 commit 2d42966

11 files changed

Lines changed: 1541 additions & 1457 deletions

File tree

.github/workflows/CI.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ jobs:
3333
with:
3434
channel: ${{ matrix.atom_channel }}
3535
- uses: actions/setup-node@v2
36+
with:
37+
version: 14
3638

3739
- name: Setup PNPM
3840
uses: pnpm/action-setup@master
3941
with:
40-
version: latest
42+
version: 5
4143

4244
- name: Install base dependencies
4345
run: |
@@ -78,11 +80,13 @@ jobs:
7880
with:
7981
channel: ${{ matrix.atom_channel }}
8082
- uses: actions/setup-node@v2
83+
with:
84+
version: 14
8185

8286
- name: Setup PNPM
8387
uses: pnpm/action-setup@master
8488
with:
85-
version: latest
89+
version: 5
8690
- run: |
8791
pnpm install
8892
pnpm prepare.nuclide
@@ -121,6 +125,12 @@ jobs:
121125
with:
122126
fetch-depth: 0
123127
- uses: actions/setup-node@v2
128+
with:
129+
version: 14
130+
- name: Setup PNPM
131+
uses: pnpm/action-setup@master
132+
with:
133+
version: 5
124134

125135
- name: Commit lint ✨
126136
uses: wagoid/commitlint-github-action@v2

package.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -79,52 +79,52 @@
7979
},
8080
"dependencies": {
8181
"@types/atom": "^1.40.10",
82-
"@types/dompurify": "^2.2.1",
83-
"@types/node": "^14.14.37",
84-
"@types/react": "^17.0.3",
85-
"@types/react-dom": "^17.0.3",
82+
"@types/dompurify": "^2.2.2",
83+
"@types/node": "^15.12.2",
84+
"@types/react": "^17.0.9",
85+
"@types/react-dom": "^17.0.6",
8686
"atom-ide-markdown-service": "^2.1.0",
8787
"atom-package-deps": "^7.2.3",
8888
"classnames": "^2.3.1",
89-
"dompurify": "^2.2.7",
89+
"dompurify": "^2.2.9",
9090
"etch": "^0.14.1",
9191
"react": "^17.0.2",
9292
"react-dom": "^17.0.2",
9393
"rxjs": "^6.6.7"
9494
},
9595
"devDependencies": {
96-
"@babel/cli": "7.13.14",
97-
"@babel/core": "7.13.14",
96+
"@babel/cli": "7.14.3",
97+
"@babel/core": "7.14.3",
9898
"@jest-runner/nuclide-e2e": "^2.0",
99-
"@types/chance": "^1.1.1",
100-
"@types/classnames": "^2.2.11",
101-
"@types/jasmine": "^3.6.9",
102-
"@types/temp": "^0.8.34",
103-
"atom-jasmine3-test-runner": "^5.2.2",
104-
"babel-jest": "^26.6.3",
105-
"babel-preset-atomic": "^4.0.0",
99+
"@types/chance": "^1.1.2",
100+
"@types/classnames": "^2.3.0",
101+
"@types/jasmine": "^3.7.7",
102+
"@types/temp": "^0.9.0",
103+
"atom-jasmine3-test-runner": "^5.2.6",
104+
"babel-jest": "^26",
105+
"babel-preset-atomic": "^4.1.0",
106106
"build-commit": "0.1.4",
107107
"chance": "^1.1.7",
108108
"cross-env": "7.0.3",
109-
"csstype": "^3.0.7",
110-
"eslint": "7.23.0",
111-
"eslint-config-atomic": "^1.12.5",
112-
"jest": "^26.6.3",
113-
"jest-circus": "^26.6.3",
114-
"jest-haste-map": "26.6.2",
115-
"jest-message-util": "26.6.2",
116-
"jest-mock": "26.6.2",
117-
"jest-runner": "26.6.3",
118-
"jest-runtime": "26.6.3",
109+
"csstype": "^3.0.8",
110+
"eslint": "7.28.0",
111+
"eslint-config-atomic": "^1.15.3",
112+
"jest": "^26",
113+
"jest-circus": "^26",
114+
"jest-haste-map": "^26",
115+
"jest-message-util": "^26",
116+
"jest-mock": "^26",
117+
"jest-runner": "^26",
118+
"jest-runtime": "^26",
119119
"mkdirp": "1.0.4",
120120
"node-ipc": "9.1.4",
121-
"npm-check-updates": "11.3.0",
122-
"prettier": "^2.2.1",
123-
"rollup": "2.44.0",
124-
"rollup-plugin-atomic": "^2.2.0",
121+
"npm-check-updates": "11.6.0",
122+
"prettier": "^2.3.1",
123+
"rollup": "2.51.0",
124+
"rollup-plugin-atomic": "^2.3.2",
125125
"shx": "0.3.3",
126126
"temp": "^0.9.4",
127-
"typescript": "^4.2.3"
127+
"typescript": "^4.3.2"
128128
},
129129
"providedServices": {},
130130
"consumedServices": {},

package/main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)