fix weak-map require module path

montagejs · Jul 27, 2017 · dd7145a · dd7145a
1 parent 436005c
commit dd7145a
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/.npmignore b/.npmignore
@@ -8,5 +8,5 @@ collections.cat.js
 collections.min.js
 /coverage
 /demo
-/minify
-/spec
+/test
+/report
diff --git a/collections.js b/collections.js
@@ -3,11 +3,17 @@
 
 var Shim = require("./shim");
 
+/*jshint evil:true */
+// reassigning causes eval to not use lexical scope.
+var globalEval = eval,
+    global = globalEval('this');
+/*jshint evil:false */
+
 global.List = require("./list");
 global.Set = require("./set");
 global.Map = require("./map");
 global.MultiMap = require("./multi-map");
-global.WeakMap = require("weak-map");
+global.WeakMap = require("./weak-map");
 global.SortedSet = require("./sorted-set");
 global.SortedMap = require("./sorted-map");
 global.LruSet = require("./lru-set");

diff --git a/listen/map-changes.js b/listen/map-changes.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var WeakMap = require("weak-map"),
+var WeakMap = require("../weak-map"),
     Map = require("../_map"),
     ChangeDescriptor = require("./change-descriptor"),
     ObjectChangeDescriptor = ChangeDescriptor.ObjectChangeDescriptor,

diff --git a/listen/range-changes.js b/listen/range-changes.js
@@ -5,7 +5,7 @@
 //Use ObjectChangeDescriptor to avoid creating useless arrays and benefit from similar gains made in property-changes
 
 
-var WeakMap = require("weak-map"),
+var WeakMap = require("../weak-map"),
     Map = require("../_map"),
     ChangeDescriptor = require("./change-descriptor"),
     ObjectChangeDescriptor = ChangeDescriptor.ObjectChangeDescriptor,

diff --git a/shim-array.js b/shim-array.js
@@ -10,7 +10,7 @@
 var Function = require("./shim-function");
 var GenericCollection = require("./generic-collection");
 var GenericOrder = require("./generic-order");
-var WeakMap = require("weak-map");
+var WeakMap = require("./weak-map");
 
 module.exports = Array;
 

diff --git a/shim-object.js b/shim-object.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var WeakMap = require("weak-map");
+var WeakMap = require("./weak-map");
 
 module.exports = Object;
 

diff --git a/weak-map.js b/weak-map.js
@@ -1 +1,2 @@
-module.exports = (global.WeakMap !== void 0) ? global.WeakMap : require("weak-map");
+
+module.exports = (typeof WeakMap !== 'undefined') ? WeakMap : require("weak-map");