Fix/more esm errors (#765)

10up · May 7, 2024 · b4708b4 · b4708b4
1 parent dfcdf94
commit b4708b4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/.changeset/lucky-kiwis-fly.md b/.changeset/lucky-kiwis-fly.md
@@ -0,0 +1,5 @@
+---
+"@headstartwp/next": patch
+---
+
+Fix: deepmerge cjs package import
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/next/src/blocks/TwitterBlock.tsx b/packages/next/src/blocks/TwitterBlock.tsx
@@ -1,6 +1,6 @@
 import { isTwitterEmbed } from '@headstartwp/core';
 import { IBlock, IBlockAttributes } from '@headstartwp/core/react';
-import Script from 'next/script';
+import Script from 'next/script.js';
 
 /**
  * Renders a twitter embed

diff --git a/packages/next/src/data/server/fetchHookData.ts b/packages/next/src/data/server/fetchHookData.ts
@@ -11,12 +11,14 @@ import {
 } from '@headstartwp/core';
 import { GetServerSidePropsContext, GetStaticPropsContext } from 'next';
 import { serializeKey } from '@headstartwp/core/react';
-import { all as merge } from 'deepmerge';
+import deepmerge from 'deepmerge';
 import { PreviewData } from '../../handlers/types';
 import { convertToPath } from '../convertToPath';
 import { getSiteFromContext } from './getSiteFromContext';
 import defaultCacheHandler from './cache';
 
+const { all: merge } = deepmerge;
+
 /**
  * The supported options for {@link fetchHookData}
  */