Skip to content

Commit 9e553c0

Browse files
Merge branch 'main' into renovate/netlify-blobs-10.x
2 parents 435a302 + f40c6bd commit 9e553c0

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

src/utils/init/utils.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,20 @@ const normalizeSettings = (settings: Partial<Settings>, config: NormalizedCached
4444
const plugins = getPluginsToAutoInstall(command, settings.plugins_from_config_file, settings.plugins_recommended)
4545
const recommendedPlugins = getRecommendPlugins(plugins, config)
4646

47+
let functionsDir = config.build.functions || 'netlify/functions'
48+
const repositoryRoot = command.netlify.repositoryRoot
49+
if (functionsDir && path.isAbsolute(functionsDir) && repositoryRoot) {
50+
const relativePath = path.relative(repositoryRoot, functionsDir)
51+
if (relativePath && !relativePath.startsWith('..')) {
52+
functionsDir = relativePath
53+
}
54+
}
55+
4756
return {
4857
defaultBaseDir: settings.baseDirectory ?? command.project.relativeBaseDirectory ?? '',
4958
defaultBuildCmd: config.build.command || settings.buildCommand,
5059
defaultBuildDir: settings.dist,
51-
defaultFunctionsDir: config.build.functions || 'netlify/functions',
60+
defaultFunctionsDir: functionsDir,
5261
recommendedPlugins,
5362
}
5463
}

0 commit comments

Comments
 (0)