Skip to content

Commit 76df141

Browse files
weswighamweswigham
authored
Merge pull request #41167 from weswigham/revert-extension-implicit-import
Revert "Add extensions to jsx automatically added import, per babel change (#40871)"
2 parents 4638c68 + 33b8a4f commit 76df141

13 files changed

+35
-35
lines changed

‎src/compiler/transformers/jsx.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ namespace ts {
7474
statements = insertStatementAfterCustomPrologue(statements.slice(), factory.createVariableStatement(/*modifiers*/ undefined, factory.createVariableDeclarationList([currentFileState.filenameDeclaration], NodeFlags.Const)));
7575
}
7676
if (currentFileState.utilizedImplicitRuntimeImports && currentFileState.utilizedImplicitRuntimeImports.size && currentFileState.importSpecifier !== undefined) {
77-
const specifier = `${currentFileState.importSpecifier}/${compilerOptions.jsx === JsxEmit.ReactJSXDev ? "jsx-dev-runtime.js" : "jsx-runtime.js"}`;
77+
const specifier = `${currentFileState.importSpecifier}/${compilerOptions.jsx === JsxEmit.ReactJSXDev ? "jsx-dev-runtime" : "jsx-runtime"}`;
7878
if (isExternalModule(node)) {
7979
// Add `import` statement
8080
const importStatement = factory.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, factory.createImportClause(/*typeOnly*/ false, /*name*/ undefined, factory.createNamedImports(arrayFrom(currentFileState.utilizedImplicitRuntimeImports.values()))), factory.createStringLiteral(specifier));

‎tests/baselines/reference/jsxJsxsCjsTransformChildren(jsx=react-jsx).js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ export {};
88
//// [jsxJsxsCjsTransformChildren.js]
99
"use strict";
1010
exports.__esModule = true;
11-
var jsx_runtime_js_1 = require("react/jsx-runtime.js");
11+
var jsx_runtime_1 = require("react/jsx-runtime");
1212
/// <reference path="react16.d.ts" />
13-
var a = jsx_runtime_js_1.jsx("div", { children: "text" }, void 0);
13+
var a = jsx_runtime_1.jsx("div", { children: "text" }, void 0);

‎tests/baselines/reference/jsxJsxsCjsTransformChildren(jsx=react-jsxdev).js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export {};
88
//// [jsxJsxsCjsTransformChildren.js]
99
"use strict";
1010
exports.__esModule = true;
11-
var jsx_dev_runtime_js_1 = require("react/jsx-dev-runtime.js");
11+
var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
1212
var _jsxFileName = "tests/cases/conformance/jsx/jsxs/jsxJsxsCjsTransformChildren.tsx";
1313
/// <reference path="react16.d.ts" />
14-
var a = jsx_dev_runtime_js_1.jsxDEV("div", { children: "text" }, void 0, false, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);
14+
var a = jsx_dev_runtime_1.jsxDEV("div", { children: "text" }, void 0, false, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);

‎tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ export {};
1111
//// [jsxJsxsCjsTransformCustomImport.js]
1212
"use strict";
1313
exports.__esModule = true;
14-
var jsx_runtime_js_1 = require("preact/jsx-runtime.js");
14+
var jsx_runtime_1 = require("preact/jsx-runtime");
1515
/// <reference path="react16.d.ts" />
16-
var a = jsx_runtime_js_1.jsxs(jsx_runtime_js_1.Fragment, { children: [jsx_runtime_js_1.jsx("p", {}, void 0), "text", jsx_runtime_js_1.jsx("div", { className: "foo" }, void 0)] }, void 0);
16+
var a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}, void 0), "text", jsx_runtime_1.jsx("div", { className: "foo" }, void 0)] }, void 0);

‎tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export {};
1111
//// [jsxJsxsCjsTransformCustomImport.js]
1212
"use strict";
1313
exports.__esModule = true;
14-
var jsx_dev_runtime_js_1 = require("preact/jsx-dev-runtime.js");
14+
var jsx_dev_runtime_1 = require("preact/jsx-dev-runtime");
1515
var _jsxFileName = "tests/cases/conformance/jsx/jsxs/jsxJsxsCjsTransformCustomImport.tsx";
1616
/// <reference path="react16.d.ts" />
17-
var a = jsx_dev_runtime_js_1.jsxDEV(jsx_dev_runtime_js_1.Fragment, { children: [jsx_dev_runtime_js_1.jsxDEV("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 3 }, this), "text", jsx_dev_runtime_js_1.jsxDEV("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);
17+
var a = jsx_dev_runtime_1.jsxDEV(jsx_dev_runtime_1.Fragment, { children: [jsx_dev_runtime_1.jsxDEV("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 3 }, this), "text", jsx_dev_runtime_1.jsxDEV("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);

‎tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ export {};
2525
//// [preact.js]
2626
"use strict";
2727
exports.__esModule = true;
28-
var jsx_runtime_js_1 = require("preact/jsx-runtime.js");
28+
var jsx_runtime_1 = require("preact/jsx-runtime");
2929
/// <reference path="react16.d.ts" />
3030
/* @jsxImportSource preact */
31-
var a = jsx_runtime_js_1.jsxs(jsx_runtime_js_1.Fragment, { children: [jsx_runtime_js_1.jsx("p", {}, void 0), "text", jsx_runtime_js_1.jsx("div", { className: "foo" }, void 0)] }, void 0);
31+
var a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}, void 0), "text", jsx_runtime_1.jsx("div", { className: "foo" }, void 0)] }, void 0);
3232
//// [react.js]
3333
"use strict";
3434
exports.__esModule = true;
35-
var jsx_runtime_js_1 = require("react/jsx-runtime.js");
35+
var jsx_runtime_1 = require("react/jsx-runtime");
3636
/// <reference path="react16.d.ts" />
3737
/* @jsxImportSource react */
3838
require("./preact");
39-
var a = jsx_runtime_js_1.jsxs(jsx_runtime_js_1.Fragment, { children: [jsx_runtime_js_1.jsx("p", {}, void 0), "text", jsx_runtime_js_1.jsx("div", { className: "foo" }, void 0)] }, void 0);
39+
var a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}, void 0), "text", jsx_runtime_1.jsx("div", { className: "foo" }, void 0)] }, void 0);

‎tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ export {};
2525
//// [preact.js]
2626
"use strict";
2727
exports.__esModule = true;
28-
var jsx_dev_runtime_js_1 = require("preact/jsx-dev-runtime.js");
28+
var jsx_dev_runtime_1 = require("preact/jsx-dev-runtime");
2929
var _jsxFileName = "tests/cases/conformance/jsx/jsxs/preact.tsx";
3030
/// <reference path="react16.d.ts" />
3131
/* @jsxImportSource preact */
32-
var a = jsx_dev_runtime_js_1.jsxDEV(jsx_dev_runtime_js_1.Fragment, { children: [jsx_dev_runtime_js_1.jsxDEV("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 3 }, this), "text", jsx_dev_runtime_js_1.jsxDEV("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 6, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 10 }, this);
32+
var a = jsx_dev_runtime_1.jsxDEV(jsx_dev_runtime_1.Fragment, { children: [jsx_dev_runtime_1.jsxDEV("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 3 }, this), "text", jsx_dev_runtime_1.jsxDEV("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 6, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 10 }, this);
3333
//// [react.js]
3434
"use strict";
3535
exports.__esModule = true;
36-
var jsx_dev_runtime_js_1 = require("react/jsx-dev-runtime.js");
36+
var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
3737
var _jsxFileName = "tests/cases/conformance/jsx/jsxs/react.tsx";
3838
/// <reference path="react16.d.ts" />
3939
/* @jsxImportSource react */
4040
require("./preact");
41-
var a = jsx_dev_runtime_js_1.jsxDEV(jsx_dev_runtime_js_1.Fragment, { children: [jsx_dev_runtime_js_1.jsxDEV("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this), "text", jsx_dev_runtime_js_1.jsxDEV("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 7, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 10 }, this);
41+
var a = jsx_dev_runtime_1.jsxDEV(jsx_dev_runtime_1.Fragment, { children: [jsx_dev_runtime_1.jsxDEV("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this), "text", jsx_dev_runtime_1.jsxDEV("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 7, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 10 }, this);

‎tests/baselines/reference/jsxJsxsCjsTransformNestedSelfClosingChild(jsx=react-jsx).js

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ console.log(
2424
//// [jsxJsxsCjsTransformNestedSelfClosingChild.js]
2525
"use strict";
2626
exports.__esModule = true;
27-
var jsx_runtime_js_1 = require("react/jsx-runtime.js");
28-
console.log(jsx_runtime_js_1.jsx("div", { children: jsx_runtime_js_1.jsx("div", {}, void 0) }, void 0));
29-
console.log(jsx_runtime_js_1.jsxs("div", { children: [jsx_runtime_js_1.jsx("div", {}, void 0),
30-
jsx_runtime_js_1.jsx("div", {}, void 0)] }, void 0));
31-
console.log(jsx_runtime_js_1.jsx("div", { children: [1, 2].map(function (i) { return jsx_runtime_js_1.jsx("div", { children: i }, i); }) }, void 0));
27+
var jsx_runtime_1 = require("react/jsx-runtime");
28+
console.log(jsx_runtime_1.jsx("div", { children: jsx_runtime_1.jsx("div", {}, void 0) }, void 0));
29+
console.log(jsx_runtime_1.jsxs("div", { children: [jsx_runtime_1.jsx("div", {}, void 0),
30+
jsx_runtime_1.jsx("div", {}, void 0)] }, void 0));
31+
console.log(jsx_runtime_1.jsx("div", { children: [1, 2].map(function (i) { return jsx_runtime_1.jsx("div", { children: i }, i); }) }, void 0));

‎tests/baselines/reference/jsxJsxsCjsTransformNestedSelfClosingChild(jsx=react-jsxdev).js

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ console.log(
2525
"use strict";
2626
var _this = this;
2727
exports.__esModule = true;
28-
var jsx_dev_runtime_js_1 = require("react/jsx-dev-runtime.js");
28+
var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
2929
var _jsxFileName = "tests/cases/conformance/jsx/jsxs/jsxJsxsCjsTransformNestedSelfClosingChild.tsx";
30-
console.log(jsx_dev_runtime_js_1.jsxDEV("div", { children: jsx_dev_runtime_js_1.jsxDEV("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 6, columnNumber: 5 }, this) }, void 0, false, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 13 }, this));
31-
console.log(jsx_dev_runtime_js_1.jsxDEV("div", { children: [jsx_dev_runtime_js_1.jsxDEV("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 12, columnNumber: 5 }, this),
32-
jsx_dev_runtime_js_1.jsxDEV("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 13, columnNumber: 5 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 10, columnNumber: 13 }, this));
33-
console.log(jsx_dev_runtime_js_1.jsxDEV("div", { children: [1, 2].map(function (i) { return jsx_dev_runtime_js_1.jsxDEV("div", { children: i }, i, false, { fileName: _jsxFileName, lineNumber: 19, columnNumber: 21 }, _this); }) }, void 0, false, { fileName: _jsxFileName, lineNumber: 17, columnNumber: 13 }, this));
30+
console.log(jsx_dev_runtime_1.jsxDEV("div", { children: jsx_dev_runtime_1.jsxDEV("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 6, columnNumber: 5 }, this) }, void 0, false, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 13 }, this));
31+
console.log(jsx_dev_runtime_1.jsxDEV("div", { children: [jsx_dev_runtime_1.jsxDEV("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 12, columnNumber: 5 }, this),
32+
jsx_dev_runtime_1.jsxDEV("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 13, columnNumber: 5 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 10, columnNumber: 13 }, this));
33+
console.log(jsx_dev_runtime_1.jsxDEV("div", { children: [1, 2].map(function (i) { return jsx_dev_runtime_1.jsxDEV("div", { children: i }, i, false, { fileName: _jsxFileName, lineNumber: 19, columnNumber: 21 }, _this); }) }, void 0, false, { fileName: _jsxFileName, lineNumber: 17, columnNumber: 13 }, this));

‎tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNames(jsx=react-jsx).js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ export {};
77
//// [jsxJsxsCjsTransformSubstitutesNames.js]
88
"use strict";
99
exports.__esModule = true;
10-
var jsx_runtime_js_1 = require("react/jsx-runtime.js");
10+
var jsx_runtime_1 = require("react/jsx-runtime");
1111
/// <reference path="react16.d.ts" />
12-
var a = jsx_runtime_js_1.jsx("div", {}, void 0);
12+
var a = jsx_runtime_1.jsx("div", {}, void 0);

‎tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNames(jsx=react-jsxdev).js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export {};
77
//// [jsxJsxsCjsTransformSubstitutesNames.js]
88
"use strict";
99
exports.__esModule = true;
10-
var jsx_dev_runtime_js_1 = require("react/jsx-dev-runtime.js");
10+
var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
1111
var _jsxFileName = "tests/cases/conformance/jsx/jsxs/jsxJsxsCjsTransformSubstitutesNames.tsx";
1212
/// <reference path="react16.d.ts" />
13-
var a = jsx_dev_runtime_js_1.jsxDEV("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);
13+
var a = jsx_dev_runtime_1.jsxDEV("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);

‎tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ export {};
1111
//// [jsxJsxsCjsTransformSubstitutesNamesFragment.js]
1212
"use strict";
1313
exports.__esModule = true;
14-
var jsx_runtime_js_1 = require("react/jsx-runtime.js");
14+
var jsx_runtime_1 = require("react/jsx-runtime");
1515
/// <reference path="react16.d.ts" />
16-
var a = jsx_runtime_js_1.jsxs(jsx_runtime_js_1.Fragment, { children: [jsx_runtime_js_1.jsx("p", {}, void 0), "text", jsx_runtime_js_1.jsx("div", {}, void 0)] }, void 0);
16+
var a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}, void 0), "text", jsx_runtime_1.jsx("div", {}, void 0)] }, void 0);

‎tests/baselines/reference/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export {};
1111
//// [jsxJsxsCjsTransformSubstitutesNamesFragment.js]
1212
"use strict";
1313
exports.__esModule = true;
14-
var jsx_dev_runtime_js_1 = require("react/jsx-dev-runtime.js");
14+
var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
1515
var _jsxFileName = "tests/cases/conformance/jsx/jsxs/jsxJsxsCjsTransformSubstitutesNamesFragment.tsx";
1616
/// <reference path="react16.d.ts" />
17-
var a = jsx_dev_runtime_js_1.jsxDEV(jsx_dev_runtime_js_1.Fragment, { children: [jsx_dev_runtime_js_1.jsxDEV("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 3 }, this), "text", jsx_dev_runtime_js_1.jsxDEV("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);
17+
var a = jsx_dev_runtime_1.jsxDEV(jsx_dev_runtime_1.Fragment, { children: [jsx_dev_runtime_1.jsxDEV("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 3 }, this), "text", jsx_dev_runtime_1.jsxDEV("div", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);

0 commit comments

Comments
 (0)