diff --git a/internal/transformers/jsxtransforms/jsx.go b/internal/transformers/jsxtransforms/jsx.go index a9650e5438..fc3fb7ac8e 100644 --- a/internal/transformers/jsxtransforms/jsx.go +++ b/internal/transformers/jsxtransforms/jsx.go @@ -794,7 +794,7 @@ func fixupWhitespaceAndDecodeEntities(text string) string { // Last non-whitespace character on this line. lastNonWhitespace := -1 // These initial values are special because the first line is: - // firstNonWhitespace = 0 to indicate that we want leading whitsepace, + // firstNonWhitespace = 0 to indicate that we want leading whitespace, // but lastNonWhitespace = -1 as a special flag to indicate that we *don't* include the line if it's all whitespace. for i := 0; i < len(text); i++ { c, size := utf8.DecodeRuneInString(text[i:]) @@ -802,7 +802,7 @@ func fixupWhitespaceAndDecodeEntities(text string) string { // If we've seen any non-whitespace characters on this line, add the 'trim' of the line. // (lastNonWhitespace === -1 is a special flag to detect whether the first line is all whitespace.) if firstNonWhitespace != -1 && lastNonWhitespace != -1 { - addLineOfJsxText(acc, text[firstNonWhitespace:lastNonWhitespace], initial) + addLineOfJsxText(acc, text[firstNonWhitespace:lastNonWhitespace+1], initial) initial = false } diff --git a/testdata/baselines/reference/submodule/compiler/errorSpanForUnclosedJsxTag.js b/testdata/baselines/reference/submodule/compiler/errorSpanForUnclosedJsxTag.js index 386adf6430..63ec409b0b 100644 --- a/testdata/baselines/reference/submodule/compiler/errorSpanForUnclosedJsxTag.js +++ b/testdata/baselines/reference/submodule/compiler/errorSpanForUnclosedJsxTag.js @@ -18,4 +18,4 @@ let Foo = { Bar() { } }; let Baz = () => { }; -let x = React.createElement(Foo.Bar, null, "Hell let y = ", React.createElement(Baz, null, "Hello")); +let x = React.createElement(Foo.Bar, null, "Hello let y = ", React.createElement(Baz, null, "Hello")); diff --git a/testdata/baselines/reference/submodule/compiler/errorSpanForUnclosedJsxTag.js.diff b/testdata/baselines/reference/submodule/compiler/errorSpanForUnclosedJsxTag.js.diff index 4f700e95a9..d071260647 100644 --- a/testdata/baselines/reference/submodule/compiler/errorSpanForUnclosedJsxTag.js.diff +++ b/testdata/baselines/reference/submodule/compiler/errorSpanForUnclosedJsxTag.js.diff @@ -7,4 +7,4 @@ -let x = React.createElement(Foo.Bar, null, - "Hello let y = ", - React.createElement(Baz, null, "Hello")); -+let x = React.createElement(Foo.Bar, null, "Hell let y = ", React.createElement(Baz, null, "Hello")); \ No newline at end of file ++let x = React.createElement(Foo.Bar, null, "Hello let y = ", React.createElement(Baz, null, "Hello")); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js b/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js index 30ff56eb00..0570331206 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js +++ b/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js @@ -92,7 +92,7 @@ function Blah(props) { // Incompatible child. var a = React.createElement(Blah, null, x => x); // Blah components don't accept text as child elements -var a = React.createElement(Blah, null, "Hello unexpected text"); +var a = React.createElement(Blah, null, "Hello unexpected text!"); // Blah components don't accept multiple children. var a = React.createElement(Blah, null, x => "" + x, x => "" + x); function Blah2(props) { @@ -101,7 +101,7 @@ function Blah2(props) { // Incompatible child. var a = React.createElement(Blah2, null, x => x); // Blah2 components don't accept text as child elements -var a = React.createElement(Blah2, null, "Hello unexpected text"); +var a = React.createElement(Blah2, null, "Hello unexpected text!"); // Blah2 components don't accept multiple children of the wrong type. var a = React.createElement(Blah2, null, x => x, x => x); function Blah3(props) { @@ -110,6 +110,6 @@ function Blah3(props) { // Incompatible child. var a = React.createElement(Blah3, null, x => x); // Blah3 components don't accept text as child elements -var a = React.createElement(Blah3, null, "Hello unexpected text"); +var a = React.createElement(Blah3, null, "Hello unexpected text!"); // Blah3 components don't accept multiple children of the wrong type. var a = React.createElement(Blah3, null, x => x, x => x); diff --git a/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js.diff b/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js.diff index 9633d2815a..9240c8544f 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js.diff @@ -9,11 +9,9 @@ function Blah(props) { return React.createElement(React.Fragment, null); } - // Incompatible child. - var a = React.createElement(Blah, null, x => x); +@@= skipped -9, +9 lines =@@ // Blah components don't accept text as child elements --var a = React.createElement(Blah, null, "Hello unexpected text!"); -+var a = React.createElement(Blah, null, "Hello unexpected text"); + var a = React.createElement(Blah, null, "Hello unexpected text!"); // Blah components don't accept multiple children. -var a = React.createElement(Blah, null, - x => "" + x, @@ -22,11 +20,9 @@ function Blah2(props) { return React.createElement(React.Fragment, null); } - // Incompatible child. - var a = React.createElement(Blah2, null, x => x); +@@= skipped -11, +9 lines =@@ // Blah2 components don't accept text as child elements --var a = React.createElement(Blah2, null, "Hello unexpected text!"); -+var a = React.createElement(Blah2, null, "Hello unexpected text"); + var a = React.createElement(Blah2, null, "Hello unexpected text!"); // Blah2 components don't accept multiple children of the wrong type. -var a = React.createElement(Blah2, null, - x => x, @@ -35,11 +31,9 @@ function Blah3(props) { return React.createElement(React.Fragment, null); } - // Incompatible child. - var a = React.createElement(Blah3, null, x => x); +@@= skipped -11, +9 lines =@@ // Blah3 components don't accept text as child elements --var a = React.createElement(Blah3, null, "Hello unexpected text!"); -+var a = React.createElement(Blah3, null, "Hello unexpected text"); + var a = React.createElement(Blah3, null, "Hello unexpected text!"); // Blah3 components don't accept multiple children of the wrong type. -var a = React.createElement(Blah3, null, - x => x, diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReactComponents.js b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReactComponents.js index 82575d2f0d..8f6c583f8a 100644 --- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReactComponents.js +++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReactComponents.js @@ -125,7 +125,7 @@ const react_1 = __importDefault(require("react")); * @type {React.SFC} */ const TabbedShowLayout = () => { - return (react_1.default.createElement("div", { className: "", key: "" }, "o")); + return (react_1.default.createElement("div", { className: "", key: "" }, "ok")); }; TabbedShowLayout.defaultProps = { tabs: "default value" @@ -142,7 +142,7 @@ const react_1 = __importDefault(require("react")); * @type {{defaultProps: {tabs: string}} & ((props?: {elem: string}) => JSX.Element)} */ const TabbedShowLayout = () => { - return (react_1.default.createElement("div", { className: "", key: "" }, "o")); + return (react_1.default.createElement("div", { className: "", key: "" }, "ok")); }; TabbedShowLayout.defaultProps = { tabs: "default value" @@ -156,7 +156,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); const react_1 = __importDefault(require("react")); const TabbedShowLayout = (/** @type {{className: string}}*/ prop) => { - return (react_1.default.createElement("div", { className: prop.className, key: "" }, "o")); + return (react_1.default.createElement("div", { className: prop.className, key: "" }, "ok")); }; TabbedShowLayout.defaultProps = { tabs: "default value" diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReactComponents.js.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReactComponents.js.diff index 1cf9129430..0422126dd6 100644 --- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReactComponents.js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReactComponents.js.diff @@ -20,12 +20,6 @@ /** * @type {React.SFC} */ - const TabbedShowLayout = () => { -- return (react_1.default.createElement("div", { className: "", key: "" }, "ok")); -+ return (react_1.default.createElement("div", { className: "", key: "" }, "o")); - }; - TabbedShowLayout.defaultProps = { - tabs: "default value" @@= skipped -17, +17 lines =@@ return (mod && mod.__esModule) ? mod : { "default": mod }; }; @@ -35,12 +29,6 @@ /** * @type {{defaultProps: {tabs: string}} & ((props?: {elem: string}) => JSX.Element)} */ - const TabbedShowLayout = () => { -- return (react_1.default.createElement("div", { className: "", key: "" }, "ok")); -+ return (react_1.default.createElement("div", { className: "", key: "" }, "o")); - }; - TabbedShowLayout.defaultProps = { - tabs: "default value" @@= skipped -17, +17 lines =@@ return (mod && mod.__esModule) ? mod : { "default": mod }; }; @@ -48,11 +36,8 @@ -var react_1 = __importDefault(require("react")); +const react_1 = __importDefault(require("react")); const TabbedShowLayout = (/** @type {{className: string}}*/ prop) => { -- return (react_1.default.createElement("div", { className: prop.className, key: "" }, "ok")); -+ return (react_1.default.createElement("div", { className: prop.className, key: "" }, "o")); + return (react_1.default.createElement("div", { className: prop.className, key: "" }, "ok")); }; - TabbedShowLayout.defaultProps = { - tabs: "default value" @@= skipped -14, +14 lines =@@ return (mod && mod.__esModule) ? mod : { "default": mod }; }; diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js index 28e3a94082..4534a7b0ce 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js @@ -15,4 +15,4 @@ export {}; Object.defineProperty(exports, "__esModule", { value: true }); const jsx_runtime_1 = require("preact/jsx-runtime"); /// -const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "tex", jsx_runtime_1.jsx("div", { className: "foo" })] }); +const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "text", jsx_runtime_1.jsx("div", { className: "foo" })] }); diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js.diff b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js.diff index 3900909ebf..2708a2c89c 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js.diff @@ -8,4 +8,4 @@ +const jsx_runtime_1 = require("preact/jsx-runtime"); /// -const a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", { className: "foo" })] }); -+const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "tex", jsx_runtime_1.jsx("div", { className: "foo" })] }); \ No newline at end of file ++const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "text", jsx_runtime_1.jsx("div", { className: "foo" })] }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js index bd7534b491..5596074a9e 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js @@ -16,4 +16,4 @@ Object.defineProperty(exports, "__esModule", { value: true }); const jsx_dev_runtime_1 = require("preact/jsx-dev-runtime"); const _jsxFileName = "jsxJsxsCjsTransformCustomImport.tsx"; /// -const 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), "tex", 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); +const 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); diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js.diff b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js.diff index de69420d5e..5ffc250aa7 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js.diff @@ -9,4 +9,4 @@ const _jsxFileName = "jsxJsxsCjsTransformCustomImport.tsx"; /// -const a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(0, jsx_dev_runtime_1.jsxDEV)("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 3 }, this), "text", (0, 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); -+const 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), "tex", 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); \ No newline at end of file ++const 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); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js index 366030dda6..29fab7c50a 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js @@ -28,7 +28,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const jsx_runtime_1 = require("preact/jsx-runtime"); /// /* @jsxImportSource preact */ -const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "tex", jsx_runtime_1.jsx("div", { className: "foo" })] }); +const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "text", jsx_runtime_1.jsx("div", { className: "foo" })] }); //// [react.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -36,4 +36,4 @@ const jsx_runtime_1 = require("react/jsx-runtime"); /// /* @jsxImportSource react */ require("./preact"); -const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "tex", jsx_runtime_1.jsx("div", { className: "foo" })] }); +const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "text", jsx_runtime_1.jsx("div", { className: "foo" })] }); diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js.diff b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js.diff index 603a5cd142..914ef3b750 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).js.diff @@ -9,7 +9,7 @@ /// /* @jsxImportSource preact */ -const a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", { className: "foo" })] }); -+const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "tex", jsx_runtime_1.jsx("div", { className: "foo" })] }); ++const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "text", jsx_runtime_1.jsx("div", { className: "foo" })] }); //// [react.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -19,4 +19,4 @@ /* @jsxImportSource react */ require("./preact"); -const a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", { className: "foo" })] }); -+const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "tex", jsx_runtime_1.jsx("div", { className: "foo" })] }); \ No newline at end of file ++const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "text", jsx_runtime_1.jsx("div", { className: "foo" })] }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js index 52b60217c6..28daa33ace 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js @@ -29,7 +29,7 @@ const jsx_dev_runtime_1 = require("preact/jsx-dev-runtime"); const _jsxFileName = "preact.tsx"; /// /* @jsxImportSource preact */ -const 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), "tex", 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); +const 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); //// [react.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -38,4 +38,4 @@ const _jsxFileName = "react.tsx"; /// /* @jsxImportSource react */ require("./preact"); -const 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), "tex", 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); +const 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); diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js.diff b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js.diff index 87172b8450..40323d805b 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).js.diff @@ -10,7 +10,7 @@ /// /* @jsxImportSource preact */ -const a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(0, jsx_dev_runtime_1.jsxDEV)("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 3 }, this), "text", (0, 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); -+const 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), "tex", 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); ++const 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); //// [react.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -21,4 +21,4 @@ /* @jsxImportSource react */ require("./preact"); -const a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(0, jsx_dev_runtime_1.jsxDEV)("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this), "text", (0, 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); -+const 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), "tex", 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); \ No newline at end of file ++const 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); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js index 33f50c1738..ada15c4de6 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js @@ -15,4 +15,4 @@ export {}; Object.defineProperty(exports, "__esModule", { value: true }); const jsx_runtime_1 = require("react/jsx-runtime"); /// -const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "tex", jsx_runtime_1.jsx("div", {})] }); +const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "text", jsx_runtime_1.jsx("div", {})] }); diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js.diff b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js.diff index f559f2049e..66c3953375 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsx).js.diff @@ -8,4 +8,4 @@ +const jsx_runtime_1 = require("react/jsx-runtime"); /// -const a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", {})] }); -+const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "tex", jsx_runtime_1.jsx("div", {})] }); \ No newline at end of file ++const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "text", jsx_runtime_1.jsx("div", {})] }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js index 187edd080e..aef9de85ed 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js @@ -16,4 +16,4 @@ Object.defineProperty(exports, "__esModule", { value: true }); const jsx_dev_runtime_1 = require("react/jsx-dev-runtime"); const _jsxFileName = "jsxJsxsCjsTransformSubstitutesNamesFragment.tsx"; /// -const 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), "tex", 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); +const 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); diff --git a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js.diff b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js.diff index ead00d0bd2..b2d20d6510 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformSubstitutesNamesFragment(jsx=react-jsxdev).js.diff @@ -9,4 +9,4 @@ const _jsxFileName = "jsxJsxsCjsTransformSubstitutesNamesFragment.tsx"; /// -const a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(0, jsx_dev_runtime_1.jsxDEV)("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 3 }, this), "text", (0, 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); -+const 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), "tex", 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); \ No newline at end of file ++const 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); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxReactEmitWhitespace.js b/testdata/baselines/reference/submodule/conformance/tsxReactEmitWhitespace.js index 15701f97f9..a6dcf36ba3 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxReactEmitWhitespace.js +++ b/testdata/baselines/reference/submodule/conformance/tsxReactEmitWhitespace.js @@ -79,16 +79,16 @@ React.createElement("div", null, p); // Emit only p React.createElement("div", null, p); // Emit " 3" -React.createElement("div", null, " "); +React.createElement("div", null, " 3"); // Emit " 3 " React.createElement("div", null, " 3 "); // Emit "3" -React.createElement("div", null); +React.createElement("div", null, "3"); // Emit no args React.createElement("div", null); // Emit "foo bar" -React.createElement("div", null, "fo ba"); +React.createElement("div", null, "foo bar"); // Emit "hello\\ world" -React.createElement("div", null, "hello worl"); +React.createElement("div", null, "hello\\ world"); // Emit " a b c d " -React.createElement("div", null, " b d "); +React.createElement("div", null, " a b c d "); diff --git a/testdata/baselines/reference/submodule/conformance/tsxReactEmitWhitespace.js.diff b/testdata/baselines/reference/submodule/conformance/tsxReactEmitWhitespace.js.diff index 2bcd69a1d3..15a866b8e5 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxReactEmitWhitespace.js.diff +++ b/testdata/baselines/reference/submodule/conformance/tsxReactEmitWhitespace.js.diff @@ -11,24 +11,4 @@ +React.createElement("div", null, " ", p, " "); // Emit only p React.createElement("div", null, p); - // Emit only p - React.createElement("div", null, p); - // Emit " 3" --React.createElement("div", null, " 3"); -+React.createElement("div", null, " "); - // Emit " 3 " - React.createElement("div", null, " 3 "); - // Emit "3" --React.createElement("div", null, "3"); -+React.createElement("div", null); - // Emit no args - React.createElement("div", null); - // Emit "foo bar" --React.createElement("div", null, "foo bar"); -+React.createElement("div", null, "fo ba"); - // Emit "hello\\ world" --React.createElement("div", null, "hello\\ world"); -+React.createElement("div", null, "hello worl"); - // Emit " a b c d " --React.createElement("div", null, " a b c d "); -+React.createElement("div", null, " b d "); \ No newline at end of file + // Emit only p \ No newline at end of file