From b4ecac36c3196b7e3543989f75c52e8bd0b50c53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 02:47:16 +0000 Subject: [PATCH] Bump merge from 1.2.0 to 1.2.1 in /7-props/starter Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/yeikos/js.merge/releases) - [Commits](https://github.com/yeikos/js.merge/compare/v1.2.0...v1.2.1) Signed-off-by: dependabot[bot] --- 7-props/starter/yarn.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) mode change 100755 => 100644 7-props/starter/yarn.lock diff --git a/7-props/starter/yarn.lock b/7-props/starter/yarn.lock old mode 100755 new mode 100644 index 4a7ea65..c034eb0 --- a/7-props/starter/yarn.lock +++ b/7-props/starter/yarn.lock @@ -5098,8 +5098,8 @@ merge-stream@^1.0.1: readable-stream "^2.0.1" merge@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" + version "1.2.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" methods@~1.1.2: version "1.1.2" @@ -6688,14 +6688,14 @@ react-dev-utils@^6.0.4: strip-ansi "4.0.0" text-table "0.2.0" -react-dom@16.5.2: - version "16.5.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7" +react-dom@^16.5.2: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - schedule "^0.5.0" + scheduler "^0.19.1" react-error-overlay@^5.0.4: version "5.0.4" @@ -6754,14 +6754,13 @@ react-scripts@2.0.4: optionalDependencies: fsevents "1.2.4" -react@16.5.2: - version "16.5.2" - resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42" +react@^16.5.2: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - schedule "^0.5.0" read-pkg-up@^1.0.1: version "1.0.1" @@ -7158,10 +7157,11 @@ saxes@^3.1.2: dependencies: xmlchars "^1.3.1" -schedule@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.5.0.tgz#c128fffa0b402488b08b55ae74bb9df55cc29cc8" +scheduler@^0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" dependencies: + loose-envify "^1.1.0" object-assign "^4.1.1" schema-utils@^0.4.4, schema-utils@^0.4.5: