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

Commit 7ef469e

Browse files
dphangdphang
authored
Merge branch 'master' into dphang/fix-rollup-plugin-commonjs
2 parents 26b3b56 + 6ac6939 commit 7ef469e

File tree

7 files changed

+87
-53
lines changed

7 files changed

+87
-53
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"homepage": "https://github.com/serverless-nextjs/serverless-next.js#readme",
4040
"devDependencies": {
41-
"@babel/core": "7.14.5",
41+
"@babel/core": "7.14.6",
4242
"@babel/plugin-proposal-class-properties": "^7.13.0",
4343
"@babel/preset-env": "^7.14.4",
4444
"@babel/preset-typescript": "^7.10.4",

‎packages/libs/cloudfront/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"homepage": "https://github.com/serverless-nextjs/serverless-next.js#readme",
3434
"dependencies": {
35-
"aws-sdk": "2.927.0"
35+
"aws-sdk": "2.928.0"
3636
},
3737
"devDependencies": {
3838
"@types/node": "^15.12.2",

‎packages/libs/cloudfront/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
resolved "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz#1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d"
88
integrity sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww==
99

10-
aws-sdk@2.927.0:
11-
version "2.927.0"
12-
resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.927.0.tgz#8545b30094eb52d16dc6b24b1c7f19bea565b261"
13-
integrity sha512-S1dbpq26bQNYBQPHAsZBt0/L/e0FAWFdjjQoU3zdaVIXa08eA9d/oRI3kEs568ErJgBjwWU1CUUlr1byBxKjUQ==
10+
aws-sdk@2.928.0:
11+
version "2.928.0"
12+
resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.928.0.tgz#006b393dbcf435072f4a2298884b293b3d848964"
13+
integrity sha512-1s2Vr+nfR+vSxXj6/cGvguwYWBLm+whGFMCSkzG8T3KyDN60YQn7Ljq3ry1bCqXV6Z9LSFDuKnkGEhtUJnaRHg==
1414
dependencies:
1515
buffer "4.9.2"
1616
events "1.1.1"

‎packages/libs/s3-static-assets/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"homepage": "https://github.com/serverless-nextjs/serverless-next.js#readme",
3434
"dependencies": {
35-
"aws-sdk": "2.927.0",
35+
"aws-sdk": "2.928.0",
3636
"fast-glob": "^3.2.5",
3737
"fs-extra": "^10.0.0",
3838
"mime-types": "^2.1.27",

‎packages/libs/s3-static-assets/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
resolved "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73"
2929
integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=
3030

31-
aws-sdk@2.927.0:
32-
version "2.927.0"
33-
resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.927.0.tgz#8545b30094eb52d16dc6b24b1c7f19bea565b261"
34-
integrity sha512-S1dbpq26bQNYBQPHAsZBt0/L/e0FAWFdjjQoU3zdaVIXa08eA9d/oRI3kEs568ErJgBjwWU1CUUlr1byBxKjUQ==
31+
aws-sdk@2.928.0:
32+
version "2.928.0"
33+
resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.928.0.tgz#006b393dbcf435072f4a2298884b293b3d848964"
34+
integrity sha512-1s2Vr+nfR+vSxXj6/cGvguwYWBLm+whGFMCSkzG8T3KyDN60YQn7Ljq3ry1bCqXV6Z9LSFDuKnkGEhtUJnaRHg==
3535
dependencies:
3636
buffer "4.9.2"
3737
events "1.1.1"

‎packages/serverless-components/nextjs-component/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -979,9 +979,9 @@
979979
version "1.2.0-alpha.4"
980980

981981
"@sls-next/cloudfront@link:../../libs/cloudfront":
982-
version "1.0.5-alpha.2"
982+
version "1.0.5-alpha.3"
983983
dependencies:
984-
aws-sdk "2.927.0"
984+
aws-sdk "2.928.0"
985985

986986
"@sls-next/core@link:../../libs/core":
987987
version "1.0.0-alpha.22"
@@ -996,7 +996,7 @@
996996
version "1.1.2-alpha.1"
997997

998998
"@sls-next/lambda-at-edge@link:../../libs/lambda-at-edge":
999-
version "1.9.0-alpha.22"
999+
version "1.9.0-alpha.23"
10001000
dependencies:
10011001
"@aws-sdk/client-s3" "3.18.0"
10021002
"@aws-sdk/client-sqs" "3.18.0"
@@ -1017,9 +1017,9 @@
10171017
version "1.6.2-alpha.3"
10181018

10191019
"@sls-next/s3-static-assets@link:../../libs/s3-static-assets":
1020-
version "1.4.1-alpha.6"
1020+
version "1.4.1-alpha.7"
10211021
dependencies:
1022-
aws-sdk "2.927.0"
1022+
aws-sdk "2.928.0"
10231023
fast-glob "^3.2.5"
10241024
fs-extra "^10.0.0"
10251025
mime-types "^2.1.27"
@@ -1244,10 +1244,10 @@ atob@^2.1.2:
12441244
resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
12451245
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
12461246

1247-
aws-sdk@2.927.0, aws-sdk@^2.387.0, aws-sdk@^2.488.0, aws-sdk@^2.920.0:
1248-
version "2.927.0"
1249-
resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.927.0.tgz#8545b30094eb52d16dc6b24b1c7f19bea565b261"
1250-
integrity sha512-S1dbpq26bQNYBQPHAsZBt0/L/e0FAWFdjjQoU3zdaVIXa08eA9d/oRI3kEs568ErJgBjwWU1CUUlr1byBxKjUQ==
1247+
aws-sdk@2.928.0, aws-sdk@^2.387.0, aws-sdk@^2.488.0, aws-sdk@^2.920.0:
1248+
version "2.928.0"
1249+
resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.928.0.tgz#006b393dbcf435072f4a2298884b293b3d848964"
1250+
integrity sha512-1s2Vr+nfR+vSxXj6/cGvguwYWBLm+whGFMCSkzG8T3KyDN60YQn7Ljq3ry1bCqXV6Z9LSFDuKnkGEhtUJnaRHg==
12511251
dependencies:
12521252
buffer "4.9.2"
12531253
events "1.1.1"

‎yarn.lock

Lines changed: 67 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -843,17 +843,17 @@
843843
resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.5.tgz#8ef4c18e58e801c5c95d3c1c0f2874a2680fadea"
844844
integrity sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w==
845845

846-
"@babel/[email protected].5", "@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5":
847-
version "7.14.5"
848-
resolved "https://registry.npmjs.org/@babel/core/-/core-7.14.5.tgz#d281f46a9905f07d1b3bf71ead54d9c7d89cb1e3"
849-
integrity sha512-RN/AwP2DJmQTZSfiDaD+JQQ/J99KsIpOCfBE5pL+5jJSt7nI3nYGoAXZu+ffYSQ029NLs2DstZb+eR81uuARgg==
846+
"@babel/[email protected].6", "@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5":
847+
version "7.14.6"
848+
resolved "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab"
849+
integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==
850850
dependencies:
851851
"@babel/code-frame" "^7.14.5"
852852
"@babel/generator" "^7.14.5"
853853
"@babel/helper-compilation-targets" "^7.14.5"
854854
"@babel/helper-module-transforms" "^7.14.5"
855-
"@babel/helpers" "^7.14.5"
856-
"@babel/parser" "^7.14.5"
855+
"@babel/helpers" "^7.14.6"
856+
"@babel/parser" "^7.14.6"
857857
"@babel/template" "^7.14.5"
858858
"@babel/traverse" "^7.14.5"
859859
"@babel/types" "^7.14.5"
@@ -1074,10 +1074,10 @@
10741074
"@babel/traverse" "^7.14.5"
10751075
"@babel/types" "^7.14.5"
10761076

1077-
"@babel/helpers@^7.14.5":
1078-
version "7.14.5"
1079-
resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.5.tgz#4870f8d9a6fdbbd65e5674a3558b4ff7fef0d9b2"
1080-
integrity sha512-xtcWOuN9VL6nApgVHtq3PPcQv5qFBJzoSZzJ/2c0QK/IP/gxVcoWSNQwFEGvmbQsuS9rhYqjILDGGXcTkA705Q==
1077+
"@babel/helpers@^7.14.6":
1078+
version "7.14.6"
1079+
resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz#5b58306b95f1b47e2a0199434fa8658fa6c21635"
1080+
integrity sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==
10811081
dependencies:
10821082
"@babel/template" "^7.14.5"
10831083
"@babel/traverse" "^7.14.5"
@@ -1101,10 +1101,10 @@
11011101
chalk "^2.0.0"
11021102
js-tokens "^4.0.0"
11031103

1104-
"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.7.2":
1105-
version "7.14.5"
1106-
resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.14.5.tgz#4cd2f346261061b2518873ffecdf1612cb032829"
1107-
integrity sha512-TM8C+xtH/9n1qzX+JNHi7AN2zHMTiPUtspO0ZdHflW8KaskkALhMmuMHb4bCmNdv9VAPzJX3/bXqkVLnAvsPfg==
1104+
"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.7.2":
1105+
version "7.14.6"
1106+
resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.14.6.tgz#d85cc68ca3cac84eae384c06f032921f5227f4b2"
1107+
integrity sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ==
11081108

11091109
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
11101110
version "7.14.5"
@@ -3269,7 +3269,7 @@
32693269
regex-parser "^2.2.10"
32703270

32713271
"@sls-next/lambda-at-edge@link:./packages/libs/lambda-at-edge":
3272-
version "1.9.0-alpha.22"
3272+
version "1.9.0-alpha.23"
32733273
dependencies:
32743274
"@aws-sdk/client-s3" "3.18.0"
32753275
"@aws-sdk/client-sqs" "3.18.0"
@@ -3629,39 +3629,39 @@
36293629
"@types/yargs-parser" "*"
36303630

36313631
"@typescript-eslint/eslint-plugin@^4.0.0":
3632-
version "4.26.1"
3633-
resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz#b9c7313321cb837e2bf8bebe7acc2220659e67d3"
3634-
integrity sha512-aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw==
3632+
version "4.27.0"
3633+
resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.27.0.tgz#0b7fc974e8bc9b2b5eb98ed51427b0be529b4ad0"
3634+
integrity sha512-DsLqxeUfLVNp3AO7PC3JyaddmEHTtI9qTSAs+RB6ja27QvIM0TA8Cizn1qcS6vOu+WDLFJzkwkgweiyFhssDdQ==
36353635
dependencies:
3636-
"@typescript-eslint/experimental-utils" "4.26.1"
3637-
"@typescript-eslint/scope-manager" "4.26.1"
3636+
"@typescript-eslint/experimental-utils" "4.27.0"
3637+
"@typescript-eslint/scope-manager" "4.27.0"
36383638
debug "^4.3.1"
36393639
functional-red-black-tree "^1.0.1"
36403640
lodash "^4.17.21"
36413641
regexpp "^3.1.0"
36423642
semver "^7.3.5"
36433643
tsutils "^3.21.0"
36443644

3645-
"@typescript-eslint/experimental-utils@4.26.1":
3646-
version "4.26.1"
3647-
resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz#a35980a2390da9232aa206b27f620eab66e94142"
3648-
integrity sha512-sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ==
3645+
"@typescript-eslint/experimental-utils@4.27.0":
3646+
version "4.27.0"
3647+
resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.27.0.tgz#78192a616472d199f084eab8f10f962c0757cd1c"
3648+
integrity sha512-n5NlbnmzT2MXlyT+Y0Jf0gsmAQzCnQSWXKy4RGSXVStjDvS5we9IWbh7qRVKdGcxT0WYlgcCYUK/HRg7xFhvjQ==
36493649
dependencies:
36503650
"@types/json-schema" "^7.0.7"
3651-
"@typescript-eslint/scope-manager" "4.26.1"
3652-
"@typescript-eslint/types" "4.26.1"
3653-
"@typescript-eslint/typescript-estree" "4.26.1"
3651+
"@typescript-eslint/scope-manager" "4.27.0"
3652+
"@typescript-eslint/types" "4.27.0"
3653+
"@typescript-eslint/typescript-estree" "4.27.0"
36543654
eslint-scope "^5.1.1"
36553655
eslint-utils "^3.0.0"
36563656

36573657
"@typescript-eslint/parser@^4.26.1":
3658-
version "4.26.1"
3659-
resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz#cecfdd5eb7a5c13aabce1c1cfd7fbafb5a0f1e8e"
3660-
integrity sha512-q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ==
3658+
version "4.27.0"
3659+
resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.27.0.tgz#85447e573364bce4c46c7f64abaa4985aadf5a94"
3660+
integrity sha512-XpbxL+M+gClmJcJ5kHnUpBGmlGdgNvy6cehgR6ufyxkEJMGP25tZKCaKyC0W/JVpuhU3VU1RBn7SYUPKSMqQvQ==
36613661
dependencies:
3662-
"@typescript-eslint/scope-manager" "4.26.1"
3663-
"@typescript-eslint/types" "4.26.1"
3664-
"@typescript-eslint/typescript-estree" "4.26.1"
3662+
"@typescript-eslint/scope-manager" "4.27.0"
3663+
"@typescript-eslint/types" "4.27.0"
3664+
"@typescript-eslint/typescript-estree" "4.27.0"
36653665
debug "^4.3.1"
36663666

36673667
"@typescript-eslint/[email protected]":
@@ -3672,11 +3672,24 @@
36723672
"@typescript-eslint/types" "4.26.1"
36733673
"@typescript-eslint/visitor-keys" "4.26.1"
36743674

3675+
"@typescript-eslint/[email protected]":
3676+
version "4.27.0"
3677+
resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.27.0.tgz#b0b1de2b35aaf7f532e89c8e81d0fa298cae327d"
3678+
integrity sha512-DY73jK6SEH6UDdzc6maF19AHQJBFVRf6fgAXHPXCGEmpqD4vYgPEzqpFz1lf/daSbOcMpPPj9tyXXDPW2XReAw==
3679+
dependencies:
3680+
"@typescript-eslint/types" "4.27.0"
3681+
"@typescript-eslint/visitor-keys" "4.27.0"
3682+
36753683
"@typescript-eslint/[email protected]":
36763684
version "4.26.1"
36773685
resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz#9e7c523f73c34b04a765e4167ca5650436ef1d38"
36783686
integrity sha512-STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg==
36793687

3688+
"@typescript-eslint/[email protected]":
3689+
version "4.27.0"
3690+
resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.27.0.tgz#712b408519ed699baff69086bc59cd2fc13df8d8"
3691+
integrity sha512-I4ps3SCPFCKclRcvnsVA/7sWzh7naaM/b4pBO2hVxnM3wrU51Lveybdw5WoIktU/V4KfXrTt94V9b065b/0+wA==
3692+
36803693
"@typescript-eslint/[email protected]":
36813694
version "4.26.1"
36823695
resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz#b2ce2e789233d62283fae2c16baabd4f1dbc9633"
@@ -3690,6 +3703,19 @@
36903703
semver "^7.3.5"
36913704
tsutils "^3.21.0"
36923705

3706+
"@typescript-eslint/[email protected]":
3707+
version "4.27.0"
3708+
resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.27.0.tgz#189a7b9f1d0717d5cccdcc17247692dedf7a09da"
3709+
integrity sha512-KH03GUsUj41sRLLEy2JHstnezgpS5VNhrJouRdmh6yNdQ+yl8w5LrSwBkExM+jWwCJa7Ct2c8yl8NdtNRyQO6g==
3710+
dependencies:
3711+
"@typescript-eslint/types" "4.27.0"
3712+
"@typescript-eslint/visitor-keys" "4.27.0"
3713+
debug "^4.3.1"
3714+
globby "^11.0.3"
3715+
is-glob "^4.0.1"
3716+
semver "^7.3.5"
3717+
tsutils "^3.21.0"
3718+
36933719
"@typescript-eslint/[email protected]":
36943720
version "4.26.1"
36953721
resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz#0d55ea735cb0d8903b198017d6d4f518fdaac546"
@@ -3698,6 +3724,14 @@
36983724
"@typescript-eslint/types" "4.26.1"
36993725
eslint-visitor-keys "^2.0.0"
37003726

3727+
"@typescript-eslint/[email protected]":
3728+
version "4.27.0"
3729+
resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.27.0.tgz#f56138b993ec822793e7ebcfac6ffdce0a60cb81"
3730+
integrity sha512-es0GRYNZp0ieckZ938cEANfEhsfHrzuLrePukLKtY3/KPXcq1Xd555Mno9/GOgXhKzn0QfkDLVgqWO3dGY80bg==
3731+
dependencies:
3732+
"@typescript-eslint/types" "4.27.0"
3733+
eslint-visitor-keys "^2.0.0"
3734+
37013735
"@vercel/nft@^0.13.1":
37023736
version "0.13.1"
37033737
resolved "https://registry.npmjs.org/@vercel/nft/-/nft-0.13.1.tgz#98df07e04620069ba63fff92af490c5842a2f31f"

0 commit comments

Comments
 (0)