Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support merging imports in import injector #16349

Merged
merged 10 commits into from
Mar 14, 2024
Merged

Support merging imports in import injector #16349

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
342715d
Test current brhavior
nicolo-ribaudo Mar 13, 2024
fd6fe1c
Support merging imports
nicolo-ribaudo Mar 13, 2024
879c46c
Fix namespace imports
nicolo-ribaudo Mar 13, 2024
ce6f690
Merge when `importPosition: before`
nicolo-ribaudo Mar 13, 2024
c5332a8
Update fixtures
nicolo-ribaudo Mar 13, 2024
73a3df6
Handle more cases
nicolo-ribaudo Mar 13, 2024
a678ac1
More tests
nicolo-ribaudo Mar 13, 2024
db9819f
Co-authored-by: Conrad Buck <conartist6@gmail.com>
nicolo-ribaudo Mar 13, 2024
9938e06
Babel 8 fixtures
nicolo-ribaudo Mar 13, 2024
bb7e373
Update fixtures (Windows)
babel-bot Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update fixtures
  • Loading branch information
@nicolo-ribaudo
nicolo-ribaudo committed Mar 13, 2024
commit c5332a8611fc2b69b02c319a5054042b83d8771d
3 changes: 1 addition & 2 deletions ...proposal-import-wasm-source/test/fixtures/node-esm/import-declaration-multiple/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { readFileSync as _readFileSync2 } from "fs";
import { readFileSync as _readFileSync } from "fs";
import { readFileSync as _readFileSync, readFileSync as _readFileSync2 } from "fs";
const s = new WebAssembly.Module(_readFileSync(new URL(import.meta.resolve("./x.wasm")))),
s2 = new WebAssembly.Module(_readFileSync2(new URL(import.meta.resolve("./x2.wasm"))));
someBody;
3 changes: 1 addition & 2 deletions ...lugin-proposal-json-modules/test/fixtures/node-esm/import-declaration-multiple/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { readFileSync as _readFileSync2 } from "fs";
import { readFileSync as _readFileSync } from "fs";
import { readFileSync as _readFileSync, readFileSync as _readFileSync2 } from "fs";
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is sub-optimal -- I'll open a separate PR.

const j = JSON.parse(_readFileSync(new URL(import.meta.resolve("./x.json")))),
j2 = JSON.parse(_readFileSync2(new URL(import.meta.resolve("./x2.json"))));
someBody;
3 changes: 1 addition & 2 deletions ...cord-and-tuple/test/fixtures/import-polyfill/custom-name-implies-should-import/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Tuple as _Tuple } from "my-polyfill";
import { Record as _Record } from "my-polyfill";
import { Record as _Record, Tuple as _Tuple } from "my-polyfill";
const r2 = _Record({
a: _Record({
b: 456
Expand Down
3 changes: 1 addition & 2 deletions ...bel-plugin-proposal-record-and-tuple/test/fixtures/import-polyfill/custom-name/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Tuple as _Tuple } from "my-polyfill";
import { Record as _Record } from "my-polyfill";
import { Record as _Record, Tuple as _Tuple } from "my-polyfill";
const r2 = _Record({
a: _Record({
b: 456
Expand Down
3 changes: 1 addition & 2 deletions ...el-plugin-proposal-record-and-tuple/test/fixtures/import-polyfill/default-name/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Tuple as _Tuple } from "@bloomberg/record-tuple-polyfill";
import { Record as _Record } from "@bloomberg/record-tuple-polyfill";
import { Record as _Record, Tuple as _Tuple } from "@bloomberg/record-tuple-polyfill";
const r2 = _Record({
a: _Record({
b: 456
Expand Down
3 changes: 1 addition & 2 deletions ...bel-plugin-transform-react-jsx-development/test/fixtures/linux/auto-import-dev/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
var _jsxFileName = "<CWD>/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/auto-import-dev/input.js";
import { jsxDEV as _jsxDEV } from "react/jsx-dev-runtime";
import { jsxDEV as _jsxDEV, Fragment as _Fragment } from "react/jsx-dev-runtime";
import { createElement as _createElement } from "react";
import { Fragment as _Fragment } from "react/jsx-dev-runtime";
var x = /*#__PURE__*/_jsxDEV(_Fragment, {
children: /*#__PURE__*/_jsxDEV("div", {
children: [/*#__PURE__*/_jsxDEV("div", {}, "1", false, {
Expand Down
4 changes: 1 addition & 3 deletions ...nsform-react-jsx/test/fixtures/autoImport/auto-import-react-source-type-module/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { jsx as _jsx } from "react/jsx-runtime";
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
import { createElement as _createElement } from "react";
import { jsxs as _jsxs } from "react/jsx-runtime";
import { Fragment as _Fragment } from "react/jsx-runtime";
var x = /*#__PURE__*/_jsx(_Fragment, {
children: /*#__PURE__*/_jsxs("div", {
children: [/*#__PURE__*/_jsx("div", {}, "1"), /*#__PURE__*/_jsx("div", {
Expand Down
3 changes: 1 addition & 2 deletions packages/babel-plugin-transform-react-jsx/test/fixtures/autoImport/react-defined/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as react from "react";
import { jsx as _jsx } from "react/jsx-runtime";
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
import { createElement as _createElement } from "react";
import { jsxs as _jsxs } from "react/jsx-runtime";
var y = react.createElement("div", {
foo: 1
});
Expand Down
3 changes: 1 addition & 2 deletions ...-react-jsx/test/fixtures/react-automatic/concatenates-adjacent-string-literals/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { jsx as _jsx } from "react/jsx-runtime";
import { jsxs as _jsxs } from "react/jsx-runtime";
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
var x = /*#__PURE__*/_jsxs("div", {
children: ["foo", "bar", "baz", /*#__PURE__*/_jsx("div", {
children: "buz bang"
Expand Down
4 changes: 1 addition & 3 deletions ...orm-react-jsx/test/fixtures/react-automatic/does-not-add-source-self-automatic/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { jsx as _jsx } from "react/jsx-runtime";
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
import { createElement as _createElement } from "react";
import { jsxs as _jsxs } from "react/jsx-runtime";
import { Fragment as _Fragment } from "react/jsx-runtime";
var x = /*#__PURE__*/_jsx(_Fragment, {
children: /*#__PURE__*/_jsxs("div", {
children: [/*#__PURE__*/_jsx("div", {}, "1"), /*#__PURE__*/_jsx("div", {
Expand Down
3 changes: 1 addition & 2 deletions ...form-react-jsx/test/fixtures/react-automatic/handle-fragments-with-no-children/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
import { Fragment as _Fragment } from "react/jsx-runtime";
import { jsx as _jsx } from "react/jsx-runtime";
import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
var x = /*#__PURE__*/_jsx(_Fragment, {});
3 changes: 1 addition & 2 deletions ...abel-plugin-transform-react-jsx/test/fixtures/react-automatic/handle-fragments/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { jsx as _jsx } from "react/jsx-runtime";
import { Fragment as _Fragment } from "react/jsx-runtime";
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
var x = /*#__PURE__*/_jsx(_Fragment, {
children: /*#__PURE__*/_jsx("div", {})
});
3 changes: 1 addition & 2 deletions ...lugin-transform-react-jsx/test/fixtures/react-automatic/handle-static-children/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { jsx as _jsx } from "react/jsx-runtime";
import { jsxs as _jsxs } from "react/jsx-runtime";
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
var x = /*#__PURE__*/_jsxs("div", {
children: [/*#__PURE__*/_jsx("span", {}), [/*#__PURE__*/_jsx("span", {}, '0'), /*#__PURE__*/_jsx("span", {}, '1')]]
});
4 changes: 1 addition & 3 deletions ...ransform-react-jsx/test/fixtures/react-automatic/should-allow-nested-fragments/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { jsx as _jsx } from "react/jsx-runtime";
import { Fragment as _Fragment } from "react/jsx-runtime";
import { jsxs as _jsxs } from "react/jsx-runtime";
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
/*#__PURE__*/_jsx("div", {
children: /*#__PURE__*/_jsxs(_Fragment, {
children: [/*#__PURE__*/_jsxs(_Fragment, {
Expand Down
3 changes: 1 addition & 2 deletions ...rm-react-jsx/test/fixtures/react-automatic/should-escape-xhtml-jsxtext-babel-7/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { jsx as _jsx } from "react/jsx-runtime";
import { jsxs as _jsxs } from "react/jsx-runtime";
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
/*#__PURE__*/_jsx("div", {
children: "wow"
});
Expand Down
3 changes: 1 addition & 2 deletions ...form-react-jsx/test/fixtures/react-automatic/should-handle-attributed-elements/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { jsxs as _jsxs } from "react/jsx-runtime";
import { jsx as _jsx } from "react/jsx-runtime";
import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
var HelloMessage = React.createClass({
displayName: "HelloMessage",
render: function () {
Expand Down
3 changes: 1 addition & 2 deletions ...jsx/test/fixtures/react-automatic/should-have-correct-comma-in-nested-children/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { jsx as _jsx } from "react/jsx-runtime";
import { jsxs as _jsxs } from "react/jsx-runtime";
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
var x = /*#__PURE__*/_jsxs("div", {
children: [/*#__PURE__*/_jsx("div", {
children: /*#__PURE__*/_jsx("br", {})
Expand Down
3 changes: 1 addition & 2 deletions ...-transform-react-jsx/test/fixtures/react-automatic/should-properly-handle-keys/output.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { jsx as _jsx } from "react/jsx-runtime";
import { jsxs as _jsxs } from "react/jsx-runtime";
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
var x = /*#__PURE__*/_jsxs("div", {
children: [/*#__PURE__*/_jsx("div", {}, "1"), /*#__PURE__*/_jsx("div", {
meow: "wolf"
Expand Down