mirror of
https://github.com/nuxt/nuxt.git
synced 2025-02-11 11:18:06 +00:00
fix(nuxt,vite): do not override vite import conditions (#30887)
This commit is contained in:
parent
cf89bf4d98
commit
d7b5d25575
@ -14,7 +14,18 @@ export function resolveDeepImportsPlugin (nuxt: Nuxt): Plugin {
|
|||||||
name: 'nuxt:resolve-bare-imports',
|
name: 'nuxt:resolve-bare-imports',
|
||||||
enforce: 'post',
|
enforce: 'post',
|
||||||
configResolved (config) {
|
configResolved (config) {
|
||||||
conditions = config.mode === 'test' ? [...config.resolve.conditions, 'import', 'require'] : config.resolve.conditions
|
const resolvedConditions = new Set([nuxt.options.dev ? 'development' : 'production', ...config.resolve.conditions])
|
||||||
|
if (resolvedConditions.has('browser')) {
|
||||||
|
resolvedConditions.add('web')
|
||||||
|
resolvedConditions.add('import')
|
||||||
|
resolvedConditions.add('module')
|
||||||
|
resolvedConditions.add('default')
|
||||||
|
}
|
||||||
|
if (config.mode === 'test') {
|
||||||
|
resolvedConditions.add('import')
|
||||||
|
resolvedConditions.add('require')
|
||||||
|
}
|
||||||
|
conditions = [...resolvedConditions]
|
||||||
},
|
},
|
||||||
async resolveId (id, importer) {
|
async resolveId (id, importer) {
|
||||||
if (!importer || isAbsolute(id) || (!isAbsolute(importer) && !importer.startsWith('virtual:') && !importer.startsWith('\0virtual:')) || exclude.some(e => id.startsWith(e))) {
|
if (!importer || isAbsolute(id) || (!isAbsolute(importer) && !importer.startsWith('virtual:') && !importer.startsWith('\0virtual:')) || exclude.some(e => id.startsWith(e))) {
|
||||||
|
@ -131,19 +131,6 @@ export async function buildClient (ctx: ViteBuildContext) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
{
|
|
||||||
name: 'nuxt:import-conditions',
|
|
||||||
enforce: 'post',
|
|
||||||
config (_config, env) {
|
|
||||||
if (env.mode !== 'test') {
|
|
||||||
return {
|
|
||||||
resolve: {
|
|
||||||
conditions: [ctx.nuxt.options.dev ? 'development' : 'production', 'web', 'browser', 'import', 'module', 'default'],
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
devStyleSSRPlugin({
|
devStyleSSRPlugin({
|
||||||
srcDir: ctx.nuxt.options.srcDir,
|
srcDir: ctx.nuxt.options.srcDir,
|
||||||
buildAssetsURL: joinURL(ctx.nuxt.options.app.baseURL, ctx.nuxt.options.app.buildAssetsDir),
|
buildAssetsURL: joinURL(ctx.nuxt.options.app.baseURL, ctx.nuxt.options.app.buildAssetsDir),
|
||||||
|
Loading…
Reference in New Issue
Block a user