Merge 14ea28c into 8b5eed3

vuepress · Jan 24, 2024 · 2d26dfd · 2d26dfd
2 parents 8b5eed3 + 14ea28c
commit 2d26dfd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/packages/bundler-webpack/src/build/createClientConfig.ts b/packages/bundler-webpack/src/build/createClientConfig.ts
@@ -25,6 +25,9 @@ export const createClientConfig = async (
     isBuild: true,
   })
 
+  // ensure browser packages are packed
+  config.resolve.set('conditionNames', ['browser', 'import', 'module'])
+
   // use internal vuepress-loader to handle SSR dependencies
   config.module
     .rule('vue')

diff --git a/packages/bundler-webpack/src/build/createServerConfig.ts b/packages/bundler-webpack/src/build/createServerConfig.ts
@@ -40,6 +40,9 @@ export const createServerConfig = async (
   // devtool
   config.devtool('source-map')
 
+  // ensure node packages are used when SSR
+  config.resolve.set('conditionNames', ['node', 'import', 'module'])
+
   // do not need to minimize server bundle
   config.optimization.minimize(false)
 

diff --git a/packages/bundler-webpack/src/dev/createDevConfig.ts b/packages/bundler-webpack/src/dev/createDevConfig.ts
@@ -15,6 +15,9 @@ export const createDevConfig = async (
     isBuild: false,
   })
 
+  // ensure browser packages are packed
+  config.resolve.set('conditionNames', ['browser', 'import', 'module'])
+
   config.plugin('html').use(HtmlPlugin, [
     {
       template: app.options.templateDev,