From 023839132d57ff8421de53b9f8aea288fbf5449b Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Mon, 13 Nov 2023 17:30:34 -0500 Subject: [PATCH 1/5] chore(deps): update babel to 7.23.3 --- package.json | 10 +- .../snapshots/3-Babel-AST.shot | 79 ++++++++++ .../snapshots/5-AST-Alignment-AST.shot | 79 ++++++++++ yarn.lock | 141 ++++++++++++++++-- 4 files changed, 295 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index f3ea48751da6..30bf2d7b3c0b 100644 --- a/package.json +++ b/package.json @@ -54,11 +54,11 @@ "devDependencies": { "@actions/core": "^1.10.0", "@actions/github": "^6.0.0", - "@babel/code-frame": "^7.22.5", - "@babel/core": "^7.22.8", - "@babel/eslint-parser": "^7.22.7", - "@babel/parser": "^7.22.7", - "@babel/types": "^7.22.5", + "@babel/code-frame": "^7.22.13", + "@babel/core": "^7.23.3", + "@babel/eslint-parser": "^7.23.3", + "@babel/parser": "^7.23.3", + "@babel/types": "^7.23.3", "@nx/eslint": "17.1.1", "@nx/jest": "17.1.1", "@nx/workspace": "17.1.1", diff --git a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot index fec2f6e4759d..422530628713 100644 --- a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot +++ b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot @@ -87,6 +87,85 @@ Program { end: { column: 42, line: 3 }, }, }, + options: ObjectExpression { + type: "ObjectExpression", + properties: [ + Property { + type: "Property", + computed: false, + key: Identifier { + type: "Identifier", + name: "assert", + + range: [89, 95], + loc: { + start: { column: 16, line: 3 }, + end: { column: 22, line: 3 }, + }, + }, + kind: "init", + method: false, + shorthand: false, + value: ObjectExpression { + type: "ObjectExpression", + properties: [ + Property { + type: "Property", + computed: false, + key: Identifier { + type: "Identifier", + name: "type", + + range: [99, 103], + loc: { + start: { column: 26, line: 3 }, + end: { column: 30, line: 3 }, + }, + }, + kind: "init", + method: false, + shorthand: false, + value: Literal { + type: "Literal", + raw: "'json'", + value: "json", + + range: [105, 111], + loc: { + start: { column: 32, line: 3 }, + end: { column: 38, line: 3 }, + }, + }, + + range: [99, 111], + loc: { + start: { column: 26, line: 3 }, + end: { column: 38, line: 3 }, + }, + }, + ], + + range: [97, 113], + loc: { + start: { column: 24, line: 3 }, + end: { column: 40, line: 3 }, + }, + }, + + range: [89, 113], + loc: { + start: { column: 16, line: 3 }, + end: { column: 40, line: 3 }, + }, + }, + ], + + range: [87, 115], + loc: { + start: { column: 14, line: 3 }, + end: { column: 42, line: 3 }, + }, + }, source: Literal { type: "Literal", raw: "'foo'", diff --git a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot index e2f15f25d11e..716706840f94 100644 --- a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot +++ b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot @@ -21,6 +21,85 @@ exports[`AST Fixtures legacy-fixtures basics dynamic-import-with-import-assertio key: Identifier { type: 'Identifier', - decorators: Array [], ++ name: 'assert', ++ ++ range: [89, 95], ++ loc: { ++ start: { column: 16, line: 3 }, ++ end: { column: 22, line: 3 }, ++ }, ++ }, ++ kind: 'init', ++ method: false, ++ shorthand: false, ++ value: ObjectExpression { ++ type: 'ObjectExpression', ++ properties: Array [ ++ Property { ++ type: 'Property', ++ computed: false, ++ key: Identifier { ++ type: 'Identifier', ++ name: 'type', ++ ++ range: [99, 103], ++ loc: { ++ start: { column: 26, line: 3 }, ++ end: { column: 30, line: 3 }, ++ }, ++ }, ++ kind: 'init', ++ method: false, ++ shorthand: false, ++ value: Literal { ++ type: 'Literal', ++ raw: '\\'json\\'', ++ value: 'json', ++ ++ range: [105, 111], ++ loc: { ++ start: { column: 32, line: 3 }, ++ end: { column: 38, line: 3 }, ++ }, ++ }, ++ ++ range: [99, 111], ++ loc: { ++ start: { column: 26, line: 3 }, ++ end: { column: 38, line: 3 }, ++ }, ++ }, ++ ], ++ ++ range: [97, 113], ++ loc: { ++ start: { column: 24, line: 3 }, ++ end: { column: 40, line: 3 }, ++ }, ++ }, ++ ++ range: [89, 113], ++ loc: { ++ start: { column: 16, line: 3 }, ++ end: { column: 40, line: 3 }, ++ }, ++ }, ++ ], ++ ++ range: [87, 115], ++ loc: { ++ start: { column: 14, line: 3 }, ++ end: { column: 42, line: 3 }, ++ }, ++ }, ++ options: ObjectExpression { ++ type: 'ObjectExpression', ++ properties: Array [ ++ Property { ++ type: 'Property', ++ computed: false, ++ key: Identifier { ++ type: 'Identifier', name: 'assert', - optional: false, diff --git a/yarn.lock b/yarn.lock index 9d4aafdc1b13..d7f1555058e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -234,7 +234,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:*, @babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.22.5, @babel/code-frame@npm:^7.8.3": +"@babel/code-frame@npm:*, @babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.8.3": version: 7.22.13 resolution: "@babel/code-frame@npm:7.22.13" dependencies: @@ -251,7 +251,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:*, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.5, @babel/core@npm:^7.18.6, @babel/core@npm:^7.22.8, @babel/core@npm:^7.22.9": +"@babel/core@npm:*, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.5, @babel/core@npm:^7.18.6, @babel/core@npm:^7.22.9": version: 7.22.20 resolution: "@babel/core@npm:7.22.20" dependencies: @@ -298,7 +298,30 @@ __metadata: languageName: node linkType: hard -"@babel/eslint-parser@npm:*, @babel/eslint-parser@npm:^7.22.7": +"@babel/core@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/core@npm:7.23.3" + dependencies: + "@ampproject/remapping": ^2.2.0 + "@babel/code-frame": ^7.22.13 + "@babel/generator": ^7.23.3 + "@babel/helper-compilation-targets": ^7.22.15 + "@babel/helper-module-transforms": ^7.23.3 + "@babel/helpers": ^7.23.2 + "@babel/parser": ^7.23.3 + "@babel/template": ^7.22.15 + "@babel/traverse": ^7.23.3 + "@babel/types": ^7.23.3 + convert-source-map: ^2.0.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.3 + semver: ^6.3.1 + checksum: d306c1fa68972f4e085e9e7ad165aee80eb801ef331f6f07808c86309f03534d638b82ad00a3bc08f4d3de4860ccd38512b2790a39e6acc2caf9ea21e526afe7 + languageName: node + linkType: hard + +"@babel/eslint-parser@npm:*": version: 7.22.15 resolution: "@babel/eslint-parser@npm:7.22.15" dependencies: @@ -312,6 +335,20 @@ __metadata: languageName: node linkType: hard +"@babel/eslint-parser@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/eslint-parser@npm:7.23.3" + dependencies: + "@nicolo-ribaudo/eslint-scope-5-internals": 5.1.1-v1 + eslint-visitor-keys: ^2.1.0 + semver: ^6.3.1 + peerDependencies: + "@babel/core": ^7.11.0 + eslint: ^7.5.0 || ^8.0.0 + checksum: 9573daebe21af5123c302c307be80cacf1c2bf236a9497068a14726d3944ef55e1282519d0ccf51882dfc369359a3442299c98cb22a419e209924db39d4030fd + languageName: node + linkType: hard + "@babel/generator@npm:^7.12.5, @babel/generator@npm:^7.18.7, @babel/generator@npm:^7.22.15, @babel/generator@npm:^7.7.2": version: 7.22.15 resolution: "@babel/generator@npm:7.22.15" @@ -324,6 +361,18 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/generator@npm:7.23.3" + dependencies: + "@babel/types": ^7.23.3 + "@jridgewell/gen-mapping": ^0.3.2 + "@jridgewell/trace-mapping": ^0.3.17 + jsesc: ^2.5.1 + checksum: b6e71cca852d4e1aa01a28a30b8c74ffc3b8d56ccb7ae3ee783028ee015f63ad861a2e386c3eb490a9a8634db485a503a33521680f4af510151e90346c46da17 + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.18.6, @babel/helper-annotate-as-pure@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-annotate-as-pure@npm:7.22.5" @@ -419,6 +468,16 @@ __metadata: languageName: node linkType: hard +"@babel/helper-function-name@npm:^7.23.0": + version: 7.23.0 + resolution: "@babel/helper-function-name@npm:7.23.0" + dependencies: + "@babel/template": ^7.22.15 + "@babel/types": ^7.23.0 + checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10 + languageName: node + linkType: hard + "@babel/helper-hoist-variables@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-hoist-variables@npm:7.22.5" @@ -461,6 +520,21 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-transforms@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/helper-module-transforms@npm:7.23.3" + dependencies: + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-module-imports": ^7.22.15 + "@babel/helper-simple-access": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 + "@babel/helper-validator-identifier": ^7.22.20 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 5d0895cfba0e16ae16f3aa92fee108517023ad89a855289c4eb1d46f7aef4519adf8e6f971e1d55ac20c5461610e17213f1144097a8f932e768a9132e2278d71 + languageName: node + linkType: hard + "@babel/helper-optimise-call-expression@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-optimise-call-expression@npm:7.22.5" @@ -580,6 +654,17 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.23.2": + version: 7.23.2 + resolution: "@babel/helpers@npm:7.23.2" + dependencies: + "@babel/template": ^7.22.15 + "@babel/traverse": ^7.23.2 + "@babel/types": ^7.23.0 + checksum: aaf4828df75ec460eaa70e5c9f66e6dadc28dae3728ddb7f6c13187dbf38030e142194b83d81aa8a31bbc35a5529a5d7d3f3cf59d5d0b595f5dd7f9d8f1ced8e + languageName: node + linkType: hard + "@babel/highlight@npm:^7.22.13": version: 7.22.13 resolution: "@babel/highlight@npm:7.22.13" @@ -591,7 +676,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:*, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.8, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.16, @babel/parser@npm:^7.22.7": +"@babel/parser@npm:*, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.8, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.16": version: 7.22.16 resolution: "@babel/parser@npm:7.22.16" bin: @@ -600,6 +685,15 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/parser@npm:7.23.3" + bin: + parser: ./bin/babel-parser.js + checksum: 4aa7366e401b5467192c1dbf2bef99ac0958c45ef69ed6704abbae68f98fab6409a527b417d1528fddc49d7664450670528adc7f45abb04db5fafca7ed766d57 + languageName: node + linkType: hard + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.5": version: 7.22.5 resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.5" @@ -1774,6 +1868,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/traverse@npm:7.23.3" + dependencies: + "@babel/code-frame": ^7.22.13 + "@babel/generator": ^7.23.3 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-function-name": ^7.23.0 + "@babel/helper-hoist-variables": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 + "@babel/parser": ^7.23.3 + "@babel/types": ^7.23.3 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: f4e0c05f2f82368b9be7e1fed38cfcc2e1074967a8b76ac837b89661adbd391e99d0b1fd8c31215ffc3a04d2d5d7ee5e627914a09082db84ec5606769409fe2b + languageName: node + linkType: hard + "@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.7, @babel/types@npm:^7.15.6, @babel/types@npm:^7.18.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.22.19 resolution: "@babel/types@npm:7.22.19" @@ -1785,6 +1897,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.23.0, @babel/types@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/types@npm:7.23.3" + dependencies: + "@babel/helper-string-parser": ^7.22.5 + "@babel/helper-validator-identifier": ^7.22.20 + to-fast-properties: ^2.0.0 + checksum: b96f1ec495351aeb2a5f98dd494aafa17df02a351548ae96999460f35c933261c839002a34c1e83552ff0d9f5e94d0b5b8e105d38131c7c9b0f5a6588676f35d + languageName: node + linkType: hard + "@bcoe/v8-coverage@npm:^0.2.3": version: 0.2.3 resolution: "@bcoe/v8-coverage@npm:0.2.3" @@ -6052,11 +6175,11 @@ __metadata: dependencies: "@actions/core": ^1.10.0 "@actions/github": ^6.0.0 - "@babel/code-frame": ^7.22.5 - "@babel/core": ^7.22.8 - "@babel/eslint-parser": ^7.22.7 - "@babel/parser": ^7.22.7 - "@babel/types": ^7.22.5 + "@babel/code-frame": ^7.22.13 + "@babel/core": ^7.23.3 + "@babel/eslint-parser": ^7.23.3 + "@babel/parser": ^7.23.3 + "@babel/types": ^7.23.3 "@nx/eslint": 17.1.1 "@nx/jest": 17.1.1 "@nx/workspace": 17.1.1 From 1c00fc50b7070a9ef38b699a439bf75b3c3c66a3 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Sun, 19 Nov 2023 15:42:11 +0100 Subject: [PATCH 2/5] Updated snapshots --- .../snapshots/3-Babel-AST.shot | 79 ------------------- .../snapshots/5-AST-Alignment-AST.shot | 79 ------------------- 2 files changed, 158 deletions(-) diff --git a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot index 422530628713..fec2f6e4759d 100644 --- a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot +++ b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot @@ -87,85 +87,6 @@ Program { end: { column: 42, line: 3 }, }, }, - options: ObjectExpression { - type: "ObjectExpression", - properties: [ - Property { - type: "Property", - computed: false, - key: Identifier { - type: "Identifier", - name: "assert", - - range: [89, 95], - loc: { - start: { column: 16, line: 3 }, - end: { column: 22, line: 3 }, - }, - }, - kind: "init", - method: false, - shorthand: false, - value: ObjectExpression { - type: "ObjectExpression", - properties: [ - Property { - type: "Property", - computed: false, - key: Identifier { - type: "Identifier", - name: "type", - - range: [99, 103], - loc: { - start: { column: 26, line: 3 }, - end: { column: 30, line: 3 }, - }, - }, - kind: "init", - method: false, - shorthand: false, - value: Literal { - type: "Literal", - raw: "'json'", - value: "json", - - range: [105, 111], - loc: { - start: { column: 32, line: 3 }, - end: { column: 38, line: 3 }, - }, - }, - - range: [99, 111], - loc: { - start: { column: 26, line: 3 }, - end: { column: 38, line: 3 }, - }, - }, - ], - - range: [97, 113], - loc: { - start: { column: 24, line: 3 }, - end: { column: 40, line: 3 }, - }, - }, - - range: [89, 113], - loc: { - start: { column: 16, line: 3 }, - end: { column: 40, line: 3 }, - }, - }, - ], - - range: [87, 115], - loc: { - start: { column: 14, line: 3 }, - end: { column: 42, line: 3 }, - }, - }, source: Literal { type: "Literal", raw: "'foo'", diff --git a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot index 716706840f94..e2f15f25d11e 100644 --- a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot +++ b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot @@ -21,85 +21,6 @@ exports[`AST Fixtures legacy-fixtures basics dynamic-import-with-import-assertio key: Identifier { type: 'Identifier', - decorators: Array [], -+ name: 'assert', -+ -+ range: [89, 95], -+ loc: { -+ start: { column: 16, line: 3 }, -+ end: { column: 22, line: 3 }, -+ }, -+ }, -+ kind: 'init', -+ method: false, -+ shorthand: false, -+ value: ObjectExpression { -+ type: 'ObjectExpression', -+ properties: Array [ -+ Property { -+ type: 'Property', -+ computed: false, -+ key: Identifier { -+ type: 'Identifier', -+ name: 'type', -+ -+ range: [99, 103], -+ loc: { -+ start: { column: 26, line: 3 }, -+ end: { column: 30, line: 3 }, -+ }, -+ }, -+ kind: 'init', -+ method: false, -+ shorthand: false, -+ value: Literal { -+ type: 'Literal', -+ raw: '\\'json\\'', -+ value: 'json', -+ -+ range: [105, 111], -+ loc: { -+ start: { column: 32, line: 3 }, -+ end: { column: 38, line: 3 }, -+ }, -+ }, -+ -+ range: [99, 111], -+ loc: { -+ start: { column: 26, line: 3 }, -+ end: { column: 38, line: 3 }, -+ }, -+ }, -+ ], -+ -+ range: [97, 113], -+ loc: { -+ start: { column: 24, line: 3 }, -+ end: { column: 40, line: 3 }, -+ }, -+ }, -+ -+ range: [89, 113], -+ loc: { -+ start: { column: 16, line: 3 }, -+ end: { column: 40, line: 3 }, -+ }, -+ }, -+ ], -+ -+ range: [87, 115], -+ loc: { -+ start: { column: 14, line: 3 }, -+ end: { column: 42, line: 3 }, -+ }, -+ }, -+ options: ObjectExpression { -+ type: 'ObjectExpression', -+ properties: Array [ -+ Property { -+ type: 'Property', -+ computed: false, -+ key: Identifier { -+ type: 'Identifier', name: 'assert', - optional: false, From f764a8ab4497514434d9190ea88fb4696d92873c Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 29 Nov 2023 00:11:50 +0100 Subject: [PATCH 3/5] update snapshots --- .../snapshots/3-Babel-AST.shot | 79 +++++++++++++++++++ .../snapshots/5-AST-Alignment-AST.shot | 79 +++++++++++++++++++ 2 files changed, 158 insertions(+) diff --git a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot index fec2f6e4759d..422530628713 100644 --- a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot +++ b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/3-Babel-AST.shot @@ -87,6 +87,85 @@ Program { end: { column: 42, line: 3 }, }, }, + options: ObjectExpression { + type: "ObjectExpression", + properties: [ + Property { + type: "Property", + computed: false, + key: Identifier { + type: "Identifier", + name: "assert", + + range: [89, 95], + loc: { + start: { column: 16, line: 3 }, + end: { column: 22, line: 3 }, + }, + }, + kind: "init", + method: false, + shorthand: false, + value: ObjectExpression { + type: "ObjectExpression", + properties: [ + Property { + type: "Property", + computed: false, + key: Identifier { + type: "Identifier", + name: "type", + + range: [99, 103], + loc: { + start: { column: 26, line: 3 }, + end: { column: 30, line: 3 }, + }, + }, + kind: "init", + method: false, + shorthand: false, + value: Literal { + type: "Literal", + raw: "'json'", + value: "json", + + range: [105, 111], + loc: { + start: { column: 32, line: 3 }, + end: { column: 38, line: 3 }, + }, + }, + + range: [99, 111], + loc: { + start: { column: 26, line: 3 }, + end: { column: 38, line: 3 }, + }, + }, + ], + + range: [97, 113], + loc: { + start: { column: 24, line: 3 }, + end: { column: 40, line: 3 }, + }, + }, + + range: [89, 113], + loc: { + start: { column: 16, line: 3 }, + end: { column: 40, line: 3 }, + }, + }, + ], + + range: [87, 115], + loc: { + start: { column: 14, line: 3 }, + end: { column: 42, line: 3 }, + }, + }, source: Literal { type: "Literal", raw: "'foo'", diff --git a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot index e2f15f25d11e..716706840f94 100644 --- a/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot +++ b/packages/ast-spec/src/legacy-fixtures/basics/fixtures/dynamic-import-with-import-assertions/snapshots/5-AST-Alignment-AST.shot @@ -21,6 +21,85 @@ exports[`AST Fixtures legacy-fixtures basics dynamic-import-with-import-assertio key: Identifier { type: 'Identifier', - decorators: Array [], ++ name: 'assert', ++ ++ range: [89, 95], ++ loc: { ++ start: { column: 16, line: 3 }, ++ end: { column: 22, line: 3 }, ++ }, ++ }, ++ kind: 'init', ++ method: false, ++ shorthand: false, ++ value: ObjectExpression { ++ type: 'ObjectExpression', ++ properties: Array [ ++ Property { ++ type: 'Property', ++ computed: false, ++ key: Identifier { ++ type: 'Identifier', ++ name: 'type', ++ ++ range: [99, 103], ++ loc: { ++ start: { column: 26, line: 3 }, ++ end: { column: 30, line: 3 }, ++ }, ++ }, ++ kind: 'init', ++ method: false, ++ shorthand: false, ++ value: Literal { ++ type: 'Literal', ++ raw: '\\'json\\'', ++ value: 'json', ++ ++ range: [105, 111], ++ loc: { ++ start: { column: 32, line: 3 }, ++ end: { column: 38, line: 3 }, ++ }, ++ }, ++ ++ range: [99, 111], ++ loc: { ++ start: { column: 26, line: 3 }, ++ end: { column: 38, line: 3 }, ++ }, ++ }, ++ ], ++ ++ range: [97, 113], ++ loc: { ++ start: { column: 24, line: 3 }, ++ end: { column: 40, line: 3 }, ++ }, ++ }, ++ ++ range: [89, 113], ++ loc: { ++ start: { column: 16, line: 3 }, ++ end: { column: 40, line: 3 }, ++ }, ++ }, ++ ], ++ ++ range: [87, 115], ++ loc: { ++ start: { column: 14, line: 3 }, ++ end: { column: 42, line: 3 }, ++ }, ++ }, ++ options: ObjectExpression { ++ type: 'ObjectExpression', ++ properties: Array [ ++ Property { ++ type: 'Property', ++ computed: false, ++ key: Identifier { ++ type: 'Identifier', name: 'assert', - optional: false, From 3a81432104c960133ceed1930146c68fcc67cf92 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 29 Nov 2023 00:13:28 +0100 Subject: [PATCH 4/5] ran yarn dedupe @babel/core --- yarn.lock | 51 ++++++++++++++------------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2b0c2fec0bff..e40fb78629c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -251,26 +251,26 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:*, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.5, @babel/core@npm:^7.18.6, @babel/core@npm:^7.22.9": - version: 7.22.20 - resolution: "@babel/core@npm:7.22.20" +"@babel/core@npm:*, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.5, @babel/core@npm:^7.18.6, @babel/core@npm:^7.22.9, @babel/core@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/core@npm:7.23.3" dependencies: "@ampproject/remapping": ^2.2.0 "@babel/code-frame": ^7.22.13 - "@babel/generator": ^7.22.15 + "@babel/generator": ^7.23.3 "@babel/helper-compilation-targets": ^7.22.15 - "@babel/helper-module-transforms": ^7.22.20 - "@babel/helpers": ^7.22.15 - "@babel/parser": ^7.22.16 + "@babel/helper-module-transforms": ^7.23.3 + "@babel/helpers": ^7.23.2 + "@babel/parser": ^7.23.3 "@babel/template": ^7.22.15 - "@babel/traverse": ^7.22.20 - "@babel/types": ^7.22.19 - convert-source-map: ^1.7.0 + "@babel/traverse": ^7.23.3 + "@babel/types": ^7.23.3 + convert-source-map: ^2.0.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.3 semver: ^6.3.1 - checksum: 73663a079194b5dc406b2e2e5e50db81977d443e4faf7ef2c27e5836cd9a359e81e551115193dc9b1a93471275351a972e54904f4d3aa6cb156f51e26abf6765 + checksum: d306c1fa68972f4e085e9e7ad165aee80eb801ef331f6f07808c86309f03534d638b82ad00a3bc08f4d3de4860ccd38512b2790a39e6acc2caf9ea21e526afe7 languageName: node linkType: hard @@ -298,29 +298,6 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/core@npm:7.23.3" - dependencies: - "@ampproject/remapping": ^2.2.0 - "@babel/code-frame": ^7.22.13 - "@babel/generator": ^7.23.3 - "@babel/helper-compilation-targets": ^7.22.15 - "@babel/helper-module-transforms": ^7.23.3 - "@babel/helpers": ^7.23.2 - "@babel/parser": ^7.23.3 - "@babel/template": ^7.22.15 - "@babel/traverse": ^7.23.3 - "@babel/types": ^7.23.3 - convert-source-map: ^2.0.0 - debug: ^4.1.0 - gensync: ^1.0.0-beta.2 - json5: ^2.2.3 - semver: ^6.3.1 - checksum: d306c1fa68972f4e085e9e7ad165aee80eb801ef331f6f07808c86309f03534d638b82ad00a3bc08f4d3de4860ccd38512b2790a39e6acc2caf9ea21e526afe7 - languageName: node - linkType: hard - "@babel/eslint-parser@npm:*": version: 7.22.15 resolution: "@babel/eslint-parser@npm:7.22.15" @@ -505,7 +482,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.22.20, @babel/helper-module-transforms@npm:^7.22.5": +"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.22.5": version: 7.22.20 resolution: "@babel/helper-module-transforms@npm:7.22.20" dependencies: @@ -643,7 +620,7 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.22.15": +"@babel/helpers@npm:^7.12.5": version: 7.22.15 resolution: "@babel/helpers@npm:7.22.15" dependencies: @@ -1850,7 +1827,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.18.8, @babel/traverse@npm:^7.22.15, @babel/traverse@npm:^7.22.20": +"@babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.18.8, @babel/traverse@npm:^7.22.15": version: 7.22.20 resolution: "@babel/traverse@npm:7.22.20" dependencies: From 95b7f97084f523c7ce9687b9e6efb1d71f36fcc2 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 29 Nov 2023 00:17:23 +0100 Subject: [PATCH 5/5] ran yarn dedupe some more --- yarn.lock | 118 +++++------------------------------------------------- 1 file changed, 9 insertions(+), 109 deletions(-) diff --git a/yarn.lock b/yarn.lock index e40fb78629c9..2e603d009122 100644 --- a/yarn.lock +++ b/yarn.lock @@ -298,21 +298,7 @@ __metadata: languageName: node linkType: hard -"@babel/eslint-parser@npm:*": - version: 7.22.15 - resolution: "@babel/eslint-parser@npm:7.22.15" - dependencies: - "@nicolo-ribaudo/eslint-scope-5-internals": 5.1.1-v1 - eslint-visitor-keys: ^2.1.0 - semver: ^6.3.1 - peerDependencies: - "@babel/core": ^7.11.0 - eslint: ^7.5.0 || ^8.0.0 - checksum: efdc749164a40de1b68e3ed395f441dfb7864c85d0a2ee3e4bc4f06dd0b7f675acb9be97cdc9025b88b3e80d38749a2b30e392ce7f6a79313c3aaf82ba8ccd68 - languageName: node - linkType: hard - -"@babel/eslint-parser@npm:^7.23.3": +"@babel/eslint-parser@npm:*, @babel/eslint-parser@npm:^7.23.3": version: 7.23.3 resolution: "@babel/eslint-parser@npm:7.23.3" dependencies: @@ -326,19 +312,7 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.12.5, @babel/generator@npm:^7.18.7, @babel/generator@npm:^7.22.15, @babel/generator@npm:^7.7.2": - version: 7.22.15 - resolution: "@babel/generator@npm:7.22.15" - dependencies: - "@babel/types": ^7.22.15 - "@jridgewell/gen-mapping": ^0.3.2 - "@jridgewell/trace-mapping": ^0.3.17 - jsesc: ^2.5.1 - checksum: 5b2a3ccdc3634f6ea86e0a442722bcd430238369432d31f15b428a4ee8013c2f4f917b5b135bf4fc1d0a3e2f87f10fd4ce5d07955ecc2d3b9400a05c2a481374 - languageName: node - linkType: hard - -"@babel/generator@npm:^7.23.3": +"@babel/generator@npm:^7.12.5, @babel/generator@npm:^7.18.7, @babel/generator@npm:^7.23.3, @babel/generator@npm:^7.7.2": version: 7.23.3 resolution: "@babel/generator@npm:7.23.3" dependencies: @@ -435,17 +409,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-function-name@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-function-name@npm:7.22.5" - dependencies: - "@babel/template": ^7.22.5 - "@babel/types": ^7.22.5 - checksum: 6b1f6ce1b1f4e513bf2c8385a557ea0dd7fa37971b9002ad19268ca4384bbe90c09681fe4c076013f33deabc63a53b341ed91e792de741b4b35e01c00238177a - languageName: node - linkType: hard - -"@babel/helper-function-name@npm:^7.23.0": +"@babel/helper-function-name@npm:^7.22.5, @babel/helper-function-name@npm:^7.23.0": version: 7.23.0 resolution: "@babel/helper-function-name@npm:7.23.0" dependencies: @@ -482,22 +446,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.22.5": - version: 7.22.20 - resolution: "@babel/helper-module-transforms@npm:7.22.20" - dependencies: - "@babel/helper-environment-visitor": ^7.22.20 - "@babel/helper-module-imports": ^7.22.15 - "@babel/helper-simple-access": ^7.22.5 - "@babel/helper-split-export-declaration": ^7.22.6 - "@babel/helper-validator-identifier": ^7.22.20 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 8fce25362df8711bd4620f41c5c18769edfeafe7f8f1dae9691966ef368e57f9da68dfa1707cd63c834c89dc4eaa82c26f12ea33e88fd262ac62844b11dcc389 - languageName: node - linkType: hard - -"@babel/helper-module-transforms@npm:^7.23.3": +"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.23.3": version: 7.23.3 resolution: "@babel/helper-module-transforms@npm:7.23.3" dependencies: @@ -595,7 +544,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.22.19, @babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.22.5": +"@babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.22.5": version: 7.22.20 resolution: "@babel/helper-validator-identifier@npm:7.22.20" checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc @@ -620,18 +569,7 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.12.5": - version: 7.22.15 - resolution: "@babel/helpers@npm:7.22.15" - dependencies: - "@babel/template": ^7.22.15 - "@babel/traverse": ^7.22.15 - "@babel/types": ^7.22.15 - checksum: 49f61a93cbae4df3328bda67af5db743fead659ae4242571226c3596b7df78546189cdf991fed1eca33b559de8abf396a90a001f474a1bab351418f07b7ae6ef - languageName: node - linkType: hard - -"@babel/helpers@npm:^7.23.2": +"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.23.2": version: 7.23.2 resolution: "@babel/helpers@npm:7.23.2" dependencies: @@ -653,16 +591,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:*, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.8, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.16": - version: 7.22.16 - resolution: "@babel/parser@npm:7.22.16" - bin: - parser: ./bin/babel-parser.js - checksum: 944c756b5bdeb07b9fec16ecef6b3c61aff9d4c4b924abadcf01afa1840a740b8e2357ae00482b5b37daad6d2bfd848c947f27ad65138d687b6fdc924bc59edd - languageName: node - linkType: hard - -"@babel/parser@npm:^7.23.3": +"@babel/parser@npm:*, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.8, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.3": version: 7.23.3 resolution: "@babel/parser@npm:7.23.3" bin: @@ -1827,25 +1756,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.18.8, @babel/traverse@npm:^7.22.15": - version: 7.22.20 - resolution: "@babel/traverse@npm:7.22.20" - dependencies: - "@babel/code-frame": ^7.22.13 - "@babel/generator": ^7.22.15 - "@babel/helper-environment-visitor": ^7.22.20 - "@babel/helper-function-name": ^7.22.5 - "@babel/helper-hoist-variables": ^7.22.5 - "@babel/helper-split-export-declaration": ^7.22.6 - "@babel/parser": ^7.22.16 - "@babel/types": ^7.22.19 - debug: ^4.1.0 - globals: ^11.1.0 - checksum: 97da9afa7f8f505ce52c36ac2531129bc4a0e250880aaf9b467dc044f30a5bce2b756c1af4d961958bc225659546e811a7d536ab3d920fd60921087989b841b9 - languageName: node - linkType: hard - -"@babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.3": +"@babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.18.8, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.3": version: 7.23.3 resolution: "@babel/traverse@npm:7.23.3" dependencies: @@ -1863,18 +1774,7 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.7, @babel/types@npm:^7.15.6, @babel/types@npm:^7.18.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": - version: 7.22.19 - resolution: "@babel/types@npm:7.22.19" - dependencies: - "@babel/helper-string-parser": ^7.22.5 - "@babel/helper-validator-identifier": ^7.22.19 - to-fast-properties: ^2.0.0 - checksum: 2d69740e69b55ba36ece0c17d5afb7b7213b34297157df39ef9ba24965aff677c56f014413052ecc5b2fbbf26910c63e5bb24a969df84d7a17153750cf75915e - languageName: node - linkType: hard - -"@babel/types@npm:^7.23.0, @babel/types@npm:^7.23.3": +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.7, @babel/types@npm:^7.15.6, @babel/types@npm:^7.18.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.3, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.23.3 resolution: "@babel/types@npm:7.23.3" dependencies: