refactor!: remove FetchOptions.skipIntegrityCheck

CHANGELOG.md

@@ -38,6 +38,8 @@ The following changes only affect people writing Yarn plugins:
 
 - `renderForm`'s `options` argument is now required to enforce that custom streams are always specified.
 
+- The `FetchOptions.skipIntegrityCheck` option has been removed. Use `FetchOptions.cacheOptions.skipIntegrityCheck` instead.
+
 ### Installs
 
 - The `pnpm` linker avoids creating symlinks that lead to loops on the file system, by moving them higher up in the directory structure.

packages/plugin-essentials/sources/commands/info.ts

@@ -227,7 +227,7 @@ export default class InfoCommand extends BaseCommand {
     const infoTree: treeUtils.TreeNode = {children: infoTreeChildren};
 
     const fetcher = configuration.makeFetcher();
-    const fetcherOptions: FetchOptions = {project, fetcher, cache, checksums: project.storedChecksums, report: new ThrowReport(), cacheOptions: {skipIntegrityCheck: true}, skipIntegrityCheck: true};
+    const fetcherOptions: FetchOptions = {project, fetcher, cache, checksums: project.storedChecksums, report: new ThrowReport(), cacheOptions: {skipIntegrityCheck: true}};
 
     const builtinInfoBuilders: Array<Exclude<Hooks['fetchPackageInfo'], undefined>> = [
       // Manifest fields

packages/plugin-essentials/sources/dedupeUtils.ts

@@ -158,7 +158,6 @@ export async function dedupe(project: Project, {strategy, patterns, cache, repor
     fetcher,
     project,
     report: throwReport,
-    skipIntegrityCheck: true,
     cacheOptions: {
       skipIntegrityCheck: true,
     },

packages/plugin-essentials/sources/suggestUtils.ts

@@ -369,7 +369,7 @@ export async function fetchDescriptorFrom(ident: Ident, range: string, {project,
   const fetcher = project.configuration.makeFetcher();
   const resolver = project.configuration.makeResolver();
 
-  const fetchOptions: FetchOptions = {project, fetcher, cache, checksums: project.storedChecksums, report, cacheOptions: {skipIntegrityCheck: true}, skipIntegrityCheck: true};
+  const fetchOptions: FetchOptions = {project, fetcher, cache, checksums: project.storedChecksums, report, cacheOptions: {skipIntegrityCheck: true}};
   const resolveOptions: ResolveOptions = {...fetchOptions, resolver, fetchOptions};
 
   // The descriptor has to be bound for the resolvers that need a parent locator. (e.g. FileResolver)

packages/plugin-exec/sources/ExecFetcher.ts

@@ -51,7 +51,6 @@ export class ExecFetcher implements Fetcher {
       onHit: () => opts.report.reportCacheHit(locator),
       onMiss: () => opts.report.reportCacheMiss(locator),
       loader: () => this.fetchFromDisk(locator, opts),
-      skipIntegrityCheck: opts.skipIntegrityCheck,
       ...opts.cacheOptions,
     });
 

packages/plugin-file/sources/FileFetcher.ts

@@ -33,7 +33,6 @@ export class FileFetcher implements Fetcher {
       onHit: () => opts.report.reportCacheHit(locator),
       onMiss: () => opts.report.reportCacheMiss(locator, `${structUtils.prettyLocator(opts.project.configuration, locator)} can't be found in the cache and will be fetched from the disk`),
       loader: () => this.fetchFromDisk(locator, opts),
-      skipIntegrityCheck: opts.skipIntegrityCheck,
       ...opts.cacheOptions,
     });
 

packages/plugin-file/sources/TarballFileFetcher.ts

@@ -27,7 +27,6 @@ export class TarballFileFetcher implements Fetcher {
       onHit: () => opts.report.reportCacheHit(locator),
       onMiss: () => opts.report.reportCacheMiss(locator, `${structUtils.prettyLocator(opts.project.configuration, locator)} can't be found in the cache and will be fetched from the disk`),
       loader: () => this.fetchFromDisk(locator, opts),
-      skipIntegrityCheck: opts.skipIntegrityCheck,
       ...opts.cacheOptions,
     });
 

packages/plugin-git/sources/GitFetcher.ts

@@ -31,7 +31,6 @@ export class GitFetcher implements Fetcher {
       onHit: () => opts.report.reportCacheHit(locator),
       onMiss: () => opts.report.reportCacheMiss(locator, `${structUtils.prettyLocator(opts.project.configuration, locator)} can't be found in the cache and will be fetched from the remote repository`),
       loader: () => this.cloneFromRemote(normalizedLocator, nextOpts),
-      skipIntegrityCheck: opts.skipIntegrityCheck,
       ...opts.cacheOptions,
     });
 

packages/plugin-github/sources/GithubFetcher.ts

@@ -25,7 +25,6 @@ export class GithubFetcher implements Fetcher {
       onHit: () => opts.report.reportCacheHit(locator),
       onMiss: () => opts.report.reportCacheMiss(locator, `${structUtils.prettyLocator(opts.project.configuration, locator)} can't be found in the cache and will be fetched from GitHub`),
       loader: () => this.fetchFromNetwork(locator, opts),
-      skipIntegrityCheck: opts.skipIntegrityCheck,
       ...opts.cacheOptions,
     });
 

packages/plugin-http/sources/TarballHttpFetcher.ts

@@ -26,7 +26,6 @@ export class TarballHttpFetcher implements Fetcher {
       onHit: () => opts.report.reportCacheHit(locator),
       onMiss: () => opts.report.reportCacheMiss(locator, `${structUtils.prettyLocator(opts.project.configuration, locator)} can't be found in the cache and will be fetched from the remote server`),
       loader: () => this.fetchFromNetwork(locator, opts),
-      skipIntegrityCheck: opts.skipIntegrityCheck,
       ...opts.cacheOptions,
     });
 

packages/plugin-npm/sources/NpmHttpFetcher.ts

@@ -32,7 +32,6 @@ export class NpmHttpFetcher implements Fetcher {
       onHit: () => opts.report.reportCacheHit(locator),
       onMiss: () => opts.report.reportCacheMiss(locator, `${structUtils.prettyLocator(opts.project.configuration, locator)} can't be found in the cache and will be fetched from the remote server`),
       loader: () => this.fetchFromNetwork(locator, opts),
-      skipIntegrityCheck: opts.skipIntegrityCheck,
       ...opts.cacheOptions,
     });
 

packages/plugin-npm/sources/NpmSemverFetcher.ts

@@ -34,7 +34,6 @@ export class NpmSemverFetcher implements Fetcher {
       onHit: () => opts.report.reportCacheHit(locator),
       onMiss: () => opts.report.reportCacheMiss(locator, `${structUtils.prettyLocator(opts.project.configuration, locator)} can't be found in the cache and will be fetched from the remote registry`),
       loader: () => this.fetchFromNetwork(locator, opts),
-      skipIntegrityCheck: opts.skipIntegrityCheck,
       ...opts.cacheOptions,
     });
 

packages/plugin-patch/sources/PatchFetcher.ts

@@ -27,7 +27,6 @@ export class PatchFetcher implements Fetcher {
       onHit: () => opts.report.reportCacheHit(locator),
       onMiss: () => opts.report.reportCacheMiss(locator, `${structUtils.prettyLocator(opts.project.configuration, locator)} can't be found in the cache and will be fetched from the disk`),
       loader: () => this.patchPackage(locator, opts),
-      skipIntegrityCheck: opts.skipIntegrityCheck,
       ...opts.cacheOptions,
     });
 

packages/yarnpkg-core/sources/Fetcher.ts

@@ -15,10 +15,6 @@ export type FetchOptions = MinimalFetchOptions & {
   cacheOptions?: CacheOptions;
   checksums: Map<LocatorHash, string | null>;
   report: Report;
-  /**
-   * @deprecated Use cacheOptions.skipIntegrityCheck instead
-   */
-  skipIntegrityCheck?: boolean;
 };
 
 export type FetchResult = {

packages/yarnpkg-core/sources/Project.ts

@@ -1040,7 +1040,7 @@ export class Project {
     };
 
     const fetcher = optFetcher || this.configuration.makeFetcher();
-    const fetcherOptions: FetchOptions = {checksums: this.storedChecksums, project: this, cache, fetcher, report, skipIntegrityCheck: true, cacheOptions};
+    const fetcherOptions: FetchOptions = {checksums: this.storedChecksums, project: this, cache, fetcher, report, cacheOptions};
 
     const linkers = this.configuration.getLinkers();
     const linkerOptions: LinkOptions = {project: this, report};

packages/yarnpkg-doctor/sources/cli.ts

@@ -249,7 +249,7 @@ async function makeResolveFn(project: Project) {
   const checksums = project.storedChecksums;
   const yarnReport = new ThrowReport();
 
-  const fetchOptions: FetchOptions = {project, fetcher, cache, checksums, report: yarnReport, cacheOptions: {skipIntegrityCheck: true}, skipIntegrityCheck: true};
+  const fetchOptions: FetchOptions = {project, fetcher, cache, checksums, report: yarnReport, cacheOptions: {skipIntegrityCheck: true}};
   const resolveOptions: ResolveOptions = {...fetchOptions, resolver, fetchOptions};
 
   return async (descriptor: Descriptor) => {