diff --git a/package.json b/package.json index c3c9b7da..db63f575 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@ember/render-modifiers": "^2.0.0", "broccoli-funnel": "^3.0.3", "broccoli-merge-trees": "^4.2.0", - "deepmerge": "^4.2.2", + "deepmerge": "^4.3.1", "ember-auto-import": "^2.6.3", "ember-cli-babel": "^7.26.11", "ember-cli-htmlbars": "^6.2.0", diff --git a/vendor/shims/deepmerge.js b/vendor/shims/deepmerge.js deleted file mode 100644 index 74d18de3..00000000 --- a/vendor/shims/deepmerge.js +++ /dev/null @@ -1,13 +0,0 @@ -(function() { - function vendorModule() { - 'use strict'; - - return { - /* eslint-disable-next-line dot-notation */ - 'default': self['deepmerge'], - __esModule: true - }; - } - - define('deepmerge', [], vendorModule); -})(); diff --git a/yarn.lock b/yarn.lock index 5e0be423..afea53bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4023,7 +4023,7 @@ deep-is@^0.1.3, deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -deepmerge@^4.2.2: +deepmerge@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==