yarn.lock: Share duplicate packages with yarn-deduplicate.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2019-08-30 18:16:37 -07:00 committed by Tim Abbott
parent e5ab9834c5
commit e57ede9421
5 changed files with 110 additions and 739 deletions

View File

@ -83,7 +83,8 @@
"svgo": "1.2.2", "svgo": "1.2.2",
"swagger-parser": "6.0.5", "swagger-parser": "6.0.5",
"vnu-jar": "^19.6.7", "vnu-jar": "^19.6.7",
"webpack-dev-server": "3.5.1" "webpack-dev-server": "3.5.1",
"yarn-deduplicate": "^1.1.1"
}, },
"scripts": { "scripts": {
"postinstall": "rm -rf ./var/webpack-cache", "postinstall": "rm -rf ./var/webpack-cache",

View File

@ -48,7 +48,7 @@ def run():
by_lang = linter_config.list_files(groups={ by_lang = linter_config.list_files(groups={
'backend': ['py', 'sh', 'pp', 'json', 'md', 'txt', 'text', 'yaml', 'rst'], 'backend': ['py', 'sh', 'pp', 'json', 'md', 'txt', 'text', 'yaml', 'rst'],
'frontend': ['js', 'ts', 'css', 'scss', 'hbs', 'html'], 'frontend': ['js', 'ts', 'css', 'scss', 'hbs', 'html', 'lock'],
}, exclude=EXCLUDED_FILES) }, exclude=EXCLUDED_FILES)
linter_config.external_linter('add_class', ['tools/find-add-class'], ['js'], linter_config.external_linter('add_class', ['tools/find-add-class'], ['js'],
@ -86,6 +86,9 @@ def run():
description="Static type checker for Python (config: mypy.ini)") description="Static type checker for Python (config: mypy.ini)")
linter_config.external_linter('tsc', ['tools/run-tsc'], ['ts'], pass_targets=False, linter_config.external_linter('tsc', ['tools/run-tsc'], ['ts'], pass_targets=False,
description="TypeScript compiler (config: static/js/tsconfig.json)") description="TypeScript compiler (config: static/js/tsconfig.json)")
linter_config.external_linter('yarn-deduplicate', ['tools/run-yarn-deduplicate'], ['lock'],
pass_targets=False,
description="Shares duplicate packages in yarn.lock")
linter_config.external_linter('gitlint', ['tools/commit-message-lint'], linter_config.external_linter('gitlint', ['tools/commit-message-lint'],
description="Checks commit messages for common formatting errors." description="Checks commit messages for common formatting errors."
"(config: .gitlint)") "(config: .gitlint)")

8
tools/run-yarn-deduplicate Executable file
View File

@ -0,0 +1,8 @@
#!/usr/bin/env bash
set -eu
if ! "$(dirname "$0")/../node_modules/.bin/yarn-deduplicate" --fail --list; then
echo
echo "Duplicates could be shared in yarn.lock. Run:"
echo "node_modules/.bin/yarn-deduplicate; yarn"
false
fi

View File

@ -26,4 +26,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea
# historical commits sharing the same major version, in which case a # historical commits sharing the same major version, in which case a
# minor version bump suffices. # minor version bump suffices.
PROVISION_VERSION = '54.0' PROVISION_VERSION = '54.1'

831
yarn.lock

File diff suppressed because it is too large Load Diff