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

refactor(remix-dev/vite): clean resolved Remix config #8586

Merged
merged 4 commits into from
Jan 24, 2024

Conversation

markdalgleish
Copy link
Member

This is a follow-up to #8582, in preparation to expose the resolved Remix config as public API (e.g. via the adapter buildEnd hook).

The only remaining properties on the resolved remixConfig object that aren't present in the user-facing config type are rootDirectory, entryClientFilePath and entryServerFilePath. These have now been moved to the buildContext object. Since a lot of code assumes these are on remixConfig, it required a bit of a refactor to accomodate this.

Copy link

changeset-bot bot commented Jan 24, 2024

⚠️ No Changeset found

Latest commit: 0f0d432

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

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

@markdalgleish markdalgleish changed the title refactor(remix-dev/vite): clean resolved config refactor(remix-dev/vite): clean resolved Remix config Jan 24, 2024
Comment on lines 431 to 432
export let getServerBuildRootDirectory = (buildContext: BuildContext) =>
getServerBuildDirectory(buildContext);
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
export let getServerBuildRootDirectory = (buildContext: BuildContext) =>
getServerBuildDirectory(buildContext);
export let getServerBuildRootDirectory = getServerBuildDirectory;

Though at that point, might be worth just exporting getServerBuildDirectory directly

Copy link
Member Author

Choose a reason for hiding this comment

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

Nice catch, I missed this!

@@ -218,6 +211,13 @@ type BuildContext =
serverBundleId: string | undefined;
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason this is string | undefined instead of ?: string?

Copy link
Member Author

Choose a reason for hiding this comment

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

So that you're forced to add the key to the object, even if the value is undefined.

@markdalgleish markdalgleish merged commit b8e3d6d into dev Jan 24, 2024
9 checks passed
@markdalgleish markdalgleish deleted the markdalgleish/clean-resolved-vite-plugin-config branch January 24, 2024 23:14
@github-actions github-actions bot added the awaiting release This issue has been fixed and will be released soon label Jan 24, 2024
Copy link
Contributor

🤖 Hello there,

We just published version 2.6.0-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Copy link
Contributor

github-actions bot commented Feb 1, 2024

🤖 Hello there,

We just published version 2.6.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

@github-actions github-actions bot removed the awaiting release This issue has been fixed and will be released soon label Feb 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants