Skip to content

feat: resolve vuetify base with given root #334

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: resolve vuetify base with given root #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions packages/shared/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ export type ImportPluginOptions =

export { generateImports } from './imports/generateImports'

export function resolveVuetifyBase () {
return path.dirname(require.resolve('vuetify/package.json', { paths: [process.cwd()] }))
export function resolveVuetifyBase (root?: string) {
const paths = (root && root != process.cwd()) ? [root] : []
paths.push(process.cwd())
return path.dirname(require.resolve('vuetify/package.json', { paths }))
}

export function isObject (value: any): value is object {
Expand Down
6 changes: 4 additions & 2 deletions packages/vite-plugin/src/stylesPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function isSubdir (root: string, test: string) {
}

export function stylesPlugin (options: Options): Plugin {
const vuetifyBase = resolveVuetifyBase()
let vuetifyBase: string

let configFile: string
const tempFiles = new Map<string, string>()
Expand All @@ -19,11 +19,13 @@ export function stylesPlugin (options: Options): Plugin {
name: 'vuetify:styles',
enforce: 'pre',
configResolved (config) {
const root = config.root || process.cwd();
vuetifyBase = resolveVuetifyBase(root)
if (isObject(options.styles)) {
if (path.isAbsolute(options.styles.configFile)) {
configFile = options.styles.configFile
} else {
configFile = path.join(config.root || process.cwd(), options.styles.configFile)
configFile = path.join(root, options.styles.configFile)
}
}
},
Expand Down