Merge pull request #113 from ember-cli/check-extensibility

Check object extensibility before adding default property.
ember-cli · Mar 5, 2017 · 9c34843 · 9c34843
2 parents b0876f8 + a1950aa
commit 9c34843
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 1 deletion.
diff --git a/lib/loader/loader.js b/lib/loader/loader.js
@@ -123,7 +123,7 @@ var loader, define, requireModule, require, requirejs;
     var exports = this.module.exports;
     if (exports !== null &&
         (typeof exports === 'object' || typeof exports === 'function') &&
-          exports['default'] === undefined && !Object.isFrozen(exports)) {
+          exports['default'] === undefined && Object.isExtensible(exports)) {
       exports['default'] = exports;
     }
   };

diff --git a/tests/all.js b/tests/all.js
@@ -736,6 +736,80 @@ test('if a module has no default property assume its export is default (function
   });
 });
 
+test('if a module has no default property assume its export is default (object)', function() {
+  var theObject = {};
+  define('foo', ['require', 'exports', 'module'], function() {
+    return theObject;
+  });
+
+  equal(require('foo')['default'], theObject);
+  equal(require('foo'), theObject);
+
+  var stats = statsForMonitor('loaderjs', tree);
+
+  deepEqual(stats, {
+    findDeps: 1,
+    define: 1,
+    exports: 1,
+    findModule: 2,
+    modules: 1,
+    reify: 1,
+    require: 2,
+    resolve: 0,
+    resolveRelative: 0,
+    pendingQueueLength: 1
+  });
+});
+
+test('does not add default if export is frozen', function() {
+  var theObject = Object.freeze({});
+  define('foo', ['require', 'exports', 'module'], function() {
+    return theObject;
+  });
+
+  ok(!('default' in require('foo')));
+  equal(require('foo'), theObject);
+
+  var stats = statsForMonitor('loaderjs', tree);
+
+  deepEqual(stats, {
+    findDeps: 1,
+    define: 1,
+    exports: 1,
+    findModule: 2,
+    modules: 1,
+    reify: 1,
+    require: 2,
+    resolve: 0,
+    resolveRelative: 0,
+    pendingQueueLength: 1
+  });
+});
+
+test('does not add default if export is sealed', function() {
+  var theObject = Object.seal({ derp: {} });
+  define('foo', ['require', 'exports', 'module'], function() {
+    return theObject;
+  });
+
+  ok(!('default' in require('foo')));
+  equal(require('foo'), theObject);
+
+  var stats = statsForMonitor('loaderjs', tree);
+
+  deepEqual(stats, {
+    findDeps: 1,
+    define: 1,
+    exports: 1,
+    findModule: 2,
+    modules: 1,
+    reify: 1,
+    require: 2,
+    resolve: 0,
+    resolveRelative: 0,
+    pendingQueueLength: 1
+  });
+});
 
 test('has good error message for missing module', function() {
   var theFunction = function theFunction() {};