Skip to content

Move code shared between server/client to "shared" folder #26734

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.

Sign up for GitHub

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

Merged
timneutkens merged 8 commits into from
Jun 30, 2021
Merged

Move code shared between server/client to "shared" folder #26734

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b4042ac
Move next-server/lib to shared/lib
timneutkens Jun 29, 2021
a9ff938
Remove bailout as there's no bundling part of next-server anymore
timneutkens Jun 29, 2021
70539ee
Add shared to initial compile
timneutkens Jun 29, 2021
8937333
Fix incorrectly changed webstorm refactor
timneutkens Jun 29, 2021
c927ae9
Update dist/next-server/lib to dist/shared/lib in tests
timneutkens Jun 29, 2021
de0b3a3
Escape dot in test regex
timneutkens Jun 30, 2021
cfaad3f
Ensure dist/next-server and dist/shared are not bundled
timneutkens Jun 30, 2021
92d2a3d
Merge branch 'canary' of github.com:vercel/next.js into add/move-shar…
timneutkens Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ensure dist/next-server and dist/shared are not bundled
  • Loading branch information
@timneutkens
timneutkens committed Jun 30, 2021
commit cfaad3f2e53734ad20680ec7105f4034294e6694
3 changes: 2 additions & 1 deletion packages/next/build/webpack-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,9 +709,10 @@ export default async function getBaseWebpackConfig(
}

if (isLocal) {
// Makes sure dist/shared and dist/next-server are not bundled
// we need to process shared/lib/router/router so that
// the DefinePlugin can inject process.env values
const isNextExternal = /next[/\\]dist[/\\]shared[/\\](?!lib[/\\]router[/\\]router)/.test(
const isNextExternal = /next[/\\]dist[/\\](shared|next-server)[/\\](?!lib[/\\]router[/\\]router)/.test(
res
)

Expand Down