Skip to content

Commit c2fa6c4

Browse files
octogonzoctogonz
authored
Merge pull request microsoft#2810 from microsoft/octogonz/upgrade-deps
Upgrade cyclic dependencies and some other components
2 parents 5438a92 + 275808d commit c2fa6c4

File tree

58 files changed

+929
-461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+929
-461
lines changed

‎apps/api-extractor-model/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"typings": "dist/rollup.d.ts",
1212
"license": "MIT",
1313
"scripts": {
14-
"build": "heft test --clean --pass-with-no-tests"
14+
"build": "heft test --clean"
1515
},
1616
"dependencies": {
1717
"@microsoft/tsdoc": "0.13.2",
@@ -20,8 +20,8 @@
2020
},
2121
"devDependencies": {
2222
"@rushstack/eslint-config": "workspace:*",
23-
"@rushstack/heft": "0.32.0",
24-
"@rushstack/heft-node-rig": "1.0.31",
23+
"@rushstack/heft": "0.34.6",
24+
"@rushstack/heft-node-rig": "1.1.11",
2525
"@types/heft-jest": "1.0.1",
2626
"@types/node": "10.17.13"
2727
}

‎apps/api-extractor-model/src/aedoc/ReleaseTag.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ export namespace ReleaseTag {
6767
return '@beta';
6868
case ReleaseTag.Public:
6969
return '@public';
70+
default:
71+
throw new Error('Unsupported release tag');
7072
}
71-
throw new Error('Unsupported release tag');
7273
}
7374

7475
/**

‎apps/api-extractor/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
},
5050
"devDependencies": {
5151
"@rushstack/eslint-config": "workspace:*",
52-
"@rushstack/heft": "0.32.0",
53-
"@rushstack/heft-node-rig": "1.0.31",
52+
"@rushstack/heft": "0.34.6",
53+
"@rushstack/heft-node-rig": "1.1.11",
5454
"@types/heft-jest": "1.0.1",
5555
"@types/lodash": "4.14.116",
5656
"@types/node": "10.17.13",

‎apps/api-extractor/src/analyzer/Span.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,16 +206,7 @@ export class Span {
206206

207207
let previousChildSpan: Span | undefined = undefined;
208208

209-
const visitedChildren: Set<ts.Node> = new Set();
210-
211209
for (const childNode of this.node.getChildren() || []) {
212-
// FIX ME: This is a temporary workaround for a problem introduced by TypeScript 4.3.
213-
// https://github.com/microsoft/TypeScript/issues/44422
214-
if (visitedChildren.has(childNode)) {
215-
continue;
216-
}
217-
visitedChildren.add(childNode);
218-
219210
const childSpan: Span = new Span(childNode);
220211
childSpan._parent = this;
221212
childSpan._previousSibling = previousChildSpan;

‎apps/api-extractor/src/generators/DtsRollupGenerator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,8 @@ export class DtsRollupGenerator {
452452
);
453453
case DtsRollupKind.PublicRelease:
454454
return releaseTag === ReleaseTag.Public || releaseTag === ReleaseTag.None;
455+
default:
456+
throw new Error(`${DtsRollupKind[dtsKind]} is not implemented`);
455457
}
456-
457-
throw new Error(`${DtsRollupKind[dtsKind]} is not implemented`);
458458
}
459459
}

‎apps/heft/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
"devDependencies": {
5454
"@microsoft/api-extractor": "workspace:*",
5555
"@rushstack/eslint-config": "workspace:*",
56-
"@rushstack/heft": "0.32.0",
57-
"@rushstack/heft-node-rig": "1.0.31",
56+
"@rushstack/heft": "0.34.6",
57+
"@rushstack/heft-node-rig": "1.1.11",
5858
"@types/argparse": "1.0.38",
5959
"@types/eslint": "7.2.0",
6060
"@types/glob": "7.1.1",

‎build-tests-samples/heft-node-basic-tutorial/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@rushstack/heft-jest-plugin": "workspace:*",
1515
"@types/heft-jest": "1.0.1",
1616
"@types/node": "10.17.13",
17-
"eslint": "~7.12.1",
17+
"eslint": "~7.30.0",
1818
"typescript": "~3.9.7"
1919
}
2020
}

‎build-tests-samples/heft-node-jest-tutorial/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@rushstack/heft-jest-plugin": "workspace:*",
1414
"@types/heft-jest": "1.0.1",
1515
"@types/node": "10.17.13",
16-
"eslint": "~7.12.1",
16+
"eslint": "~7.30.0",
1717
"typescript": "~3.9.7"
1818
}
1919
}

‎build-tests-samples/heft-webpack-basic-tutorial/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@types/react-dom": "16.9.8",
1818
"@types/webpack-env": "1.13.0",
1919
"css-loader": "~4.2.1",
20-
"eslint": "~7.12.1",
20+
"eslint": "~7.30.0",
2121
"html-webpack-plugin": "~4.5.0",
2222
"react": "~16.13.1",
2323
"react-dom": "~16.13.1",

‎build-tests-samples/packlets-tutorial/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@rushstack/eslint-config": "workspace:*",
1313
"@rushstack/heft": "workspace:*",
1414
"@types/node": "10.17.13",
15-
"eslint": "~7.12.1",
15+
"eslint": "~7.30.0",
1616
"typescript": "~3.9.7"
1717
}
1818
}

‎build-tests/heft-action-plugin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@rushstack/eslint-config": "workspace:*",
1313
"@rushstack/heft": "workspace:*",
1414
"@types/node": "10.17.13",
15-
"eslint": "~7.12.1",
15+
"eslint": "~7.30.0",
1616
"typescript": "~3.9.7"
1717
},
1818
"dependencies": {

‎build-tests/heft-example-plugin-01/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@rushstack/heft": "workspace:*",
1818
"@types/node": "10.17.13",
1919
"@types/tapable": "1.0.6",
20-
"eslint": "~7.12.1",
20+
"eslint": "~7.30.0",
2121
"typescript": "~3.9.7"
2222
}
2323
}

‎build-tests/heft-example-plugin-02/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@rushstack/eslint-config": "workspace:*",
2222
"@rushstack/heft": "workspace:*",
2323
"@types/node": "10.17.13",
24-
"eslint": "~7.12.1",
24+
"eslint": "~7.30.0",
2525
"heft-example-plugin-01": "workspace:*",
2626
"typescript": "~3.9.7"
2727
}

‎build-tests/heft-fastify-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@rushstack/heft": "workspace:*",
1616
"@types/heft-jest": "1.0.1",
1717
"@types/node": "10.17.13",
18-
"eslint": "~7.12.1",
18+
"eslint": "~7.30.0",
1919
"typescript": "~3.9.7"
2020
},
2121
"dependencies": {

‎build-tests/heft-jest-reporters-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@rushstack/heft": "workspace:*",
1313
"@rushstack/heft-jest-plugin": "workspace:*",
1414
"@types/heft-jest": "1.0.1",
15-
"eslint": "~7.12.1",
15+
"eslint": "~7.30.0",
1616
"typescript": "~3.9.7",
1717
"@jest/reporters": "~25.4.0",
1818
"@jest/types": "~25.4.0"

‎build-tests/heft-node-everything-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@rushstack/heft-jest-plugin": "workspace:*",
1616
"@types/heft-jest": "1.0.1",
1717
"@types/node": "10.17.13",
18-
"eslint": "~7.12.1",
18+
"eslint": "~7.30.0",
1919
"heft-example-plugin-01": "workspace:*",
2020
"heft-example-plugin-02": "workspace:*",
2121
"tslint": "~5.20.1",

‎build-tests/heft-sass-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@types/webpack-env": "1.13.0",
1919
"autoprefixer": "~9.8.0",
2020
"css-loader": "~4.2.1",
21-
"eslint": "~7.12.1",
21+
"eslint": "~7.30.0",
2222
"html-webpack-plugin": "~4.5.0",
2323
"node-sass": "5.0.0",
2424
"postcss": "7.0.32",

‎build-tests/heft-webpack4-everything-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@rushstack/heft-webpack4-plugin": "workspace:*",
1515
"@types/heft-jest": "1.0.1",
1616
"@types/webpack-env": "1.13.0",
17-
"eslint": "~7.12.1",
17+
"eslint": "~7.30.0",
1818
"file-loader": "~6.0.0",
1919
"tslint": "~5.20.1",
2020
"tslint-microsoft-contrib": "~6.2.0",

‎build-tests/heft-webpack5-everything-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@rushstack/heft-webpack5-plugin": "workspace:*",
1515
"@types/heft-jest": "1.0.1",
1616
"@types/webpack-env": "1.13.0",
17-
"eslint": "~7.12.1",
17+
"eslint": "~7.30.0",
1818
"tslint": "~5.20.1",
1919
"tslint-microsoft-contrib": "~6.2.0",
2020
"typescript": "~3.9.7"

0 commit comments

Comments
 (0)