diff --git a/packages/airbnb-base/package.json b/packages/airbnb-base/package.json index ff1b3a231..c4d9e7198 100644 --- a/packages/airbnb-base/package.json +++ b/packages/airbnb-base/package.json @@ -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" }, diff --git a/packages/airbnb/package.json b/packages/airbnb/package.json index cc0863531..f634e9c39 100644 --- a/packages/airbnb/package.json +++ b/packages/airbnb/package.json @@ -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" diff --git a/packages/banner/package.json b/packages/banner/package.json index 7fb082b11..80a23e203 100644 --- a/packages/banner/package.json +++ b/packages/banner/package.json @@ -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": { diff --git a/packages/clean/package.json b/packages/clean/package.json index 4248ef312..a6aae7b8b 100644 --- a/packages/clean/package.json +++ b/packages/clean/package.json @@ -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" diff --git a/packages/compile-loader/package.json b/packages/compile-loader/package.json index d0d0d32ed..d8104abc6 100644 --- a/packages/compile-loader/package.json +++ b/packages/compile-loader/package.json @@ -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" diff --git a/packages/copy/package.json b/packages/copy/package.json index b9b1fe7b5..93e6af02c 100644 --- a/packages/copy/package.json +++ b/packages/copy/package.json @@ -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" diff --git a/packages/dev-server/package.json b/packages/dev-server/package.json index ce9f7fd4c..9801f3698 100644 --- a/packages/dev-server/package.json +++ b/packages/dev-server/package.json @@ -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" diff --git a/packages/eslint/package.json b/packages/eslint/package.json index cee1bbbb4..b5c7a660b 100644 --- a/packages/eslint/package.json +++ b/packages/eslint/package.json @@ -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", diff --git a/packages/font-loader/package.json b/packages/font-loader/package.json index 0ad515f5d..20919dc32 100644 --- a/packages/font-loader/package.json +++ b/packages/font-loader/package.json @@ -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" }, diff --git a/packages/html-loader/package.json b/packages/html-loader/package.json index b19020e0a..30e7bf631 100644 --- a/packages/html-loader/package.json +++ b/packages/html-loader/package.json @@ -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": { diff --git a/packages/html-template/package.json b/packages/html-template/package.json index 7c2ac6baf..6579fe33e 100644 --- a/packages/html-template/package.json +++ b/packages/html-template/package.json @@ -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" }, diff --git a/packages/image-loader/package.json b/packages/image-loader/package.json index ad704c25c..11cf021d4 100644 --- a/packages/image-loader/package.json +++ b/packages/image-loader/package.json @@ -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" }, diff --git a/packages/jest/package.json b/packages/jest/package.json index cb550fc5c..b7be5dd60 100644 --- a/packages/jest/package.json +++ b/packages/jest/package.json @@ -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", diff --git a/packages/karma/package.json b/packages/karma/package.json index ba240f85f..453bb840b 100644 --- a/packages/karma/package.json +++ b/packages/karma/package.json @@ -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", diff --git a/packages/library/library/package.json b/packages/library/library/package.json index 249b69ae2..8b2ae50e7 100644 --- a/packages/library/library/package.json +++ b/packages/library/library/package.json @@ -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", diff --git a/packages/loader-merge/package.json b/packages/loader-merge/package.json index 17eefe59e..62eaeeef4 100644 --- a/packages/loader-merge/package.json +++ b/packages/loader-merge/package.json @@ -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" diff --git a/packages/mocha/package.json b/packages/mocha/package.json index 23862332f..dfd55c2f6 100644 --- a/packages/mocha/package.json +++ b/packages/mocha/package.json @@ -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" }, diff --git a/packages/neutrino/package.json b/packages/neutrino/package.json index 89857aa55..86e3ab526 100644 --- a/packages/neutrino/package.json +++ b/packages/neutrino/package.json @@ -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", diff --git a/packages/node/package.json b/packages/node/package.json index 661699103..3767aa628 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -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", diff --git a/packages/pwa/package.json b/packages/pwa/package.json index e740d9fbe..f6003a949 100644 --- a/packages/pwa/package.json +++ b/packages/pwa/package.json @@ -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": { diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 779cae938..0b7fd3e86 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -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" diff --git a/packages/react/package.json b/packages/react/package.json index 33a2302ef..1a50ef5da 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -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" }, diff --git a/packages/standardjs/package.json b/packages/standardjs/package.json index cfc7fe765..b23027574 100644 --- a/packages/standardjs/package.json +++ b/packages/standardjs/package.json @@ -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", diff --git a/packages/web/package.json b/packages/web/package.json index f905c8eac..9274e2e8e 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -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",