Use stable id for package requests

This allows the previous dev dependencies to be loaded from the graph
correctly.

Author: devongovett

packages/core/core/src/BundleGraph.js

@@ -1932,9 +1932,13 @@ export default class BundleGraph {
     addReferencedBundles(bundle);
 
     this.traverseBundles((childBundle, _, traversal) => {
+      if (childBundle.id === bundle.id) {
+        return;
+      }
+
       if (childBundle.bundleBehavior === BundleBehavior.inline) {
         bundles.push(childBundle);
-      } else if (childBundle.id !== bundle.id) {
+      } else {
         traversal.skipChildren();
       }
     }, bundle);

packages/core/core/src/requests/PackageRequest.js

@@ -5,7 +5,7 @@ import type {Async} from '@parcel/types';
 import type {SharedReference} from '@parcel/workers';
 
 import type {StaticRunOpts} from '../RequestTracker';
-import {requestTypes} from '../RequestTracker';
+import {requestTypes, type RunAPI} from '../RequestTracker';
 import type {Bundle} from '../types';
 import type BundleGraph from '../BundleGraph';
 import type {BundleInfo, RunPackagerRunnerResult} from '../PackagerRunner';
@@ -15,6 +15,7 @@ import nullthrows from 'nullthrows';
 import {runConfigRequest} from './ConfigRequest';
 import {getDevDepRequests, runDevDepRequest} from './DevDepRequest';
 import createParcelConfigRequest from './ParcelConfigRequest';
+import type {WriteBundlesRequestResult} from './WriteBundlesRequest';
 
 type PackageRequestInput = {|
   bundleGraph: BundleGraph,
@@ -24,7 +25,10 @@ type PackageRequestInput = {|
   useMainThread?: boolean,
 |};
 
-export type PackageRequestResult = BundleInfo[];
+export type PackageRequestResult = {|
+  hash: string,
+  info: BundleInfo[],
+|};
 
 type RunInput<TResult> = {|
   input: PackageRequestInput,
@@ -34,7 +38,7 @@ type RunInput<TResult> = {|
 export type PackageRequest = {|
   id: ContentKey,
   +type: typeof requestTypes.package_request,
-  run: (RunInput<BundleInfo[]>) => Async<BundleInfo[]>,
+  run: (RunInput<PackageRequestResult>) => Async<PackageRequestResult>,
   input: PackageRequestInput,
 |};
 
@@ -43,12 +47,27 @@ export function createPackageRequest(
 ): PackageRequest {
   return {
     type: requestTypes.package_request,
-    id: input.bundleGraph.getHash(input.bundle),
+    id: getPackageRequestId(input.bundle),
     run,
     input,
   };
 }
 
+export function getPackageRequestId(bundle: Bundle): string {
+  return 'package:' + bundle.id;
+}
+
+export async function canSkipPackageRequest(
+  api: RunAPI<WriteBundlesRequestResult>,
+  request: PackageRequest,
+): Promise<boolean> {
+  return (
+    api.canSkipSubrequest(request.id) &&
+    (await api.getRequestResult<PackageRequestResult>(request.id))?.hash ===
+      request.input.bundleGraph.getHash(request.input.bundle)
+  );
+}
+
 async function run({input, api, farm}) {
   let {bundleGraphReference, optionsRef, bundle, useMainThread} = input;
   let runPackage = farm.createHandle('runPackage', useMainThread);
@@ -100,6 +119,11 @@ async function run({input, api, farm}) {
     info.time = Date.now() - start;
   }
 
-  api.storeResult(bundleInfo);
-  return bundleInfo;
+  let res = {
+    hash: input.bundleGraph.getHash(input.bundle),
+    info: bundleInfo,
+  };
+
+  api.storeResult(res);
+  return res;
 }

packages/core/core/src/requests/WriteBundlesRequest.js

@@ -13,7 +13,11 @@ import {HASH_REF_PREFIX} from '../constants';
 import {joinProjectPath} from '../projectPath';
 import nullthrows from 'nullthrows';
 import {hashString} from '@parcel/rust';
-import {createPackageRequest} from './PackageRequest';
+import {
+  canSkipPackageRequest,
+  createPackageRequest,
+  getPackageRequestId,
+} from './PackageRequest';
 import createWriteBundleRequest from './WriteBundleRequest';
 
 type WriteBundlesRequestInput = {|
@@ -93,7 +97,7 @@ async function run({input, api, farm, options}) {
   // This avoids the cost of serializing the bundle graph for single file change builds.
   let useMainThread =
     bundles.length === 1 ||
-    bundles.filter(b => !api.canSkipSubrequest(bundleGraph.getHash(b)))
+    bundles.filter(b => !api.canSkipSubrequest(getPackageRequestId(b)))
       .length === 1;
 
   try {
@@ -107,7 +111,9 @@ async function run({input, api, farm, options}) {
           useMainThread,
         });
 
-        let infos = await api.runRequest(request);
+        let {info: infos} = await api.runRequest(request, {
+          force: !(await canSkipPackageRequest(api, request)),
+        });
 
         if (!useMainThread) {
           // Force a refresh of the cache to avoid a race condition