Skip to content

Commit bc1c454

Browse files
gregmagolanjosephperrott
authored andcommitted
build: allow ng_package patch to silently fail so that issue can be fixed in angular repo (#17620)
1 parent de2342d commit bc1c454

File tree

3 files changed

+117
-18
lines changed

3 files changed

+117
-18
lines changed

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,19 @@
141141
"parse5": "^5.0.0",
142142
"protractor": "^5.4.2",
143143
"resolve-bin": "^0.4.0",
144-
"rollup": "^0.56.3",
144+
"rollup": "~1.25.0",
145145
"rollup-plugin-alias": "^1.4.0",
146-
"rollup-plugin-node-resolve": "^3.0.3",
146+
"rollup-plugin-commonjs": "^10.1.0",
147+
"rollup-plugin-node-resolve": "^5.2.0",
148+
"rollup-plugin-sourcemaps": "^0.4.2",
147149
"run-sequence": "^1.2.2",
148150
"scss-bundle": "^2.5.1",
149151
"selenium-webdriver": "^3.6.0",
150152
"send": "^0.17.1",
151153
"shelljs": "^0.8.3",
152154
"sorcery": "^0.10.0",
153155
"stylelint": "^10.1.0",
156+
"terser": "^4.3.9",
154157
"ts-api-guardian": "^0.4.6",
155158
"ts-node": "^3.0.4",
156159
"tsconfig-paths": "^2.3.0",

tools/bazel/postinstall-patches.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,13 @@ searchAndReplace(
6363
'node_modules/@angular/compiler-cli/src/ngtsc/entry_point/src/logic.js');
6464

6565
// Workaround for https://github.com/angular/angular/issues/32603.
66-
shelljs.cat(path.join(__dirname, './rollup_windows_arguments.patch')).exec('patch -p0');
66+
try {
67+
shelljs.cat(path.join(__dirname, './rollup_windows_arguments.patch')).exec('patch -p0');
68+
} catch (_) {
69+
// This is getting fixed in ng_rollup_bundle itself but due to the dependency sandwich
70+
// between this repo and the material-unit-test job in the angular repo we need to add
71+
// this try/catch here temporarily.
72+
}
6773

6874
// Workaround for: https://hackmd.io/MlqFp-yrSx-0mw4rD7dnQQ?both. We only want to discard
6975
// the metadata of files in the bazel managed node modules. That way we keep the default

yarn.lock

Lines changed: 105 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,6 +1056,11 @@
10561056
"@types/events" "*"
10571057
"@types/node" "*"
10581058

1059+
"@types/estree@*", "@types/[email protected]":
1060+
version "0.0.39"
1061+
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
1062+
integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
1063+
10591064
"@types/events@*":
10601065
version "1.2.0"
10611066
resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
@@ -1271,6 +1276,13 @@
12711276
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
12721277
integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
12731278

1279+
1280+
version "0.0.8"
1281+
resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
1282+
integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
1283+
dependencies:
1284+
"@types/node" "*"
1285+
12741286
"@types/run-sequence@^0.0.29":
12751287
version "0.0.29"
12761288
resolved "https://registry.yarnpkg.com/@types/run-sequence/-/run-sequence-0.0.29.tgz#6ad0f7383136e13925322e69fc41db77b30b2075"
@@ -1529,6 +1541,11 @@ accepts@~1.3.7:
15291541
mime-types "~2.1.24"
15301542
negotiator "0.6.2"
15311543

1544+
acorn@^7.1.0:
1545+
version "7.1.0"
1546+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
1547+
integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
1548+
15321549
adm-zip@^0.4.9, adm-zip@~0.4.3:
15331550
version "0.4.13"
15341551
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.13.tgz#597e2f8cc3672151e1307d3e95cddbc75672314a"
@@ -2453,10 +2470,10 @@ builtin-modules@^1.0.0, builtin-modules@^1.1.1:
24532470
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
24542471
integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
24552472

2456-
builtin-modules@^2.0.0:
2457-
version "2.0.0"
2458-
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e"
2459-
integrity sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==
2473+
builtin-modules@^3.1.0:
2474+
version "3.1.0"
2475+
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
2476+
integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
24602477

24612478
24622479
version "3.0.0"
@@ -3047,6 +3064,11 @@ commander@^2.13.0, commander@^2.15.1, commander@^2.16.0, commander@^2.19.0, comm
30473064
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
30483065
integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
30493066

3067+
commander@^2.20.0:
3068+
version "2.20.3"
3069+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
3070+
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
3071+
30503072
commondir@^1.0.1:
30513073
version "1.0.1"
30523074
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -4341,6 +4363,11 @@ estraverse@^4.1.0, estraverse@^4.2.0:
43414363
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
43424364
integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
43434365

4366+
estree-walker@^0.6.1:
4367+
version "0.6.1"
4368+
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
4369+
integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
4370+
43444371
esutils@^2.0.2:
43454372
version "2.0.2"
43464373
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -6392,6 +6419,13 @@ is-redirect@^1.0.0:
63926419
resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
63936420
integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
63946421

6422+
is-reference@^1.1.2:
6423+
version "1.1.4"
6424+
resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.1.4.tgz#3f95849886ddb70256a3e6d062b1a68c13c51427"
6425+
integrity sha512-uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==
6426+
dependencies:
6427+
"@types/estree" "0.0.39"
6428+
63956429
is-regexp@^1.0.0:
63966430
version "1.0.0"
63976431
resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
@@ -7556,7 +7590,7 @@ madge@^3.4.4:
75567590
rc "^1.2.7"
75577591
walkdir "^0.0.12"
75587592

7559-
7593+
[email protected], magic-string@^0.25.2:
75607594
version "0.25.4"
75617595
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.4.tgz#325b8a0a79fc423db109b77fd5a19183b7ba5143"
75627596
integrity sha512-oycWO9nEVAP2RVPbIoDoA4Y7LFIJ3xRYov93gAyJhZkET1tNuB0u7uWkZS2LpBWTJUWnmau/To8ECWRC+jKNfw==
@@ -9789,6 +9823,13 @@ resolve@^1.1.6, resolve@^1.10.0:
97899823
dependencies:
97909824
path-parse "^1.0.6"
97919825

9826+
resolve@^1.11.0:
9827+
version "1.12.0"
9828+
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
9829+
integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
9830+
dependencies:
9831+
path-parse "^1.0.6"
9832+
97929833
resolve@^1.11.1:
97939834
version "1.11.1"
97949835
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
@@ -9871,19 +9912,51 @@ rollup-plugin-alias@^1.4.0:
98719912
dependencies:
98729913
slash "^1.0.0"
98739914

9874-
rollup-plugin-node-resolve@^3.0.3:
9875-
version "3.4.0"
9876-
resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89"
9877-
integrity sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==
9915+
rollup-plugin-commonjs@^10.1.0:
9916+
version "10.1.0"
9917+
resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
9918+
integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
98789919
dependencies:
9879-
builtin-modules "^2.0.0"
9920+
estree-walker "^0.6.1"
9921+
is-reference "^1.1.2"
9922+
magic-string "^0.25.2"
9923+
resolve "^1.11.0"
9924+
rollup-pluginutils "^2.8.1"
9925+
9926+
rollup-plugin-node-resolve@^5.2.0:
9927+
version "5.2.0"
9928+
resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
9929+
integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
9930+
dependencies:
9931+
"@types/resolve" "0.0.8"
9932+
builtin-modules "^3.1.0"
98809933
is-module "^1.0.0"
9881-
resolve "^1.1.6"
9934+
resolve "^1.11.1"
9935+
rollup-pluginutils "^2.8.1"
9936+
9937+
rollup-plugin-sourcemaps@^0.4.2:
9938+
version "0.4.2"
9939+
resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
9940+
integrity sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=
9941+
dependencies:
9942+
rollup-pluginutils "^2.0.1"
9943+
source-map-resolve "^0.5.0"
9944+
9945+
rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.8.1:
9946+
version "2.8.2"
9947+
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
9948+
integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
9949+
dependencies:
9950+
estree-walker "^0.6.1"
98829951

9883-
rollup@^0.56.3:
9884-
version "0.56.5"
9885-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.56.5.tgz#40fe3cf0cd1659d469baad11f4d5b6336c14ce84"
9886-
integrity sha512-IGPk5vdWrsc4vkiW9XMeXr5QMtxmvATTttTi59w2jBQWe9G/MMQtn8teIBAj+DdK51TrpVT6P0aQUaQUlUYCJA==
9952+
rollup@~1.25.0:
9953+
version "1.25.2"
9954+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.25.2.tgz#739f508bd8f7ece52bb6c1fcda83466af82b7f6d"
9955+
integrity sha512-+7z6Wab/L45QCPcfpuTZKwKiB0tynj05s/+s2U3F2Bi7rOLPr9UcjUwO7/xpjlPNXA/hwnth6jBExFRGyf3tMg==
9956+
dependencies:
9957+
"@types/estree" "*"
9958+
"@types/node" "*"
9959+
acorn "^7.1.0"
98879960

98889961
router@^1.3.1:
98899962
version "1.3.3"
@@ -10477,6 +10550,14 @@ source-map-support@^0.4.0, source-map-support@^0.4.15, source-map-support@~0.4.0
1047710550
dependencies:
1047810551
source-map "^0.5.6"
1047910552

10553+
source-map-support@~0.5.12:
10554+
version "0.5.16"
10555+
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
10556+
integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
10557+
dependencies:
10558+
buffer-from "^1.0.0"
10559+
source-map "^0.6.0"
10560+
1048010561
source-map-url@^0.4.0:
1048110562
version "0.4.0"
1048210563
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -11130,6 +11211,15 @@ ternary-stream@^2.0.1:
1113011211
merge-stream "^1.0.0"
1113111212
through2 "^2.0.1"
1113211213

11214+
terser@^4.3.9:
11215+
version "4.3.9"
11216+
resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz#e4be37f80553d02645668727777687dad26bbca8"
11217+
integrity sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==
11218+
dependencies:
11219+
commander "^2.20.0"
11220+
source-map "~0.6.1"
11221+
source-map-support "~0.5.12"
11222+
1113311223
test-exclude@^5.2.2:
1113411224
version "5.2.3"
1113511225
resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"

0 commit comments

Comments
 (0)