Skip to content

Commit 07343ca

Browse files
nicolo-ribaudonicolo-ribaudo
committed
disallowJSXAmbiguity -> disallowAmbiguousJSXLike 
1 parent 7e55e16 commit 07343ca

8 files changed

Lines changed: 26 additions & 23 deletions

File tree

‎packages/babel-parser/src/plugins/typescript/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
14281428
}
14291429

14301430
tsParseTypeAssertion(): N.TsTypeAssertion {
1431-
if (this.getPluginOption("typescript", "disallowJSXAmbiguity")) {
1431+
if (this.getPluginOption("typescript", "disallowAmbiguousJSXLike")) {
14321432
this.raise(this.state.start, TSErrors.ReservedTypeAssertion);
14331433
}
14341434

@@ -2959,7 +2959,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
29592959
if (
29602960
node.params.length === 1 &&
29612961
!node.extra?.trailingComma &&
2962-
this.getPluginOption("typescript", "disallowJSXAmbiguity")
2962+
this.getPluginOption("typescript", "disallowAmbiguousJSXLike")
29632963
) {
29642964
this.raise(node.start, TSErrors.ReservedArrowTypeParam);
29652965
}

‎packages/babel-parser/test/fixtures/typescript/disallow-jsx-ambiguity/options.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"plugins": [["typescript", { "disallowJSXAmbiguity": true }]]
2+
"plugins": [["typescript", { "disallowAmbiguousJSXLike": true }]]
33
}

‎packages/babel-parser/typings/babel-parser.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export interface FlowPluginOptions {
185185

186186
export interface TypeScriptPluginOptions {
187187
dts?: boolean;
188-
disallowJSXAmbiguity?: boolean;
188+
disallowAmbiguousJSXLike?: boolean;
189189
}
190190

191191
export const tokTypes: {

‎packages/babel-plugin-syntax-typescript/src/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function removePlugin(plugins, name) {
1515
}
1616
}
1717

18-
export default declare((api, { isTSX, disallowJSXAmbiguity }) => {
18+
export default declare((api, { isTSX, disallowAmbiguousJSXLike }) => {
1919
api.assertVersion(7);
2020

2121
return {
@@ -32,7 +32,7 @@ export default declare((api, { isTSX, disallowJSXAmbiguity }) => {
3232
removePlugin(plugins, "jsx");
3333

3434
parserOpts.plugins.push(
35-
["typescript", { disallowJSXAmbiguity }],
35+
["typescript", { disallowAmbiguousJSXLike }],
3636
"classProperties",
3737
);
3838

‎packages/babel-plugin-syntax-typescript/test/fixtures/disallow-jsx-ambiguity/options.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"plugins": [["syntax-typescript", { "disallowJSXAmbiguity": true }]]
2+
"plugins": [["syntax-typescript", { "disallowAmbiguousJSXLike": true }]]
33
}

‎packages/babel-preset-typescript/src/index.js‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default declare((api, opts) => {
88
const {
99
allExtensions,
1010
allowNamespaces,
11-
disallowJSXAmbiguity,
11+
disallowAmbiguousJSXLike,
1212
isTSX,
1313
jsxPragma,
1414
jsxPragmaFrag,
@@ -17,19 +17,19 @@ export default declare((api, opts) => {
1717
} = normalizeOptions(opts);
1818

1919
const pluginOptions = process.env.BABEL_8_BREAKING
20-
? (isTSX, disallowJSXAmbiguity) => ({
20+
? (isTSX, disallowAmbiguousJSXLike) => ({
2121
allowNamespaces,
22-
disallowJSXAmbiguity,
22+
disallowAmbiguousJSXLike,
2323
isTSX,
2424
jsxPragma,
2525
jsxPragmaFrag,
2626
onlyRemoveTypeImports,
2727
optimizeConstEnums,
2828
})
29-
: (isTSX, disallowJSXAmbiguity) => ({
29+
: (isTSX, disallowAmbiguousJSXLike) => ({
3030
allowDeclareFields: opts.allowDeclareFields,
3131
allowNamespaces,
32-
disallowJSXAmbiguity,
32+
disallowAmbiguousJSXLike,
3333
isTSX,
3434
jsxPragma,
3535
jsxPragmaFrag,
@@ -42,7 +42,10 @@ export default declare((api, opts) => {
4242
? [
4343
{
4444
plugins: [
45-
[transformTypeScript, pluginOptions(isTSX, disallowJSXAmbiguity)],
45+
[
46+
transformTypeScript,
47+
pluginOptions(isTSX, disallowAmbiguousJSXLike),
48+
],
4649
],
4750
},
4851
]
@@ -65,7 +68,7 @@ export default declare((api, opts) => {
6568
},
6669
{
6770
test: /\.tsx$/,
68-
// disallowJSXAmbiguity is a no-op when parsing TSX, since it's
71+
// disallowAmbiguousJSXLike is a no-op when parsing TSX, since it's
6972
// always disallowed.
7073
plugins: [[transformTypeScript, pluginOptions(true, false)]],
7174
},

‎packages/babel-preset-typescript/src/normalize-options.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function normalizeOptions(options = {}) {
77
const TopLevelOptions = {
88
allExtensions: "allExtensions",
99
allowNamespaces: "allowNamespaces",
10-
disallowJSXAmbiguity: "disallowJSXAmbiguity",
10+
disallowAmbiguousJSXLike: "disallowAmbiguousJSXLike",
1111
isTSX: "isTSX",
1212
jsxPragma: "jsxPragma",
1313
jsxPragmaFrag: "jsxPragmaFrag",
@@ -55,15 +55,15 @@ export default function normalizeOptions(options = {}) {
5555
v.invariant(allExtensions, "isTSX:true requires allExtensions:true");
5656
}
5757

58-
const disallowJSXAmbiguity = v.validateBooleanOption(
59-
TopLevelOptions.disallowJSXAmbiguity,
60-
options.disallowJSXAmbiguity,
58+
const disallowAmbiguousJSXLike = v.validateBooleanOption(
59+
TopLevelOptions.disallowAmbiguousJSXLike,
60+
options.disallowAmbiguousJSXLike,
6161
false,
6262
);
63-
if (disallowJSXAmbiguity) {
63+
if (disallowAmbiguousJSXLike) {
6464
v.invariant(
6565
allExtensions,
66-
"disallowJSXAmbiguity:true requires allExtensions:true",
66+
"disallowAmbiguousJSXLike:true requires allExtensions:true",
6767
);
6868
}
6969

@@ -76,7 +76,7 @@ export default function normalizeOptions(options = {}) {
7676
return {
7777
allExtensions,
7878
allowNamespaces,
79-
disallowJSXAmbiguity,
79+
disallowAmbiguousJSXLike,
8080
isTSX,
8181
jsxPragma,
8282
jsxPragmaFrag,

‎packages/babel-preset-typescript/test/normalize-options.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe("normalize options", () => {
3333
Object {
3434
"allExtensions": false,
3535
"allowNamespaces": true,
36-
"disallowJSXAmbiguity": false,
36+
"disallowAmbiguousJSXLike": false,
3737
"isTSX": false,
3838
"jsxPragma": "React",
3939
"jsxPragmaFrag": "React.Fragment",
@@ -82,7 +82,7 @@ Object {
8282
Object {
8383
"allExtensions": false,
8484
"allowNamespaces": true,
85-
"disallowJSXAmbiguity": false,
85+
"disallowAmbiguousJSXLike": false,
8686
"isTSX": false,
8787
"jsxPragma": undefined,
8888
"jsxPragmaFrag": "React.Fragment",

0 commit comments

Comments
 (0)