Skip to content

Commit

Permalink
Merge pull request #2810 from microsoft/octogonz/upgrade-deps
Browse files Browse the repository at this point in the history
Upgrade cyclic dependencies and some other components
  • Loading branch information
octogonz authored Jul 13, 2021
2 parents 5438a92 + 275808d commit c2fa6c4
Show file tree
Hide file tree
Showing 58 changed files with 929 additions and 461 deletions.
6 changes: 3 additions & 3 deletions apps/api-extractor-model/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"typings": "dist/rollup.d.ts",
"license": "MIT",
"scripts": {
"build": "heft test --clean --pass-with-no-tests"
"build": "heft test --clean"
},
"dependencies": {
"@microsoft/tsdoc": "0.13.2",
Expand All @@ -20,8 +20,8 @@
},
"devDependencies": {
"@rushstack/eslint-config": "workspace:*",
"@rushstack/heft": "0.32.0",
"@rushstack/heft-node-rig": "1.0.31",
"@rushstack/heft": "0.34.6",
"@rushstack/heft-node-rig": "1.1.11",
"@types/heft-jest": "1.0.1",
"@types/node": "10.17.13"
}
Expand Down
3 changes: 2 additions & 1 deletion apps/api-extractor-model/src/aedoc/ReleaseTag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ export namespace ReleaseTag {
return '@beta';
case ReleaseTag.Public:
return '@public';
default:
throw new Error('Unsupported release tag');
}
throw new Error('Unsupported release tag');
}

/**
Expand Down
4 changes: 2 additions & 2 deletions apps/api-extractor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
},
"devDependencies": {
"@rushstack/eslint-config": "workspace:*",
"@rushstack/heft": "0.32.0",
"@rushstack/heft-node-rig": "1.0.31",
"@rushstack/heft": "0.34.6",
"@rushstack/heft-node-rig": "1.1.11",
"@types/heft-jest": "1.0.1",
"@types/lodash": "4.14.116",
"@types/node": "10.17.13",
Expand Down
9 changes: 0 additions & 9 deletions apps/api-extractor/src/analyzer/Span.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,7 @@ export class Span {

let previousChildSpan: Span | undefined = undefined;

const visitedChildren: Set<ts.Node> = new Set();

for (const childNode of this.node.getChildren() || []) {
// FIX ME: This is a temporary workaround for a problem introduced by TypeScript 4.3.
// https://github.com/microsoft/TypeScript/issues/44422
if (visitedChildren.has(childNode)) {
continue;
}
visitedChildren.add(childNode);

const childSpan: Span = new Span(childNode);
childSpan._parent = this;
childSpan._previousSibling = previousChildSpan;
Expand Down
4 changes: 2 additions & 2 deletions apps/api-extractor/src/generators/DtsRollupGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,8 @@ export class DtsRollupGenerator {
);
case DtsRollupKind.PublicRelease:
return releaseTag === ReleaseTag.Public || releaseTag === ReleaseTag.None;
default:
throw new Error(`${DtsRollupKind[dtsKind]} is not implemented`);
}

throw new Error(`${DtsRollupKind[dtsKind]} is not implemented`);
}
}
4 changes: 2 additions & 2 deletions apps/heft/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"devDependencies": {
"@microsoft/api-extractor": "workspace:*",
"@rushstack/eslint-config": "workspace:*",
"@rushstack/heft": "0.32.0",
"@rushstack/heft-node-rig": "1.0.31",
"@rushstack/heft": "0.34.6",
"@rushstack/heft-node-rig": "1.1.11",
"@types/argparse": "1.0.38",
"@types/eslint": "7.2.0",
"@types/glob": "7.1.1",
Expand Down
2 changes: 1 addition & 1 deletion build-tests-samples/heft-node-basic-tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@rushstack/heft-jest-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/node": "10.17.13",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"typescript": "~3.9.7"
}
}
2 changes: 1 addition & 1 deletion build-tests-samples/heft-node-jest-tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@rushstack/heft-jest-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/node": "10.17.13",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"typescript": "~3.9.7"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@types/react-dom": "16.9.8",
"@types/webpack-env": "1.13.0",
"css-loader": "~4.2.1",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"html-webpack-plugin": "~4.5.0",
"react": "~16.13.1",
"react-dom": "~16.13.1",
Expand Down
2 changes: 1 addition & 1 deletion build-tests-samples/packlets-tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@rushstack/eslint-config": "workspace:*",
"@rushstack/heft": "workspace:*",
"@types/node": "10.17.13",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"typescript": "~3.9.7"
}
}
2 changes: 1 addition & 1 deletion build-tests/heft-action-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@rushstack/eslint-config": "workspace:*",
"@rushstack/heft": "workspace:*",
"@types/node": "10.17.13",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"typescript": "~3.9.7"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-example-plugin-01/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@rushstack/heft": "workspace:*",
"@types/node": "10.17.13",
"@types/tapable": "1.0.6",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"typescript": "~3.9.7"
}
}
2 changes: 1 addition & 1 deletion build-tests/heft-example-plugin-02/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@rushstack/eslint-config": "workspace:*",
"@rushstack/heft": "workspace:*",
"@types/node": "10.17.13",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"heft-example-plugin-01": "workspace:*",
"typescript": "~3.9.7"
}
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-fastify-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@rushstack/heft": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/node": "10.17.13",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"typescript": "~3.9.7"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-jest-reporters-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@rushstack/heft": "workspace:*",
"@rushstack/heft-jest-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"typescript": "~3.9.7",
"@jest/reporters": "~25.4.0",
"@jest/types": "~25.4.0"
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-node-everything-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@rushstack/heft-jest-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/node": "10.17.13",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"heft-example-plugin-01": "workspace:*",
"heft-example-plugin-02": "workspace:*",
"tslint": "~5.20.1",
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-sass-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@types/webpack-env": "1.13.0",
"autoprefixer": "~9.8.0",
"css-loader": "~4.2.1",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"html-webpack-plugin": "~4.5.0",
"node-sass": "5.0.0",
"postcss": "7.0.32",
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-webpack4-everything-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@rushstack/heft-webpack4-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/webpack-env": "1.13.0",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"file-loader": "~6.0.0",
"tslint": "~5.20.1",
"tslint-microsoft-contrib": "~6.2.0",
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-webpack5-everything-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@rushstack/heft-webpack5-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/webpack-env": "1.13.0",
"eslint": "~7.12.1",
"eslint": "~7.30.0",
"tslint": "~5.20.1",
"tslint-microsoft-contrib": "~6.2.0",
"typescript": "~3.9.7"
Expand Down
Loading

0 comments on commit c2fa6c4

Please sign in to comment.