Skip to content

Commit 9116f80

Browse files
turadgturadg
committed
chore: replace babel/types with built-in babel types
1 parent c1f2382 commit 9116f80

File tree

7 files changed

+37
-66
lines changed

7 files changed

+37
-66
lines changed

‎packages/evasive-transform/package.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
"devDependencies": {
4141
"@babel/types": "~7.28.2",
4242
"@endo/ses-ava": "workspace:^",
43-
"@types/babel__generator": "^7.27.0",
44-
"@types/babel__traverse": "^7.28.0",
4543
"ava": "^6.4.1",
4644
"c8": "^7.14.0",
4745
"eslint": "^8.57.0",
@@ -74,8 +72,8 @@
7472
"timeout": "2m"
7573
},
7674
"dependencies": {
77-
"@babel/generator": "^7.28.0",
78-
"@babel/parser": "~7.28.0",
79-
"@babel/traverse": "~7.28.0"
75+
"@babel/generator": "^7.28.3",
76+
"@babel/parser": "~7.28.3",
77+
"@babel/traverse": "~7.28.3"
8078
}
8179
}

‎packages/evasive-transform/src/generate.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ export const generate = (ast, options) => {
8585
options && 'sourceMap' in options ? options.sourceMap : undefined;
8686
const source = options ? options.source : undefined;
8787
const result = generator(
88-
// @ts-expect-error File and Node types incompatible
8988
ast,
9089
{
9190
sourceFileName: sourceUrl,

‎packages/evasive-transform/src/transform-ast.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ export function transformAst(ast, { elideComments = false } = {}) {
5252
}
5353
// Rewrite all comments.
5454
(leadingComments || []).forEach(node => transformComment(node));
55-
// XXX: there is no such Node having type matching /^Comment.+/ in
56-
// @babel/types
5755
if (type.startsWith('Comment')) {
58-
// @ts-expect-error - see above XXX
5956
transformComment(p.node);
6057
}
6158
(innerComments || []).forEach(node => transformComment(node));

‎packages/module-source/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
"test:xs": "node scripts/generate-test-xs.js && xst tmp/test-xs.js"
4343
},
4444
"dependencies": {
45-
"@babel/generator": "^7.28.0",
46-
"@babel/parser": "~7.28.0",
47-
"@babel/traverse": "~7.28.0",
45+
"@babel/generator": "^7.28.3",
46+
"@babel/parser": "~7.28.3",
47+
"@babel/traverse": "~7.28.3",
4848
"@babel/types": "~7.28.2",
4949
"ses": "workspace:^"
5050
},

‎packages/ses/package.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,13 @@
9999
"@endo/immutable-arraybuffer": "workspace:^"
100100
},
101101
"devDependencies": {
102-
"@babel/generator": "^7.28.0",
103-
"@babel/parser": "~7.28.0",
104-
"@babel/traverse": "~7.28.0",
102+
"@babel/generator": "^7.28.3",
103+
"@babel/parser": "~7.28.3",
104+
"@babel/traverse": "~7.28.3",
105105
"@babel/types": "~7.28.2",
106106
"@endo/compartment-mapper": "workspace:^",
107107
"@endo/module-source": "workspace:^",
108108
"@endo/test262-runner": "workspace:^",
109-
"@types/babel__traverse": "^7.28.0",
110109
"ava": "^6.4.1",
111110
"babel-eslint": "^10.1.0",
112111
"c8": "^7.14.0",

‎packages/ses/scripts/hermes-transforms.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ export const hermesTransforms = {
8181
traverse(ast, transforms, undefined, { filename: location });
8282

8383
const { code } = generate(
84-
// @ts-expect-error File and Node types incompatible
8584
ast,
8685
{
8786
// Nothing being done with sourcemaps as this point

‎yarn.lock‎

Lines changed: 28 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ __metadata:
2323
languageName: node
2424
linkType: hard
2525

26-
"@babel/generator@npm:^7.28.0":
27-
version: 7.28.0
28-
resolution: "@babel/generator@npm:7.28.0"
26+
"@babel/generator@npm:^7.28.3":
27+
version: 7.28.3
28+
resolution: "@babel/generator@npm:7.28.3"
2929
dependencies:
30-
"@babel/parser": "npm:^7.28.0"
31-
"@babel/types": "npm:^7.28.0"
30+
"@babel/parser": "npm:^7.28.3"
31+
"@babel/types": "npm:^7.28.2"
3232
"@jridgewell/gen-mapping": "npm:^0.3.12"
3333
"@jridgewell/trace-mapping": "npm:^0.3.28"
3434
jsesc: "npm:^3.0.2"
35-
checksum: 10c0/1b3d122268ea3df50fde707ad864d9a55c72621357d5cebb972db3dd76859c45810c56e16ad23123f18f80cc2692f5a015d2858361300f0f224a05dc43d36a92
35+
checksum: 10c0/0ff58bcf04f8803dcc29479b547b43b9b0b828ec1ee0668e92d79f9e90f388c28589056637c5ff2fd7bcf8d153c990d29c448d449d852bf9d1bc64753ca462bc
3636
languageName: node
3737
linkType: hard
3838

@@ -57,14 +57,14 @@ __metadata:
5757
languageName: node
5858
linkType: hard
5959

60-
"@babel/parser@npm:^7.27.2, @babel/parser@npm:^7.28.0, @babel/parser@npm:^7.7.0, @babel/parser@npm:~7.28.0":
61-
version: 7.28.0
62-
resolution: "@babel/parser@npm:7.28.0"
60+
"@babel/parser@npm:^7.27.2, @babel/parser@npm:^7.28.3, @babel/parser@npm:^7.7.0, @babel/parser@npm:~7.28.3":
61+
version: 7.28.3
62+
resolution: "@babel/parser@npm:7.28.3"
6363
dependencies:
64-
"@babel/types": "npm:^7.28.0"
64+
"@babel/types": "npm:^7.28.2"
6565
bin:
6666
parser: ./bin/babel-parser.js
67-
checksum: 10c0/c2ef81d598990fa949d1d388429df327420357cb5200271d0d0a2784f1e6d54afc8301eb8bdf96d8f6c77781e402da93c7dc07980fcc136ac5b9d5f1fce701b5
67+
checksum: 10c0/1f41eb82623b0ca0f94521b57f4790c6c457cd922b8e2597985b36bdec24114a9ccf54640286a760ceb60f11fe9102d192bf60477aee77f5d45f1029b9b72729
6868
languageName: node
6969
linkType: hard
7070

@@ -79,22 +79,22 @@ __metadata:
7979
languageName: node
8080
linkType: hard
8181

82-
"@babel/traverse@npm:^7.7.0, @babel/traverse@npm:~7.28.0":
83-
version: 7.28.0
84-
resolution: "@babel/traverse@npm:7.28.0"
82+
"@babel/traverse@npm:^7.7.0, @babel/traverse@npm:~7.28.3":
83+
version: 7.28.3
84+
resolution: "@babel/traverse@npm:7.28.3"
8585
dependencies:
8686
"@babel/code-frame": "npm:^7.27.1"
87-
"@babel/generator": "npm:^7.28.0"
87+
"@babel/generator": "npm:^7.28.3"
8888
"@babel/helper-globals": "npm:^7.28.0"
89-
"@babel/parser": "npm:^7.28.0"
89+
"@babel/parser": "npm:^7.28.3"
9090
"@babel/template": "npm:^7.27.2"
91-
"@babel/types": "npm:^7.28.0"
91+
"@babel/types": "npm:^7.28.2"
9292
debug: "npm:^4.3.1"
93-
checksum: 10c0/32794402457827ac558173bcebdcc0e3a18fa339b7c41ca35621f9f645f044534d91bb923ff385f5f960f2e495f56ce18d6c7b0d064d2f0ccb55b285fa6bc7b9
93+
checksum: 10c0/26e95b29a46925b7b41255e03185b7e65b2c4987e14bbee7bbf95867fb19c69181f301bbe1c7b201d4fe0cce6aa0cbea0282dad74b3a0fef3d9058f6c76fdcb3
9494
languageName: node
9595
linkType: hard
9696

97-
"@babel/types@npm:^7.0.0, @babel/types@npm:^7.27.1, @babel/types@npm:^7.28.0, @babel/types@npm:^7.28.2, @babel/types@npm:^7.7.0, @babel/types@npm:~7.28.2":
97+
"@babel/types@npm:^7.27.1, @babel/types@npm:^7.28.2, @babel/types@npm:^7.7.0, @babel/types@npm:~7.28.2":
9898
version: 7.28.2
9999
resolution: "@babel/types@npm:7.28.2"
100100
dependencies:
@@ -438,13 +438,11 @@ __metadata:
438438
version: 0.0.0-use.local
439439
resolution: "@endo/evasive-transform@workspace:packages/evasive-transform"
440440
dependencies:
441-
"@babel/generator": "npm:^7.28.0"
442-
"@babel/parser": "npm:~7.28.0"
443-
"@babel/traverse": "npm:~7.28.0"
441+
"@babel/generator": "npm:^7.28.3"
442+
"@babel/parser": "npm:~7.28.3"
443+
"@babel/traverse": "npm:~7.28.3"
444444
"@babel/types": "npm:~7.28.2"
445445
"@endo/ses-ava": "workspace:^"
446-
"@types/babel__generator": "npm:^7.27.0"
447-
"@types/babel__traverse": "npm:^7.28.0"
448446
ava: "npm:^6.4.1"
449447
c8: "npm:^7.14.0"
450448
eslint: "npm:^8.57.0"
@@ -636,9 +634,9 @@ __metadata:
636634
version: 0.0.0-use.local
637635
resolution: "@endo/module-source@workspace:packages/module-source"
638636
dependencies:
639-
"@babel/generator": "npm:^7.28.0"
640-
"@babel/parser": "npm:~7.28.0"
641-
"@babel/traverse": "npm:~7.28.0"
637+
"@babel/generator": "npm:^7.28.3"
638+
"@babel/parser": "npm:~7.28.3"
639+
"@babel/traverse": "npm:~7.28.3"
642640
"@babel/types": "npm:~7.28.2"
643641
ava: "npm:^6.4.1"
644642
babel-eslint: "npm:^10.1.0"
@@ -2204,24 +2202,6 @@ __metadata:
22042202
languageName: node
22052203
linkType: hard
22062204

2207-
"@types/babel__generator@npm:^7.27.0":
2208-
version: 7.27.0
2209-
resolution: "@types/babel__generator@npm:7.27.0"
2210-
dependencies:
2211-
"@babel/types": "npm:^7.0.0"
2212-
checksum: 10c0/9f9e959a8792df208a9d048092fda7e1858bddc95c6314857a8211a99e20e6830bdeb572e3587ae8be5429e37f2a96fcf222a9f53ad232f5537764c9e13a2bbd
2213-
languageName: node
2214-
linkType: hard
2215-
2216-
"@types/babel__traverse@npm:^7.28.0":
2217-
version: 7.28.0
2218-
resolution: "@types/babel__traverse@npm:7.28.0"
2219-
dependencies:
2220-
"@babel/types": "npm:^7.28.2"
2221-
checksum: 10c0/b52d7d4e8fc6a9018fe7361c4062c1c190f5778cf2466817cb9ed19d69fbbb54f9a85ffedeb748ed8062d2cf7d4cc088ee739848f47c57740de1c48cbf0d0994
2222-
languageName: node
2223-
linkType: hard
2224-
22252205
"@types/eslint@npm:^7.2.13":
22262206
version: 7.29.0
22272207
resolution: "@types/eslint@npm:7.29.0"
@@ -9796,17 +9776,16 @@ __metadata:
97969776
version: 0.0.0-use.local
97979777
resolution: "ses@workspace:packages/ses"
97989778
dependencies:
9799-
"@babel/generator": "npm:^7.28.0"
9800-
"@babel/parser": "npm:~7.28.0"
9801-
"@babel/traverse": "npm:~7.28.0"
9779+
"@babel/generator": "npm:^7.28.3"
9780+
"@babel/parser": "npm:~7.28.3"
9781+
"@babel/traverse": "npm:~7.28.3"
98029782
"@babel/types": "npm:~7.28.2"
98039783
"@endo/cache-map": "workspace:^"
98049784
"@endo/compartment-mapper": "workspace:^"
98059785
"@endo/env-options": "workspace:^"
98069786
"@endo/immutable-arraybuffer": "workspace:^"
98079787
"@endo/module-source": "workspace:^"
98089788
"@endo/test262-runner": "workspace:^"
9809-
"@types/babel__traverse": "npm:^7.28.0"
98109789
ava: "npm:^6.4.1"
98119790
babel-eslint: "npm:^10.1.0"
98129791
c8: "npm:^7.14.0"

0 commit comments

Comments
 (0)