Skip to content

Commit 2ec6424

Browse files
committed
fix: switch to deepmerge-ts for esm
1 parent 552a432 commit 2ec6424

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"react": ">=16.3.0"
5555
},
5656
"dependencies": {
57-
"deepmerge": "^3.2.0",
57+
"deepmerge-ts": "^5.0.0",
5858
"hoist-non-react-statics": "^3.3.0"
5959
},
6060
"jest": {

src/createTheming.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* @flow */
22

33
import * as React from 'react';
4-
import deepmerge from 'deepmerge';
4+
import { deepmerge } from 'deepmerge-ts';
55
import createThemeProvider from './createThemeProvider';
66
import createWithTheme from './createWithTheme';
77
import type { WithThemeType } from './createWithTheme';

src/createWithTheme.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* @flow */
22

33
import * as React from 'react';
4-
import deepmerge from 'deepmerge';
4+
import { deepmerge } from 'deepmerge-ts';
55
import hoistNonReactStatics from 'hoist-non-react-statics';
66

77
import type { ThemeProviderType } from './createThemeProvider';

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -1642,10 +1642,10 @@ deep-is@~0.1.3:
16421642
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
16431643
integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
16441644

1645-
deepmerge@^3.2.0:
1646-
version "3.2.0"
1647-
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e"
1648-
integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==
1645+
deepmerge-ts@^5.0.0:
1646+
version "5.0.0"
1647+
resolved "https://registry.yarnpkg.com/deepmerge-ts/-/deepmerge-ts-5.0.0.tgz#789f7ac89a0f17c2f4a0fc0beaaa14703b56bc93"
1648+
integrity sha512-esq9xUO8+CQCG63IlpkoOBNlpm1m4WBm0NRLFrGL/dcgzqWi1tmTLfG7QTvffqYt6T+dS+xaxrHxdexqGWkV1g==
16491649

16501650
default-require-extensions@^2.0.0:
16511651
version "2.0.0"

0 commit comments

Comments
 (0)