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

Alternative solution for components.json, templates.json and tools.json. #393

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

ericfennis
Copy link
Contributor

Why

I noticed there are a lot of PRs having merge conflicts because another PR is merged with changes in components.json, templates.json or tools.json. Resulting in asking the contributors every time to rebase their PR. This is not very efficient and maintaining this can be a pain.

Solution

Move each "repo" to its own JSON files.

To test this I started by moving the last added one to a JSON file. I think we could easily create a script for migrating all items in the JSON files to their own JSON files. But to make sure it is working with the current open PRs I kept the current JSON files for now.

Notes

The current updateStars.js is not working with this setup.
I recommend removing this script and extending the "page load data" scripts I created for tools, templates, and components. We could fetch the GitHub stars there. So they will be updated every build. This will fixes #217

@netlify
Copy link

netlify bot commented Mar 19, 2023

Deploy Preview for sveltesociety-preview ready!

Name Link
🔨 Latest commit 794d96f
🔍 Latest deploy log https://app.netlify.com/sites/sveltesociety-preview/deploys/64176ac457bc75000873c975
😎 Deploy Preview https://deploy-preview-393--sveltesociety-preview.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@MacFJA
Copy link
Collaborator

MacFJA commented Mar 20, 2023

I added your idea to the discussion #318

@benmccann benmccann changed the base branch from staging to main July 9, 2023 03:04
@MacFJA MacFJA added the need rebase The PR need to be rebased label Jul 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
need rebase The PR need to be rebased
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants