From c70e9bea99f6e50b0cd9fbee4ccf4ff4fe1884e8 Mon Sep 17 00:00:00 2001 From: Paul Soporan Date: Wed, 8 Jul 2020 17:39:50 +0300 Subject: [PATCH 1/2] fix(doctor): fix resolve errors with resolvers that need fetchers --- packages/yarnpkg-doctor/sources/cli.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/yarnpkg-doctor/sources/cli.ts b/packages/yarnpkg-doctor/sources/cli.ts index 4d5128786ffb..a27cdfe63a7f 100644 --- a/packages/yarnpkg-doctor/sources/cli.ts +++ b/packages/yarnpkg-doctor/sources/cli.ts @@ -1,15 +1,15 @@ #!/usr/bin/env node -import {getPluginConfiguration} from '@yarnpkg/cli'; -import {Cache, Configuration, Project, Report, Workspace, structUtils, ProjectLookup, Manifest, Descriptor, HardDependencies, ThrowReport, StreamReport, MessageName, Ident} from '@yarnpkg/core'; -import {PortablePath, npath, ppath, xfs} from '@yarnpkg/fslib'; -import {Cli, Command} from 'clipanion'; -import globby from 'globby'; -import micromatch from 'micromatch'; -import {Module} from 'module'; -import * as ts from 'typescript'; +import {getPluginConfiguration} from '@yarnpkg/cli'; +import {Cache, Configuration, Project, Report, Workspace, structUtils, ProjectLookup, Manifest, Descriptor, HardDependencies, ThrowReport, StreamReport, MessageName, Ident, ResolveOptions, FetchOptions} from '@yarnpkg/core'; +import {PortablePath, npath, ppath, xfs} from '@yarnpkg/fslib'; +import {Cli, Command} from 'clipanion'; +import globby from 'globby'; +import micromatch from 'micromatch'; +import {Module} from 'module'; +import * as ts from 'typescript'; -import * as ast from './ast'; +import * as ast from './ast'; const BUILTINS = new Set([...Module.builtinModules || [], `pnpapi`]); @@ -242,8 +242,8 @@ async function makeResolveFn(project: Project) { const checksums = project.storedChecksums; const yarnReport = new ThrowReport(); - const fetchOptions = {project, fetcher, cache, checksums, report: yarnReport}; - const resolveOptions = {...fetchOptions, resolver}; + const fetchOptions: FetchOptions = {project, fetcher, cache, checksums, report: yarnReport, skipIntegrityCheck: true}; + const resolveOptions: ResolveOptions = {...fetchOptions, resolver, fetchOptions}; return async (descriptor: Descriptor) => { const candidates = await resolver.getCandidates(descriptor, new Map(), resolveOptions); From 20f48de0625d4d42c2eea08cacb3902f08d2ee93 Mon Sep 17 00:00:00 2001 From: Paul Soporan Date: Wed, 8 Jul 2020 17:41:53 +0300 Subject: [PATCH 2/2] chore: set versions --- .yarn/versions/021b6d44.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .yarn/versions/021b6d44.yml diff --git a/.yarn/versions/021b6d44.yml b/.yarn/versions/021b6d44.yml new file mode 100644 index 000000000000..6680e1d996b5 --- /dev/null +++ b/.yarn/versions/021b6d44.yml @@ -0,0 +1,2 @@ +releases: + "@yarnpkg/doctor": prerelease