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

Commit 12e41bb

Browse files
dphangdphang
authored
chore: ensure dist directories are cleaned before builds, remove unneeded yarn install in publish commands (#1304)
1 parent 442a906 commit 12e41bb

File tree

13 files changed

+565
-370
lines changed

13 files changed

+565
-370
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"packages-build": "lerna run build",
2121
"test:watch": "yarn test --watch --collect-coverage=false",
2222
"check-gh-token": ": \"${GH_TOKEN:?Please set GH_TOKEN to a GitHub personal token that can create releases.}\"",
23-
"prerelease": "yarn check-gh-token && yarn install && lerna publish --conventional-commits --conventional-prerelease --exact --create-release github --dist-tag alpha",
24-
"graduate": "yarn check-gh-token && yarn install && lerna version --conventional-commits --conventional-graduate --exact --create-release github && lerna publish from-git",
23+
"prerelease": "yarn check-gh-token && lerna publish --conventional-commits --conventional-prerelease --exact --create-release github --dist-tag alpha",
24+
"graduate": "yarn check-gh-token && lerna version --conventional-commits --conventional-graduate --exact --create-release github && lerna publish from-git",
2525
"lint": "eslint .",
2626
"integration": "jest --runInBand --config jest.integration.config.json --setupTestFrameworkScriptFile=./jest.integration.setup.js",
2727
"postinstall": "yarn packages-install && opencollective-postinstall",

‎packages/libs/cloudfront/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
"directory": "packages/libs/cloudfront"
1717
},
1818
"scripts": {
19-
"prepare": "yarn build",
20-
"build": "tsc -p tsconfig.build.json"
19+
"prepare": "yarn clean && yarn build",
20+
"build": "tsc -p tsconfig.build.json",
21+
"clean": "yarn rimraf dist"
2122
},
2223
"keywords": [
2324
"AWS",
@@ -36,6 +37,7 @@
3637
},
3738
"devDependencies": {
3839
"@types/node": "^15.12.2",
40+
"rimraf": "^3.0.2",
3941
"typescript": "^4.3.4"
4042
}
4143
}

‎packages/libs/cloudfront/yarn.lock

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,24 @@ [email protected]:
2222
uuid "3.3.2"
2323
xml2js "0.4.19"
2424

25+
balanced-match@^1.0.0:
26+
version "1.0.2"
27+
resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
28+
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
29+
2530
base64-js@^1.0.2:
2631
version "1.3.1"
2732
resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
2833
integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
2934

35+
brace-expansion@^1.1.7:
36+
version "1.1.11"
37+
resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
38+
integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
39+
dependencies:
40+
balanced-match "^1.0.0"
41+
concat-map "0.0.1"
42+
3043
[email protected]:
3144
version "4.9.2"
3245
resolved "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
@@ -36,16 +49,51 @@ [email protected]:
3649
ieee754 "^1.1.4"
3750
isarray "^1.0.0"
3851

52+
[email protected]:
53+
version "0.0.1"
54+
resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
55+
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
56+
3957
[email protected]:
4058
version "1.1.1"
4159
resolved "https://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
4260
integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
4361

62+
fs.realpath@^1.0.0:
63+
version "1.0.0"
64+
resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
65+
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
66+
67+
glob@^7.1.3:
68+
version "7.1.7"
69+
resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
70+
integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
71+
dependencies:
72+
fs.realpath "^1.0.0"
73+
inflight "^1.0.4"
74+
inherits "2"
75+
minimatch "^3.0.4"
76+
once "^1.3.0"
77+
path-is-absolute "^1.0.0"
78+
4479
[email protected], ieee754@^1.1.4:
4580
version "1.1.13"
4681
resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
4782
integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
4883

84+
inflight@^1.0.4:
85+
version "1.0.6"
86+
resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
87+
integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
88+
dependencies:
89+
once "^1.3.0"
90+
wrappy "1"
91+
92+
inherits@2:
93+
version "2.0.4"
94+
resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
95+
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
96+
4997
isarray@^1.0.0:
5098
version "1.0.0"
5199
resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -56,6 +104,25 @@ [email protected]:
56104
resolved "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
57105
integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
58106

107+
minimatch@^3.0.4:
108+
version "3.0.4"
109+
resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
110+
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
111+
dependencies:
112+
brace-expansion "^1.1.7"
113+
114+
once@^1.3.0:
115+
version "1.4.0"
116+
resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
117+
integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
118+
dependencies:
119+
wrappy "1"
120+
121+
path-is-absolute@^1.0.0:
122+
version "1.0.1"
123+
resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
124+
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
125+
59126
[email protected]:
60127
version "1.3.2"
61128
resolved "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
@@ -66,6 +133,13 @@ [email protected]:
66133
resolved "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
67134
integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
68135

136+
rimraf@^3.0.2:
137+
version "3.0.2"
138+
resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
139+
integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
140+
dependencies:
141+
glob "^7.1.3"
142+
69143
[email protected]:
70144
version "1.2.1"
71145
resolved "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
@@ -94,6 +168,11 @@ [email protected]:
94168
resolved "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
95169
integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
96170

171+
wrappy@1:
172+
version "1.0.2"
173+
resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
174+
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
175+
97176
[email protected]:
98177
version "0.4.19"
99178
resolved "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"

‎packages/libs/core/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
"directory": "packages/libs/core"
1818
},
1919
"scripts": {
20-
"prepare": "yarn build",
21-
"build": "tsc -p tsconfig.build.json && tsc -p tsconfig.module.json"
20+
"prepare": "yarn clean && yarn build",
21+
"build": "tsc -p tsconfig.build.json && tsc -p tsconfig.module.json",
22+
"clean": "yarn rimraf dist"
2223
},
2324
"keywords": [
2425
"Next.js",
@@ -40,6 +41,7 @@
4041
"devDependencies": {
4142
"@types/cookie": "^0.4.0",
4243
"@types/jsonwebtoken": "^8.5.0",
44+
"rimraf": "^3.0.2",
4345
"typescript": "^4.3.4"
4446
}
4547
}

‎packages/libs/core/yarn.lock

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,29 @@
3939
resolved "https://registry.npmjs.org/@types/node/-/node-15.3.1.tgz#23a06b87eedb524016616e886b116b8fdcb180af"
4040
integrity sha512-weaeiP4UF4XgF++3rpQhpIJWsCTS4QJw5gvBhQu6cFIxTwyxWIe3xbnrY/o2lTCQ0lsdb8YIUDUvLR4Vuz5rbw==
4141

42+
balanced-match@^1.0.0:
43+
version "1.0.2"
44+
resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
45+
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
46+
47+
brace-expansion@^1.1.7:
48+
version "1.1.11"
49+
resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
50+
integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
51+
dependencies:
52+
balanced-match "^1.0.0"
53+
concat-map "0.0.1"
54+
4255
[email protected]:
4356
version "1.0.1"
4457
resolved "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
4558
integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
4659

60+
[email protected]:
61+
version "0.0.1"
62+
resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
63+
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
64+
4765
cookie@^0.4.1:
4866
version "0.4.1"
4967
resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
@@ -56,6 +74,36 @@ [email protected]:
5674
dependencies:
5775
safe-buffer "^5.0.1"
5876

77+
fs.realpath@^1.0.0:
78+
version "1.0.0"
79+
resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
80+
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
81+
82+
glob@^7.1.3:
83+
version "7.1.7"
84+
resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
85+
integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
86+
dependencies:
87+
fs.realpath "^1.0.0"
88+
inflight "^1.0.4"
89+
inherits "2"
90+
minimatch "^3.0.4"
91+
once "^1.3.0"
92+
path-is-absolute "^1.0.0"
93+
94+
inflight@^1.0.4:
95+
version "1.0.6"
96+
resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
97+
integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
98+
dependencies:
99+
once "^1.3.0"
100+
wrappy "1"
101+
102+
inherits@2:
103+
version "2.0.4"
104+
resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
105+
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
106+
59107
jsonwebtoken@^8.5.1:
60108
version "8.5.1"
61109
resolved "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
@@ -124,11 +172,30 @@ lodash.once@^4.0.0:
124172
resolved "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
125173
integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
126174

175+
minimatch@^3.0.4:
176+
version "3.0.4"
177+
resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
178+
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
179+
dependencies:
180+
brace-expansion "^1.1.7"
181+
127182
ms@^2.1.1:
128183
version "2.1.3"
129184
resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
130185
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
131186

187+
once@^1.3.0:
188+
version "1.4.0"
189+
resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
190+
integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
191+
dependencies:
192+
wrappy "1"
193+
194+
path-is-absolute@^1.0.0:
195+
version "1.0.1"
196+
resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
197+
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
198+
132199
path-to-regexp@^6.1.0:
133200
version "6.2.0"
134201
resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.0.tgz#f7b3803336104c346889adece614669230645f38"
@@ -139,6 +206,13 @@ regex-parser@^2.2.10:
139206
resolved "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
140207
integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==
141208

209+
rimraf@^3.0.2:
210+
version "3.0.2"
211+
resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
212+
integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
213+
dependencies:
214+
glob "^7.1.3"
215+
142216
safe-buffer@^5.0.1:
143217
version "5.2.1"
144218
resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -153,3 +227,8 @@ typescript@^4.3.4:
153227
version "4.3.4"
154228
resolved "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc"
155229
integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew==
230+
231+
wrappy@1:
232+
version "1.0.2"
233+
resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
234+
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

‎packages/libs/lambda-at-edge/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"build-lambda-at-edge": "dist/command.js"
1212
},
1313
"scripts": {
14-
"prepare": "yarn build",
15-
"clean": "ts-node scripts/clean-dist.ts",
14+
"prepare": "yarn clean && yarn build",
15+
"clean": "yarn rimraf dist",
1616
"build-test-manifests": "ts-node scripts/build-test-manifests.ts",
1717
"copy-sharp-modules": "ts-node scripts/copy-sharp-modules.ts",
1818
"build": "rollup --config && tsc -p tsconfig.build.json && yarn copy-sharp-modules"
@@ -49,6 +49,7 @@
4949
"@types/send": "^0.17.0",
5050
"@types/sharp": "^0.28.1",
5151
"fetch-mock-jest": "^1.5.1",
52+
"rimraf": "^3.0.2",
5253
"rollup": "^2.46.0",
5354
"rollup-plugin-delete": "^2.0.0",
5455
"rollup-plugin-node-externals": "^2.2.0",

‎packages/libs/lambda-at-edge/scripts/clean-dist.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
"directory": "packages/libs/s3-static-assets"
1717
},
1818
"scripts": {
19-
"prepare": "yarn build",
20-
"build": "tsc -p tsconfig.build.json"
19+
"prepare": "yarn clean && yarn build",
20+
"build": "tsc -p tsconfig.build.json",
21+
"clean": "yarn rimraf dist"
2122
},
2223
"keywords": [
2324
"AWS",
@@ -40,6 +41,7 @@
4041
},
4142
"devDependencies": {
4243
"@types/mime-types": "^2.1.0",
44+
"rimraf": "^3.0.2",
4345
"typescript": "^4.3.4"
4446
}
4547
}

0 commit comments

Comments
 (0)