Skip to content

Conversation

ArmandPhilippot
Copy link
Member

@ArmandPhilippot ArmandPhilippot commented Oct 10, 2025

I was about to update the content-collections branch because we're missing the last changes... but I noticed we had a few remains from older Astro versions (.env.d.ts, favicon) in this branch. So, I followed the tutorial from scratch (while keeping the git history and the few additional files like LICENSE) to check if we missed anything.

Changes

  • Updates all the dependencies ([email protected] > [email protected])
  • Removes pnpm-lock.yaml (we had both package-lock.json and pnpm-lock.yaml; we should only have one them and not everyone use pnpm)
  • Removes src/env.d.ts, this is no longer needed and this no longer auto-generated
  • Updates the favicon to match the new one (auto-generated by create astro)
  • Adds .vscode (auto-generated by create astro)
  • Reorders .gitignore to match what is generated by create astro
  • Reorders src/pages/about.astro:
    • In Unit 2.3, each time we tell the user to put the new content below the existing ones, so the previous order was wrong. (this also clean up the markup around My skills are:)
    • In Unit 6-3, the frontmatter uses a different order than the one we had in Unit 2-4: this should probably be reordered both here and in the docs.
  • Reorders src/layouts/MarkdownPostLayout.astro: we had the frontmatter.description between the date and the author in Unit 4-2 and Unit 4-3 and there was no empty lines. (Unit 5-3 should be fixed in the docs)
  • Adds a missing semicolon in src/components/Social.astro
  • Removes an unecessary await in src/pages/blog.astro and reorder frontmatter data to match Unit 5.1
  • As noted in fix(tutorial): prevent Typescript error + tiny data reordering docs#12532, we temporarily define the menu script in an Astro template so Typescript complains because of the default strict preset. This is no longer an issue once in menu.js but to avoid extra wording or confusion while following the tutorial, I updated src/scripts/menu.js with the Typescript fix.

Questions:

  • the content-collections branch has a .gitpod.yml file but not the complete branch, should this file be in both or none?
  • the content-collections branch has a Open in Stackblitz button in the README, should we add a similar button to the complete branch?

Tests

I've checked on Linux using both Firefox and Chromium and no issues in dev and preview!

@sarah11918
Copy link
Member

Question answers:

  1. No gitpod.yml so let's remove it. Gitpod service has rebranded, and completely changed!
  2. No "open in StackBlitz" button, since we now have partnership with Google Firebase Studio!

@ArmandPhilippot
Copy link
Member Author

Thanks! I just removed them from the content-collections branch. 🫡

Copy link
Member

@sarah11918 sarah11918 left a comment

Choose a reason for hiding this comment

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

Looks great, thank you so much!

@ArmandPhilippot ArmandPhilippot merged commit 0859a3e into withastro:complete Oct 11, 2025
@ArmandPhilippot ArmandPhilippot deleted the fix/clean-up-complete-branch branch October 11, 2025 13:00
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.

2 participants