From 8d51fdcf650088e586a48babce318354113e974b Mon Sep 17 00:00:00 2001
From: Anton <thekashey@gmail.com>
Date: Mon, 29 Jan 2018 15:42:33 +1100
Subject: [PATCH] add 'id' to the module variable, #619 (#688)

---
 src/builtins/hmr-runtime.js             |  4 ++--
 src/builtins/prelude.js                 |  5 +++--
 test/hmr.js                             | 12 +++++++++++-
 test/integration/hmr-callbacks/index.js |  7 +++++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/builtins/hmr-runtime.js b/src/builtins/hmr-runtime.js
index af0cb1c1c4e..e78f7b569ce 100644
--- a/src/builtins/hmr-runtime.js
+++ b/src/builtins/hmr-runtime.js
@@ -1,7 +1,7 @@
 var global = (1, eval)('this');
 var OldModule = module.bundle.Module;
-function Module() {
-  OldModule.call(this);
+function Module(moduleName) {
+  OldModule.call(this, moduleName);
   this.hot = {
     accept: function (fn) {
       this._acceptCallback = fn || function () {};
diff --git a/src/builtins/prelude.js b/src/builtins/prelude.js
index 2d2f9d5b8e7..948449b57aa 100644
--- a/src/builtins/prelude.js
+++ b/src/builtins/prelude.js
@@ -37,7 +37,7 @@ require = (function (modules, cache, entry) {
       
       localRequire.resolve = resolve;
 
-      var module = cache[name] = new newRequire.Module;
+      var module = cache[name] = new newRequire.Module(name);
 
       modules[name][0].call(module.exports, localRequire, module, module.exports);
     }
@@ -53,7 +53,8 @@ require = (function (modules, cache, entry) {
     }
   }
 
-  function Module() {
+  function Module(moduleName) {
+    this.id = moduleName;
     this.bundle = newRequire;
     this.exports = {};
   }
diff --git a/test/hmr.js b/test/hmr.js
index 70092a38149..fef54a0409d 100644
--- a/test/hmr.js
+++ b/test/hmr.js
@@ -180,8 +180,12 @@ describe('hmr', function() {
     b = bundler(__dirname + '/input/index.js', {watch: true, hmr: true});
     let bundle = await b.bundle();
     let outputs = [];
+    let moduleId = '';
 
     run(bundle, {
+      reportModuleId(id) {
+        moduleId = id;
+      },
       output(o) {
         outputs.push(o);
       }
@@ -195,7 +199,13 @@ describe('hmr', function() {
     );
 
     await nextEvent(b, 'bundled');
-    assert.deepEqual(outputs, [3, 'dispose', 10, 'accept']);
+    assert.notEqual(moduleId, undefined);
+    assert.deepEqual(outputs, [
+      3,
+      'dispose-' + moduleId,
+      10,
+      'accept-' + moduleId
+    ]);
   });
 
   it('should work across bundles', async function() {
diff --git a/test/integration/hmr-callbacks/index.js b/test/integration/hmr-callbacks/index.js
index 5a192e714b6..0c683847209 100644
--- a/test/integration/hmr-callbacks/index.js
+++ b/test/integration/hmr-callbacks/index.js
@@ -6,10 +6,13 @@ function run() {
 
 run();
 
+// eslint-disable-next-line no-undef
+reportModuleId(module.id);
+
 module.hot.dispose(function () {
-  output('dispose');
+  output('dispose-' + module.id);
 });
 
 module.hot.accept(function () {
-  output('accept');
+  output('accept-' + module.id);
 });