check for duplicate asset ids

parcel-bundler · Jul 26, 2018 · 804a8a8 · 804a8a8
1 parent 2e1ffc6
commit 804a8a8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/Asset.js b/src/Asset.js
@@ -193,7 +193,7 @@ class Asset {
     if (!this.id) {
       this.id =
         this.options.production || this.options.scopeHoist
-          ? md5(this.relativeName, 'base64').slice(0, 4)
+          ? md5(this.relativeName, 'base64').slice(0, 10)
           : this.relativeName;
     }
 

diff --git a/src/Bundler.js b/src/Bundler.js
@@ -60,6 +60,8 @@ class Bundler extends EventEmitter {
     this.loadedAssets = new Map();
     this.watchedAssets = new Map();
 
+    this.assets = new Map();
+
     this.farm = null;
     this.watcher = null;
     this.hmr = null;
@@ -517,6 +519,23 @@ class Bundler extends EventEmitter {
     await this.loadAsset(asset);
   }
 
+  sliceAssetId(asset, length = 3, offset = 0) {
+    if (offset + length >= asset.id.length) {
+      throw new Error(`Could not find an asset id for ${asset.relativeName}`);
+    }
+
+    let assetId = asset.id;
+    assetId = assetId.slice(offset, offset + length);
+    if (this.assets.has(assetId)) {
+      if (length < 4) {
+        length++;
+      }
+      return this.sliceAssetId(asset, length, offset + 1);
+    }
+
+    return assetId;
+  }
+
   async loadAsset(asset) {
     if (asset.processed) {
       return;
@@ -545,6 +564,12 @@ class Bundler extends EventEmitter {
     asset.hash = processed.hash;
     asset.cacheData = processed.cacheData;
 
+    if (this.options.production && !this.options.scopeHoist) {
+      asset.id = this.sliceAssetId(asset);
+    }
+
+    this.assets.set(asset.id, asset);
+
     // Call the delegate to get implicit dependencies
     let dependencies = processed.dependencies;
     if (this.delegate.getImplicitDependencies) {