Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-10 18:58:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxt,vite): do not override vite import conditions (#30887)

Browse Source
This commit is contained in:
Daniel Roe 2025-02-06 13:29:05 +00:00 committed by GitHub
parent cf89bf4d98
commit d7b5d25575
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/nuxt/src/core/plugins/resolve-deep-imports.ts
View File

@ -14,7 +14,18 @@ export function resolveDeepImportsPlugin (nuxt: Nuxt): Plugin {
name: 'nuxt:resolve-bare-imports',
enforce: 'post',
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) {
if (!importer || isAbsolute(id) || (!isAbsolute(importer) && !importer.startsWith('virtual:') && !importer.startsWith('\0virtual:')) || exclude.some(e => id.startsWith(e))) {

13
packages/vite/src/client.ts
View File

@ -131,19 +131,6 @@ export async function buildClient (ctx: ViteBuildContext) {
},
},
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({
srcDir: ctx.nuxt.options.srcDir,
buildAssetsURL: joinURL(ctx.nuxt.options.app.baseURL, ctx.nuxt.options.app.buildAssetsDir),