Skip to content

feat(cli): include notice with license when generating disclaimer (#5072)#5111

Merged
arcanis merged 1 commit intoyarnpkg:masterfrom
iansu:fix-5072
Jan 15, 2018
Merged

feat(cli): include notice with license when generating disclaimer (#5072)#5111
arcanis merged 1 commit intoyarnpkg:masterfrom
iansu:fix-5072

Conversation

@iansu
Copy link
Copy Markdown
Contributor

@iansu iansu commented Dec 19, 2017

Summary

Include NOTICE file (if present) along with LICENSE when running yarn licenses generate-disclaimer.

Fixes #5072

Test plan

  • Create a package and add json2array (or any package with a NOTICE file) as a dependency
  • Run yarn licenses generate-disclaimer and observe that the NOTICE text is included after the LICENSE text

@buildsize
Copy link
Copy Markdown

buildsize Bot commented Dec 19, 2017

This change will increase the build size from 10.39 MB to 10.4 MB, an increase of 1.53 KB (0%)

File name Previous Size New Size Change
yarn-[version].noarch.rpm 900.2 KB 900.25 KB 60 bytes (0%)
yarn-[version].js 3.91 MB 3.92 MB 700 bytes (0%)
yarn-legacy-[version].js 4.06 MB 4.06 MB 700 bytes (0%)
yarn-v[version].tar.gz 905.32 KB 905.4 KB 83 bytes (0%)
yarn_[version]all.deb 669.15 KB 669.18 KB 28 bytes (0%)

Copy link
Copy Markdown
Member

@arcanis arcanis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@arcanis arcanis merged commit 05b4e01 into yarnpkg:master Jan 15, 2018
agoldis added a commit to agoldis/yarn that referenced this pull request Feb 2, 2018
…readdir_files

* upstream/master: (34 commits)
  feat(upgrade, add): Separately log added/upgraded dependencies (yarnpkg#5227)
  feat(publish): Publish command uses publishConfig.access in package.json (yarnpkg#5290)
  fix(CLI): Use process exit instead of exitCode for node < 4 (yarnpkg#5291)
  feat(cli): error on missing workspace directory (yarnpkg#5206) (yarnpkg#5222)
  feat: better error when package is not found (yarnpkg#5213)
  Allow scoped package as alias source (yarnpkg#5229)
  fix(cli): Use correct directory for upgrade-interactive (yarnpkg#5272)
  nohoist baseline implementation (yarnpkg#4979)
  1.4.1
  1.4.0
  Show current version, when new version is not supplied on "yarn publish" (yarnpkg#4947)
  fix(install): use node-gyp from homebrew npm (yarnpkg#4994)
  Fix transient symlinks overriding direct ones v2 (yarnpkg#5016)
  fix(auth): Fixes authentication conditions and logic with registries (yarnpkg#5216)
  chore(package): move devDeps to appropriate place (yarnpkg#5166)
  fix(resolution) Eliminate "missing peerDep" warning when dep exists at root level. (yarnpkg#5088)
  fix(cli): improve guessing of package names that contain a dot (yarnpkg#5102) (yarnpkg#5135)
  feat(cli): include notice with license when generating disclaimer (yarnpkg#5072) (yarnpkg#5111)
  feat(cli): group by license in licenses list (yarnpkg#5074) (yarnpkg#5110)
  feat(cli): improve error message when file resolver can't find file (yarnpkg#5134) (yarnpkg#5145)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants