Packager request

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["packages/transformers/js", "packages/utils/fs-search"]
+members = ["packages/transformers/js", "packages/utils/fs-search", "packages/utils/hash"]
 
 [profile.release]
 opt-level = 3

packages/bundlers/default/package.json

@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "@parcel/diagnostic": "2.0.0-beta.3.1",
+    "@parcel/hash": "2.0.0-beta.3.1",
     "@parcel/plugin": "2.0.0-beta.3.1",
     "@parcel/utils": "2.0.0-beta.3.1",
     "nullthrows": "^1.1.1"

packages/bundlers/default/src/DefaultBundler.js

@@ -12,7 +12,8 @@ import type {SchemaEntity} from '@parcel/utils';
 
 import invariant from 'assert';
 import {Bundler} from '@parcel/plugin';
-import {md5FromString, validateSchema} from '@parcel/utils';
+import {validateSchema} from '@parcel/utils';
+import {hashString} from '@parcel/hash';
 import nullthrows from 'nullthrows';
 import {encodeJSONKeyComponent} from '@parcel/diagnostic';
 
@@ -397,7 +398,7 @@ export default (new Bundler({
 
       let [firstBundle] = [...sourceBundles];
       let sharedBundle = bundleGraph.createBundle({
-        uniqueKey: md5FromString([...sourceBundles].map(b => b.id).join(':')),
+        uniqueKey: hashString([...sourceBundles].map(b => b.id).join(':')),
         // Allow this bundle to be deduplicated. It shouldn't be further split.
         // TODO: Reconsider bundle/asset flags.
         isSplittable: true,

packages/core/core/package.json

@@ -27,6 +27,7 @@
     "@parcel/diagnostic": "2.0.0-beta.3.1",
     "@parcel/events": "2.0.0-beta.3.1",
     "@parcel/fs": "2.0.0-beta.3.1",
+    "@parcel/hash": "2.0.0-beta.3.1",
     "@parcel/logger": "2.0.0-beta.3.1",
     "@parcel/package-manager": "2.0.0-beta.3.1",
     "@parcel/plugin": "2.0.0-beta.3.1",

packages/core/core/src/AssetGraph.js

@@ -19,12 +19,8 @@ import type {
 } from './types';
 
 import invariant from 'assert';
-import crypto from 'crypto';
-import {
-  md5FromObject,
-  md5FromOrderedObject,
-  objectSortedEntries,
-} from '@parcel/utils';
+import {hashString, Hash} from '@parcel/hash';
+import {hashObject, objectSortedEntries} from '@parcel/utils';
 import nullthrows from 'nullthrows';
 import ContentGraph, {type SerializedContentGraph} from './ContentGraph';
 import {createDependency} from './Dependency';
@@ -57,15 +53,19 @@ export function nodeFromDep(dep: Dependency): DependencyNode {
 
 export function nodeFromAssetGroup(assetGroup: AssetGroup): AssetGroupNode {
   return {
-    id: md5FromOrderedObject({
-      filePath: assetGroup.filePath,
-      env: assetGroup.env.id,
-      isSource: assetGroup.isSource,
-      sideEffects: assetGroup.sideEffects,
-      code: assetGroup.code,
-      pipeline: assetGroup.pipeline,
-      query: assetGroup.query ? objectSortedEntries(assetGroup.query) : null,
-    }),
+    id: hashString(
+      assetGroup.filePath +
+        assetGroup.env.id +
+        String(assetGroup.isSource) +
+        String(assetGroup.sideEffects) +
+        (assetGroup.code ?? '') +
+        ':' +
+        (assetGroup.pipeline ?? '') +
+        ':' +
+        (assetGroup.query
+          ? JSON.stringify(objectSortedEntries(assetGroup.query))
+          : ''),
+    ),
     type: 'asset_group',
     value: assetGroup,
     usedSymbolsDownDirty: true,
@@ -93,7 +93,7 @@ export function nodeFromEntrySpecifier(entry: string): EntrySpecifierNode {
 
 export function nodeFromEntryFile(entry: Entry): EntryFileNode {
   return {
-    id: 'entry_file:' + md5FromObject(entry),
+    id: 'entry_file:' + hashObject(entry),
     type: 'entry_file',
     value: entry,
   };
@@ -569,18 +569,18 @@ export default class AssetGraph extends ContentGraph<AssetGraphNode> {
       return this.hash;
     }
 
-    let hash = crypto.createHash('md5');
+    let hash = new Hash();
     // TODO: sort??
     this.traverse(nodeId => {
       let node = nullthrows(this.getNode(nodeId));
       if (node.type === 'asset') {
-        hash.update(nullthrows(node.value.outputHash));
+        hash.writeString(nullthrows(node.value.outputHash));
       } else if (node.type === 'dependency' && node.value.target) {
-        hash.update(JSON.stringify(node.value.target));
+        hash.writeString(JSON.stringify(node.value.target));
       }
     });
 
-    this.hash = hash.digest('hex');
+    this.hash = hash.finish();
     return this.hash;
   }
 }

packages/core/core/src/BundleGraph.js

@@ -22,9 +22,9 @@ import type AssetGraph from './AssetGraph';
 
 import assert from 'assert';
 import invariant from 'assert';
-import crypto from 'crypto';
 import nullthrows from 'nullthrows';
 import {objectSortedEntriesDeep} from '@parcel/utils';
+import {Hash, hashString} from '@parcel/hash';
 
 import {getBundleGroupId, getPublicId} from './utils';
 import {ALL_EDGE_TYPES, mapVisitor} from './Graph';
@@ -234,10 +234,6 @@ export default class BundleGraph {
         return;
       }
 
-      if (node.type === 'asset' && !this.bundleHasAsset(bundle, node.value)) {
-        bundle.stats.size += node.value.stats.size;
-      }
-
       if (node.type === 'asset' || node.type === 'dependency') {
         this._graph.addEdge(bundleNodeId, nodeId, 'contains');
       }
@@ -432,10 +428,6 @@ export default class BundleGraph {
           // aggregate.
           false /* removeOrphans */,
         );
-
-        if (node.type === 'asset') {
-          bundle.stats.size -= asset.stats.size;
-        }
       } else {
         actions.skipChildren();
       }
@@ -1404,10 +1396,10 @@ export default class BundleGraph {
       return existingHash;
     }
 
-    let hash = crypto.createHash('md5');
+    let hash = new Hash();
     // TODO: sort??
     this.traverseAssets(bundle, asset => {
-      hash.update(
+      hash.writeString(
         [
           this.getAssetPublicId(asset),
           asset.outputHash,
@@ -1419,7 +1411,7 @@ export default class BundleGraph {
       );
     });
 
-    let hashHex = hash.digest('hex');
+    let hashHex = hash.finish();
     this._bundleContentHashes.set(bundle.id, hashHex);
     return hashHex;
   }
@@ -1457,23 +1449,33 @@ export default class BundleGraph {
   }
 
   getHash(bundle: Bundle): string {
-    let hash = crypto.createHash('md5');
-    hash.update(bundle.id);
-    hash.update(this.getContentHash(bundle));
+    let hash = new Hash();
+    hash.writeString(
+      bundle.id + bundle.target.publicUrl + this.getContentHash(bundle),
+    );
 
     let inlineBundles = this.getInlineBundles(bundle);
     for (let inlineBundle of inlineBundles) {
-      hash.update(this.getContentHash(inlineBundle));
+      hash.writeString(this.getContentHash(inlineBundle));
     }
 
     for (let referencedBundle of this.getReferencedBundles(bundle)) {
       if (!referencedBundle.isInline) {
-        hash.update(referencedBundle.id);
+        hash.writeString(referencedBundle.id);
       }
     }
 
-    hash.update(JSON.stringify(objectSortedEntriesDeep(bundle.env)));
-    return hash.digest('hex');
+    hash.writeString(JSON.stringify(objectSortedEntriesDeep(bundle.env)));
+    return hash.finish();
+  }
+
+  getBundleGraphHash(): string {
+    let hashes = '';
+    for (let bundle of this.getBundles()) {
+      hashes += this.getHash(bundle);
+    }
+
+    return hashString(hashes);
   }
 
   addBundleToBundleGroup(bundle: Bundle, bundleGroup: BundleGroup) {

packages/core/core/src/Dependency.js

@@ -5,8 +5,8 @@ import type {
   ModuleSpecifier,
   Symbol,
 } from '@parcel/types';
-import {md5FromOrderedObject} from '@parcel/utils';
 import type {Dependency, Environment, Target} from './types';
+import {hashString} from '@parcel/hash';
 
 type DependencyOpts = {|
   id?: string,
@@ -33,13 +33,13 @@ type DependencyOpts = {|
 export function createDependency(opts: DependencyOpts): Dependency {
   let id =
     opts.id ||
-    md5FromOrderedObject({
-      sourceAssetId: opts.sourceAssetId,
-      moduleSpecifier: opts.moduleSpecifier,
-      env: opts.env.id,
-      target: opts.target,
-      pipeline: opts.pipeline,
-    });
+    hashString(
+      (opts.sourceAssetId ?? '') +
+        opts.moduleSpecifier +
+        opts.env.id +
+        (opts.target ? JSON.stringify(opts.target) : '') +
+        (opts.pipeline ?? ''),
+    );
 
   return {
     ...opts,

packages/core/core/src/Environment.js

@@ -1,7 +1,7 @@
 // @flow
 import type {EnvironmentOptions} from '@parcel/types';
 import type {Environment} from './types';
-import {md5FromOrderedObject} from '@parcel/utils';
+import {hashString} from '@parcel/hash';
 
 const DEFAULT_ENGINES = {
   browsers: ['> 0.25%'],
@@ -113,12 +113,14 @@ export function mergeEnvironments(
 function getEnvironmentHash(env: Environment): string {
   // context is excluded from hash so that assets can be shared between e.g. workers and browser.
   // Different engines should be sufficient to distinguish multi-target builds.
-  return md5FromOrderedObject({
-    engines: env.engines,
-    includeNodeModules: env.includeNodeModules,
-    outputFormat: env.outputFormat,
-    isLibrary: env.isLibrary,
-    shouldScopeHoist: env.shouldScopeHoist,
-    sourceMap: env.sourceMap,
-  });
+  return hashString(
+    JSON.stringify([
+      env.engines,
+      env.includeNodeModules,
+      env.outputFormat,
+      env.isLibrary,
+      env.shouldScopeHoist,
+      env.sourceMap,
+    ]),
+  );
 }

packages/core/core/src/InternalConfig.js

@@ -7,9 +7,9 @@ import type {
   ConfigResult,
   DevDepOptions,
 } from '@parcel/types';
-import {md5FromString} from '@parcel/utils';
 import type {Config, Environment} from './types';
 import {createEnvironment} from './Environment';
+import {hashString} from '@parcel/hash';
 
 type ConfigOpts = {|
   plugin: PackageName,
@@ -38,7 +38,7 @@ export function createConfig({
 }: ConfigOpts): Config {
   let environment = env ?? createEnvironment();
   return {
-    id: md5FromString(plugin + searchPath + environment.id + String(isSource)),
+    id: hashString(plugin + searchPath + environment.id + String(isSource)),
     isSource: isSource ?? false,
     searchPath,
     env: environment,