Skip to content

Commit 0e4fb78

Browse files
Upgrade aws-sdk & delete removed files on sync
1 parent 93bd1f2 commit 0e4fb78

File tree

3 files changed

+57
-69
lines changed

3 files changed

+57
-69
lines changed

lib/s3-sync.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import { merge } from 'lodash'
99
// To increase s3's download & upload dir perf
1010
http.globalAgent.maxSockets = https.globalAgent.maxSockets = 30
1111

12+
const deleteRemoved = true
13+
1214
const { AWS_ACCESS_KEY, AWS_SECRET_KEY, AWS_SHOULD_PUBLISH } = process.env
1315

1416
const client = S3.createClient({
@@ -27,6 +29,7 @@ const jsonDocsDirDownloadOptions = {
2729
}
2830

2931
const jsonDocsDirUploadOptions = merge({}, jsonDocsDirDownloadOptions, {
32+
deleteRemoved,
3033
s3Params: {
3134
ACL: 'public-read',
3235
CacheControl: 'max-age=365000000, immutable',
@@ -43,6 +46,7 @@ let revDocsDirDownloadOptions = {
4346
}
4447

4548
const revDocsDirUploadOptions = merge({}, revDocsDirDownloadOptions, {
49+
deleteRemoved,
4650
s3Params: {
4751
ACL: 'public-read',
4852
GrantRead: 'uri=http://acs.amazonaws.com/groups/global/AllUsers',

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
"pretty-quick": "^1.6.0"
5353
},
5454
"resolutions": {
55-
"aws-sdk": "~2.224.1",
56-
"graceful-fs": "^4.1.11"
55+
"aws-sdk": "~2.276.1"
5756
},
5857
"engines": {
5958
"node": ">= 8"

yarn.lock

Lines changed: 52 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44

55
"@types/node@*":
6-
version "9.6.5"
7-
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.5.tgz#ee700810fdf49ac1c399fc5980b7559b3e5a381d"
6+
version "10.5.2"
7+
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.2.tgz#f19f05314d5421fe37e74153254201a7bf00a707"
88

99
acorn-jsx@^4.1.1:
1010
version "4.1.1"
@@ -75,9 +75,9 @@ assertion-error@^1.0.1:
7575
version "1.1.0"
7676
resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
7777

78-
aws-sdk@~2.0.31, aws-sdk@~2.224.1:
79-
version "2.224.1"
80-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.224.1.tgz#82fe93e10b3e818f315c35ce8667cdc8db94a0b3"
78+
aws-sdk@~2.0.31, aws-sdk@~2.276.1:
79+
version "2.276.1"
80+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.276.1.tgz#4f5cd52f4d1a13a412c8a8d75b276c556ad13947"
8181
dependencies:
8282
buffer "4.9.1"
8383
events "1.1.1"
@@ -87,8 +87,7 @@ aws-sdk@~2.0.31, aws-sdk@~2.224.1:
8787
sax "1.2.1"
8888
url "0.10.3"
8989
uuid "3.1.0"
90-
xml2js "0.4.17"
91-
xmlbuilder "4.2.1"
90+
xml2js "0.4.19"
9291

9392
babel-code-frame@^6.26.0:
9493
version "6.26.0"
@@ -103,8 +102,8 @@ balanced-match@^1.0.0:
103102
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
104103

105104
base64-js@^1.0.2:
106-
version "1.2.3"
107-
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801"
105+
version "1.3.0"
106+
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
108107

109108
boolbase@~1.0.0:
110109
version "1.0.0"
@@ -160,15 +159,7 @@ chalk@^1.1.3:
160159
strip-ansi "^3.0.0"
161160
supports-color "^2.0.0"
162161

163-
chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1:
164-
version "2.3.2"
165-
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
166-
dependencies:
167-
ansi-styles "^3.2.1"
168-
escape-string-regexp "^1.0.5"
169-
supports-color "^5.3.0"
170-
171-
chalk@^2.3.0:
162+
chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1:
172163
version "2.4.1"
173164
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
174165
dependencies:
@@ -222,14 +213,14 @@ clone@^1.0.2:
222213
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
223214

224215
color-convert@^1.9.0:
225-
version "1.9.1"
226-
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
216+
version "1.9.2"
217+
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.2.tgz#49881b8fba67df12a96bdf3f56c0aab9e7913147"
227218
dependencies:
228-
color-name "^1.1.1"
219+
color-name "1.1.1"
229220

230-
color-name@^1.1.1:
231-
version "1.1.3"
232-
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
221+
222+
version "1.1.1"
223+
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
233224

234225
235226
version "2.15.1"
@@ -341,8 +332,8 @@ domelementtype@~1.1.1:
341332
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
342333

343334
domhandler@^2.3.0:
344-
version "2.4.1"
345-
resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
335+
version "2.4.2"
336+
resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
346337
dependencies:
347338
domelementtype "1"
348339

@@ -482,8 +473,8 @@ espree@^4.0.0:
482473
acorn-jsx "^4.1.1"
483474

484475
esprima@^4.0.0:
485-
version "4.0.0"
486-
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
476+
version "4.0.1"
477+
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
487478

488479
esquery@^1.0.1:
489480
version "1.0.1"
@@ -641,10 +632,16 @@ globby@^5.0.0:
641632
pify "^2.0.0"
642633
pinkie-promise "^2.0.0"
643634

644-
graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@~3.0.5:
635+
graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
645636
version "4.1.11"
646637
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
647638

639+
graceful-fs@~3.0.5:
640+
version "3.0.11"
641+
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
642+
dependencies:
643+
natives "^1.1.0"
644+
648645
649646
version "1.10.5"
650647
resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
@@ -707,24 +704,20 @@ husky@^0.14.3:
707704
strip-indent "^2.0.0"
708705

709706
iconv-lite@^0.4.17:
710-
version "0.4.21"
711-
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
707+
version "0.4.23"
708+
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
712709
dependencies:
713-
safer-buffer "^2.1.0"
710+
safer-buffer ">= 2.1.2 < 3"
714711

715712
716713
version "1.1.8"
717714
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
718715

719716
ieee754@^1.1.4:
720-
version "1.1.11"
721-
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455"
722-
723-
ignore@^3.3.3:
724-
version "3.3.7"
725-
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
717+
version "1.1.12"
718+
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
726719

727-
ignore@^3.3.7:
720+
ignore@^3.3.3, ignore@^3.3.7:
728721
version "3.3.10"
729722
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
730723

@@ -1010,11 +1003,7 @@ lodash@^3.10.1:
10101003
version "3.10.1"
10111004
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
10121005

1013-
lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
1014-
version "4.17.5"
1015-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
1016-
1017-
lodash@^4.17.10:
1006+
lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
10181007
version "4.17.10"
10191008
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
10201009

@@ -1099,6 +1088,10 @@ [email protected]:
10991088
version "0.0.7"
11001089
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
11011090

1091+
natives@^1.1.0:
1092+
version "1.1.4"
1093+
resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.4.tgz#2f0f224fc9a7dd53407c7667c84cf8dbe773de58"
1094+
11021095
natural-compare@^1.4.0:
11031096
version "1.4.0"
11041097
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -1392,10 +1385,10 @@ s3@^4.4.0:
13921385
streamsink "~1.2.0"
13931386

13941387
safe-buffer@~5.1.0, safe-buffer@~5.1.1:
1395-
version "5.1.1"
1396-
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
1388+
version "5.1.2"
1389+
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
13971390

1398-
safer-buffer@^2.1.0:
1391+
"safer-buffer@>= 2.1.2 < 3":
13991392
version "2.1.2"
14001393
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
14011394

@@ -1496,7 +1489,7 @@ strip-json-comments@^2.0.1:
14961489
version "2.0.1"
14971490
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
14981491

1499-
1492+
[email protected], supports-color@^5.3.0:
15001493
version "5.4.0"
15011494
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
15021495
dependencies:
@@ -1506,12 +1499,6 @@ supports-color@^2.0.0:
15061499
version "2.0.0"
15071500
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
15081501

1509-
supports-color@^5.3.0:
1510-
version "5.3.0"
1511-
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
1512-
dependencies:
1513-
has-flag "^3.0.0"
1514-
15151502
15161503
version "1.0.1"
15171504
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
@@ -1552,8 +1539,8 @@ type-detect@^4.0.0:
15521539
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
15531540

15541541
universalify@^0.1.0:
1555-
version "0.1.1"
1556-
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
1542+
version "0.1.2"
1543+
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
15571544

15581545
uri-js@^4.2.1:
15591546
version "4.2.2"
@@ -1583,8 +1570,8 @@ wcwidth@^1.0.1:
15831570
defaults "^1.0.3"
15841571

15851572
which@^1.2.9:
1586-
version "1.3.0"
1587-
resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
1573+
version "1.3.1"
1574+
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
15881575
dependencies:
15891576
isexe "^2.0.0"
15901577

@@ -1602,18 +1589,16 @@ write@^0.2.1:
16021589
dependencies:
16031590
mkdirp "^0.5.1"
16041591

1605-
1606-
version "0.4.17"
1607-
resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.17.tgz#17be93eaae3f3b779359c795b419705a8817e868"
1592+
1593+
version "0.4.19"
1594+
resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
16081595
dependencies:
16091596
sax ">=0.6.0"
1610-
xmlbuilder "^4.1.0"
1597+
xmlbuilder "~9.0.1"
16111598

1612-
[email protected], xmlbuilder@^4.1.0:
1613-
version "4.2.1"
1614-
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5"
1615-
dependencies:
1616-
lodash "^4.0.0"
1599+
xmlbuilder@~9.0.1:
1600+
version "9.0.7"
1601+
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
16171602

16181603
yallist@^2.1.2:
16191604
version "2.1.2"

0 commit comments

Comments
 (0)