From 552a4328c62e44986ce5cd39dd2647d424d4b362 Mon Sep 17 00:00:00 2001
From: Aron Griffis <aron@scampersand.com>
Date: Sat, 25 Mar 2023 09:16:43 -0400
Subject: [PATCH 1/2] chore: update circleci node to supported version 16

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 090a48b..4d07fdd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,7 +35,7 @@ aliases:
 defaults: &defaults
   working_directory: ~/react-theme-provider
   docker:
-    - image: circleci/node:8
+    - image: circleci/node:16
 
 version: 2
 jobs:

From 2ec642425a94095d0c5fb95cf85aceb8a320258a Mon Sep 17 00:00:00 2001
From: Aron Griffis <aron@scampersand.com>
Date: Sat, 25 Mar 2023 08:52:51 -0400
Subject: [PATCH 2/2] fix: switch to deepmerge-ts for esm

---
 package.json           | 2 +-
 src/createTheming.js   | 2 +-
 src/createWithTheme.js | 2 +-
 yarn.lock              | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 92865d4..a43464d 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "react": ">=16.3.0"
   },
   "dependencies": {
-    "deepmerge": "^3.2.0",
+    "deepmerge-ts": "^5.0.0",
     "hoist-non-react-statics": "^3.3.0"
   },
   "jest": {
diff --git a/src/createTheming.js b/src/createTheming.js
index 70d297e..9b520e3 100644
--- a/src/createTheming.js
+++ b/src/createTheming.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 import * as React from 'react';
-import deepmerge from 'deepmerge';
+import { deepmerge } from 'deepmerge-ts';
 import createThemeProvider from './createThemeProvider';
 import createWithTheme from './createWithTheme';
 import type { WithThemeType } from './createWithTheme';
diff --git a/src/createWithTheme.js b/src/createWithTheme.js
index 812dcb2..a7f4889 100644
--- a/src/createWithTheme.js
+++ b/src/createWithTheme.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 import * as React from 'react';
-import deepmerge from 'deepmerge';
+import { deepmerge } from 'deepmerge-ts';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 
 import type { ThemeProviderType } from './createThemeProvider';
diff --git a/yarn.lock b/yarn.lock
index 140b287..462724e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1642,10 +1642,10 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-deepmerge@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e"
-  integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==
+deepmerge-ts@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/deepmerge-ts/-/deepmerge-ts-5.0.0.tgz#789f7ac89a0f17c2f4a0fc0beaaa14703b56bc93"
+  integrity sha512-esq9xUO8+CQCG63IlpkoOBNlpm1m4WBm0NRLFrGL/dcgzqWi1tmTLfG7QTvffqYt6T+dS+xaxrHxdexqGWkV1g==
 
 default-require-extensions@^2.0.0:
   version "2.0.0"