Skip to content

Commit 64fa466

Browse files
nicolo-ribaudonicolo-ribaudo
authored
Enable import attributes parsing by default (#16850)
* Enable import attributes parsing by default * Remove plugin from tests * Update fixtures * Fix failures * `make build` * Fix TS errors * Fix * Update .d.ts * Move in core * [babel 8] Remove syntax plugins from preset-env * Update fixtures * Fix ESM build of Babel 7 and standalone * Update flow allowlist * Update parser fixtures for Babel 8 * Update generator tests * Update parser test * Update standalone * Do not run import attribtues plugin test in Babel 8 * Make tests pass in babel 8 * Fix Babel 8 build * [babel 8] Stop printing legacy "with" attributes * fix prettier integration test * Fix Babel 8 compat in syntax-import-attributes * Try fix * Do not error for the removed `importAttributes` plugin * Skip a test in babel7/8 compat e2e * Throw an error when using removed option from the parser * Fixes after rebase * Raise `ImportCallArity` also when `createImportExpressions` * Fix linting
1 parent c369676 commit 64fa466

File tree

309 files changed

+1271
-624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+1271
-624
lines changed

‎Gulpfile.mjs

+3
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ function buildRollup(packages, buildStandalone) {
410410
bool(process.env.BABEL_8_BREAKING)
411411
? [
412412
// These require()s are all in babel-preset-env/src/polyfills/babel-7-plugins.cjs
413+
// and packages/babel-preset-env/src/babel-7-available-plugins.cjs.
413414
// They are gated by a !process.env.BABEL_8_BREAKING check, but
414415
// @rollup/plugin-commonjs extracts them to import statements outside of the
415416
// check and thus they end up in the final bundle.
@@ -418,6 +419,8 @@ function buildRollup(packages, buildStandalone) {
418419
"./babel-polyfill.cjs",
419420
"./regenerator.cjs",
420421
"@babel/compat-data/corejs2-built-ins",
422+
"@babel/plugin-syntax-import-assertions",
423+
"@babel/plugin-syntax-import-attributes",
421424
]
422425
: [],
423426
dynamicRequireTargets: [

‎eslint/babel-eslint-parser/test/index.js

+24-14
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,31 @@ const BABEL_OPTIONS = {
3232
),
3333
};
3434
const PROPS_TO_REMOVE = [
35-
"importKind",
36-
"exportKind",
37-
"variance",
38-
"typeArguments",
39-
"filename",
40-
"identifierName",
35+
{ key: "importKind", type: null },
36+
{ key: "exportKind", type: null },
37+
{ key: "variance", type: null },
38+
{ key: "typeArguments", type: null },
39+
{ key: "filename", type: null },
40+
{ key: "identifierName", type: null },
41+
// espree doesn't support these yet
42+
{ key: "attributes", type: "ImportDeclaration" },
43+
{ key: "attributes", type: "ExportNamedDeclaration" },
44+
{ key: "attributes", type: "ExportAllDeclaration" },
45+
{ key: "attributes", type: "ImportExpression" },
46+
{ key: "options", type: "ImportExpression" },
4147
];
4248

4349
function deeplyRemoveProperties(obj, props) {
4450
for (const [k, v] of Object.entries(obj)) {
51+
if (
52+
props.some(
53+
({ key, type }) => key === k && (type == null || type === obj.type),
54+
)
55+
) {
56+
delete obj[k];
57+
continue;
58+
}
59+
4560
if (typeof v === "object") {
4661
if (Array.isArray(v)) {
4762
for (const el of v) {
@@ -51,16 +66,9 @@ function deeplyRemoveProperties(obj, props) {
5166
}
5267
}
5368

54-
if (props.includes(k)) {
55-
delete obj[k];
56-
} else if (v != null) {
69+
if (v != null) {
5770
deeplyRemoveProperties(v, props);
5871
}
59-
continue;
60-
}
61-
62-
if (props.includes(k)) {
63-
delete obj[k];
6472
}
6573
}
6674
}
@@ -101,6 +109,7 @@ describe("Babel and Espree", () => {
101109
}).ast;
102110

103111
deeplyRemoveProperties(babelAST, PROPS_TO_REMOVE);
112+
deeplyRemoveProperties(espreeAST, ["offset"]);
104113
expect(babelAST).toEqual(espreeAST);
105114
} else {
106115
// ESLint 8
@@ -117,6 +126,7 @@ describe("Babel and Espree", () => {
117126
}).ast;
118127

119128
deeplyRemoveProperties(babelAST, PROPS_TO_REMOVE);
129+
deeplyRemoveProperties(espreeAST, ["offset"]);
120130
expect(babelAST).toEqual(espreeAST);
121131
}
122132
}

‎packages/babel-core/src/parser/util/missing-plugin-helper.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,6 @@ const pluginNameMap: Record<
8484
url: "https://github.com/babel/babel/tree/main/packages/babel-preset-react",
8585
},
8686
},
87-
importAttributes: {
88-
syntax: {
89-
name: "@babel/plugin-syntax-import-attributes",
90-
url: "https://github.com/babel/babel/tree/main/packages/babel-plugin-syntax-import-attributes",
91-
},
92-
},
9387
pipelineOperator: {
9488
syntax: {
9589
name: "@babel/plugin-syntax-pipeline-operator",
@@ -204,6 +198,12 @@ if (!process.env.BABEL_8_BREAKING) {
204198
url: "https://github.com/babel/babel/tree/main/packages/babel-plugin-syntax-import-assertions",
205199
},
206200
},
201+
importAttributes: {
202+
syntax: {
203+
name: "@babel/plugin-syntax-import-attributes",
204+
url: "https://github.com/babel/babel/tree/main/packages/babel-plugin-syntax-import-attributes",
205+
},
206+
},
207207
importMeta: {
208208
syntax: {
209209
name: "@babel/plugin-syntax-import-meta",

‎packages/babel-generator/src/generators/modules.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ export function _printAttributes(
7878
const { attributes, assertions } = node;
7979

8080
if (
81+
!process.env.BABEL_8_BREAKING &&
8182
attributes &&
8283
!importAttributesKeyword &&
8384
// In the production build only show the warning once.
@@ -101,7 +102,11 @@ Please specify the "importAttributesKeyword" generator option, whose value can b
101102
this.word(useAssertKeyword ? "assert" : "with");
102103
this.space();
103104

104-
if (!useAssertKeyword && importAttributesKeyword !== "with") {
105+
if (
106+
!process.env.BABEL_8_BREAKING &&
107+
!useAssertKeyword &&
108+
importAttributesKeyword !== "with"
109+
) {
105110
// with-legacy
106111
this.printList(attributes || assertions);
107112
return;
@@ -132,11 +137,9 @@ export function ExportAllDeclaration(
132137
this.space();
133138
this.word("from");
134139
this.space();
135-
// @ts-expect-error Fixme: attributes is not defined in DeclareExportAllDeclaration
136140
if (node.attributes?.length || node.assertions?.length) {
137141
this.print(node.source, true);
138142
this.space();
139-
// @ts-expect-error Fixme: attributes is not defined in DeclareExportAllDeclaration
140143
this._printAttributes(node, false);
141144
} else {
142145
this.print(node.source);

‎packages/babel-generator/test/fixtures/importAttributesKeyword/attributes-assert-to-assert/options.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"plugins": [["importAttributes", { "deprecatedAssertSyntax": true }]],
2+
"plugins": ["deprecatedImportAssert"],
33
"importAttributesKeyword": "assert"
44
}

‎packages/babel-generator/test/fixtures/importAttributesKeyword/attributes-assert-to-default/options.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
22
"BABEL_8_BREAKING": true,
3-
"plugins": [["importAttributes", { "deprecatedAssertSyntax": true }]],
4-
"warns": "You are using import attributes, without specifying the desired output syntax.",
5-
"expectedReParseError": true
3+
"plugins": ["deprecatedImportAssert"]
64
}

‎packages/babel-generator/test/fixtures/importAttributesKeyword/attributes-assert-to-default/output.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import "a" with type: "json";
1+
import "a" with { type: "json" };

‎packages/babel-generator/test/fixtures/importAttributesKeyword/attributes-assert-to-with-legacy/options.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
2-
"plugins": [["importAttributes", { "deprecatedAssertSyntax": true }]],
2+
"BABEL_8_BREAKING": false,
3+
"plugins": ["deprecatedImportAssert"],
34
"importAttributesKeyword": "with-legacy",
45
"expectedReParseError": true
56
}

‎packages/babel-generator/test/fixtures/importAttributesKeyword/attributes-assert-to-with/options.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"plugins": [["importAttributes", { "deprecatedAssertSyntax": true }]],
2+
"plugins": ["deprecatedImportAssert"],
33
"importAttributesKeyword": "with"
44
}

‎packages/babel-generator/test/fixtures/importAttributesKeyword/attributes-with-to-default-babel-7/input.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import "a" with { type: "json" };

‎packages/babel-generator/test/fixtures/importAttributesKeyword/attributes-with-to-default-babel-7/options.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"BABEL_8_BREAKING": false,
3+
"_": "The warning is only shown once in the release build, tested by the assertions-with-to-default fixture",
4+
"noWarnInPublishBuild": true,
5+
"plugins": ["importAttributes"],
6+
"warns": "You are using import attributes, without specifying the desired output syntax.",
7+
"expectedReParseError": true
8+
}

‎packages/babel-generator/test/fixtures/importAttributesKeyword/attributes-with-to-default-babel-7/output.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import "a" with type: "json";

‎packages/babel-generator/test/fixtures/importAttributesKeyword/attributes-with-to-default/options.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{
2-
"_": "The warning is only shown once in the release build, tested by the assertions-with-to-default fixture",
3-
"noWarnInPublishBuild": true,
4-
"plugins": ["importAttributes"],
5-
"warns": "You are using import attributes, without specifying the desired output syntax.",
6-
"expectedReParseError": true
2+
"BABEL_8_BREAKING": true,
3+
"plugins": ["importAttributes"]
74
}

‎packages/babel-generator/test/fixtures/importAttributesKeyword/attributes-with-to-default/output.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import "a" with type: "json";
1+
import "a" with { type: "json" };

‎packages/babel-generator/test/fixtures/importAttributesKeyword/attributes-with-to-with-legacy/options.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"BABEL_8_BREAKING": false,
23
"plugins": ["importAttributes"],
34
"importAttributesKeyword": "with-legacy",
45
"expectedReParseError": true

‎packages/babel-generator/test/preserve-format.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const FAILURES = [
5959
"importAttributesKeyword/attributes-assert-to-with/input.js",
6060
"importAttributesKeyword/attributes-assert-to-with-legacy/input.js",
6161
"importAttributesKeyword/attributes-with-to-assert/input.js",
62-
"importAttributesKeyword/attributes-with-to-default/input.js",
62+
"importAttributesKeyword/attributes-with-to-default-babel-7/input.js",
6363
"importAttributesKeyword/attributes-with-to-with-legacy/input.js",
6464
"importAttributesKeyword/legacy-module-attributes-to-assert/input.js",
6565
"importAttributesKeyword/legacy-module-attributes-to-with/input.js",

‎packages/babel-parser/src/parse-error/standard-errors.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,10 @@ export default {
117117
"Illegal 'use strict' directive in function with non-simple parameter list.",
118118
IllegalReturn: "'return' outside of function.",
119119
ImportAttributesUseAssert:
120-
"The `assert` keyword in import attributes is deprecated and it has been replaced by the `with` keyword. You can enable the `deprecatedAssertSyntax: true` option in the import attributes plugin to suppress this error.",
120+
"The `assert` keyword in import attributes is deprecated and it has been replaced by the `with` keyword. You can enable the `deprecatedImportAssert` parser plugin to suppress this error.",
121121
ImportBindingIsString: ({ importName }: { importName: string }) =>
122122
`A string literal cannot be used as an imported binding.\n- Did you mean \`import { "${importName}" as foo }\`?`,
123-
ImportCallArgumentTrailingComma:
124-
"Trailing comma is disallowed inside import(...) arguments.",
125-
ImportCallArity: ({ maxArgumentCount }: { maxArgumentCount: 1 | 2 }) =>
126-
`\`import()\` requires exactly ${
127-
maxArgumentCount === 1 ? "one argument" : "one or two arguments"
128-
}.`,
123+
ImportCallArity: `\`import()\` requires exactly one or two arguments.`,
129124
ImportCallNotNewExpression: "Cannot use new with import(...).",
130125
ImportCallSpreadArgument: "`...` is not allowed in `import()`.",
131126
ImportJSONBindingNotDefault:

‎packages/babel-parser/src/parser/expression.ts

+16-58
Original file line numberDiff line numberDiff line change
@@ -881,9 +881,7 @@ export default abstract class ExpressionParser extends LValParser {
881881
} else {
882882
node.arguments = this.parseCallExpressionArguments(
883883
tt.parenR,
884-
base.type === "Import",
885884
base.type !== "Super",
886-
// @ts-expect-error todo(flow->ts)
887885
node,
888886
refExpressionErrors,
889887
);
@@ -960,27 +958,8 @@ export default abstract class ExpressionParser extends LValParser {
960958
optional: boolean,
961959
): T {
962960
if (node.callee.type === "Import") {
963-
if (node.arguments.length === 2) {
964-
if (
965-
process.env.BABEL_8_BREAKING ||
966-
!(
967-
this.hasPlugin("moduleAttributes") ||
968-
this.hasPlugin("importAssertions")
969-
)
970-
) {
971-
this.expectPlugin("importAttributes");
972-
}
973-
}
974961
if (node.arguments.length === 0 || node.arguments.length > 2) {
975-
this.raise(Errors.ImportCallArity, node, {
976-
maxArgumentCount:
977-
this.hasPlugin("importAttributes") ||
978-
(!process.env.BABEL_8_BREAKING &&
979-
(this.hasPlugin("importAssertions") ||
980-
this.hasPlugin("moduleAttributes")))
981-
? 2
982-
: 1,
983-
});
962+
this.raise(Errors.ImportCallArity, node);
984963
} else {
985964
for (const arg of node.arguments) {
986965
if (arg.type === "SpreadElement") {
@@ -998,11 +977,10 @@ export default abstract class ExpressionParser extends LValParser {
998977
parseCallExpressionArguments(
999978
this: Parser,
1000979
close: TokenType,
1001-
dynamicImport?: boolean,
1002980
allowPlaceholder?: boolean,
1003-
nodeForExtra?: N.Node | null,
981+
nodeForExtra?: Undone<N.Node> | null,
1004982
refExpressionErrors?: ExpressionErrors | null,
1005-
): Array<N.Expression | undefined | null> {
983+
): Array<N.Expression> {
1006984
const elts: N.Expression[] = [];
1007985
let first = true;
1008986
const oldInFSharpPipelineDirectBody = this.state.inFSharpPipelineDirectBody;
@@ -1014,18 +992,6 @@ export default abstract class ExpressionParser extends LValParser {
1014992
} else {
1015993
this.expect(tt.comma);
1016994
if (this.match(close)) {
1017-
if (
1018-
dynamicImport &&
1019-
!this.hasPlugin("importAttributes") &&
1020-
(process.env.BABEL_8_BREAKING ||
1021-
(!this.hasPlugin("importAssertions") &&
1022-
!this.hasPlugin("moduleAttributes")))
1023-
) {
1024-
this.raise(
1025-
Errors.ImportCallArgumentTrailingComma,
1026-
this.state.lastTokStartLoc,
1027-
);
1028-
}
1029995
if (nodeForExtra) {
1030996
this.addTrailingCommaExtraToNode(nodeForExtra);
1031997
}
@@ -2067,10 +2033,7 @@ export default abstract class ExpressionParser extends LValParser {
20672033
} else {
20682034
this.expect(tt.comma);
20692035
if (this.match(close)) {
2070-
this.addTrailingCommaExtraToNode(
2071-
// @ts-expect-error todo(flow->ts) improve node types
2072-
node,
2073-
);
2036+
this.addTrailingCommaExtraToNode(node);
20742037
break;
20752038
}
20762039
}
@@ -2115,7 +2078,7 @@ export default abstract class ExpressionParser extends LValParser {
21152078
return this.finishNode(node, type);
21162079
}
21172080

2118-
addTrailingCommaExtraToNode(node: N.Node): void {
2081+
addTrailingCommaExtraToNode(node: Undone<N.Node>): void {
21192082
this.addExtra(node, "trailingComma", this.state.lastTokStartLoc.index);
21202083
this.addExtra(node, "trailingCommaLoc", this.state.lastTokStartLoc, false);
21212084
}
@@ -2982,25 +2945,20 @@ export default abstract class ExpressionParser extends LValParser {
29822945
): N.ImportExpression {
29832946
this.next(); // eat tt.parenL
29842947
node.source = this.parseMaybeAssignAllowIn();
2985-
if (
2986-
this.hasPlugin("importAttributes") ||
2987-
(!process.env.BABEL_8_BREAKING && this.hasPlugin("importAssertions"))
2988-
) {
2989-
node.options = null;
2990-
}
2948+
node.options = null;
29912949
if (this.eat(tt.comma)) {
2992-
if (
2993-
process.env.BABEL_8_BREAKING ||
2994-
!(
2995-
this.hasPlugin("moduleAttributes") ||
2996-
this.hasPlugin("importAssertions")
2997-
)
2998-
) {
2999-
this.expectPlugin("importAttributes");
3000-
}
30012950
if (!this.match(tt.parenR)) {
30022951
node.options = this.parseMaybeAssignAllowIn();
3003-
this.eat(tt.comma);
2952+
2953+
if (this.eat(tt.comma) && !this.match(tt.parenR)) {
2954+
// keep consuming arguments, to then throw ImportCallArity
2955+
// instead of "expected )"
2956+
do {
2957+
this.parseMaybeAssignAllowIn();
2958+
} while (this.eat(tt.comma) && !this.match(tt.parenR));
2959+
2960+
this.raise(Errors.ImportCallArity, node);
2961+
}
30042962
}
30052963
}
30062964
this.expect(tt.parenR);

0 commit comments

Comments
 (0)