Skip to content

[legacy-framework] (meta) Integrate our new next.js fork into the monorepo at ./nextjs#2079

Merged
flybayer merged 3 commits intocanaryfrom
fork-nextjs
Mar 6, 2021
Merged

[legacy-framework] (meta) Integrate our new next.js fork into the monorepo at ./nextjs#2079
flybayer merged 3 commits intocanaryfrom
fork-nextjs

Conversation

@flybayer
Copy link
Copy Markdown
Member

@flybayer flybayer commented Mar 6, 2021

Starts work discussed in #1990

What are the changes and their implications?

We now have an official fork of next.js at https://github.com/blitz-js/next.js

This PR integrates that fork into our monorepo using https://github.com/ingydotnet/git-subrepo which is like git submodules or git subtrees but better.

Git subrepo enables a really nice experience for working on our next js fork right here in our monorepo like the rest of our packages. From a contributor perspective, you don't even need to know that the nextjs folder is synced to another repo. You just change files like normal.

Process for syncing our fork:

  1. Run yarn push-nextjs script which pushes changes from here to https://github.com/blitz-js/next.js
  2. Inside a clone of https://github.com/blitz-js/next.js, run git fetch upstream and get merge upstream/canary and push changes
  3. Run yarn pull-nextjs inside the monorepo

This PR only adds the fork in nextjs folder, it doesn't change anything about the fork or change existing blitz code to use the fork.

kodiakhq[bot]
kodiakhq bot previously approved these changes Mar 6, 2021
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Mar 6, 2021

Size Change: 0 B

Total Size: 230 kB

ℹ️ View Unchanged
Filename Size Change
packages/babel-preset/dist/blitzjs-babel-preset.cjs.dev.js 1.69 kB 0 B
packages/babel-preset/dist/blitzjs-babel-preset.cjs.js 150 B 0 B
packages/babel-preset/dist/blitzjs-babel-preset.cjs.prod.js 1.69 kB 0 B
packages/babel-preset/dist/blitzjs-babel-preset.esm.js 1.63 kB 0 B
packages/blitz/cli/dist/blitz-cli.cjs.dev.js 1.47 kB 0 B
packages/blitz/cli/dist/blitz-cli.cjs.js 142 B 0 B
packages/blitz/cli/dist/blitz-cli.cjs.prod.js 1.47 kB 0 B
packages/blitz/cli/dist/blitz-cli.esm.js 1.37 kB 0 B
packages/blitz/custom-server/dist/blitz-custom-server.cjs.dev.js 288 B 0 B
packages/blitz/custom-server/dist/blitz-custom-server.cjs.js 149 B 0 B
packages/blitz/custom-server/dist/blitz-custom-server.cjs.prod.js 288 B 0 B
packages/blitz/custom-server/dist/blitz-custom-server.esm.js 123 B 0 B
packages/blitz/dist/blitz.cjs.dev.js 355 B 0 B
packages/blitz/dist/blitz.cjs.js 139 B 0 B
packages/blitz/dist/blitz.cjs.prod.js 355 B 0 B
packages/blitz/dist/blitz.esm.js 102 B 0 B
packages/config/dist/blitzjs-config.cjs.dev.js 1.1 kB 0 B
packages/config/dist/blitzjs-config.cjs.js 146 B 0 B
packages/config/dist/blitzjs-config.cjs.prod.js 1.09 kB 0 B
packages/config/dist/blitzjs-config.esm.js 975 B 0 B
packages/core/config/dist/blitzjs-core-config.cjs.dev.js 260 B 0 B
packages/core/config/dist/blitzjs-core-config.cjs.js 150 B 0 B
packages/core/config/dist/blitzjs-core-config.cjs.prod.js 260 B 0 B
packages/core/config/dist/blitzjs-core-config.esm.js 73 B 0 B
packages/core/dist/blitz-data-080e83b6.cjs.dev.js 1 kB 0 B
packages/core/dist/blitz-data-11f14b56.cjs.prod.js 1 kB 0 B
packages/core/dist/blitz-data-d1f53a00.esm.js 910 B 0 B
packages/core/dist/blitzjs-core.cjs.dev.js 8.6 kB 0 B
packages/core/dist/blitzjs-core.cjs.js 144 B 0 B
packages/core/dist/blitzjs-core.cjs.prod.js 8.32 kB 0 B
packages/core/dist/blitzjs-core.esm.js 8.29 kB 0 B
packages/core/dist/constants-016ca9ae.esm.js 2.34 kB 0 B
packages/core/dist/constants-7093bd41.cjs.dev.js 2.44 kB 0 B
packages/core/dist/constants-77910dbe.cjs.prod.js 2.44 kB 0 B
packages/core/dist/extends-1b905a27.esm.js 241 B 0 B
packages/core/dist/extends-93eedbb0.cjs.dev.js 250 B 0 B
packages/core/dist/extends-f26277ce.cjs.prod.js 250 B 0 B
packages/core/document/dist/blitzjs-core-document.cjs.dev.js 448 B 0 B
packages/core/document/dist/blitzjs-core-document.cjs.js 151 B 0 B
packages/core/document/dist/blitzjs-core-document.cjs.prod.js 450 B 0 B
packages/core/document/dist/blitzjs-core-document.esm.js 272 B 0 B
packages/core/dynamic/dist/blitzjs-core-dynamic.cjs.dev.js 263 B 0 B
packages/core/dynamic/dist/blitzjs-core-dynamic.cjs.js 151 B 0 B
packages/core/dynamic/dist/blitzjs-core-dynamic.cjs.prod.js 263 B 0 B
packages/core/dynamic/dist/blitzjs-core-dynamic.esm.js 73 B 0 B
packages/core/head/dist/blitzjs-core-head.cjs.dev.js 245 B 0 B
packages/core/head/dist/blitzjs-core-head.cjs.js 148 B 0 B
packages/core/head/dist/blitzjs-core-head.cjs.prod.js 245 B 0 B
packages/core/head/dist/blitzjs-core-head.esm.js 64 B 0 B
packages/core/image/dist/blitzjs-core-image.cjs.dev.js 249 B 0 B
packages/core/image/dist/blitzjs-core-image.cjs.js 149 B 0 B
packages/core/image/dist/blitzjs-core-image.cjs.prod.js 249 B 0 B
packages/core/image/dist/blitzjs-core-image.esm.js 65 B 0 B
packages/core/server/dist/blitzjs-core-server.cjs.dev.js 13.2 kB 0 B
packages/core/server/dist/blitzjs-core-server.cjs.js 148 B 0 B
packages/core/server/dist/blitzjs-core-server.cjs.prod.js 13.2 kB 0 B
packages/core/server/dist/blitzjs-core-server.esm.js 13.1 kB 0 B
packages/core/with-blitz/dist/blitzjs-core-with-blitz.cjs.dev.js 1.29 kB 0 B
packages/core/with-blitz/dist/blitzjs-core-with-blitz.cjs.js 151 B 0 B
packages/core/with-blitz/dist/blitzjs-core-with-blitz.cjs.prod.js 1.29 kB 0 B
packages/core/with-blitz/dist/blitzjs-core-with-blitz.esm.js 1.15 kB 0 B
packages/display/dist/blitzjs-display.cjs.dev.js 2 kB 0 B
packages/display/dist/blitzjs-display.cjs.js 147 B 0 B
packages/display/dist/blitzjs-display.cjs.prod.js 1.95 kB 0 B
packages/display/dist/blitzjs-display.esm.js 1.86 kB 0 B
packages/file-pipeline/dist/blitzjs-file-pipeline.cjs.dev.js 6.88 kB 0 B
packages/file-pipeline/dist/blitzjs-file-pipeline.cjs.js 150 B 0 B
packages/file-pipeline/dist/blitzjs-file-pipeline.cjs.prod.js 6.88 kB 0 B
packages/file-pipeline/dist/blitzjs-file-pipeline.esm.js 6.61 kB 0 B
packages/generator/dist/blitzjs-generator.cjs.dev.js 13.7 kB 0 B
packages/generator/dist/blitzjs-generator.cjs.js 148 B 0 B
packages/generator/dist/blitzjs-generator.cjs.prod.js 13.7 kB 0 B
packages/generator/dist/blitzjs-generator.esm.js 13.3 kB 0 B
packages/generator/dist/templates/app/babel.config.js 78 B 0 B
packages/generator/dist/templates/app/blitz.config.js 310 B 0 B
packages/generator/dist/templates/app/jest.config.js 60 B 0 B
packages/installer/dist/blitzjs-installer.cjs.dev.js 6.91 kB 0 B
packages/installer/dist/blitzjs-installer.cjs.js 148 B 0 B
packages/installer/dist/blitzjs-installer.cjs.prod.js 6.91 kB 0 B
packages/installer/dist/blitzjs-installer.esm.js 6.72 kB 0 B
packages/repl/dist/blitzjs-repl.cjs.dev.js 1.75 kB 0 B
packages/repl/dist/blitzjs-repl.cjs.js 144 B 0 B
packages/repl/dist/blitzjs-repl.cjs.prod.js 1.75 kB 0 B
packages/repl/dist/blitzjs-repl.esm.js 1.6 kB 0 B
packages/server/dist/blitzjs-server.cjs.dev.js 12.6 kB 0 B
packages/server/dist/blitzjs-server.cjs.js 145 B 0 B
packages/server/dist/blitzjs-server.cjs.prod.js 12.6 kB 0 B
packages/server/dist/blitzjs-server.esm.js 12.4 kB 0 B

compressed-size-action

@JuanM04
Copy link
Copy Markdown

JuanM04 commented Mar 6, 2021

Should eslint, prettier, and other tools ignore ./nextjs (at least for now)?

@flybayer
Copy link
Copy Markdown
Member Author

flybayer commented Mar 6, 2021

Should eslint, prettier, and other tools ignore ./nextjs (at least for now)?

Prettier isn't ignoring it because it uses the next.js prettier config. eslint is currently ignoring nextjs because it doen't work yet. I'll enable it in another PR (so code inside nextjs uses their eslint config).

@flybayer flybayer merged commit fa10972 into canary Mar 6, 2021
@flybayer flybayer deleted the fork-nextjs branch March 6, 2021 23:39
@itsdillon itsdillon changed the title (meta) Integrate our new next.js fork into the monorepo at ./nextjs [legacy-framework] (meta) Integrate our new next.js fork into the monorepo at ./nextjs Jul 7, 2022
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.

2 participants