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.

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

fix: Ensure imports are above other statements #13132

Merged
merged 2 commits into from
Sep 5, 2024
Merged

Conversation

Rich-Harris
Copy link
Member

@Rich-Harris Rich-Harris commented Sep 4, 2024

See #13082 and #13131 for context. We can worry about a more sophisticated fix when we get round to the work that #13048 was designed to enable.

Fixes #13135

Before submitting the PR, please make sure you do the following

  • It's really useful if your PR references an issue where it is discussed ahead of time. In many cases, features are absent for a reason. For large changes, please create an RFC: https://github.com/sveltejs/rfcs
  • Prefix your PR title with feat:, fix:, chore:, or docs:.
  • This message body should clearly illustrate what problems it solves.
  • Ideally, include a test that fails without this PR but passes with it.

Tests and linting

  • Run the tests with pnpm test and lint the project with pnpm lint

Copy link

changeset-bot bot commented Sep 4, 2024

🦋 Changeset detected

Latest commit: 6f81a98

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
svelte Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@Rich-Harris
Copy link
Member Author

(cc @benmccann)

@benmccann
Copy link
Member

We can worry about a more sophisticated fix when we get round to the work that #13048 was designed to enable

That work is already done (#13075), so I need the more sophisticated fix now 😄 I can work on that now as it doesn't seem like it'd take too long. I expect there are at least a couple of ways at least we could fix this:

  • split state.hoisted into state.hoisted and state.imports
  • leave module imports in module.body instead of moving them to state.hoisted and then put module.body above state.hoisted

Any preference?

@dummdidumm
Copy link
Member

Third option:

const imports = [], hoisted = [], body = [];
for (... iterate over stuff) {
  ..sort into right bucket
}
module = [...imports, ..etc]

Copy link
Member

@dummdidumm dummdidumm left a comment

Choose a reason for hiding this comment

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

Implementing my proposal and gonna merge to a) fix the regression we reintroduced b) unblock #13075

@benmccann
Copy link
Member

awesome! thanks @dummdidumm! I've updated #13075 to build on top of this PR

@benmccann benmccann changed the title fix: revert #13048 fix: sort imports Sep 11, 2024
@benmccann benmccann changed the title fix: sort imports fix: Ensure imports are above other statements Sep 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Svelte 5] Regression in JS output - script context module variable declarations before import statements
3 participants