Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd58ed23

Browse files
committed
fix: ensure that we don't skip files in standalone root dir that are outside of project workspace
1 parent7d85c94 commitd58ed23

File tree

2 files changed

+48
-56
lines changed

2 files changed

+48
-56
lines changed

‎src/build/content/server.ts‎

Lines changed: 37 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
writeFile,
1111
}from'node:fs/promises'
1212
import{createRequire}from'node:module'
13-
import{dirname,join,resolve,sep}from'node:path'
13+
import{dirname,join,relative,sep}from'node:path'
1414
import{joinasposixJoin,sepasposixSep}from'node:path/posix'
1515

1616
import{trace}from'@opentelemetry/api'
@@ -145,9 +145,11 @@ export const copyNextServerCode = async (ctx: PluginContext): Promise<void> => {
145145
awaitcp(srcPath,destPath,{recursive:true,force:true})
146146
})
147147

148-
// this is different node_modules thanone handled `copyNextDependencies`
149-
// this is under the standalone/.next folder (not standalone/node_modules)
148+
// this is different node_modules thanones handled by `copyNextDependencies`
149+
// this is under the standalone/.next folder (not standalone/node_modules or standalone/<some-workspace/node_modules)
150150
// and started to be created by Next.js in some cases in next@16.1.0-canary.3
151+
// this node_modules is artificially created and doesn't have equivalent in the repo
152+
// so we only copy it, without additional symlinks handling
151153
if(existsSync(join(srcDir,'node_modules'))){
152154
constfilter=ctx.constants.IS_LOCAL ?undefined :nodeModulesFilter
153155
constsrc=join(srcDir,'node_modules')
@@ -158,26 +160,6 @@ export const copyNextServerCode = async (ctx: PluginContext): Promise<void> => {
158160
force:true,
159161
filter,
160162
})
161-
162-
// const workspaceNodeModulesDir = ctx.resolveFromSiteDir('node_modules')
163-
// const rootNodeModulesDir = resolve('node_modules')
164-
165-
// // chain trying to fix potentially broken symlinks first using workspace node_modules if it exist
166-
// // and later root node_modules for monorepo cases
167-
// const workspacePromise = existsSync(workspaceNodeModulesDir)
168-
// ? recreateNodeModuleSymlinks(workspaceNodeModulesDir, dest)
169-
// : Promise.resolve()
170-
171-
// promises.push(
172-
// workspacePromise.then(() => {
173-
// if (
174-
// rootNodeModulesDir !== workspaceNodeModulesDir &&
175-
// existsSync(resolve('node_modules'))
176-
// ) {
177-
// return recreateNodeModuleSymlinks(rootNodeModulesDir, dest)
178-
// }
179-
// }),
180-
// )
181163
}
182164

183165
awaitPromise.all(promises)
@@ -325,42 +307,41 @@ async function patchNextModules(
325307

326308
exportconstcopyNextDependencies=async(ctx:PluginContext):Promise<void>=>{
327309
awaittracer.withActiveSpan('copyNextDependencies',async()=>{
328-
constentries=awaitreaddir(ctx.standaloneDir)
329-
constfilter=ctx.constants.IS_LOCAL ?undefined :nodeModulesFilter
310+
constpromises:Promise<void>[]=[]
311+
312+
constnodeModulesLocationsInStandalone=newSet<string>()
313+
constcommonFilter=ctx.constants.IS_LOCAL ?undefined :nodeModulesFilter
314+
315+
constdotNextDir=join(ctx.standaloneDir,ctx.nextDistDir)
316+
317+
awaitcp(ctx.standaloneRootDir,ctx.serverHandlerRootDir,{
318+
recursive:true,
319+
verbatimSymlinks:true,
320+
force:true,
321+
filter:async(sourcePath:string)=>{
322+
if(sourcePath===dotNextDir){
323+
// copy all except the distDir (.next) folder as this is handled in a separate function
324+
// this will include the node_modules folder as well
325+
returnfalse
326+
}
330327

331-
constpromises:Promise<void>[]=entries.map(async(entry)=>{
332-
// copy all except the distDir (.next) folder as this is handled in a separate function
333-
// this will include the node_modules folder as well
334-
if(entry===ctx.nextDistDir){
335-
return
336-
}
337-
constsrc=join(ctx.standaloneDir,entry)
338-
constdest=join(ctx.serverHandlerDir,entry)
339-
awaitcp(src,dest,{
340-
recursive:true,
341-
verbatimSymlinks:true,
342-
force:true,
343-
filter,
344-
})
328+
if(sourcePath.endsWith('node_modules')){
329+
// keep track of node_modules as we might need to recreate symlinks
330+
// we are still copying them
331+
nodeModulesLocationsInStandalone.add(sourcePath)
332+
}
345333

346-
if(entry==='node_modules'){
347-
awaitrecreateNodeModuleSymlinks(ctx.resolveFromSiteDir('node_modules'),dest)
348-
}
334+
// finally apply common filter if defined
335+
returncommonFilter?.(sourcePath)??true
336+
},
349337
})
350338

351-
// inside a monorepo there is a root `node_modules` folder that contains all the dependencies
352-
constrootSrcDir=join(ctx.standaloneRootDir,'node_modules')
353-
constrootDestDir=join(ctx.serverHandlerRootDir,'node_modules')
354-
355-
// use the node_modules tree from the process.cwd() and not the one from the standalone output
356-
// as the standalone node_modules are already wrongly assembled by Next.js.
357-
// see: https://github.com/vercel/next.js/issues/50072
358-
if(existsSync(rootSrcDir)&&ctx.standaloneRootDir!==ctx.standaloneDir){
359-
promises.push(
360-
cp(rootSrcDir,rootDestDir,{recursive:true,verbatimSymlinks:true, filter}).then(()=>
361-
recreateNodeModuleSymlinks(resolve('node_modules'),rootDestDir),
362-
),
363-
)
339+
for(constnodeModulesLocationInStandaloneofnodeModulesLocationsInStandalone){
340+
constrelativeToRoot=relative(ctx.standaloneRootDir,nodeModulesLocationInStandalone)
341+
constlocationInProject=join(ctx.outputFileTracingRoot,relativeToRoot)
342+
constlocationInServerHandler=join(ctx.serverHandlerRootDir,relativeToRoot)
343+
344+
promises.push(recreateNodeModuleSymlinks(locationInProject,locationInServerHandler))
364345
}
365346

366347
awaitPromise.all(promises)
@@ -486,7 +467,7 @@ export const verifyHandlerDirStructure = async (ctx: PluginContext) => {
486467
// https://github.com/pnpm/pnpm/issues/9654
487468
// https://github.com/pnpm/pnpm/issues/5928
488469
// https://github.com/pnpm/pnpm/issues/7362 (persisting even though ticket is closed)
489-
constnodeModulesFilter=async(sourcePath:string)=>{
470+
constnodeModulesFilter=(sourcePath:string)=>{
490471
// Filtering rule for the following packages:
491472
// - @rspack+binding-linux-x64-musl
492473
// - @swc+core-linux-x64-musl

‎src/build/plugin-context.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,17 @@ export class PluginContext {
8484
returnthis.requiredServerFiles.relativeAppDir??''
8585
}
8686

87+
/**
88+
* The root directory for output file tracing. Paths inside standalone directory preserve paths of project, relative to this directory.
89+
*/
90+
getoutputFileTracingRoot():string{
91+
return(
92+
this.requiredServerFiles.config.outputFileTracingRoot??
93+
// fallback for older Next.js versions that don't have outputFileTracingRoot in the config, but had it in config.experimental
94+
this.requiredServerFiles.config.experimental.outputFileTracingRoot
95+
)
96+
}
97+
8798
/**
8899
* The working directory inside the lambda that is used for monorepos to execute the serverless function
89100
*/

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp