fix(plugin): use the user's vite.config (#524)

Tested and confirmed it does use the user's build.rollupOptions.external when I add that to the `vite.config.js` Tested w/ both the problem build (a serverless func repo) and a modules repo. `configFile: false` should remain or else it'll get stuck in infinite loop of yext plugin.
yext · May 14, 2024 · 57e3e81 · 57e3e81
1 parent 52ebb40
commit 57e3e81
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 7 deletions.
diff --git a/packages/pages/src/util/viteConfig.ts b/packages/pages/src/util/viteConfig.ts
@@ -16,3 +16,10 @@ export const scopedViteConfigPath = (scope?: string) => {
     return viteConfigPath;
   }
 };
+
+export const removePluginFromViteConfig = (config: any) => {
+  if (config?.plugins) {
+    config.plugins = "";
+  }
+  return config;
+};
diff --git a/packages/pages/src/vite-plugin/modules/plugin.ts b/packages/pages/src/vite-plugin/modules/plugin.ts
@@ -1,4 +1,4 @@
-import { build, Plugin } from "vite";
+import { build, mergeConfig, Plugin } from "vite";
 import { ProjectStructure } from "../../common/src/project/structure.js";
 import { glob } from "glob";
 import path from "node:path";
@@ -15,6 +15,10 @@ import postcss from "postcss";
 import nested from "postcss-nested";
 import { createModuleLogger } from "../../common/src/module/internal/logger.js";
 import { getModuleName } from "../../common/src/module/internal/getModuleConfig.js";
+import {
+  removePluginFromViteConfig,
+  scopedViteConfigPath,
+} from "../../util/viteConfig.js";
 
 type FileInfo = {
   path: string;
@@ -61,6 +65,9 @@ export const buildModules = async (
     );
   }
 
+  const viteConfigPath = scopedViteConfigPath(projectStructure.config.scope);
+  const viteConfig = viteConfigPath ? await import(viteConfigPath) : "";
+
   for (const [moduleName, fileInfo] of Object.entries(filepaths)) {
     logger.info = (msg, options) => {
       if (msg.includes("building for production")) {
@@ -70,7 +77,7 @@ export const buildModules = async (
       loggerInfo(msg, options);
     };
 
-    await build({
+    const moduleBuildConfig = {
       customLogger: logger,
       configFile: false,
       envDir: envVarConfig.envVarDir,
@@ -92,7 +99,10 @@ export const buildModules = async (
         },
       },
       experimental: {
-        renderBuiltUrl(filename, { type }) {
+        renderBuiltUrl(
+          filename: string,
+          { type }: { type: "asset" | "public" }
+        ) {
           let domain = `http://localhost:8000`;
           if (typeof process.env.YEXT_SITE_ARGUMENT !== "undefined") {
             try {
@@ -135,7 +145,13 @@ export const buildModules = async (
           },
         }),
       ],
-    });
+    };
+    await build(
+      mergeConfig(
+        removePluginFromViteConfig(viteConfig.default),
+        moduleBuildConfig
+      )
+    );
   }
 };
 

diff --git a/packages/pages/src/vite-plugin/serverless-functions/plugin.ts b/packages/pages/src/vite-plugin/serverless-functions/plugin.ts
@@ -1,4 +1,4 @@
-import { build, createLogger } from "vite";
+import { build, createLogger, mergeConfig } from "vite";
 import { ProjectStructure } from "../../common/src/project/structure.js";
 import { glob } from "glob";
 import path from "node:path";
@@ -8,6 +8,10 @@ import { processEnvVariables } from "../../util/processEnvVariables.js";
 import { FunctionMetadataParser } from "../../common/src/function/internal/functionMetadataParser.js";
 import { nodePolyfills } from "vite-plugin-node-polyfills";
 import pc from "picocolors";
+import {
+  removePluginFromViteConfig,
+  scopedViteConfigPath,
+} from "../../util/viteConfig.js";
 
 export const buildServerlessFunctions = async (
   projectStructure: ProjectStructure
@@ -41,6 +45,9 @@ export const buildServerlessFunctions = async (
   const logger = createLogger();
   const loggerInfo = logger.info;
 
+  const viteConfigPath = scopedViteConfigPath(projectStructure.config.scope);
+  const viteConfig = viteConfigPath ? await import(viteConfigPath) : "";
+
   for (const [name, filepath] of Object.entries(filepaths)) {
     logger.info = (msg, options) => {
       if (msg.includes("building for production")) {
@@ -53,7 +60,7 @@ export const buildServerlessFunctions = async (
       loggerInfo(msg, options);
     };
 
-    await build({
+    const serverlessFunctionBuildConfig = {
       customLogger: logger,
       configFile: false,
       envDir: envVarConfig.envVarDir,
@@ -88,7 +95,13 @@ export const buildServerlessFunctions = async (
           },
         }),
       ],
-    });
+    };
+    await build(
+      mergeConfig(
+        removePluginFromViteConfig(viteConfig.default),
+        serverlessFunctionBuildConfig
+      )
+    );
   }
 };