fix(install): Inherit optional property for resolutions (#7273)

6040

__tests__/commands/install/resolutions.js

@@ -46,6 +46,12 @@ test.concurrent('install with --frozen-lockfile with resolutions', async (): Pro
   }
 });
 
+test.concurrent('install with resolutions on optional dependencies should not resolve', (): Promise<void> => {
+  return runInstall({ignoreOptional: true}, {source: 'resolutions', cwd: 'optional-deps'}, async config => {
+    expect(await isPackagePresent(config, 'left-pad')).toEqual(false);
+  });
+});
+
 test.concurrent('install with exotic resolutions should override versions', (): Promise<void> => {
   return runInstall({}, {source: 'resolutions', cwd: 'exotic-version'}, async config => {
     expect(await getPackageVersion(config, 'left-pad')).toEqual('1.1.1');

__tests__/fixtures/install/resolutions/optional-deps/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "project",
+  "version": "1.0.0",
+  "optionalDependencies": {
+    "left-pad": "^1.0.0"
+  },
+  "resolutions": {
+    "left-pad": "^1.1.1"
+  }
+}

src/cli/commands/check.js

@@ -275,7 +275,8 @@ export async function run(config: Config, reporter: Reporter, flags: Object, arg
     const remoteType = pkg._reference.remote.type;
     const isLinkedDependency =
       remoteType === 'link' || remoteType === 'workspace' || (remoteType === 'file' && config.linkFileDependencies);
-    if (isLinkedDependency) {
+    const isResolution = pkg._reference.hint === 'resolution';
+    if (isLinkedDependency || isResolution) {
       continue;
     }
 

src/cli/commands/install.js

@@ -1,5 +1,6 @@
 /* @flow */
 
+import objectPath from 'object-path';
 import type {InstallationMethod} from '../../util/yarn-version.js';
 import type {Reporter} from '../../reporters/index.js';
 import type {ReporterSelectOption} from '../../reporters/types.js';
@@ -285,8 +286,9 @@ export class Install {
 
       this.resolutionMap.init(this.resolutions);
       for (const packageName of Object.keys(this.resolutionMap.resolutionsByPackage)) {
+        const optional = objectPath.has(manifest.optionalDependencies, packageName) && this.flags.ignoreOptional;
         for (const {pattern} of this.resolutionMap.resolutionsByPackage[packageName]) {
-          resolutionDeps = [...resolutionDeps, {registry, pattern, optional: false, hint: 'resolution'}];
+          resolutionDeps = [...resolutionDeps, {registry, pattern, optional, hint: 'resolution'}];
         }
       }