Use updated @yarnpkg/lockfile dependency and prepare for release.

userfrosting · Jun 19, 2018 · f497a51 · f497a51
1 parent 6da652a
commit f497a51
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 9,669 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.2.0] - 2018-06-19
+### Added
+- Merge `peerDependencies` in Yarn and NPM packages. (thanks @FabianMeul)
+
 ## [1.2.0-rc.1] - 2018-02-02
 ### Added
 - Duplicate dependency checker that uses `yarn.lock`. This is a stop-gap solution for Yarn's inability to report flat mode dependency conflicts when running in a non-interactive context.

diff --git a/node_modules_bundled/@yarnpkg/lockfile/LICENSE b/node_modules_bundled/@yarnpkg/lockfile/LICENSE
diff --git a/node_modules_bundled/@yarnpkg/lockfile/README.md b/node_modules_bundled/@yarnpkg/lockfile/README.md