Skip to content

Commit 6e00835

Browse files
committed
Merge pull request #11895 from brzpegasus/node-detection
[BUGFIX beta] Properly detect if the environment is Node.
2 parents 68719dd + 97b1a3d commit 6e00835

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

packages/loader/lib/main.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ var define, requireModule, require, requirejs, Ember;
22
var mainContext = this;
33

44
(function() {
5-
var isNode = typeof process !== 'undefined' && {}.toString.call(process) === '[object process]';
5+
var isNode = typeof window === 'undefined' &&
6+
typeof process !== 'undefined' && {}.toString.call(process) === '[object process]';
67

78
if (!isNode) {
89
Ember = this.Ember = this.Ember || {};

0 commit comments

Comments
 (0)