Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dependencies for @typescript-eslint/eslint-plugin #4327

Merged
merged 2 commits into from Jul 16, 2019
Merged

Fix dependencies for @typescript-eslint/eslint-plugin #4327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee40797
Fix dependencies for @typescript-eslint/eslint-plugin
mikeharder Jul 16, 2019
a4038aa
Update pnpm-lock.yaml
mikeharder Jul 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 27 additions & 27 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions common/config/rush/pnpmfile.js
View file
Open in desktop
@@ -1,4 +1,4 @@
"use strict";
'use strict';

/**
* When using the PNPM package manager, you can use pnpmfile.js to workaround
Expand Down Expand Up @@ -28,12 +28,20 @@ module.exports = {
* The return value is the updated object.
*/
function readPackage(packageJson, context) {

// // The karma types have a missing dependency on typings from the log4js package.
// if (packageJson.name === '@types/karma') {
// context.log('Fixed up dependencies for @types/karma');
// packageJson.dependencies['log4js'] = '0.6.38';
// }

// @typescript-eslint/eslint-plugin@1.12.0 introduced an implicit dependency on @typescript-eslint/typescript-estree.
// This should be fixed in a future release of @typescript-eslint/eslint-plugin.
// https://github.com/typescript-eslint/typescript-eslint/issues/705
if (packageJson.name === '@typescript-eslint/eslint-plugin') {
context.log('Fixed up dependencies for @typescript-eslint/eslint-plugin');
packageJson.dependencies['@typescript-eslint/typescript-estree'] =
'^1.11.0';
}

return packageJson;
}