-
Notifications
You must be signed in to change notification settings - Fork 189
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
Merge next into master, include both Gatsby.js and Next.js #1444
Conversation
Progress towards Seneca-CDOT#1237: Migrate front-end from GatsbyJS to Next.js
503a375
to
fec8d64
Compare
6f2d0d4
to
39161e0
Compare
This is ready for review. I've streamlined the eslint stuff so we only have a single code base, but it works across node, JS, and TS. I had to fix a bunch of existing lint issues that were hiding in our code. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested with npm run develop
was able to run it with local backend. All expected front-end functionality was still working. Also ran npm run develop:next
and it built successfully
For testing this, I'll up-level the docs that are buried in this PR: Telescope Frontend DevelopmentIntroductionTelescope is in the process of porting the front-end from GatsbyJS To facilitate this conversion, we are hosting both front-ends in the NOTE: if you are only working on the front-end code, set Running GatsbyJSFrom the root of the project, you can run a number of GatsbyJS specific npm scripts:
Running Next.jsFrom the root of the project, you can run a number of GatsbyJS specific npm scripts:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In gatsby-config.js
, line 7, it needs an extra ../
:
path: path.join(__dirname, '../../../', '.env'),
@manekenpix great catch, thanks for reviewing this so closely. I'll correct and rebase soon to deal with these new changes. |
Pushed a fix for the gatsby-config.js issue. I think I'll wait for approval to do a rebase at the end, since it's going to be a bit of work. |
Also, |
Tested all the above commands using your remote, runs both Gatsby and Next start page; LGTM. (always wanted to say that) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've tested this using Docker on Windows and I'm able to run both Gatsby and Next frontends :D
@humphd Vercel failed, and there are still conflicts. Are we ok merging with the conflicts? |
Vercel is just wanting me to approve the changes to the config (happens every time I push), and I'll fix merge conflicts once it's approved. |
I've now merged this on I the mean time, I wanted to mention a few things to everyone that has open PRs touching the frontend (@manekenpix, @lixiaoqity, @phast184, @NathanPang001, @abhaseen, @PedroFonsecaDEV, @jiyoungsin, @c3ho, @tianlangwu):
If you have problems or need help, let us know in your PR. |
Description
I want to make it easier to run the Gatsby and Next frontends side-by-side. The current branch-based separation makes it really hard to switch back and forth with dependencies. To do that, I've merged the
next
branch intomaster
, and created a temporary parallel front-end structure:Our default front-end continues to be Gatsby, and all references to
src/frontend
have been updated tosrc/frontend/gatsby
.I've adjusted our scripts to work for both next and gatsby, and added temporary docs in
src/frontend/README.md
.I've renamed the env variable
PROXY_GATSBY
ToPROXY_FRONTEND
, since it will work for both cases.I've cleaned up the next.js deps and eslint config to be more accurate and up-to-date.
I've separated the front-end specific bits of
.gitignore
into each of the frontend dirs.I think everything is working, but check my math please.