fixed server-only leak from material ui package

VulcanJS · Sep 28, 2021 · 9bf4c21 · 9bf4c21
1 parent bd1de65
commit 9bf4c21
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/packages/@vulcanjs/next-material-ui/index.ts b/packages/@vulcanjs/next-material-ui/index.ts
@@ -1,5 +1,4 @@
 export * from "./emotion/createEmotionCache";
-export * from "./getAppEnhancer";
 
 export { default as Link } from "./components/Link";
 export { default as NextMuiLink } from "./components/Link"; // recommanded alias to use
diff --git a/packages/@vulcanjs/next-material-ui/server.ts b/packages/@vulcanjs/next-material-ui/server.ts
@@ -0,0 +1 @@
+export * from "./server/getAppEnhancer";
diff --git a/...canjs/next-material-ui/getAppEnhancer.tsx → ...ext-material-ui/server/getAppEnhancer.tsx b/...canjs/next-material-ui/getAppEnhancer.tsx → ...ext-material-ui/server/getAppEnhancer.tsx
@@ -3,7 +3,7 @@ import { AppSheetsCollector, Sheets } from "@vulcanjs/next-style-collector";
 
 import createEmotionServer from "@emotion/server/create-instance";
 // import theme from "/src/theme";
-import { createEmotionCache } from "./emotion/createEmotionCache";
+import { createEmotionCache } from "../emotion/createEmotionCache";
 
 export const getAppEnhancer = (): AppSheetsCollector => {
   const cache = createEmotionCache();

diff --git a/packages/@vulcanjs/webpack/extendWebpackConfig.js b/packages/@vulcanjs/webpack/extendWebpackConfig.js
@@ -63,6 +63,7 @@ const extendWebpackConfig = (environment) => (webpackConfig) => {
     events: false,
     path: false,
     stream: false,
+    util: false,
   };
 
   withMagicImports(webpackConfig);

diff --git a/src/lib/i18n.ts b/src/lib/i18n.ts
@@ -13,7 +13,12 @@ const i18nInstance = new I18N({
   defaultLanguage: "en",
   otherLanguages: ["fr"],
   localeSubpaths: {},
-  localePath: path.resolve("./public/locales"),
+  // TODO: this code seems to run client-side
+  // to be improved when updating i18n
+  localePath:
+    typeof path.resolve === "function"
+      ? path.resolve("./public/locales")
+      : "./public/locales",
 });
 
 // reexport everything

diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
@@ -11,7 +11,7 @@ import theme from "~/lib/style/defaultTheme";
 import {
   getAppEnhancer as getMuiAppEnhancer,
   //getMuiDocumentInitialProps,
-} from "@vulcanjs/next-material-ui";
+} from "@vulcanjs/next-material-ui/server";
 import { i18nPropsFromCtx, DocumentLanguageProps } from "~/lib/i18n";
 
 interface VNSDocumentProps {