From 7674d46913d140e18f17b891641dd7cb7c4e9f28 Mon Sep 17 00:00:00 2001 From: Duval Kilpatrick Date: Thu, 7 Nov 2024 18:11:55 -0500 Subject: [PATCH] fix(scaffold): update module template --- packages/pages/src/dev/server/server.ts | 21 +++++++------------ .../pages/src/scaffold/modules/templates.ts | 6 +++--- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/packages/pages/src/dev/server/server.ts b/packages/pages/src/dev/server/server.ts index 892c878b6..f5930fb49 100644 --- a/packages/pages/src/dev/server/server.ts +++ b/packages/pages/src/dev/server/server.ts @@ -56,24 +56,19 @@ export const createServer = async ( module, projectStructure ); - if (moduleInfo !== undefined) { - let vite; - // initialize using postCss if we have it - if (moduleInfo.postCssPath !== undefined) { - vite = await createViteServer({ - ...getViteServerConfig(projectStructure), + if (moduleInfo) { + let viteServerConfig = getViteServerConfig(projectStructure); + if (moduleInfo.postCssPath) { + viteServerConfig = { + ...viteServerConfig, css: { postcss: moduleInfo.postCssPath, }, - }); - } else { - vite = await createViteServer(getViteServerConfig(projectStructure)); - } - // otherwise initialize without setting postcss - if (!vite) { - vite = await createViteServer(getViteServerConfig(projectStructure)); + }; } + const vite = await createViteServer(viteServerConfig); + app.use(vite.middlewares); app.use(errorMiddleware(vite)); app.use( diff --git a/packages/pages/src/scaffold/modules/templates.ts b/packages/pages/src/scaffold/modules/templates.ts index d7b2a3b7b..53c3042d1 100644 --- a/packages/pages/src/scaffold/modules/templates.ts +++ b/packages/pages/src/scaffold/modules/templates.ts @@ -13,7 +13,8 @@ export const moduleCode = ( const tailwind = useTailwind ? ` className="tailwind"` : ``; const formattedModuleName = formatModuleName(moduleName); - return `import { Module, ModuleConfig, ModuleProps } from "@yext/pages/*"; + return `import * as React from "react"; +import { Module, ModuleConfig, ModuleProps } from "@yext/pages/*"; import { AnalyticsProvider } from "@yext/pages-components"; import "./index.css"; @@ -39,9 +40,8 @@ const ${formattedModuleName}: Module = () => { return( Module