Skip to content

feat(devtools): support for xdg-home-config #526

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
antfu merged 2 commits into from
Nov 27, 2023
Merged

feat(devtools): support for xdg-home-config #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45a813c
feat(devtools): support for xdg-home-config
paro-paro Nov 23, 2023
8251159
chore: refactor
antfu Nov 27, 2023
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
4 changes: 2 additions & 2 deletions packages/devtools/src/dev-auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { homedir } from 'node:os'
import { join } from 'node:path'
import { existsSync } from 'node:fs'
import fs from 'node:fs/promises'
import { randomStr } from '@antfu/utils'
import { getHomeDir } from './utils/local-options'

let token: string | undefined

export async function getDevAuthToken() {
if (token)
return token

const home = homedir()
const home = getHomeDir()
const dir = join(home, '.nuxt/devtools')
const filepath = join(dir, 'dev-auth-token.txt')

Expand Down
10 changes: 9 additions & 1 deletion packages/devtools/src/utils/local-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ interface LocalOptionSearchOptions {
key?: string | boolean
}

export function getHomeDir() {
return process.env.XDG_CONFIG_HOME || homedir()
}

export async function readLocalOptions<T>(defaults: T, options: LocalOptionSearchOptions): Promise<T> {
const { filePath } = getOptionsFilepath(options)

Expand All @@ -34,11 +38,15 @@ export async function readLocalOptions<T>(defaults: T, options: LocalOptionSearc

function getOptionsFilepath(options: LocalOptionSearchOptions) {
let hashedKey

if (options.key)
hashedKey = hash(`${options.root}:${options.key}`)
else
hashedKey = hash(options.root)
const filePath = join(homedir(), '.nuxt/devtools', `${hashedKey}.json`)

const home = getHomeDir()
const filePath = join(home, '.nuxt/devtools', `${hashedKey}.json`)

return {
filePath,
hashedKey,
Expand Down