feat: change quasarConfig cache way

dongwa · Aug 11, 2023 · 7f127e3 · 7f127e3
1 parent 2dfa469
commit 7f127e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 22 deletions.
diff --git a/src/build.ts b/src/build.ts
@@ -155,6 +155,10 @@ export async function build(opts: BuildOptions): Promise<BuilderOutput> {
   // Read quasar.config.js
   const quasarConfigName = 'quasar.config.js';
   const quasarConfig = getQuasarConfig(entrypointPath);
+
+  // cache quasarConfig to vercel config
+  config.quasarConfig = quasarConfig;
+
   consola.log('load quasar config', quasarConfig);
 
   // Read options from quasar.config.js otherwise set sensible defaults

diff --git a/src/prepare-cache.ts b/src/prepare-cache.ts
@@ -1,28 +1,18 @@
-import path from 'path';
 import consola from 'consola';
-import { getQuasarConfig } from './utils';
 import { startStep, endStep } from './utils';
 import { PrepareCacheOptions, glob, Files } from '@vercel/build-utils';
 
+import type { QuasarConfiguration } from './utils';
+
 async function prepareCache({
   workPath,
-  entrypoint,
+  config,
 }: PrepareCacheOptions): Promise<Files> {
   startStep('Collect cache');
 
-  let distDir = 'dist/ssr';
-  try {
-    // Get quasar directory
-    const entrypointDirname = path.dirname(entrypoint);
-    // Get quasar path
-    const entrypointPath = path.join(workPath, entrypointDirname);
-    console.log('entrypointPath', entrypointPath);
-    const conf = getQuasarConfig(entrypointPath);
-
-    distDir = conf.build.distDir;
-  } catch (error) {
-    consola.error(error);
-  }
+  const quasarConfig = config.quasarConfig as QuasarConfiguration;
+  console.log('quasarConfig', quasarConfig);
+  let distDir = quasarConfig?.build?.distDir || 'dist/ssr';
 
   console.log('distDir', distDir);
 

diff --git a/src/utils.ts b/src/utils.ts
@@ -178,15 +178,10 @@ const defaultQuasarConfig: QuasarConfiguration = {
   },
 };
 
-/** cache quasarConfig  */
-let quasarConfigCache: QuasarConfiguration | undefined = undefined;
-
 export function getQuasarConfig(
   rootDir: string,
   quasarConfigName = './quasar.config.js'
 ): QuasarConfiguration {
-  if (quasarConfigCache) return quasarConfigCache;
-
   const load = jiti(rootDir);
 
   let quasarConfigModule = load(quasarConfigName);
@@ -210,7 +205,6 @@ export function getQuasarConfig(
       quasarConfig.ssr[key] =
         defaultQuasarConfig.ssr[key as keyof typeof defaultQuasarConfig['ssr']];
   }
-  quasarConfigCache = quasarConfig;
   return quasarConfig;
 }