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(nuxt,schema): merge custom and resolved app configs #19602

Merged
merged 1 commit into from Mar 11, 2023

Conversation

danielroe
Copy link
Member

@danielroe danielroe commented Mar 11, 2023

πŸ”— Linked issue

#15592

❓ Type of change

  • πŸ“– Documentation (updates to the documentation or readme)
  • 🐞 Bug fix (a non-breaking change that fixes an issue)
  • πŸ‘Œ Enhancement (improving an existing functionality like performance)
  • ✨ New feature (a non-breaking change that adds functionality)
  • 🧹 Chore (updates to the build process or auxiliary tools and libraries)
  • ⚠️ Breaking change (fix or feature that would cause existing functionality to change)

πŸ“š Description

This fixes a couple of type issues with the current config schema implementation, notably:

  1. NuxtOptions/NuxtConfig were defined in conflicting ways - with two different definitions of appConfig - one extending CustomAppConfig and one extending the ResolvedAppConfig. In this PR we now merge the two, smartly choosing the type from CustomAppConfig but picking from ResolvedAppConfig whether or not the item is defined. We also do not include a key signature for CustomAppConfig.
  2. It's possible CustomAppConfig was not in fact augmented previously - I've used a different type name for safety.

πŸ“ Checklist

  • I have linked an issue or discussion.
  • I have updated the documentation accordingly.

@codesandbox
Copy link

codesandbox bot commented Mar 11, 2023

CodeSandbox logoCodeSandbox logoΒ  Open in CodeSandbox Web Editor | VS Code | VS Code Insiders

@danielroe danielroe added this to the v3.3 milestone Mar 11, 2023
@danielroe
Copy link
Member Author

merging to test on edge - please feel free to comment if you spot any issues πŸ™

@danielroe danielroe merged commit 60b4c48 into main Mar 11, 2023
@danielroe danielroe deleted the fix/conflicting-schema branch March 11, 2023 22:53
@danielroe danielroe mentioned this pull request Mar 11, 2023
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.

None yet

1 participant