fixup rebase

vercel · Jan 18, 2019 · 949574f · 949574f
1 parent 399721a
commit 949574f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/src/loaders/relocate-loader.js b/src/loaders/relocate-loader.js
@@ -88,7 +88,7 @@ module.exports = function (code) {
     const name = assetState.assets[assetPath] ||
         (assetState.assets[assetPath] = getUniqueAssetName(outName, assetPath, assetState.assetNames));
 
-    console.log('Emitting ' + assetPath + ' for module ' + id);
+    // console.log('Emitting ' + assetPath + ' for module ' + id);
     assetEmissionPromises = assetEmissionPromises.then(async () => {
       const [source, permissions] = await Promise.all([
         new Promise((resolve, reject) =>

diff --git a/test/unit/tsconfig-paths-conflicting-external/output.js b/test/unit/tsconfig-paths-conflicting-external/output.js
@@ -43,20 +43,16 @@ module.exports =
 "use strict";
 
 exports.__esModule = true;
-var _module_1 = __webpack_require__(563);
+var _module_1 = __webpack_require__(816);
 console.log(_module_1["default"]);
 
 
 /***/ }),
 
-/***/ 563:
-/***/ (function(__unusedmodule, exports) {
-
-"use strict";
-
-exports.__esModule = true;
-exports["default"] = {};
+/***/ 816:
+/***/ (function(module) {
 
+module.exports = require("@module");
 
 /***/ })
 

diff --git a/test/unit/tsconfig-paths/output.js b/test/unit/tsconfig-paths/output.js
@@ -43,20 +43,16 @@ module.exports =
 "use strict";
 
 exports.__esModule = true;
-var _module_1 = __webpack_require__(637);
+var _module_1 = __webpack_require__(816);
 console.log(_module_1["default"]);
 
 
 /***/ }),
 
-/***/ 637:
-/***/ (function(__unusedmodule, exports) {
-
-"use strict";
-
-exports.__esModule = true;
-exports["default"] = {};
+/***/ 816:
+/***/ (function(module) {
 
+module.exports = require("@module");
 
 /***/ })