Skip to content

Commit b68fb54

Browse files
committed
chore: fix root path issue
1 parent ae9df1f commit b68fb54

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

Diff for: src/lib/one-graph/cli-netlify-graph.js

+15-6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ const internalConsole = {
1717

1818
InternalConsole.registerConsole(internalConsole)
1919

20+
/**
21+
* Remove any relative path components from the given path
22+
* @param {string[]} items Filesystem path items to filter
23+
* @return {string[]} Filtered filesystem path items
24+
*/
25+
const filterRelativePathItems = (items) => items.filter((part) => part !== '')
26+
2027
/**
2128
* Return a full NetlifyGraph config with any defaults overridden by netlify.toml
2229
* @param {import('../base-command').BaseCommand} command
@@ -44,7 +51,7 @@ const getNetlifyGraphConfig = async ({ command, options }) => {
4451
error(detectServerSettingsError)
4552
}
4653

47-
const siteRoot = [path.sep, ...site.root.split(path.sep).filter((part) => part !== '')]
54+
const siteRoot = [path.sep, ...filterRelativePathItems(site.root.split(path.sep))]
4855

4956
const tsConfig = 'tsconfig.json'
5057
const autodetectedLanguage = fs.existsSync(tsConfig) ? 'typescript' : 'javascript'
@@ -53,10 +60,12 @@ const getNetlifyGraphConfig = async ({ command, options }) => {
5360
const isNextjs = framework === 'Next.js'
5461
const detectedFunctionsPathString = getFunctionsDir({ config, options })
5562
const detectedFunctionsPath = detectedFunctionsPathString ? detectedFunctionsPathString.split(path.sep) : null
56-
const functionsPath = isNextjs ? [...siteRoot, 'pages', 'api'] : [...siteRoot, ...detectedFunctionsPath]
57-
const netlifyGraphPath = isNextjs
58-
? [...siteRoot, 'lib', 'netlifyGraph']
59-
: [...siteRoot, ...NetlifyGraph.defaultNetlifyGraphConfig.netlifyGraphPath]
63+
const functionsPath = filterRelativePathItems(isNextjs ? [...siteRoot, 'pages', 'api'] : [...detectedFunctionsPath])
64+
const netlifyGraphPath = filterRelativePathItems(
65+
isNextjs
66+
? [...siteRoot, 'lib', 'netlifyGraph']
67+
: [...siteRoot, ...NetlifyGraph.defaultNetlifyGraphConfig.netlifyGraphPath],
68+
)
6069
const baseConfig = { ...NetlifyGraph.defaultNetlifyGraphConfig, ...userSpecifiedConfig }
6170
const netlifyGraphImplementationFilename = [...netlifyGraphPath, `index.${baseConfig.extension}`]
6271
const netlifyGraphTypeDefinitionsFilename = [...netlifyGraphPath, `index.d.ts`]
@@ -224,7 +233,7 @@ const generateHandler = (netlifyGraphConfig, schema, operationId, handlerOptions
224233
const defaultBaseFilename = `${operationName}.${fileExtension}`
225234
const baseFilename = defaultBaseFilename
226235

227-
filenameArr = [...netlifyGraphConfig.functionsPath, baseFilename]
236+
filenameArr = [path.sep, ...netlifyGraphConfig.functionsPath, baseFilename]
228237
}
229238

230239
const absoluteFilename = path.resolve(...filenameArr)

0 commit comments

Comments
 (0)