Move global to /src and make CSP compatible

src/Map.ts

@@ -1,6 +1,6 @@
 import { ArrayLike } from './interfaces';
 import { hasClass } from './support/decorators';
-import global from './support/global';
+import global from './global';
 import { forOf, Iterable, IterableIterator, ShimIterator } from './iterator';
 import { is as objectIs } from './object';
 import './Symbol';

src/Observable.ts

@@ -1,6 +1,6 @@
 import { Iterable, forOf, isIterable, isArrayLike } from './iterator';
 import { hasClass } from './support/decorators';
-import global from './support/global';
+import global from './global';
 import './Symbol';
 
 /**

src/Promise.ts

@@ -1,5 +1,5 @@
 import { Thenable } from './interfaces';
-import global from './support/global';
+import global from './global';
 import { queueMicroTask } from './support/queue';
 import { forOf, Iterable } from './iterator';
 import './Symbol';

src/Set.ts

@@ -1,6 +1,6 @@
 import { ArrayLike } from './interfaces';
 import { hasClass } from './support/decorators';
-import global from './support/global';
+import global from './global';
 import { forOf, IterableIterator, Iterable, ShimIterator } from './iterator';
 import './Symbol';
 

src/Symbol.ts

@@ -1,5 +1,5 @@
 import has from './support/has';
-import global from './support/global';
+import global from './global';
 import { getValueDescriptor } from './support/util';
 
 declare global {

src/WeakMap.ts

@@ -1,6 +1,6 @@
 import { ArrayLike } from './interfaces';
 import { hasClass } from './support/decorators';
-import global from './support/global';
+import global from './global';
 import { forOf, Iterable } from './iterator';
 import './Symbol';
 

src/global.ts

@@ -0,0 +1,19 @@
+const globalObject: any = (function (): any {
+
+	if (typeof global !== 'undefined') {
+		// global spec defines a reference to the global object called 'global'
+		// https://github.com/tc39/proposal-global
+		// `global` is also defined in NodeJS
+		return global;
+	}
+	else if (typeof window !== 'undefined') {
+		// window is defined in browsers
+		return window;
+	}
+	else if (typeof self !== 'undefined') {
+		// self is defined in WebWorkers
+		return self;
+	}
+})();
+
+export default globalObject;

src/native/Map.ts

@@ -1,4 +1,4 @@
-import global from '../support/global';
+import global from '../global';
 
 export interface Map<K, V> {
 	clear(): void;

src/native/Promise.ts

@@ -1,4 +1,4 @@
-import global from '../support/global';
+import global from '../global';
 
 /* tslint:disable-next-line:variable-name */
 const PromiseConstructor = global.Promise;

src/native/Set.ts

@@ -1,4 +1,4 @@
-import global from '../support/global';
+import global from '../global';
 
 export interface Set<T> {
 	add(value: T): this;

src/native/Symbol.ts

@@ -1,4 +1,4 @@
-import global from '../support/global';
+import global from '../global';
 import { getValueDescriptor } from '../support/util';
 
 /* tslint:disable-next-line:variable-name */

src/native/WeakMap.ts

@@ -1,4 +1,4 @@
-import global from '../support/global';
+import global from '../global';
 
 export interface WeakMap<K, V> {
 	clear(): void;

src/native/number.ts

@@ -1,4 +1,4 @@
-import global from '../support/global';
+import global from '../global';
 
 /**
  * The smallest interval between two representable numbers.

src/number.ts

@@ -1,4 +1,4 @@
-import global from './support/global';
+import global from './global';
 
 /**
  * The smallest interval between two representable numbers.

src/support/has.ts

@@ -1,4 +1,4 @@
-import global from './global';
+import global from '../global';
 import has from '@dojo/has/has';
 import { add } from '@dojo/has/has';
 

src/support/queue.ts

@@ -1,4 +1,4 @@
-import global from './global';
+import global from '../global';
 import has from './has';
 import { Handle } from '../interfaces';
 

tests/unit/all.ts

@@ -1,10 +1,10 @@
 import './native/all';
 import './support/decorators';
-import './support/global';
 import './support/has';
 import './support/queue';
 import './support/util';
 import './array';
+import './global';
 import './iterator';
 import './main';
 import './Map';

tests/unit/global.ts

@@ -0,0 +1,12 @@
+import * as registerSuite from 'intern!object';
+import * as assert from 'intern/chai!assert';
+import globalObj from '../../src/global';
+
+registerSuite({
+	name: 'global',
+
+	'global references the global object for the target environment'() {
+		// If tests are running under CSP, unsafe eval will be denied and this test will fail
+		assert.strictEqual(globalObj, Function('return this')(), 'Expecting global object to be in global object');
+	}
+});

tests/unit/native/Map.ts

@@ -1,7 +1,7 @@
 import * as registerSuite from 'intern!object';
 import * as assert from 'intern/chai!assert';
 import has from '../../../src/support/has';
-import global from '../../../src/support/global';
+import global from '../../../src/global';
 
 registerSuite({
 	name: 'native/Map',

tests/unit/native/Promise.ts

@@ -1,7 +1,7 @@
 import * as registerSuite from 'intern!object';
 import * as assert from 'intern/chai!assert';
 import has from '../../../src/support/has';
-import global from '../../../src/support/global';
+import global from '../../../src/global';
 
 registerSuite({
 	name: 'native/Promise',

tests/unit/native/Set.ts

@@ -1,7 +1,7 @@
 import * as registerSuite from 'intern!object';
 import * as assert from 'intern/chai!assert';
 import has from '../../../src/support/has';
-import global from '../../../src/support/global';
+import global from '../../../src/global';
 
 registerSuite({
 	name: 'native/Set',

tests/unit/native/Symbol.ts

@@ -1,7 +1,7 @@
 import * as registerSuite from 'intern!object';
 import * as assert from 'intern/chai!assert';
 import has from '../../../src/support/has';
-import global from '../../../src/support/global';
+import global from '../../../src/global';
 
 registerSuite({
 	name: 'native/Symbol',

tests/unit/native/WeakMap.ts

@@ -1,7 +1,7 @@
 import * as registerSuite from 'intern!object';
 import * as assert from 'intern/chai!assert';
 import has from '../../../src/support/has';
-import global from '../../../src/support/global';
+import global from '../../../src/global';
 
 registerSuite({
 	name: 'native/WeakMap',

tests/unit/native/iterator.ts

@@ -1,7 +1,7 @@
 import * as registerSuite from 'intern!object';
 import * as assert from 'intern/chai!assert';
 import has, { add as hasAdd } from '../../../src/support/has';
-import global from '../../../src/support/global';
+import global from '../../../src/global';
 
 hasAdd('es6-iterator', () => Boolean(global.Symbol && global.Symbol.iterator && global.Array.prototype[Symbol.iterator]));
 

tests/unit/native/number.ts

@@ -1,7 +1,7 @@
 import * as registerSuite from 'intern!object';
 import * as assert from 'intern/chai!assert';
 import has, { add as hasAdd } from '../../../src/support/has';
-import global from '../../../src/support/global';
+import global from '../../../src/global';
 
 hasAdd('es6-number', 'EPSILON' in global.Number);
 

tests/unit/native/object.ts

@@ -1,7 +1,7 @@
 import * as registerSuite from 'intern!object';
 import * as assert from 'intern/chai!assert';
 import has, { add as hasAdd } from '../../../src/support/has';
-import global from '../../../src/support/global';
+import global from '../../../src/global';
 
 hasAdd('es6-object', 'getOwnPropertySymbols' in global.Object);