Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"workspace": ["nested"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"private": true
}
12 changes: 12 additions & 0 deletions packages/vite/src/node/server/__tests__/search-root.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ describe('searchForWorkspaceRoot', () => {
expect(resolved).toBe(resolve(dirname, 'fixtures/yarn'))
})

test('deno', () => {
const resolved = searchForWorkspaceRoot(
resolve(dirname, 'fixtures/deno/nested'),
)
expect(resolved).toBe(resolve(dirname, 'fixtures/deno'))
})

test('deno at root', () => {
const resolved = searchForWorkspaceRoot(resolve(dirname, 'fixtures/deno'))
expect(resolved).toBe(resolve(dirname, 'fixtures/deno'))
})

test('none', () => {
const resolved = searchForWorkspaceRoot(
resolve(dirname, 'fixtures/none/nested'),
Expand Down
19 changes: 19 additions & 0 deletions packages/vite/src/node/server/searchRoot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,24 @@ function hasWorkspacePackageJSON(root: string): boolean {
}
}

// https://docs.deno.com/runtime/fundamentals/workspaces/
function hasWorkspaceDenoJSON(root: string): boolean {
for (const name of ['deno.json', 'deno.jsonc']) {
const path = join(root, name)
if (!isFileReadable(path)) {
continue
}
try {
const content = JSON.parse(fs.readFileSync(path, 'utf-8')) || {}
if (content.workspace) return true
} catch {
// deno.jsonc is only detected when it is also valid JSON. Full
// JSONC parsing would require an additional parser.
}
}
return false
}

function hasRootFile(root: string): boolean {
return ROOT_FILES.some((file) => fs.existsSync(join(root, file)))
}
Expand Down Expand Up @@ -69,6 +87,7 @@ export function searchForWorkspaceRoot(
): string {
if (hasRootFile(current)) return current
if (hasWorkspacePackageJSON(current)) return current
if (hasWorkspaceDenoJSON(current)) return current

const dir = dirname(current)
// reach the fs root
Expand Down
2 changes: 2 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.