Skip to content

Commit 18f938c

Browse files
Fix race condition in --watch --verbose test (#14232)
* Fix race condition in `--watch --verbose` test * Fix windows * Update `@ampproject/remapping` in lockfile and related fixtures
1 parent 4aca47c commit 18f938c

File tree

6 files changed

+34
-17
lines changed

6 files changed

+34
-17
lines changed

packages/babel-cli/test/fixtures/babel/dir --out-dir --watch --verbose with external dependencies/executor.js

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,29 @@ const run = (function* () {
2626

2727
run.next();
2828

29+
const batchedStrings = [];
30+
let batchId = 0;
31+
2932
process.stdin.on("data", function listener(chunk) {
3033
const str = String(chunk).trim();
3134
if (!str) return;
3235

33-
console.log(str);
36+
if (str.startsWith("src")) {
37+
batchedStrings.push(str);
38+
} else {
39+
// "src/index.js -> lib/index.js"-like strings don't always come in order,
40+
// so we need to collect and sort them before logging.
41+
if (batchedStrings.length > 0) {
42+
batchedStrings.sort();
43+
for (const str of batchedStrings) {
44+
console.log(`BATCHED(${batchId})`, str);
45+
}
46+
batchId++;
47+
batchedStrings.length = 0;
48+
}
49+
50+
console.log(str);
51+
}
3452

3553
if (run.next(str).done) {
3654
process.exit(0);
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
src/index.js -> lib/index.js
2-
src/main.js -> lib/main.js
1+
BATCHED(0) src/index.js -> lib/index.js
2+
BATCHED(0) src/main.js -> lib/main.js
33
Successfully compiled 2 files with Babel (123ms).
44
EXECUTOR lib/index.js "let str = /"Hi :)/";"
55
EXECUTOR lib/main.js "console.log(/"Hi :)/");"
6-
src/index.js -> lib/index.js
7-
src/main.js -> lib/main.js
6+
BATCHED(1) src/index.js -> lib/index.js
7+
BATCHED(1) src/main.js -> lib/main.js
88
Successfully compiled 2 files with Babel (123ms).
99
EXECUTOR lib/index.js "let str = /"Updated!/";"
1010
EXECUTOR lib/main.js "console.log(/"Updated!/");"

packages/babel-core/test/fixtures/transformation/source-maps/input-source-map-complex/source-map.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": 3,
33
"sources": ["HelloWorld.vue"],
44
"names": ["name", "data", "msg"],
5-
"mappings": ";;;;;;AAsFA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAA;AACAA,oBADA;;AAEAC;AACA;AACAC;AADA;AAGA;;AANA,C",
5+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAsFA;AACAA,oBADA;;AAEAC;AACA;AACAC;AADA;AAGA;;AANA,C",
66
"sourceRoot": "src/components",
77
"sourcesContent": [
88
"<template>\n <div class=\"hello\">\n <h1>{{ msg }}</h1>\n <h2>Essential Links</h2>\n <ul>\n <li>\n <a\n href=\"https://vuejs.org\"\n target=\"_blank\"\n >\n Core Docs\n </a>\n </li>\n <li>\n <a\n href=\"https://forum.vuejs.org\"\n target=\"_blank\"\n >\n Forum\n </a>\n </li>\n <li>\n <a\n href=\"https://chat.vuejs.org\"\n target=\"_blank\"\n >\n Community Chat\n </a>\n </li>\n <li>\n <a\n href=\"https://twitter.com/vuejs\"\n target=\"_blank\"\n >\n Twitter\n </a>\n </li>\n <br>\n <li>\n <a\n href=\"http://vuejs-templates.github.io/webpack/\"\n target=\"_blank\"\n >\n Docs for This Template\n </a>\n </li>\n </ul>\n <h2>Ecosystem</h2>\n <ul>\n <li>\n <a\n href=\"http://router.vuejs.org/\"\n target=\"_blank\"\n >\n vue-router\n </a>\n </li>\n <li>\n <a\n href=\"http://vuex.vuejs.org/\"\n target=\"_blank\"\n >\n vuex\n </a>\n </li>\n <li>\n <a\n href=\"http://vue-loader.vuejs.org/\"\n target=\"_blank\"\n >\n vue-loader\n </a>\n </li>\n <li>\n <a\n href=\"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/vuejs/awesome-vue\"\n target=\"_blank\"\n >\n awesome-vue\n </a>\n </li>\n </ul>\n </div>\n</template>\n\n<script>\nexport default {\n name: 'HelloWorld',\n data () {\n return {\n msg: 'Welcome to Your Vue.js App'\n }\n }\n}\n</script>\n\n<!-- Add \"scoped\" attribute to limit CSS to this component only -->\n<style scoped>\nh1, h2 {\n font-weight: normal;\n}\nul {\n list-style-type: none;\n padding: 0;\n}\nli {\n display: inline-block;\n margin: 0 10px;\n}\na {\n color: #42b983;\n}\n</style>\n"

packages/babel-core/test/fixtures/transformation/source-maps/input-source-map-external/source-map.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"mappings": "AAAA,UAAU,Y;SAAM,C;AAAC,CAAjB",
2+
"mappings": "AAAA,UAAU,Y;SAAM;AAAC,CAAjB",
33
"names": [],
44
"sources": ["original.js"],
55
"sourcesContent": ["var foo = () => 4;"],

packages/babel-core/test/fixtures/transformation/source-maps/input-source-map/source-map.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"mappings": "AAAA,UAAU,Y;SAAM,C;AAAC,CAAjB",
2+
"mappings": "AAAA,UAAU,Y;SAAM;AAAC,CAAjB",
33
"names": [],
44
"sources": ["original.js"],
55
"sourcesContent": ["var foo = () => 4;"],

yarn.lock

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ __metadata:
66
cacheKey: 8
77

88
"@ampproject/remapping@npm:^2.0.0":
9-
version: 2.0.0
10-
resolution: "@ampproject/remapping@npm:2.0.0"
9+
version: 2.0.2
10+
resolution: "@ampproject/remapping@npm:2.0.2"
1111
dependencies:
12-
"@jridgewell/resolve-uri": ^3.0.3
13-
"@jridgewell/trace-mapping": ^0.2.0
12+
"@jridgewell/trace-mapping": ^0.2.2
1413
sourcemap-codec: 1.4.8
15-
checksum: 01165f814ffb39acb385be8f5e9debdd94faf5b582efca167df87b74a3240b96aada76a13875a479127beb3543dfe26cfab41867e88c98f528c1a72e433b4896
14+
checksum: 5759df3715f0291cbf97099a9bb7202201a1a267e232ee1505418c768b9ae7281cd550b1da563a12808a06529eb1298744a6cabde21ac354fc8450044c7f2213
1615
languageName: node
1716
linkType: hard
1817

@@ -4093,13 +4092,13 @@ __metadata:
40934092
languageName: node
40944093
linkType: hard
40954094

4096-
"@jridgewell/trace-mapping@npm:^0.2.0":
4097-
version: 0.2.0
4098-
resolution: "@jridgewell/trace-mapping@npm:0.2.0"
4095+
"@jridgewell/trace-mapping@npm:^0.2.2":
4096+
version: 0.2.5
4097+
resolution: "@jridgewell/trace-mapping@npm:0.2.5"
40994098
dependencies:
41004099
"@jridgewell/resolve-uri": ^3.0.3
41014100
sourcemap-codec: 1.4.8
4102-
checksum: 378284cb50374953437cd4e3b1e9bd9a8973f2f5d62d155ee646da9d7bcaaad8988087c6bfc54970ff730adb8a75fb06585d51544d53d7afccec61d20e5edaa7
4101+
checksum: 7ac0a2992f4a8d16c1cbe03bccbcfbd1e96bf5071b0a794dd97904a7588cc248b73e8091fabcb13dac8f40bc51297ee4ef98a6a870ca5a4dfb8e2dcbf6f33956
41034102
languageName: node
41044103
linkType: hard
41054104

0 commit comments

Comments
 (0)