Skip to content

Commit

Permalink
Merge pull request #24 from zonkyio/native-object-assign
Browse files Browse the repository at this point in the history
Use native Object.assign
  • Loading branch information
bobisjan committed Dec 26, 2018
2 parents 37e1375 + a5fe036 commit e4144f3
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions lib/generate-manifest-from-configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
module.exports = generateManifestFromConfiguration;

const hasTarget = require('./has-target');
const objectAssign = require('object-assign');

function generateManifestFromConfiguration(configuration) {
const manifest = {};
Expand All @@ -27,7 +26,7 @@ function copyIcons(iconsDefinition) {

for (let icon of iconsDefinition) {
if (!icon.targets || hasTarget(icon, 'manifest')) {
copy = objectAssign({}, icon);
copy = Object.assign({}, icon);
delete copy.targets;

icons.push(copy);
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"broccoli-caching-writer": "^3.0.3",
"broccoli-merge-trees": "^3.0.2",
"ember-cli-babel": "^7.1.2",
"object-assign": "^4.1.1",
"web-app-manifest-validator": "^1.0.0",
"xmlbuilder": "^9.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6380,7 +6380,7 @@ number-is-nan@^1.0.0:
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=

object-assign@4.1.1, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
object-assign@4.1.1, object-assign@^4.0.1, object-assign@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
Expand Down

0 comments on commit e4144f3

Please sign in to comment.