Skip to content
This repository was archived by the owner on Jan 28, 2025. It is now read-only.

Commit 56a7ebd

Browse files
authored
Merge branch 'master' into dphang/no-op-rewrite
2 parents 433d1e8 + df2b703 commit 56a7ebd

File tree

2 files changed

+80
-19
lines changed

2 files changed

+80
-19
lines changed

.github/workflows/CI.yml

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

6060
start-e2e-tests:
6161
# Note: we only run e2e tests automatically if this PR is not from a fork or dependabot, as forks won't have access to secrets
62-
if: ${{ startsWith(github.head_ref, 'dependabot/') == false && github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) }}
62+
if: ${{ startsWith(github.event.pull_request.head.ref, 'refs/heads/dependabot/') == false && github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) }}
6363
runs-on: ubuntu-latest
6464

6565
steps:

yarn.lock

Lines changed: 79 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3075,10 +3075,10 @@
30753075
ramda "^0.26.1"
30763076
semver "^6.1.1"
30773077

3078-
"@serverless/dashboard-plugin@^5.4.2":
3079-
version "5.4.2"
3080-
resolved "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.2.tgz#afad1ce3a38d6563cb3d57d8122f9a9906178ebf"
3081-
integrity sha512-yFugs3TBPjZh6Gt/8lPca8H7n2/ICin17r/zmhiOhIscYMgIJT1EOY9EyCFWIQi9AMAmZD0a3ZR8U8gSYYTT9A==
3078+
"@serverless/dashboard-plugin@^5.4.3":
3079+
version "5.4.3"
3080+
resolved "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.3.tgz#83a166ee1591da665f7ff67a7aa0bbb2d9be6858"
3081+
integrity sha512-lgQh7NG5B0T+jr5/CWLZUvW2EqQ5Phzf+XTybM/I+Obwc5jxtpOmPgItDs52kBgyNLDJAqzUN+YRpfE/HBGsoQ==
30823082
dependencies:
30833083
"@serverless/event-mocks" "^1.1.1"
30843084
"@serverless/platform-client" "^4.2.3"
@@ -3260,16 +3260,34 @@
32603260
"@sinonjs/commons" "^1.7.0"
32613261

32623262
"@sls-next/core@link:packages/libs/core":
3263-
version "0.0.0"
3264-
uid ""
3263+
version "3.2.0-alpha.7"
3264+
dependencies:
3265+
"@hapi/accept" "^5.0.1"
3266+
cookie "^0.4.1"
3267+
jsonwebtoken "^8.5.1"
3268+
path-to-regexp "^6.1.0"
3269+
regex-parser "^2.2.10"
32653270

32663271
"@sls-next/lambda-at-edge@link:./packages/libs/lambda-at-edge":
3267-
version "0.0.0"
3268-
uid ""
3272+
version "3.2.0-alpha.8"
3273+
dependencies:
3274+
"@aws-sdk/client-s3" "3.19.0"
3275+
"@aws-sdk/client-sqs" "3.19.0"
3276+
"@hapi/accept" "5.0.1"
3277+
"@sls-next/core" "link:packages/libs/core"
3278+
"@vercel/nft" "^0.13.1"
3279+
execa "^5.0.1"
3280+
fresh "^0.5.2"
3281+
fs-extra "^9.1.0"
3282+
get-stream "^6.0.0"
3283+
is-animated "^2.0.1"
3284+
klaw "^3.0.0"
3285+
node-fetch "^2.6.1"
3286+
path-to-regexp "^6.1.0"
3287+
send "^0.17.1"
32693288

32703289
"@sls-next/next-aws-cloudfront@link:./packages/compat-layers/lambda-at-edge-compat":
3271-
version "0.0.0"
3272-
uid ""
3290+
version "3.1.0"
32733291

32743292
"@szmarczak/http-timer@^1.1.2":
32753293
version "1.1.2"
@@ -4261,7 +4279,7 @@ available-typed-arrays@^1.0.2:
42614279
resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz#9e0ae84ecff20caae6a94a1c3bc39b955649b7a9"
42624280
integrity sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==
42634281

4264-
aws-sdk@^2.934.0, aws-sdk@^2.935.0:
4282+
aws-sdk@^2.935.0, aws-sdk@^2.936.0:
42654283
version "2.936.0"
42664284
resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.936.0.tgz#b69f5db7c0c745f260b014415a8fbfb38c5e615d"
42674285
integrity sha512-X0kuyycck0fEPN5V0Vw1PmPIQ4BO0qupsL1El5jnXzXxNkf1cOmn5PMSxPXPsdcqua4w4h3sf143/yME0V9w8g==
@@ -4975,6 +4993,18 @@ cli-boxes@^2.2.1:
49754993
resolved "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
49764994
integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
49774995

4996+
cli-color@^1.4:
4997+
version "1.4.0"
4998+
resolved "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz#7d10738f48526824f8fe7da51857cb0f572fe01f"
4999+
integrity sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w==
5000+
dependencies:
5001+
ansi-regex "^2.1.1"
5002+
d "1"
5003+
es5-ext "^0.10.46"
5004+
es6-iterator "^2.0.3"
5005+
memoizee "^0.4.14"
5006+
timers-ext "^0.1.5"
5007+
49785008
cli-color@^2.0.0:
49795009
version "2.0.0"
49805010
resolved "https://registry.npmjs.org/cli-color/-/cli-color-2.0.0.tgz#11ecfb58a79278cf6035a60c54e338f9d837897c"
@@ -5001,6 +5031,17 @@ cli-cursor@^3.1.0:
50015031
dependencies:
50025032
restore-cursor "^3.1.0"
50035033

5034+
cli-progress-footer@^1.1.1:
5035+
version "1.1.1"
5036+
resolved "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-1.1.1.tgz#8aa2292f5cca4f6639e3e0107ef04d897d620563"
5037+
integrity sha512-J0uW2u06pWI0tMKCbcCiMOZd8TbWj4EpuYgPo4Jiwih/FfGbd4dbLcJieO0Ior1pY1HBrnmCuHFk6GB9azE4pg==
5038+
dependencies:
5039+
cli-color "^1.4"
5040+
d "1"
5041+
es5-ext "^0.10.47"
5042+
process-utils "^2.0.1"
5043+
timers-ext "^0.1.7"
5044+
50045045
cli-truncate@^2.1.0:
50055046
version "2.1.0"
50065047
resolved "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
@@ -6501,7 +6542,7 @@ ext-name@^5.0.0:
65016542
ext-list "^2.0.0"
65026543
sort-keys-length "^1.0.0"
65036544

6504-
ext@^1.1.2:
6545+
ext@^1.1.0, ext@^1.1.2, ext@^1.4.0:
65056546
version "1.4.0"
65066547
resolved "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
65076548
integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
@@ -10488,6 +10529,24 @@ process-nextick-args@~2.0.0:
1048810529
resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
1048910530
integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
1049010531

10532+
process-utils@^2.0.1:
10533+
version "2.6.0"
10534+
resolved "https://registry.npmjs.org/process-utils/-/process-utils-2.6.0.tgz#0f0d3b2633ec1f4656def20d36425f92ec60cf23"
10535+
integrity sha512-2zKFADQDvHiUDyJQTsBTdu1+Q2D/WtReBotZwXmD9oUueb0kNv4rXulK/78hMM+nclBNFZ/ZlHOJtobt8oHpqQ==
10536+
dependencies:
10537+
ext "^1.1.0"
10538+
type "^2.0.0"
10539+
10540+
process-utils@^4.0.0:
10541+
version "4.0.0"
10542+
resolved "https://registry.npmjs.org/process-utils/-/process-utils-4.0.0.tgz#3e5b204e1d38e62fe39ef3144664a1fe94097b9e"
10543+
integrity sha512-fMyMQbKCxX51YxR7YGCzPjLsU3yDzXFkP4oi1/Mt5Ixnk7GO/7uUTj8mrCHUwuvozWzI+V7QSJR9cZYnwNOZPg==
10544+
dependencies:
10545+
ext "^1.4.0"
10546+
fs2 "^0.3.9"
10547+
memoizee "^0.4.14"
10548+
type "^2.1.0"
10549+
1049110550
[email protected], process@^0.11.10:
1049210551
version "0.11.10"
1049310552
resolved "https://registry.npmjs.org/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -11331,24 +11390,25 @@ serialize-javascript@^5.0.1:
1133111390
randombytes "^2.1.0"
1133211391

1133311392
serverless@^2.44.0:
11334-
version "2.48.1"
11335-
resolved "https://registry.npmjs.org/serverless/-/serverless-2.48.1.tgz#c7f6e8358103b1cd2a7bf6c1f12b544fb500d2e5"
11336-
integrity sha512-G61WEeJwDWsmsXW3jBzYnnNOJzw3ysqL5/3b0UHy1Zi8RhpkzzI9J7poteJHVmDchw9Ru5tczIKYq2dCfufxsA==
11393+
version "2.49.0"
11394+
resolved "https://registry.npmjs.org/serverless/-/serverless-2.49.0.tgz#97723559e888223e254d573c8d48923c00e8b8a8"
11395+
integrity sha512-nJ9YZ23YcYqrqCni5UuqZWhERB0Qo7tXASAGXrk3B55UHU75b3wz1QQzKd0sgIqbcfwsUsEuNt3+AJlfCzdTpA==
1133711396
dependencies:
1133811397
"@serverless/cli" "^1.5.2"
1133911398
"@serverless/components" "^3.12.0"
11340-
"@serverless/dashboard-plugin" "^5.4.2"
11399+
"@serverless/dashboard-plugin" "^5.4.3"
1134111400
"@serverless/utils" "^5.3.0"
1134211401
ajv "^6.12.6"
1134311402
ajv-keywords "^3.5.2"
1134411403
archiver "^5.3.0"
11345-
aws-sdk "^2.934.0"
11404+
aws-sdk "^2.936.0"
1134611405
bluebird "^3.7.2"
1134711406
boxen "^5.0.1"
1134811407
cachedir "^2.3.0"
1134911408
chalk "^4.1.1"
1135011409
child-process-ext "^2.1.1"
1135111410
ci-info "^3.2.0"
11411+
cli-progress-footer "^1.1.1"
1135211412
d "^1.0.1"
1135311413
dayjs "^1.10.5"
1135411414
decompress "^4.2.1"
@@ -11374,6 +11434,7 @@ serverless@^2.44.0:
1137411434
node-fetch "^2.6.1"
1137511435
object-hash "^2.2.0"
1137611436
path2 "^0.1.0"
11437+
process-utils "^4.0.0"
1137711438
promise-queue "^2.2.5"
1137811439
replaceall "^0.1.6"
1137911440
semver "^7.3.5"
@@ -12306,7 +12367,7 @@ [email protected], timers-browserify@^2.0.4:
1230612367
dependencies:
1230712368
setimmediate "^1.0.4"
1230812369

12309-
timers-ext@^0.1.7:
12370+
timers-ext@^0.1.5, timers-ext@^0.1.7:
1231012371
version "0.1.7"
1231112372
resolved "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
1231212373
integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==

0 commit comments

Comments
 (0)