Commit 51b88fa
module: disallow CJS <-> ESM edges in a cycle from require(esm)
This patch disallows CJS <-> ESM edges when they come from
require(esm) requested in ESM evalaution.
Drive-by: don't reuse the cache for imported CJS modules to stash
source code of required ESM because the former is also used for
cycle detection.
PR-URL: #52264
Backport-PR-URL: #53500
Fixes: #52145
Reviewed-By: Geoffrey Booth <[email protected]>
Reviewed-By: Guy Bedford <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>1 parent 4dae68c commit 51b88fa
File tree
28 files changed
+499
-47
lines changed- doc/api
- lib/internal
- modules
- cjs
- esm
- src
- test
- es-module
- fixtures/es-modules
- esm-cjs-esm-cycle
- esm-cjs-esm-esm-cycle
- esm-esm-cjs-esm-cycle
- esm-esm-cjs-esm-esm-cycle
28 files changed
+499
-47
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2521 | 2521 | | |
2522 | 2522 | | |
2523 | 2523 | | |
| 2524 | + | |
| 2525 | + | |
| 2526 | + | |
| 2527 | + | |
| 2528 | + | |
| 2529 | + | |
| 2530 | + | |
| 2531 | + | |
| 2532 | + | |
| 2533 | + | |
| 2534 | + | |
| 2535 | + | |
| 2536 | + | |
| 2537 | + | |
| 2538 | + | |
2524 | 2539 | | |
2525 | 2540 | | |
2526 | 2541 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1692 | 1692 | | |
1693 | 1693 | | |
1694 | 1694 | | |
| 1695 | + | |
1695 | 1696 | | |
1696 | 1697 | | |
1697 | 1698 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
| 66 | + | |
| 67 | + | |
66 | 68 | | |
67 | | - | |
| 69 | + | |
68 | 70 | | |
69 | 71 | | |
70 | 72 | | |
71 | 73 | | |
| 74 | + | |
72 | 75 | | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
73 | 80 | | |
74 | 81 | | |
75 | 82 | | |
76 | | - | |
| 83 | + | |
77 | 84 | | |
78 | 85 | | |
79 | 86 | | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
80 | 91 | | |
81 | 92 | | |
82 | | - | |
83 | | - | |
84 | 93 | | |
85 | 94 | | |
86 | 95 | | |
| |||
137 | 146 | | |
138 | 147 | | |
139 | 148 | | |
| 149 | + | |
140 | 150 | | |
141 | 151 | | |
142 | 152 | | |
| |||
942 | 952 | | |
943 | 953 | | |
944 | 954 | | |
| 955 | + | |
| 956 | + | |
| 957 | + | |
| 958 | + | |
| 959 | + | |
| 960 | + | |
| 961 | + | |
| 962 | + | |
| 963 | + | |
| 964 | + | |
945 | 965 | | |
946 | 966 | | |
947 | 967 | | |
| |||
1009 | 1029 | | |
1010 | 1030 | | |
1011 | 1031 | | |
1012 | | - | |
1013 | | - | |
| 1032 | + | |
| 1033 | + | |
| 1034 | + | |
| 1035 | + | |
1014 | 1036 | | |
1015 | 1037 | | |
1016 | | - | |
| 1038 | + | |
| 1039 | + | |
| 1040 | + | |
| 1041 | + | |
| 1042 | + | |
| 1043 | + | |
| 1044 | + | |
| 1045 | + | |
| 1046 | + | |
1017 | 1047 | | |
1018 | 1048 | | |
1019 | 1049 | | |
| |||
1027 | 1057 | | |
1028 | 1058 | | |
1029 | 1059 | | |
1030 | | - | |
1031 | | - | |
1032 | | - | |
1033 | | - | |
1034 | | - | |
1035 | | - | |
1036 | | - | |
1037 | | - | |
| 1060 | + | |
| 1061 | + | |
| 1062 | + | |
| 1063 | + | |
| 1064 | + | |
| 1065 | + | |
| 1066 | + | |
| 1067 | + | |
| 1068 | + | |
1038 | 1069 | | |
1039 | | - | |
| 1070 | + | |
| 1071 | + | |
| 1072 | + | |
| 1073 | + | |
1040 | 1074 | | |
1041 | | - | |
1042 | 1075 | | |
1043 | 1076 | | |
1044 | 1077 | | |
| |||
1280 | 1313 | | |
1281 | 1314 | | |
1282 | 1315 | | |
1283 | | - | |
| 1316 | + | |
1284 | 1317 | | |
1285 | 1318 | | |
1286 | 1319 | | |
| |||
1366 | 1399 | | |
1367 | 1400 | | |
1368 | 1401 | | |
1369 | | - | |
| 1402 | + | |
1370 | 1403 | | |
1371 | 1404 | | |
1372 | 1405 | | |
| |||
1407 | 1440 | | |
1408 | 1441 | | |
1409 | 1442 | | |
| 1443 | + | |
1410 | 1444 | | |
1411 | 1445 | | |
1412 | 1446 | | |
1413 | 1447 | | |
1414 | 1448 | | |
1415 | 1449 | | |
1416 | 1450 | | |
| 1451 | + | |
1417 | 1452 | | |
1418 | 1453 | | |
1419 | 1454 | | |
| |||
1425 | 1460 | | |
1426 | 1461 | | |
1427 | 1462 | | |
1428 | | - | |
| 1463 | + | |
1429 | 1464 | | |
1430 | 1465 | | |
1431 | 1466 | | |
1432 | 1467 | | |
1433 | 1468 | | |
1434 | 1469 | | |
1435 | 1470 | | |
1436 | | - | |
| 1471 | + | |
1437 | 1472 | | |
1438 | 1473 | | |
1439 | 1474 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
152 | 152 | | |
153 | 153 | | |
154 | 154 | | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
155 | 160 | | |
156 | 161 | | |
157 | 162 | | |
| |||
201 | 206 | | |
202 | 207 | | |
203 | 208 | | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
204 | 214 | | |
205 | 215 | | |
206 | 216 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
5 | 8 | | |
6 | 9 | | |
7 | 10 | | |
| |||
15 | 18 | | |
16 | 19 | | |
17 | 20 | | |
| 21 | + | |
| 22 | + | |
18 | 23 | | |
19 | 24 | | |
| 25 | + | |
20 | 26 | | |
21 | 27 | | |
22 | 28 | | |
| |||
30 | 36 | | |
31 | 37 | | |
32 | 38 | | |
33 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
34 | 43 | | |
35 | 44 | | |
36 | 45 | | |
| |||
248 | 257 | | |
249 | 258 | | |
250 | 259 | | |
| 260 | + | |
251 | 261 | | |
252 | 262 | | |
253 | 263 | | |
254 | | - | |
| 264 | + | |
| 265 | + | |
255 | 266 | | |
256 | | - | |
| 267 | + | |
257 | 268 | | |
258 | 269 | | |
259 | | - | |
260 | | - | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
261 | 280 | | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
262 | 290 | | |
263 | 291 | | |
264 | 292 | | |
| |||
270 | 298 | | |
271 | 299 | | |
272 | 300 | | |
| 301 | + | |
273 | 302 | | |
274 | 303 | | |
275 | 304 | | |
| |||
304 | 333 | | |
305 | 334 | | |
306 | 335 | | |
307 | | - | |
308 | | - | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
309 | 350 | | |
310 | 351 | | |
311 | 352 | | |
312 | 353 | | |
313 | 354 | | |
314 | 355 | | |
315 | | - | |
| 356 | + | |
316 | 357 | | |
317 | | - | |
318 | | - | |
319 | | - | |
| 358 | + | |
320 | 359 | | |
321 | 360 | | |
322 | 361 | | |
| |||
333 | 372 | | |
334 | 373 | | |
335 | 374 | | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
336 | 389 | | |
337 | 390 | | |
338 | 391 | | |
| |||
0 commit comments