Skip to content

Commit b4082cb

Browse files
chore(deps): update babel to v7.22.10 (#15236)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: fisker <[email protected]>
1 parent 91e850b commit b4082cb

File tree

5 files changed

+62
-34
lines changed

5 files changed

+62
-34
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
],
3232
"dependencies": {
3333
"@angular/compiler": "16.2.0",
34-
"@babel/code-frame": "7.22.5",
34+
"@babel/code-frame": "7.22.10",
3535
"@babel/parser": "7.22.10",
36-
"@babel/types": "7.22.5",
36+
"@babel/types": "7.22.10",
3737
"@glimmer/syntax": "0.84.3",
3838
"@iarna/toml": "2.2.5",
3939
"@prettier/is-es5-identifier-name": "0.2.0",
@@ -106,7 +106,7 @@
106106
"yaml-unist-parser": "2.0.1"
107107
},
108108
"devDependencies": {
109-
"@babel/generator": "7.22.9",
109+
"@babel/generator": "7.22.10",
110110
"@esbuild-plugins/node-modules-polyfill": "0.2.2",
111111
"@glimmer/reference": "0.84.3",
112112
"@types/estree": "1.0.1",

scripts/build/config.js

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import path from "node:path";
22
import url from "node:url";
33
import fs from "node:fs";
4-
import { createRequire } from "node:module";
54
import createEsmUtils from "esm-utils";
65
import { PROJECT_ROOT, DIST_DIR, copyFile } from "../utils/index.js";
76
import buildJavascriptModule from "./build-javascript-module.js";
@@ -426,12 +425,22 @@ const nonPluginUniversalFiles = [
426425
umdVariableName: "prettier",
427426
replaceModule: [
428427
{
429-
module: require.resolve("@babel/highlight"),
428+
module: require.resolve("@babel/highlight", {
429+
paths: [require.resolve("@babel/code-frame")],
430+
}),
430431
path: path.join(dirname, "./shims/babel-highlight.js"),
431432
},
432433
{
433-
module: createRequire(require.resolve("vnopts")).resolve("chalk"),
434-
path: path.join(dirname, "./shims/chalk.js"),
434+
module: require.resolve("chalk", {
435+
paths: [require.resolve("@babel/code-frame")],
436+
}),
437+
path: path.join(dirname, "./shims/chalk.cjs"),
438+
},
439+
{
440+
module: require.resolve("chalk", {
441+
paths: [require.resolve("vnopts")],
442+
}),
443+
path: path.join(dirname, "./shims/chalk.cjs"),
435444
},
436445
replaceDiffPackageEntry("lib/diff/array.js"),
437446
],
@@ -514,6 +523,15 @@ const nodejsFiles = [
514523
replacement: "const readBuffer = Buffer.alloc(this.options.readChunk);",
515524
},
516525
replaceDiffPackageEntry("lib/diff/array.js"),
526+
// `@babel/code-frame` and `@babel/highlight` use compatible `chalk`, but they installed separately
527+
{
528+
module: require.resolve("chalk", {
529+
paths: [require.resolve("@babel/highlight")],
530+
}),
531+
path: require.resolve("chalk", {
532+
paths: [require.resolve("@babel/code-frame")],
533+
}),
534+
},
517535
],
518536
addDefaultExport: true,
519537
},
@@ -547,6 +565,15 @@ const nodejsFiles = [
547565
module: require.resolve("parent-module"),
548566
path: path.join(dirname, "./shims/parent-module.cjs"),
549567
},
568+
// `@babel/code-frame` and `@babel/highlight` use compatible `chalk`, but they installed separately
569+
{
570+
module: require.resolve("chalk", {
571+
paths: [require.resolve("@babel/highlight")],
572+
}),
573+
path: require.resolve("chalk", {
574+
paths: [require.resolve("@babel/code-frame")],
575+
}),
576+
},
550577
],
551578
},
552579
].flatMap((file) => {
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
import chalk from "./chalk.js";
2-
31
export const shouldHighlight = () => false;
4-
export const getChalk = () => chalk;
2+
export default String;
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
"use strict";
2+
13
const chalk = new Proxy(String, { get: () => chalk });
24

3-
export default chalk;
5+
module.exports = chalk;

yarn.lock

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,13 @@ __metadata:
5252
languageName: node
5353
linkType: hard
5454

55-
"@babel/code-frame@npm:7.22.5, @babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.5":
56-
version: 7.22.5
57-
resolution: "@babel/code-frame@npm:7.22.5"
55+
"@babel/code-frame@npm:7.22.10, @babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.5":
56+
version: 7.22.10
57+
resolution: "@babel/code-frame@npm:7.22.10"
5858
dependencies:
59-
"@babel/highlight": ^7.22.5
60-
checksum: cfe804f518f53faaf9a1d3e0f9f74127ab9a004912c3a16fda07fb6a633393ecb9918a053cb71804204c1b7ec3d49e1699604715e2cfb0c9f7bc4933d324ebb6
59+
"@babel/highlight": ^7.22.10
60+
chalk: ^2.4.2
61+
checksum: 89a06534ad19759da6203a71bad120b1d7b2ddc016c8e07d4c56b35dea25e7396c6da60a754e8532a86733092b131ae7f661dbe6ba5d165ea777555daa2ed3c9
6162
languageName: node
6263
linkType: hard
6364

@@ -91,15 +92,15 @@ __metadata:
9192
languageName: node
9293
linkType: hard
9394

94-
"@babel/generator@npm:7.22.9, @babel/generator@npm:^7.22.5, @babel/generator@npm:^7.7.2":
95-
version: 7.22.9
96-
resolution: "@babel/generator@npm:7.22.9"
95+
"@babel/generator@npm:7.22.10, @babel/generator@npm:^7.22.5, @babel/generator@npm:^7.7.2":
96+
version: 7.22.10
97+
resolution: "@babel/generator@npm:7.22.10"
9798
dependencies:
98-
"@babel/types": ^7.22.5
99+
"@babel/types": ^7.22.10
99100
"@jridgewell/gen-mapping": ^0.3.2
100101
"@jridgewell/trace-mapping": ^0.3.17
101102
jsesc: ^2.5.1
102-
checksum: 7c9d2c58b8d5ac5e047421a6ab03ec2ff5d9a5ff2c2212130a0055e063ac349e0b19d435537d6886c999771aef394832e4f54cd9fc810100a7f23d982f6af06b
103+
checksum: 59a79730abdff9070692834bd3af179e7a9413fa2ff7f83dff3eb888765aeaeb2bfc7b0238a49613ed56e1af05956eff303cc139f2407eda8df974813e486074
103104
languageName: node
104105
linkType: hard
105106

@@ -226,14 +227,14 @@ __metadata:
226227
languageName: node
227228
linkType: hard
228229

229-
"@babel/highlight@npm:^7.0.0, @babel/highlight@npm:^7.22.5":
230-
version: 7.22.5
231-
resolution: "@babel/highlight@npm:7.22.5"
230+
"@babel/highlight@npm:^7.0.0, @babel/highlight@npm:^7.22.10":
231+
version: 7.22.10
232+
resolution: "@babel/highlight@npm:7.22.10"
232233
dependencies:
233234
"@babel/helper-validator-identifier": ^7.22.5
234-
chalk: ^2.0.0
235+
chalk: ^2.4.2
235236
js-tokens: ^4.0.0
236-
checksum: f61ae6de6ee0ea8d9b5bcf2a532faec5ab0a1dc0f7c640e5047fc61630a0edb88b18d8c92eb06566d30da7a27db841aca11820ecd3ebe9ce514c9350fbed39c4
237+
checksum: f714a1e1a72dd9d72f6383f4f30fd342e21a8df32d984a4ea8f5eab691bb6ba6db2f8823d4b4cf135d98869e7a98925b81306aa32ee3c429f8cfa52c75889e1b
237238
languageName: node
238239
linkType: hard
239240

@@ -429,14 +430,14 @@ __metadata:
429430
languageName: node
430431
linkType: hard
431432

432-
"@babel/types@npm:7.22.5, @babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3":
433-
version: 7.22.5
434-
resolution: "@babel/types@npm:7.22.5"
433+
"@babel/types@npm:7.22.10, @babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3":
434+
version: 7.22.10
435+
resolution: "@babel/types@npm:7.22.10"
435436
dependencies:
436437
"@babel/helper-string-parser": ^7.22.5
437438
"@babel/helper-validator-identifier": ^7.22.5
438439
to-fast-properties: ^2.0.0
439-
checksum: c13a9c1dc7d2d1a241a2f8363540cb9af1d66e978e8984b400a20c4f38ba38ca29f06e26a0f2d49a70bad9e57615dac09c35accfddf1bb90d23cd3e0a0bab892
440+
checksum: 095c4f4b7503fa816e4094113f0ec2351ef96ff32012010b771693066ff628c7c664b21c6bd3fb93aeb46fe7c61f6b3a3c9e4ed0034d6a2481201c417371c8af
440441
languageName: node
441442
linkType: hard
442443

@@ -2594,7 +2595,7 @@ __metadata:
25942595
languageName: node
25952596
linkType: hard
25962597

2597-
"chalk@npm:2.4.2, chalk@npm:^2.0.0, chalk@npm:^2.4.1":
2598+
"chalk@npm:2.4.2, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
25982599
version: 2.4.2
25992600
resolution: "chalk@npm:2.4.2"
26002601
dependencies:
@@ -7004,10 +7005,10 @@ __metadata:
70047005
resolution: "prettier@workspace:."
70057006
dependencies:
70067007
"@angular/compiler": 16.2.0
7007-
"@babel/code-frame": 7.22.5
7008-
"@babel/generator": 7.22.9
7008+
"@babel/code-frame": 7.22.10
7009+
"@babel/generator": 7.22.10
70097010
"@babel/parser": 7.22.10
7010-
"@babel/types": 7.22.5
7011+
"@babel/types": 7.22.10
70117012
"@esbuild-plugins/node-modules-polyfill": 0.2.2
70127013
"@glimmer/reference": 0.84.3
70137014
"@glimmer/syntax": 0.84.3

0 commit comments

Comments
 (0)