Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Upgrade deepmerge dependency #8608

Merged
merged 1 commit into from
Oct 9, 2017
Merged

[core] Upgrade deepmerge dependency #8608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"babel-runtime": "^6.26.0",
"brcast": "^3.0.1",
"classnames": "^2.2.5",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"dom-helpers": "^3.2.1",
"hoist-non-react-statics": "^1.2.0",
"jss": "^8.1.0",
Expand Down Expand Up @@ -95,7 +95,7 @@
"babel-loader": "^7.1.2",
"babel-plugin-flow-react-proptypes": "6.1.0",
"babel-plugin-istanbul": "^4.1.5",
"babel-plugin-preval": "^1.5.0",
"babel-plugin-preval": "^1.5.1",
"babel-plugin-react-remove-properties": "^0.2.5",
"babel-plugin-transform-dev-warning": "^0.1.0",
"babel-plugin-transform-flow-strip-types": "^6.22.0",
Expand Down Expand Up @@ -143,7 +143,7 @@
"karma-mocha-reporter": "^2.2.4",
"karma-phantomjs-launcher": "^1.0.4",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.4",
"karma-webpack": "^2.0.5",
"marked": "^0.3.6",
"mocha": "^4.0.1",
"next": "^3.2.2",
Expand Down
3 changes: 0 additions & 3 deletions src/styles/createMuiTheme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ function createMuiTheme(options: Object = {}) {
zIndex,
},
other,
{
clone: true, // We don't want to mutate the input
},
),
};
}
Expand Down
3 changes: 3 additions & 0 deletions src/styles/createPalette.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ export default function createPalette(palette: Object) {
getContrastText,
},
other,
{
clone: false, // No need to clone deep
},
);

// Dev warnings
Expand Down
3 changes: 3 additions & 0 deletions src/styles/createTypography.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,8 @@ export default function createTypography(palette: Object, typography: Object | F
},
},
other,
{
clone: false, // No need to clone deep
},
);
}
4 changes: 1 addition & 3 deletions src/styles/getStylesCreator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ function getStylesCreator(stylesOrCreator: Object | (Object => Object)) {

Object.keys(overrides).forEach(key => {
warning(stylesWithOverrides[key], 'You are trying to overrides a style that do not exist.');
stylesWithOverrides[key] = deepmerge(stylesWithOverrides[key], overrides[key], {
clone: true, // We don't want to mutate the input
});
stylesWithOverrides[key] = deepmerge(stylesWithOverrides[key], overrides[key]);
});

return stylesWithOverrides;
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,9 +785,9 @@ [email protected]:
glob "^7.1.1"
resolve "^1.3.2"

babel-plugin-preval@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.5.0.tgz#be4e3353ce6ec4fd0c6b199701193306033bf54b"
babel-plugin-preval@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.5.1.tgz#e4f4466a71561a4aae3c79c0b44627e68a3ab9a6"
dependencies:
babel-core "^6.26.0"
babel-macros "^1.0.0"
Expand Down Expand Up @@ -2578,9 +2578,9 @@ deep-is@~0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"

deepmerge@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
deepmerge@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.0.0.tgz#35f7ee08e8bde1173b3a529f732dcda67ce82e29"

default-require-extensions@^1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -5104,9 +5104,9 @@ karma-sourcemap-loader@^0.3.7:
dependencies:
graceful-fs "^4.1.2"

karma-webpack@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.4.tgz#3e2d4f48ba94a878e1c66bb8e1ae6128987a175b"
karma-webpack@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.5.tgz#4f56887e32cf4f9583391c2388415de06af06efd"
dependencies:
async "~0.9.0"
loader-utils "^0.2.5"
Expand Down