Skip to content

Commit 8b204c9

Browse files
authored
Merge pull request #188 from microsoft/octogonz/rushstack-eslint
Update ESLint dependencies
2 parents 492025f + 380187c commit 8b204c9

File tree

8 files changed

+343
-316
lines changed

8 files changed

+343
-316
lines changed

api-demo/.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// This is a workaround for https://github.com/eslint/eslint/issues/3458
2-
require("@microsoft/eslint-config-scalable-ts/patch-eslint6");
2+
require("@rushstack/eslint-config/patch-eslint6");
33

44
module.exports = {
5-
extends: [ "@microsoft/eslint-config-scalable-ts" ],
5+
extends: [ "@rushstack/eslint-config" ],
66
parserOptions: { tsconfigRootDir: __dirname },
77
};

api-demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"colors": "~1.3.3"
1111
},
1212
"devDependencies": {
13-
"@microsoft/eslint-config-scalable-ts": "0.3.0",
13+
"@rushstack/eslint-config": "0.4.0",
1414
"eslint": "^6.0.0",
1515
"rimraf": "~2.6.3",
1616
"typescript": "~3.5.3"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"packageName": "@microsoft/tsdoc",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/tsdoc",
10+
"email": "4673363+octogonz@users.noreply.github.com"
11+
}

common/config/rush/yarn.lock

Lines changed: 320 additions & 304 deletions
Large diffs are not rendered by default.

playground/.eslintrc.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// This is a workaround for https://github.com/eslint/eslint/issues/3458
2-
require("@microsoft/eslint-config-scalable-ts/patch-eslint6");
2+
require("@rushstack/eslint-config/patch-eslint6");
33

44
module.exports = {
55
extends: [
6-
"@microsoft/eslint-config-scalable-ts",
7-
"@microsoft/eslint-config-scalable-ts/react"
6+
"@rushstack/eslint-config",
7+
"@rushstack/eslint-config/react"
88
],
99

1010
settings: {

playground/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
},
1212
"dependencies": {
1313
"@microsoft/tsdoc": "0.12.14",
14-
"@types/react": "16.9.2",
15-
"@types/react-dom": "16.9.0",
14+
"@types/react": "16.9.6",
15+
"@types/react-dom": "16.9.2",
1616
"promise": "~8.0.3",
1717
"monaco-editor": "~0.17.1",
1818
"tslib": "~1.10.0"
1919
},
2020
"devDependencies": {
21-
"@microsoft/eslint-config-scalable-ts": "0.3.0",
21+
"@rushstack/eslint-config": "0.4.0",
2222
"@microsoft/set-webpack-public-path-plugin": "~2.1.123",
2323
"@types/webpack-env": "~1.14.0",
2424
"clean-webpack-plugin": "~3.0.0",

tsdoc/.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// This is a workaround for https://github.com/eslint/eslint/issues/3458
2-
require("@microsoft/eslint-config-scalable-ts/patch-eslint6");
2+
require("@rushstack/eslint-config/patch-eslint6");
33

44
module.exports = {
5-
extends: [ "@microsoft/eslint-config-scalable-ts" ],
5+
extends: [ "@rushstack/eslint-config" ],
66
parserOptions: { tsconfigRootDir: __dirname },
77
};

tsdoc/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"license": "MIT",
2222
"dependencies": {},
2323
"devDependencies": {
24-
"@microsoft/eslint-config-scalable-ts": "0.3.0",
24+
"@rushstack/eslint-config": "0.4.0",
2525
"@types/jest": "24.0.16",
2626
"eslint": "^6.0.0",
2727
"jest": "~24.8.0",

0 commit comments

Comments
 (0)