Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Commit

Permalink
fix(deps): update dependency deepmerge to ^2.0.0 (#401)
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored and eliperelman committed Nov 21, 2017
1 parent 39599a4 commit 9f90d02
Show file tree
Hide file tree
Showing 24 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion packages/airbnb-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"@neutrinojs/eslint": "^7.3.2",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"eslint-config-airbnb-base": "^12.0.1",
"eslint-plugin-import": "^2.7.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/airbnb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"@neutrinojs/eslint": "^7.3.2",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"eslint-config-airbnb": "^16.1.0",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-jsx-a11y": "^6.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/banner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"homepage": "https://neutrino.js.org",
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"webpack": "^3.6.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/clean/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"clean-webpack-plugin": "^0.1.17",
"deepmerge": "^1.5.2"
"deepmerge": "^2.0.0"
},
"peerDependencies": {
"neutrino": "^7.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/compile-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-merge": "^1.1.0",
"deepmerge": "^1.5.2"
"deepmerge": "^2.0.0"
},
"devDependencies": {
"webpack": "^3.6.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/copy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"copy-webpack-plugin": "^4.0.1",
"deepmerge": "^1.5.2"
"deepmerge": "^2.0.0"
},
"peerDependencies": {
"neutrino": "^7.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"homepage": "https://neutrino.js.org",
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"opn": "^5.1.0",
"webpack": "^3.6.0",
"webpack-dev-server": "^2.9.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"babel-eslint": "^8.0.1",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"eslint": "^4.7.2",
"eslint-loader": "^1.9.0",
"eslint-plugin-babel": "^4.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/font-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"homepage": "https://neutrino.js.org",
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"file-loader": "^1.0.0",
"url-loader": "^0.5.8"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/html-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"homepage": "https://neutrino.js.org",
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"html-loader": "^0.5.1"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/html-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"homepage": "https://neutrino.js.org",
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"html-webpack-plugin": "^2.30.1",
"html-webpack-template": "^5.6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/image-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"homepage": "https://neutrino.js.org",
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"file-loader": "^1.0.0",
"url-loader": "^0.5.8"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"babel-core": "^6.26.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
"babel-preset-jest": "^21.0.2",
"deepmerge": "^1.5.1",
"deepmerge": "^2.0.0",
"eslint-plugin-jest": "^21.0.2",
"jest-cli": "^21.0.2",
"ramda": "^0.25.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/karma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"@neutrinojs/loader-merge": "^7.3.2",
"babel-plugin-istanbul": "^4.1.5",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"karma": "^1.7.1",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/library/library/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@neutrinojs/minify": "^7.3.0",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-preset-env": "^1.6.0",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"fast-async": "^6.3.0",
"webpack": "^3.6.0",
"webpack-node-externals": "^1.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/loader-merge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"homepage": "https://neutrino.js.org",
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"deepmerge": "^1.5.2"
"deepmerge": "^2.0.0"
},
"peerDependencies": {
"neutrino": "^7.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/mocha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
"babel-register": "^6.26.0",
"change-case": "^3.0.1",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"mocha": "^3.5.3",
"ramda": "^0.25.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/neutrino/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"dependencies": {
"deep-sort-object": "^1.0.2",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"fluture": "^7.1.3",
"immutable": "^3.8.1",
"immutable-ext": "^1.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@neutrinojs/start-server": "^7.3.2",
"babel-plugin-dynamic-import-node": "^1.1.0",
"babel-preset-env": "^1.6.0",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"fast-async": "^6.3.0",
"ramda": "^0.25.0",
"webpack": "^3.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/pwa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"homepage": "https://neutrino.js.org",
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"offline-plugin": "^4.8.4"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@blueprintjs/core": "^1.31.0",
"@neutrinojs/banner": "^7.1.1",
"@neutrinojs/react": "^7.1.1",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"normalize.css": "^7.0.0",
"prop-types": "^15.6.0",
"webpack-node-externals": "^1.6.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-react-jsx": "^6.24.1",
"babel-preset-react": "^6.24.0",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"eslint-plugin-react": "^7.4.0",
"react-hot-loader": "^3.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/standardjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
"dependencies": {
"@neutrinojs/eslint": "^7.3.2",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"eslint-config-standard": "^10.2.1",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-node": "^5.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@neutrinojs/style-loader": "^7.3.2",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-preset-env": "^1.6.0",
"deepmerge": "^1.5.2",
"deepmerge": "^2.0.0",
"fast-async": "^6.3.0",
"script-ext-html-webpack-plugin": "^1.8.5",
"webpack": "^3.6.0",
Expand Down

0 comments on commit 9f90d02

Please sign in to comment.