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

docs(examples): ignore routes.d.ts and generate it automatically in routes-gen example #3019

Merged

Conversation

frontsideair
Copy link
Contributor

@frontsideair frontsideair commented Apr 29, 2022

In routes-gen example, it would be a better pattern to not commit the autogenerated route typings to the repo, instead generating them after install so they can be there for the CI.

@remix-cla-bot
Copy link
Contributor

remix-cla-bot bot commented Apr 29, 2022

Hi @frontsideair,

Welcome, and thank you for contributing to Remix!

Before we consider your pull request, we ask that you sign our Contributor License Agreement (CLA). We require this only once.

You may review the CLA and sign it by adding your name to contributors.yml.

Once the CLA is signed, the CLA Signed label will be added to the pull request.

If you have already signed the CLA and received this response in error, or if you have any questions, please contact us at hello@remix.run.

Thanks!

- The Remix team

@remix-cla-bot
Copy link
Contributor

remix-cla-bot bot commented Apr 29, 2022

Thank you for signing the Contributor License Agreement. Let's get this merged! 🥳

@MichaelDeBoey MichaelDeBoey changed the title Ignore routes.d.ts and generate it automatically docs(examples): ignore routes.d.ts and generate it automatically in routes-gen example May 2, 2022
@MichaelDeBoey MichaelDeBoey changed the base branch from dev to main May 2, 2022 10:24
@MichaelDeBoey MichaelDeBoey changed the base branch from main to dev May 2, 2022 10:24
@MichaelDeBoey
Copy link
Member

@frontsideair Examples go against main branch.
Please rebase your branch onto main & set it as base branch of this PR.

@MichaelDeBoey MichaelDeBoey added the needs-response We need a response from the original author about this issue/PR label May 2, 2022
@frontsideair frontsideair changed the base branch from dev to main May 4, 2022 23:34
@frontsideair
Copy link
Contributor Author

Done!

@github-actions github-actions bot removed the needs-response We need a response from the original author about this issue/PR label May 4, 2022
@MichaelDeBoey
Copy link
Member

MichaelDeBoey commented May 5, 2022

@frontsideair It seems like something went wrong while rebasing & you only changed the base branch of the PR.

Running the following command should fix it though:

git reset --hard main && git cherry-pick 6126f4e && git cherry-pick b5e8aea && git push -f

@MichaelDeBoey MichaelDeBoey added the needs-response We need a response from the original author about this issue/PR label May 5, 2022
@MichaelDeBoey MichaelDeBoey marked this pull request as draft May 5, 2022 00:10
@frontsideair frontsideair force-pushed the ignore-routes-gen-typings branch from 2871dd1 to de1290e Compare May 5, 2022 08:58
@frontsideair frontsideair marked this pull request as ready for review May 5, 2022 08:58
@frontsideair
Copy link
Contributor Author

Should be fine now.

@github-actions github-actions bot removed the needs-response We need a response from the original author about this issue/PR label May 5, 2022
@MichaelDeBoey
Copy link
Member

@frontsideair You still have some commits in your branch that aren't supposed to be here.
Please run

git reset --hard main && git cherry-pick 2170332 && git cherry-pick 1d2bcd3 && git cherry-pick de1290e && git push -f

@MichaelDeBoey MichaelDeBoey added the needs-response We need a response from the original author about this issue/PR label May 5, 2022
@frontsideair frontsideair force-pushed the ignore-routes-gen-typings branch from de1290e to 5718668 Compare May 5, 2022 12:29
@frontsideair
Copy link
Contributor Author

Woah, my bad. Fixed it now, thanks!

@github-actions github-actions bot removed the needs-response We need a response from the original author about this issue/PR label May 5, 2022
@MichaelDeBoey MichaelDeBoey merged commit 099eb67 into remix-run:main May 5, 2022
aaronpowell pushed a commit to aaronpowell/remix that referenced this pull request May 10, 2022
… `routes-gen` example (remix-run#3019)

* Ignore routes.d.ts and generate it automatically

* Add frontsideair to the contributors list

* Move route generation to build step
aaronpowell pushed a commit to aaronpowell/remix that referenced this pull request May 12, 2022
… `routes-gen` example (remix-run#3019)

* Ignore routes.d.ts and generate it automatically

* Add frontsideair to the contributors list

* Move route generation to build step
aaronpowell pushed a commit to aaronpowell/remix that referenced this pull request May 15, 2022
… `routes-gen` example (remix-run#3019)

* Ignore routes.d.ts and generate it automatically

* Add frontsideair to the contributors list

* Move route generation to build step
aaronpowell pushed a commit to aaronpowell/remix that referenced this pull request May 16, 2022
… `routes-gen` example (remix-run#3019)

* Ignore routes.d.ts and generate it automatically

* Add frontsideair to the contributors list

* Move route generation to build step
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.

3 participants