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

Jump to bottom

Migrate to new config #2962

Merged
merged 46 commits into from
Apr 2, 2022
Merged

Migrate to new config #2962

merged 46 commits into from
Apr 2, 2022

Conversation

natemoo-re
Copy link
Member

@natemoo-re natemoo-re commented Apr 2, 2022 •
edited
Loading

Changes

  • Implements RFC0019
  • This is a massive PR that touches a ton of files. Most changes are just renaming config, but some additional logic had to be moved around for:
    • site and base
    • pages being removed in favor of srcDir
  • At one point, this PR attempted to auto-generate the correct config for users. Turns out this is pretty difficult, so I skipped it. Instead, I focused on providing a well typed AstroUserConfig object that should point users in the right direction.
    • If we detect a legacy config, we'll exit early and point users to our migration guide.

Testing

Tests have all been updated

Docs

Not yet

@changeset-bot
Copy link

changeset-bot bot commented Apr 2, 2022 •
edited
Loading

🦋 Changeset detected

Latest commit: c382bdd

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

This PR includes changesets to release 7 packages
Name Type
@astrojs/sitemap Minor
astro Minor
@astrojs/deno Minor
@astrojs/netlify Minor
@astrojs/partytown Minor
@astrojs/tailwind Minor
@astrojs/markdown-remark Minor

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

@github-actions github-actions bot added pkg: astro Related to the core `astro` package (scope) pkg: example Related to an example package (scope) feat: markdown Related to Markdown (scope) test labels Apr 2, 2022
@natemoo-re natemoo-re marked this pull request as ready for review April 2, 2022 04:53
bholmesdev
bholmesdev approved these changes Apr 2, 2022
View reviewed changes
Copy link
Contributor

@bholmesdev bholmesdev left a comment

Choose a reason for hiding this comment

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

Small comment but looks migreat!

packages/astro/src/core/config.ts Outdated Show resolved Hide resolved
packages/astro/test/test-utils.js Show resolved Hide resolved
@natemoo-re natemoo-re mentioned this pull request Apr 2, 2022
Merged
@FredKSchott FredKSchott force-pushed the feat/new-config branch 2 times, most recently from 25e9c7d to 1e69dfd Compare April 2, 2022 17:28
bholmesdev and others added 22 commits April 2, 2022 12:06
@bholmesdev @FredKSchott
refactor: markdownOptions -> markdown
8d18719
@bholmesdev @FredKSchott
fix: remaining type errors
090e301
@bholmesdev @FredKSchott
feat: update AstroUserConfig
7c38c18
@bholmesdev @FredKSchott
refactor: update CLI flag mapper + server mapper
e3ddd5f
@bholmesdev @FredKSchott
fix: loadFixture projectRoot
be7b62b
@bholmesdev @FredKSchott
fix: merge CLI flags before validating / transforming
1d3fa13
@bholmesdev @FredKSchott
wip: attempt to fix bad createRouteManifest config
4dab14c
@FredKSchott
refactor: combine config.base and config.site
1d60488
@FredKSchott
fix: skip route manifest test for now
c8c6f86
@FredKSchott
fix: site and base handling
82ef288
@FredKSchott
refactor: update failing config testes
759c46c
@FredKSchott
fix: build failure
1dda1d0
@FredKSchott
feat: update config types with migration help
22b045c
@FredKSchott
chore: update types
9038ff3
@FredKSchott
fix(deno): update deno fixture
534394b
@FredKSchott
chore: remove config migration logic
d7cae89
@FredKSchott
chore: remove logLevel
5c0bf81
@FredKSchott
chore: clean-up config types
7b4dd45
@FredKSchott
chore: update config warning
2f5035f
@FredKSchott
chore: add changeset
4ee4246
@natemoo-re @bholmesdev @FredKSchott
Sitemap Integration (#2965)
52ca910 
* feat: add sitemap filter config option

* feat: add canonicalURL sitemap config option

* docs: update sitemap README

* fix: update for new config

* fix: filter not being applied

* chore: changeset

Co-authored-by: bholmesdev <[email protected]>
@FredKSchott
fred pass
ffcb645
@FredKSchott FredKSchott merged commit 17c0292 into main Apr 2, 2022
@FredKSchott FredKSchott deleted the feat/new-config branch April 2, 2022 18:30
@github-actions github-actions bot mentioned this pull request Apr 2, 2022
Merged
SiriousHunter pushed a commit to SiriousHunter/astro that referenced this pull request Feb 3, 2023
@natemoo-re @bholmesdev @FredKSchott
Migrate to new config (withastro#2962)
f996510 
* wip: config migration

* fix: formatting

* refactor: projectRoot -> root

* refactor: pageUrlFormat -> format

* refactor: buildOptions.site -> site

* refactor: public -> publicDir

* refactor: dist -> outDir

* refactor: styleOptions -> style

* fix: some dist tests -> outDir

* refactor: remove legacyBuild (with TODOs)

* refactor: more legacyBuild cleanup

* refactor: server host and port

* fix: remove experimentalStaticBuild CLI flag

* refactor: src -> srcDir

* refactor: devOptions.trailing -> trailing

* refactor: remove sitemap + related flags

* refactor: experimentalSSR -> experimental.ssr

* fix: last devOptions

* refactor: drafts -> markdown.drafts

* fix: TS error on port as const

* refactor: remove pages

* refactor: more --project-root updates

* refactor: markdownOptions -> markdown

* fix: remaining type errors

* feat: update AstroUserConfig

* refactor: update CLI flag mapper + server mapper

* fix: loadFixture projectRoot

* fix: merge CLI flags before validating / transforming

* wip: attempt to fix bad createRouteManifest config

* refactor: combine config.base and config.site

* fix: skip route manifest test for now

* fix: site and base handling

* refactor: update failing config testes

* fix: build failure

* feat: update config types with migration help

* chore: update types

* fix(deno): update deno fixture

* chore: remove config migration logic

* chore: remove logLevel

* chore: clean-up config types

* chore: update config warning

* chore: add changeset

* Sitemap Integration (withastro#2965)

* feat: add sitemap filter config option

* feat: add canonicalURL sitemap config option

* docs: update sitemap README

* fix: update for new config

* fix: filter not being applied

* chore: changeset

Co-authored-by: bholmesdev <[email protected]>

* fred pass

* fix: Astro.resolve typo

* fix: public => publicDir

Co-authored-by: bholmesdev <[email protected]>
Co-authored-by: Fred K. Schott <[email protected]>
SiriousHunter pushed a commit to SiriousHunter/astro that referenced this pull request Feb 3, 2023
@natemoo-re @bholmesdev @FredKSchott
Migrate to new config (withastro#2962)
e26e235 
* wip: config migration

* fix: formatting

* refactor: projectRoot -> root

* refactor: pageUrlFormat -> format

* refactor: buildOptions.site -> site

* refactor: public -> publicDir

* refactor: dist -> outDir

* refactor: styleOptions -> style

* fix: some dist tests -> outDir

* refactor: remove legacyBuild (with TODOs)

* refactor: more legacyBuild cleanup

* refactor: server host and port

* fix: remove experimentalStaticBuild CLI flag

* refactor: src -> srcDir

* refactor: devOptions.trailing -> trailing

* refactor: remove sitemap + related flags

* refactor: experimentalSSR -> experimental.ssr

* fix: last devOptions

* refactor: drafts -> markdown.drafts

* fix: TS error on port as const

* refactor: remove pages

* refactor: more --project-root updates

* refactor: markdownOptions -> markdown

* fix: remaining type errors

* feat: update AstroUserConfig

* refactor: update CLI flag mapper + server mapper

* fix: loadFixture projectRoot

* fix: merge CLI flags before validating / transforming

* wip: attempt to fix bad createRouteManifest config

* refactor: combine config.base and config.site

* fix: skip route manifest test for now

* fix: site and base handling

* refactor: update failing config testes

* fix: build failure

* feat: update config types with migration help

* chore: update types

* fix(deno): update deno fixture

* chore: remove config migration logic

* chore: remove logLevel

* chore: clean-up config types

* chore: update config warning

* chore: add changeset

* Sitemap Integration (withastro#2965)

* feat: add sitemap filter config option

* feat: add canonicalURL sitemap config option

* docs: update sitemap README

* fix: update for new config

* fix: filter not being applied

* chore: changeset

Co-authored-by: bholmesdev <[email protected]>

* fred pass

* fix: Astro.resolve typo

* fix: public => publicDir

Co-authored-by: bholmesdev <[email protected]>
Co-authored-by: Fred K. Schott <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bholmesdev bholmesdev bholmesdev approved these changes

@JuanM04 JuanM04 JuanM04 left review comments

Assignees
No one assigned
Labels
feat: markdown Related to Markdown (scope) pkg: astro Related to the core `astro` package (scope) pkg: example Related to an example package (scope)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@natemoo-re @JuanM04 @bholmesdev @FredKSchott