Skip to content

Commit 756c910

Browse files
Andyandrewbranch
authored andcommitted
Merge pull request #261 from Microsoft/npm_checks
Exclude NPM checks from check-parse-results when run as part of a test/publish
1 parent 80c3378 commit 756c910

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

packages/types-publisher/src/check-parse-results.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ import { fetchJson} from "./util/io";
66
import { best, done, nAtATime } from "./util/util";
77

88
if (!module.parent) {
9-
done(main());
9+
done(main(true));
1010
}
1111

12-
export default async function main(): Promise<void> {
12+
export default async function main(includeNpmChecks: boolean): Promise<void> {
1313
const packages = await AllPackages.readTypings();
1414
const [log, logResult] = logger();
1515
check(packages, info => info.libraryName, "Library Name", log);
1616
check(packages, info => info.projectName, "Project Name", log);
17-
await nAtATime(10, packages, pkg => checkNpm(pkg, log), {
18-
name: "Checking for typed packages...",
19-
flavor: pkg => pkg.typingsPackageName
20-
});
17+
if (includeNpmChecks) {
18+
await nAtATime(10, packages, pkg => checkNpm(pkg, log), {
19+
name: "Checking for typed packages...",
20+
flavor: pkg => pkg.typingsPackageName
21+
});
22+
}
2123
await writeLog("conflicts.md", logResult());
2224
}
2325

packages/types-publisher/src/full.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default async function full(client: NpmClient, dry: boolean, timeStamp: s
2525
await clean();
2626
await getDefinitelyTyped(options);
2727
await parseDefinitions(options);
28-
await checkParseResults();
28+
await checkParseResults(/*includeNpmChecks*/ false);
2929
await calculateVersions(/*forceUpdate*/ false, options);
3030
await generatePackages(options);
3131
await createSearchIndex(/*skipDownloads*/ false, /*full*/ false);

packages/types-publisher/src/tester/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ if (!module.parent) {
1616
async function main(options: Options, nProcesses?: number): Promise<void> {
1717
await clean();
1818
await parseDefinitions(options);
19-
await checkParseResults();
19+
await checkParseResults(/*includeNpmChecks*/false);
2020
await runTests(options, nProcesses);
2121
}

0 commit comments

Comments
 (0)