fix: fix quasar.config.js error

dongwa · May 19, 2022 · fbc5648 · fbc5648
1 parent c9a105c
commit fbc5648
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/src/build.ts b/src/build.ts
@@ -114,6 +114,8 @@ export async function build(opts: BuildOptions): Promise<BuilderOutput> {
   // Read nuxt.config.js
   const quasarConfigName = 'quasar.config.js';
   const quasarConfigFile = getQuasarConfig(entrypointPath);
+  consola.log('load quasar config', quasarConfigFile);
+
   // Read options from nuxt.config.js otherwise set sensible defaults
   // const staticDir =
   //   quasarConfigFile.dir && quasarConfigFile.dir.static
@@ -141,6 +143,7 @@ export async function build(opts: BuildOptions): Promise<BuilderOutput> {
   // ----------------- Install ssr dependencies -----------------
   startStep('Install dist dependencies');
 
+  //TODO: remove || 'dist/ssr' and log
   const distDir = path.join(entrypointPath, quasarConfigFile.build.distDir);
   // Get folder where we'll store node_modules
   const distModulesPath = path.join(distDir, 'node_modules');

diff --git a/src/launcher.ts b/src/launcher.ts
@@ -7,19 +7,6 @@ const { Bridge } =
 let listener: any;
 let quasarConfig;
 
-const defaultQuasarConfig = {
-  build: {
-    publicPath: '/',
-    vueRouterMode: 'hash',
-    distDir: 'dist/ssr',
-  },
-  ssr: {
-    pwa: false,
-    prodProd: 3000,
-    ssrPwaHtmlFilename: 'offline.html',
-  },
-};
-
 const loaders = [
   { name: 'jiti', args: [] },
   {
@@ -42,7 +29,6 @@ for (const { name, args } of loaders) {
       prod: true,
     });
     quasarConfig = config.default || config;
-    quasarConfig = Object.assign(defaultQuasarConfig, quasarConfig);
     break;
   } catch (err) {
     if (name === 'esm') {
@@ -60,7 +46,7 @@ try {
 
   listener = require(path.join(
     __dirname,
-    quasarConfig.build.distDir,
+    quasarConfig.build.distDir || 'dist/ssr',
     'index.js'
   ));
   if (listener.default) listener = listener.default;

diff --git a/src/utils.ts b/src/utils.ts
@@ -282,8 +282,19 @@ export function getQuasarConfig(
     prod: true,
   });
   quasarConfigFile = quasarConfigFile.default || quasarConfigFile;
-  consola.log('load quasar config', quasarConfigFile);
-  return Object.assign(defaultQuasarConfig, quasarConfigFile);
+  for (let key in defaultQuasarConfig.build) {
+    if (!quasarConfigFile.build[key])
+      quasarConfigFile.build[key] =
+        defaultQuasarConfig.build[
+          key as keyof typeof defaultQuasarConfig['build']
+        ];
+  }
+  for (let key in defaultQuasarConfig.ssr) {
+    if (!quasarConfigFile.ssr[key])
+      quasarConfigFile.ssr[key] =
+        defaultQuasarConfig.ssr[key as keyof typeof defaultQuasarConfig['ssr']];
+  }
+  return quasarConfigFile;
 }
 
 export function getNuxtConfigName(rootDir: string): string {