Skip to content
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

Jump to bottom

fix: change style plugin prefix for nuxt #328

Merged
merged 5 commits into from
Jul 3, 2024
Merged

fix: change style plugin prefix for nuxt #328

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17f8307
refactor: extract plugin virtual prefix and name from style plugins
franz-bendezu Jan 1, 2024
0e6f93b
fix: change virtual prefix for nuxt compability
franz-bendezu Jan 1, 2024
38b0dc1
fix: remove unnecessary slash from regex
franz-bendezu Jan 2, 2024
9790719
refactor: create VIRTUAL_MODULE_ID constant for unify values
franz-bendezu Jan 7, 2024
678cec2
feat: add support to direct url from nuxt via ssr
franz-bendezu Jan 7, 2024
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
24 changes: 15 additions & 9 deletions packages/vite-plugin/src/stylesPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ function isSubdir (root: string, test: string) {
return relative && !relative.startsWith('..') && !path.isAbsolute(relative)
}

const PLUGIN_VIRTUAL_PREFIX = "virtual:"
const PLUGIN_VIRTUAL_NAME = "plugin-vuetify"
const VIRTUAL_MODULE_ID = `${PLUGIN_VIRTUAL_PREFIX}${PLUGIN_VIRTUAL_NAME}`

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

Expand Down Expand Up @@ -36,7 +40,7 @@ export function stylesPlugin (options: Options): Plugin {
)
) {
if (options.styles === 'none') {
return '\0__void__'
return `${PLUGIN_VIRTUAL_PREFIX}__void__`
} else if (options.styles === 'sass') {
const target = source.replace(/\.css$/, '.sass')
return this.resolve(target, importer, { skipSelf: true, custom })
Expand All @@ -51,25 +55,27 @@ export function stylesPlugin (options: Options): Plugin {

tempFiles.set(file, contents)

return `\0plugin-vuetify:${file}`
return `${VIRTUAL_MODULE_ID}:${file}`
}
} else if (source.startsWith('/plugin-vuetify:')) {
return '\0' + source.slice(1)
} else if (source.startsWith('/@id/__x00__plugin-vuetify:')) {
return '\0' + source.slice(12)
} else if (source.startsWith(`/${PLUGIN_VIRTUAL_NAME}:`)) {
return PLUGIN_VIRTUAL_PREFIX + source.slice(1)
} else if (source.startsWith(`/@id/__x00__${PLUGIN_VIRTUAL_NAME}:`)) {
return PLUGIN_VIRTUAL_PREFIX + source.slice(12)
} else if (source.startsWith(`/${VIRTUAL_MODULE_ID}:`)) {
return source.slice(1)
}

return null
},
load (id) {
// When Vite is configured with `optimizeDeps.exclude: ['vuetify']`, the
// received id contains a version hash (e.g. \0__void__?v=893fa859).
if (/^\0__void__(\?.*)?$/.test(id)) {
if (new RegExp(`^${PLUGIN_VIRTUAL_PREFIX}__void__(\\?.*)?$`).test(id)) {
return ''
}

if (id.startsWith('\0plugin-vuetify')) {
const file = /^\0plugin-vuetify:(.*?)(\?.*)?$/.exec(id)![1]
if (id.startsWith(`${VIRTUAL_MODULE_ID}`)) {
const file = new RegExp(`^${VIRTUAL_MODULE_ID}:(.*?)(\\?.*)?$`).exec(id)![1]

return tempFiles.get(file)
}
Expand Down