Skip to content

Commit 44d25cd

Browse files
Merge branch 'canary'
2 parents 7bf6e3b + 45fe2a6 commit 44d25cd

File tree

8 files changed

+646
-629
lines changed

8 files changed

+646
-629
lines changed

.github/workflows/e2e_comment.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ jobs:
1414
WORKFLOW_RUN_INFO: ${{ toJSON(github.event.workflow_run) }}
1515
run: echo "$WORKFLOW_RUN_INFO"
1616
- name: Download Artifacts
17-
uses: dawidd6/action-download-artifact@v2.22.0
17+
uses: dawidd6/action-download-artifact@v2.24.2
1818
with:
1919
github_token: ${{ secrets.GITHUB_TOKEN }}
2020
workflow: nodejs.yml
2121
run_id: ${{ github.event.workflow_run.id }}
2222
name: e2e
2323
- name: Get PR number
24-
uses: dawidd6/action-download-artifact@v2.22.0
24+
uses: dawidd6/action-download-artifact@v2.24.2
2525
with:
2626
github_token: ${{ secrets.GITHUB_TOKEN }}
2727
workflow: nodejs.yml
2828
run_id: ${{ github.event.workflow_run.id }}
2929
name: pr_num
3030
- name: Read the pr_num file
3131
id: pr_num_reader
32-
uses: juliangruber/[email protected].4
32+
uses: juliangruber/[email protected].6
3333
with:
3434
path: ./pr_num.txt
3535
- name: List images
@@ -56,7 +56,7 @@ jobs:
5656
token: ${{ secrets.GITHUB_TOKEN }}
5757
body: ${{ format(env.MESSAGE, env.IMG_MARKDOWN, github.repository, github.event.workflow_run.id) }}
5858
- name: Hide older comments
59-
uses: kanga333/comment-hider@v0.3.0
59+
uses: kanga333/comment-hider@v0.4.0
6060
with:
6161
github_token: ${{ secrets.GITHUB_TOKEN }}
6262
leave_visible: 1

.github/workflows/nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
node-version: [16.x]
1717
os:
18-
- macos-11.0
18+
- macos-12
1919
- ubuntu-18.04
2020
- windows-latest
2121
fail-fast: false

app/menus/menus/edit.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ export default (
3131
} as any,
3232
{
3333
role: 'paste',
34-
accelerator: commandKeys['editor:paste']
34+
accelerator: commandKeys['editor:paste'],
35+
registerAccelerator: true
3536
},
3637
{
3738
label: 'Select All',

app/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,33 @@
1010
},
1111
"repository": "zeit/hyper",
1212
"dependencies": {
13-
"@electron/remote": "2.0.8",
13+
"@electron/remote": "2.0.9",
1414
"async-retry": "1.3.3",
1515
"chokidar": "^3.5.3",
1616
"color": "4.2.3",
1717
"default-shell": "1.0.1",
18-
"electron-fetch": "1.7.4",
18+
"electron-fetch": "1.9.1",
1919
"electron-is-dev": "2.0.0",
2020
"electron-store": "8.1.0",
21-
"fs-extra": "10.1.0",
21+
"fs-extra": "11.1.0",
2222
"git-describe": "4.1.1",
2323
"lodash": "4.17.21",
2424
"mkdirp": "1.0.4",
2525
"ms": "2.1.3",
2626
"native-process-working-directory": "^1.0.2",
27-
"node-pty": "0.10.1",
27+
"node-pty": "0.11.0-beta26",
2828
"os-locale": "5.0.0",
29-
"parse-url": "7.0.2",
29+
"parse-url": "8.1.0",
3030
"pify": "5.0.0",
3131
"queue": "6.0.2",
3232
"react": "17.0.2",
3333
"react-dom": "17.0.2",
34-
"semver": "7.3.7",
34+
"semver": "7.3.8",
3535
"shell-env": "3.0.1",
3636
"sudo-prompt": "^9.2.1",
37-
"uuid": "8.3.2"
37+
"uuid": "9.0.0"
3838
},
3939
"optionalDependencies": {
40-
"native-reg": "1.1.0"
40+
"native-reg": "1.1.1"
4141
}
4242
}

app/yarn.lock

Lines changed: 43 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# yarn lockfile v1
33

44

5-
"@electron/[email protected].8":
6-
version "2.0.8"
7-
resolved "https://registry.npmjs.org/@electron/remote/-/remote-2.0.8.tgz#85ff321f0490222993207106e2f720273bb1a5c3"
8-
integrity sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==
5+
"@electron/[email protected].9":
6+
version "2.0.9"
7+
resolved "https://registry.npmjs.org/@electron/remote/-/remote-2.0.9.tgz#092ff085407bc907f45b89a72c36faa773ccf2d9"
8+
integrity sha512-LR0W0ID6WAKHaSs0x5LX9aiG+5pFBNAJL6eQAJfGkCuZPUa6nZz+czZLdlTDETG45CgF/0raSvCtYOYUpr6c+A==
99

1010
"@types/semver@^7.3.8":
1111
version "7.3.8"
@@ -164,10 +164,10 @@ dot-prop@^6.0.1:
164164
dependencies:
165165
is-obj "^2.0.0"
166166

167-
electron-fetch@1.7.4:
168-
version "1.7.4"
169-
resolved "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.7.4.tgz#af975ab92a14798bfaa025f88dcd2e54a7b0b769"
170-
integrity sha512-+fBLXEy4CJWQ5bz8dyaeSG1hD6JJ15kBZyj3eh24pIVrd3hLM47H/umffrdQfS6GZ0falF0g9JT9f3Rs6AVUhw==
167+
electron-fetch@1.9.1:
168+
version "1.9.1"
169+
resolved "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.9.1.tgz#e28bfe78d467de3f2dec884b1d72b8b05322f30f"
170+
integrity sha512-M9qw6oUILGVrcENMSRRefE1MbHPIz0h79EKIeJWK9v563aT9Qkh8aEHPO1H5vi970wPirNY+jO9OpFoLiMsMGA==
171171
dependencies:
172172
encoding "^0.1.13"
173173

@@ -250,10 +250,10 @@ find-up@^3.0.0:
250250
dependencies:
251251
locate-path "^3.0.0"
252252

253-
fs-extra@10.1.0:
254-
version "10.1.0"
255-
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
256-
integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
253+
fs-extra@11.1.0:
254+
version "11.1.0"
255+
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed"
256+
integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==
257257
dependencies:
258258
graceful-fs "^4.2.0"
259259
jsonfile "^6.0.1"
@@ -356,13 +356,6 @@ is-obj@^2.0.0:
356356
resolved "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
357357
integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
358358

359-
is-ssh@^1.4.0:
360-
version "1.4.0"
361-
resolved "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2"
362-
integrity sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==
363-
dependencies:
364-
protocols "^2.0.1"
365-
366359
is-stream@^1.1.0:
367360
version "1.1.0"
368361
resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -477,10 +470,10 @@ [email protected]:
477470
resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
478471
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
479472

480-
nan@^2.14.0:
481-
version "2.14.2"
482-
resolved "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
483-
integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
473+
nan@^2.17.0:
474+
version "2.17.0"
475+
resolved "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
476+
integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
484477

485478
native-process-working-directory@^1.0.2:
486479
version "1.0.2"
@@ -489,10 +482,10 @@ native-process-working-directory@^1.0.2:
489482
dependencies:
490483
node-addon-api "^3.1.0"
491484

492-
493-
version "1.1.0"
494-
resolved "https://registry.npmjs.org/native-reg/-/native-reg-1.1.0.tgz#caa7a21c8e537c977cf481296d5675edebcbcbe2"
495-
integrity sha512-nykrWHVAp9E6oLUypAVDFj+kq5J4AMd7VA5CVOqMw/k4w7Mhuc6p/1tLTqDLJbQsFs85qT1ElQw8Yn/RayUupg==
485+
486+
version "1.1.1"
487+
resolved "https://registry.npmjs.org/native-reg/-/native-reg-1.1.1.tgz#cc5e12218c1da2f71d7421f617fc133441d70c77"
488+
integrity sha512-DmqwT6XC8MLwo8HaZey3bASf0aa/gHC7FAuKMjuf7fXa7FLXwz/khXGouKcmD1rXAfJME1XveKSM4+86wLkb1w==
496489
dependencies:
497490
node-gyp-build "4"
498491

@@ -511,23 +504,18 @@ node-gyp-build@4:
511504
resolved "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
512505
integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
513506

514-
node-pty@0.10.1:
515-
version "0.10.1"
516-
resolved "https://registry.npmjs.org/node-pty/-/node-pty-0.10.1.tgz#cd05d03a2710315ec40221232ec04186f6ac2c6d"
517-
integrity sha512-JTdtUS0Im/yRsWJSx7yiW9rtpfmxqxolrtnyKwPLI+6XqTAPW/O2MjS8FYL4I5TsMbH2lVgDb2VMjp+9LoQGNg==
507+
node-pty@0.11.0-beta26:
508+
version "0.11.0-beta26"
509+
resolved "https://registry.npmjs.org/node-pty/-/node-pty-0.11.0-beta26.tgz#59b58d5ebcf10cba1a85593b2f8395b22fa685c1"
510+
integrity sha512-txc5z6KVdVKaEoybgN6NlS7ldZJyeFvhrkfafOsNm6IiLqhY5F0y+U4ZQeZpqU3hxDg708bwajoqyTpMYst6Ng==
518511
dependencies:
519-
nan "^2.14.0"
512+
nan "^2.17.0"
520513

521514
normalize-path@^3.0.0, normalize-path@~3.0.0:
522515
version "3.0.0"
523516
resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
524517
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
525518

526-
normalize-url@^6.1.0:
527-
version "6.1.0"
528-
resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
529-
integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
530-
531519
npm-run-path@^2.0.0:
532520
version "2.0.2"
533521
resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -604,22 +592,19 @@ p-try@^2.0.0:
604592
resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
605593
integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
606594

607-
parse-path@^5.0.0:
608-
version "5.0.0"
609-
resolved "https://registry.npmjs.org/parse-path/-/parse-path-5.0.0.tgz#f933152f3c6d34f4cf36cfc3d07b138ac113649d"
610-
integrity sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A==
595+
parse-path@^7.0.0:
596+
version "7.0.0"
597+
resolved "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz#605a2d58d0a749c8594405d8cc3a2bf76d16099b"
598+
integrity sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==
611599
dependencies:
612600
protocols "^2.0.0"
613601

614-
parse-url@7.0.2:
615-
version "7.0.2"
616-
resolved "https://registry.npmjs.org/parse-url/-/parse-url-7.0.2.tgz#d21232417199b8d371c6aec0cedf1406fd6393f0"
617-
integrity sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg==
602+
parse-url@8.1.0:
603+
version "8.1.0"
604+
resolved "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz#972e0827ed4b57fc85f0ea6b0d839f0d8a57a57d"
605+
integrity sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==
618606
dependencies:
619-
is-ssh "^1.4.0"
620-
normalize-url "^6.1.0"
621-
parse-path "^5.0.0"
622-
protocols "^2.0.1"
607+
parse-path "^7.0.0"
623608

624609
path-exists@^3.0.0:
625610
version "3.0.0"
@@ -653,7 +638,7 @@ pkg-up@^3.1.0:
653638
dependencies:
654639
find-up "^3.0.0"
655640

656-
protocols@^2.0.0, protocols@^2.0.1:
641+
protocols@^2.0.0:
657642
version "2.0.1"
658643
resolved "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"
659644
integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==
@@ -725,10 +710,10 @@ scheduler@^0.20.2:
725710
loose-envify "^1.1.0"
726711
object-assign "^4.1.1"
727712

728-
[email protected].7, semver@^7.3.5:
729-
version "7.3.7"
730-
resolved "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
731-
integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
713+
[email protected].8, semver@^7.3.5:
714+
version "7.3.8"
715+
resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
716+
integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
732717
dependencies:
733718
lru-cache "^6.0.0"
734719

@@ -833,10 +818,10 @@ uri-js@^4.2.2:
833818
dependencies:
834819
punycode "^2.1.0"
835820

836-
uuid@8.3.2:
837-
version "8.3.2"
838-
resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
839-
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
821+
uuid@9.0.0:
822+
version "9.0.0"
823+
resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
824+
integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
840825

841826
which@^1.2.9:
842827
version "1.3.1"

0 commit comments

Comments
 (0)