Skip to content

Commit a82fd9b

Browse files
authored
Merge branch 'develop' into sig/remix-peer-dep
2 parents 6a614e0 + b65ccc6 commit a82fd9b

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/external-contributors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
- name: Generate GitHub App token
3939
id: app-token
40-
uses: actions/create-github-app-token@v1
40+
uses: actions/create-github-app-token@v2
4141
with:
4242
app-id: ${{ vars.GITFLOW_APP_ID }}
4343
private-key: ${{ secrets.GITFLOW_APP_PRIVATE_KEY }}

.github/workflows/gitflow-sync-develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Generate GitHub App token
2929
id: app-token
30-
uses: actions/create-github-app-token@v1
30+
uses: actions/create-github-app-token@v2
3131
with:
3232
app-id: ${{ vars.GITFLOW_APP_ID }}
3333
private-key: ${{ secrets.GITFLOW_APP_PRIVATE_KEY }}

packages/ember/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"@types/ember-resolver": "5.0.13",
5858
"@types/ember__debug": "^3.16.5",
5959
"@types/qunit": "~2.19.11",
60-
"@types/rsvp": "~4.0.3",
60+
"@types/rsvp": "~4.0.9",
6161
"babel-eslint": "~10.1.0",
6262
"broccoli-asset-rev": "~3.0.0",
6363
"ember-cli": "~4.12.3",

yarn.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9002,10 +9002,10 @@
90029002
"@types/glob" "*"
90039003
"@types/node" "*"
90049004

9005-
"@types/rsvp@*", "@types/rsvp@~4.0.3":
9006-
version "4.0.4"
9007-
resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.4.tgz#55e93e7054027f1ad4b4ebc1e60e59eb091e2d32"
9008-
integrity sha512-J3Ol++HCC7/hwZhanDvggFYU/GtxHxE/e7cGRWxR04BF7Tt3TqJZ84BkzQgDxmX0uu8IagiyfmfoUlBACh2Ilg==
9005+
"@types/rsvp@*", "@types/rsvp@~4.0.9":
9006+
version "4.0.9"
9007+
resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.9.tgz#7d9d07c1a2fa82c808eca37757cc6a20272a4b66"
9008+
integrity sha512-F6vaN5mbxw2MBCu/AD9fSKwrhnto2pE77dyUsi415qz9IP9ni9ZOWXHxnXfsM4NW9UjW+it189jvvqnhv37Z7Q==
90099009

90109010
"@types/scheduler@*":
90119011
version "0.16.1"
@@ -28775,6 +28775,7 @@ stylus@0.59.0, stylus@^0.59.0:
2877528775

2877628776
sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
2877728777
version "3.36.0"
28778+
uid fd682f6129e507c00bb4e6319cc5d6b767e36061
2877828779
resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
2877928780
dependencies:
2878028781
"@jridgewell/gen-mapping" "^0.3.2"

0 commit comments

Comments
 (0)