diff --git a/packages/schema/src/config/experimental.ts b/packages/schema/src/config/experimental.ts index 0c6709eb36..d1507afa66 100644 --- a/packages/schema/src/config/experimental.ts +++ b/packages/schema/src/config/experimental.ts @@ -30,5 +30,14 @@ export default { * @see https://github.com/nuxt/framework/pull/5750 */ treeshakeClientOnly: false, + + /** + * Split server bundle into multiple chunks and dynamically import them + * + * Note: Enabling this flag can cause hydration issues in some platform. + * + * @see https://github.com/nuxt/framework/issues/6432 + */ + viteServerDynamicImports: false, } } diff --git a/packages/vite/package.json b/packages/vite/package.json index 8a58161684..a136b60f18 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -46,7 +46,6 @@ "postcss-url": "^10.1.3", "rollup": "^2.77.2", "rollup-plugin-visualizer": "^5.7.1", - "std-env": "^3.1.1", "ufo": "^0.8.5", "unplugin": "^0.8.1", "vite": "~3.0.4", diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 99f58330d2..3ca723a5d2 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -2,11 +2,9 @@ import { resolveTSConfig } from 'pkg-types' import { resolve } from 'pathe' import * as vite from 'vite' import vuePlugin from '@vitejs/plugin-vue' -import { provider } from 'std-env' import viteJsxPlugin from '@vitejs/plugin-vue-jsx' import { logger, resolveModule } from '@nuxt/kit' import { joinURL, withoutLeadingSlash, withTrailingSlash } from 'ufo' -import type { OutputOptions } from 'rollup' import { ViteBuildContext, ViteOptions } from './vite' import { wpfs } from './utils/wpfs' import { cacheDirPlugin } from './plugins/cache-dir' @@ -80,7 +78,7 @@ export async function buildServer (ctx: ViteBuildContext) { entryFileNames: 'server.mjs', preferConst: true, // TODO: https://github.com/vitejs/vite/pull/8641 - inlineDynamicImports: false, + inlineDynamicImports: !ctx.nuxt.options.experimental.viteServerDynamicImports, format: 'module' }, onwarn (warning, rollupWarn) { @@ -112,11 +110,6 @@ export async function buildServer (ctx: ViteBuildContext) { })) } - // Hotfix for https://github.com/nuxt/framework/issues/6204 - if (provider === 'netlify') { - (serverConfig.build.rollupOptions.output as OutputOptions).inlineDynamicImports = true - } - await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true }) const onBuild = () => ctx.nuxt.callHook('build:resources', wpfs) diff --git a/yarn.lock b/yarn.lock index 720cea65df..8e1e0bd883 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1886,7 +1886,6 @@ __metadata: postcss-url: ^10.1.3 rollup: ^2.77.2 rollup-plugin-visualizer: ^5.7.1 - std-env: ^3.1.1 ufo: ^0.8.5 unbuild: latest unplugin: ^0.8.1