Skip to content

Commit a32276d

Browse files
authored
Merge pull request #1018 from serverless-heaven/serverless-zip-method
Ensure consistent artifact `sha` (remove `bestzip` and bring back `archiver`)
2 parents 0e83424 + df24200 commit a32276d

File tree

11 files changed

+246
-962
lines changed

11 files changed

+246
-962
lines changed

examples/babel-multiple-statically-entries/yarn.lock

Lines changed: 1 addition & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,13 +1811,6 @@ ansi-styles@^3.2.1:
18111811
dependencies:
18121812
color-convert "^1.9.0"
18131813

1814-
ansi-styles@^4.0.0:
1815-
version "4.3.0"
1816-
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
1817-
integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
1818-
dependencies:
1819-
color-convert "^2.0.1"
1820-
18211814
ansi-styles@^4.1.0:
18221815
version "4.2.1"
18231816
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
@@ -1896,19 +1889,6 @@ archiver@^4.0.1:
18961889
tar-stream "^2.1.2"
18971890
zip-stream "^3.0.1"
18981891

1899-
archiver@^5.3.0:
1900-
version "5.3.0"
1901-
resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba"
1902-
integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==
1903-
dependencies:
1904-
archiver-utils "^2.1.0"
1905-
async "^3.2.0"
1906-
buffer-crc32 "^0.2.1"
1907-
readable-stream "^3.6.0"
1908-
readdir-glob "^1.0.0"
1909-
tar-stream "^2.2.0"
1910-
zip-stream "^4.1.0"
1911-
19121892
arg@^4.1.0:
19131893
version "4.1.3"
19141894
resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
@@ -2136,17 +2116,6 @@ bcrypt-pbkdf@^1.0.0:
21362116
dependencies:
21372117
tweetnacl "^0.14.3"
21382118

2139-
bestzip@^2.2.0:
2140-
version "2.2.0"
2141-
resolved "https://registry.yarnpkg.com/bestzip/-/bestzip-2.2.0.tgz#a6757c04469eeb503708881e1910a4b413155ee7"
2142-
integrity sha512-MCuN3sjLA//zKhheXSOAMlFtj4oZEHKCa+gHGLYUDnL2VRuuwARVV+QKMwtbDk5CL2AQs+3Dw20h8KJJrbENSg==
2143-
dependencies:
2144-
archiver "^5.3.0"
2145-
async "^3.2.0"
2146-
glob "^7.1.6"
2147-
which "^2.0.2"
2148-
yargs "^16.2.0"
2149-
21502119
better-assert@~1.0.0:
21512120
version "1.0.2"
21522121
resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
@@ -2193,15 +2162,6 @@ bl@^4.0.1:
21932162
inherits "^2.0.4"
21942163
readable-stream "^3.4.0"
21952164

2196-
bl@^4.0.3:
2197-
version "4.1.0"
2198-
resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
2199-
integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
2200-
dependencies:
2201-
buffer "^5.5.0"
2202-
inherits "^2.0.4"
2203-
readable-stream "^3.4.0"
2204-
22052165
22062166
version "0.0.5"
22072167
resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
@@ -2697,15 +2657,6 @@ cli-width@^2.0.0:
26972657
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
26982658
integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
26992659

2700-
cliui@^7.0.2:
2701-
version "7.0.4"
2702-
resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
2703-
integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
2704-
dependencies:
2705-
string-width "^4.2.0"
2706-
strip-ansi "^6.0.0"
2707-
wrap-ansi "^7.0.0"
2708-
27092660
[email protected], clone-response@^1.0.2:
27102661
version "1.0.2"
27112662
resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -2863,16 +2814,6 @@ compress-commons@^3.0.0:
28632814
normalize-path "^3.0.0"
28642815
readable-stream "^2.3.7"
28652816

2866-
compress-commons@^4.1.0:
2867-
version "4.1.0"
2868-
resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz#25ec7a4528852ccd1d441a7d4353cd0ece11371b"
2869-
integrity sha512-ofaaLqfraD1YRTkrRKPCrGJ1pFeDG/MVCkVVV2FNGeWquSlqw5wOrwOfPQ1xF2u+blpeWASie5EubHz+vsNIgA==
2870-
dependencies:
2871-
buffer-crc32 "^0.2.13"
2872-
crc32-stream "^4.0.1"
2873-
normalize-path "^3.0.0"
2874-
readable-stream "^3.6.0"
2875-
28762817
28772818
version "0.0.1"
28782819
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -2979,14 +2920,6 @@ [email protected], core-util-is@~1.0.0:
29792920
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
29802921
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
29812922

2982-
crc-32@^1.2.0:
2983-
version "1.2.0"
2984-
resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
2985-
integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
2986-
dependencies:
2987-
exit-on-epipe "~1.0.1"
2988-
printj "~1.1.0"
2989-
29902923
crc32-stream@^3.0.1:
29912924
version "3.0.1"
29922925
resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz#cae6eeed003b0e44d739d279de5ae63b171b4e85"
@@ -2995,14 +2928,6 @@ crc32-stream@^3.0.1:
29952928
crc "^3.4.4"
29962929
readable-stream "^3.4.0"
29972930

2998-
crc32-stream@^4.0.1:
2999-
version "4.0.2"
3000-
resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007"
3001-
integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==
3002-
dependencies:
3003-
crc-32 "^1.2.0"
3004-
readable-stream "^3.4.0"
3005-
30062931
crc@^3.4.4:
30072932
version "3.8.0"
30082933
resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
@@ -3751,11 +3676,6 @@ execa@^4.0.0:
37513676
signal-exit "^3.0.2"
37523677
strip-final-newline "^2.0.0"
37533678

3754-
exit-on-epipe@~1.0.1:
3755-
version "1.0.1"
3756-
resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
3757-
integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
3758-
37593679
expand-brackets@^2.1.4:
37603680
version "2.1.4"
37613681
resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -4179,11 +4099,6 @@ gensync@^1.0.0-beta.1:
41794099
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
41804100
integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
41814101

4182-
get-caller-file@^2.0.5:
4183-
version "2.0.5"
4184-
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
4185-
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
4186-
41874102
get-proxy@^2.0.0:
41884103
version "2.1.0"
41894104
resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93"
@@ -6399,11 +6314,6 @@ prettyoutput@^1.2.0:
63996314
commander "2.19.x"
64006315
lodash "4.17.x"
64016316

6402-
printj@~1.1.0:
6403-
version "1.1.2"
6404-
resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
6405-
integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
6406-
64076317
process-nextick-args@~2.0.0:
64086318
version "2.0.1"
64096319
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -6608,13 +6518,6 @@ readable-stream@^3.0.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable
66086518
string_decoder "^1.1.1"
66096519
util-deprecate "^1.0.1"
66106520

6611-
readdir-glob@^1.0.0:
6612-
version "1.1.1"
6613-
resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"
6614-
integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==
6615-
dependencies:
6616-
minimatch "^3.0.4"
6617-
66186521
readdirp@^2.2.1:
66196522
version "2.2.1"
66206523
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -6778,11 +6681,6 @@ request@^2.88.0:
67786681
tunnel-agent "^0.6.0"
67796682
uuid "^3.3.2"
67806683

6781-
require-directory@^2.1.1:
6782-
version "2.1.1"
6783-
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
6784-
integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
6785-
67866684
resolve-url@^0.2.1:
67876685
version "0.2.1"
67886686
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -7016,7 +6914,6 @@ serverless-offline@^6.5.0:
70166914
"serverless-webpack@file:../..":
70176915
version "5.5.5"
70186916
dependencies:
7019-
bestzip "^2.2.0"
70206917
bluebird "^3.7.2"
70216918
fs-extra "^9.1.0"
70226919
glob "^7.2.0"
@@ -7452,15 +7349,6 @@ string-width@^4.0.0, string-width@^4.1.0:
74527349
is-fullwidth-code-point "^3.0.0"
74537350
strip-ansi "^6.0.0"
74547351

7455-
string-width@^4.2.0:
7456-
version "4.2.2"
7457-
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
7458-
integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
7459-
dependencies:
7460-
emoji-regex "^8.0.0"
7461-
is-fullwidth-code-point "^3.0.0"
7462-
strip-ansi "^6.0.0"
7463-
74647352
string.prototype.trimend@^1.0.1:
74657353
version "1.0.1"
74667354
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
@@ -7612,17 +7500,6 @@ tar-stream@^2.1.0, tar-stream@^2.1.2:
76127500
inherits "^2.0.3"
76137501
readable-stream "^3.1.1"
76147502

7615-
tar-stream@^2.2.0:
7616-
version "2.2.0"
7617-
resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
7618-
integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
7619-
dependencies:
7620-
bl "^4.0.3"
7621-
end-of-stream "^1.4.1"
7622-
fs-constants "^1.0.0"
7623-
inherits "^2.0.3"
7624-
readable-stream "^3.1.1"
7625-
76267503
term-size@^1.2.0:
76277504
version "1.2.0"
76287505
resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -8168,7 +8045,7 @@ which@^1.2.9:
81688045
dependencies:
81698046
isexe "^2.0.0"
81708047

8171-
which@^2.0.1, which@^2.0.2:
8048+
which@^2.0.1:
81728049
version "2.0.2"
81738050
resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
81748051
integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
@@ -8219,15 +8096,6 @@ worker-farm@^1.7.0:
82198096
dependencies:
82208097
errno "~0.1.7"
82218098

8222-
wrap-ansi@^7.0.0:
8223-
version "7.0.0"
8224-
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
8225-
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
8226-
dependencies:
8227-
ansi-styles "^4.0.0"
8228-
string-width "^4.1.0"
8229-
strip-ansi "^6.0.0"
8230-
82318099
wrappy@1:
82328100
version "1.0.2"
82338101
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -8309,11 +8177,6 @@ y18n@^4.0.0:
83098177
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
83108178
integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
83118179

8312-
y18n@^5.0.5:
8313-
version "5.0.5"
8314-
resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
8315-
integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
8316-
83178180
yallist@^2.1.2:
83188181
version "2.1.2"
83198182
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
@@ -8350,24 +8213,6 @@ yargs-parser@^18.1.3:
83508213
camelcase "^5.0.0"
83518214
decamelize "^1.2.0"
83528215

8353-
yargs-parser@^20.2.2:
8354-
version "20.2.7"
8355-
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
8356-
integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==
8357-
8358-
yargs@^16.2.0:
8359-
version "16.2.0"
8360-
resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
8361-
integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
8362-
dependencies:
8363-
cliui "^7.0.2"
8364-
escalade "^3.1.1"
8365-
get-caller-file "^2.0.5"
8366-
require-directory "^2.1.1"
8367-
string-width "^4.2.0"
8368-
y18n "^5.0.5"
8369-
yargs-parser "^20.2.2"
8370-
83718216
yauzl@^2.4.2:
83728217
version "2.10.0"
83738218
resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
@@ -8403,12 +8248,3 @@ zip-stream@^3.0.1:
84038248
archiver-utils "^2.1.0"
84048249
compress-commons "^3.0.0"
84058250
readable-stream "^3.6.0"
8406-
8407-
zip-stream@^4.1.0:
8408-
version "4.1.0"
8409-
resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79"
8410-
integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==
8411-
dependencies:
8412-
archiver-utils "^2.1.0"
8413-
compress-commons "^4.1.0"
8414-
readable-stream "^3.6.0"

0 commit comments

Comments
 (0)