diff --git a/src/customElements.ts b/src/customElements.ts index 1879a79f..f72a2f65 100644 --- a/src/customElements.ts +++ b/src/customElements.ts @@ -1,6 +1,6 @@ import { assign } from '@dojo/core/lang'; import { from as arrayFrom } from '@dojo/shim/array'; -import global from '@dojo/core/global'; +import global from '@dojo/shim/global'; import { Constructor, DNode, WidgetBaseInterface, WidgetProperties } from './interfaces'; import { WidgetBase } from './WidgetBase'; import { w } from './d'; diff --git a/src/meta/Base.ts b/src/meta/Base.ts index 3d8f5f26..78e172df 100644 --- a/src/meta/Base.ts +++ b/src/meta/Base.ts @@ -1,4 +1,4 @@ -import global from '@dojo/core/global'; +import global from '@dojo/shim/global'; import Map from '@dojo/shim/Map'; import Set from '@dojo/shim/Set'; import { WidgetMetaProperties } from '../interfaces'; diff --git a/src/mixins/Projector.ts b/src/mixins/Projector.ts index 0afbc592..42532a52 100644 --- a/src/mixins/Projector.ts +++ b/src/mixins/Projector.ts @@ -1,5 +1,5 @@ import { assign } from '@dojo/core/lang'; -import global from '@dojo/core/global'; +import global from '@dojo/shim/global'; import { createHandle } from '@dojo/core/lang'; import { Handle } from '@dojo/interfaces/core'; import { VNode } from '@dojo/interfaces/vdom'; diff --git a/tests/support/loadJsdom.ts b/tests/support/loadJsdom.ts index ef28496a..bc5d5851 100644 --- a/tests/support/loadJsdom.ts +++ b/tests/support/loadJsdom.ts @@ -1,5 +1,5 @@ import * as jsdom from 'jsdom'; -import global from '@dojo/core/global'; +import global from '@dojo/shim/global'; /* In order to have the tests work under Node.js, we need to load JSDom and polyfill * requestAnimationFrame */ diff --git a/tests/unit/customElements.ts b/tests/unit/customElements.ts index 4217e822..e1e5d528 100644 --- a/tests/unit/customElements.ts +++ b/tests/unit/customElements.ts @@ -2,7 +2,7 @@ import * as registerSuite from 'intern!object'; import * as assert from 'intern/chai!assert'; import { initializeElement, handleAttributeChanged, CustomElementDescriptor } from '../../src/customElements'; import { WidgetBase } from '../../src/WidgetBase'; -import global from '@dojo/core/global'; +import global from '@dojo/shim/global'; import { assign } from '@dojo/core/lang'; import * as projector from '../../src/mixins/Projector'; import * as sinon from 'sinon'; diff --git a/tests/unit/meta/Dimensions.ts b/tests/unit/meta/Dimensions.ts index d53fd0b8..f46611f2 100644 --- a/tests/unit/meta/Dimensions.ts +++ b/tests/unit/meta/Dimensions.ts @@ -1,4 +1,4 @@ -import global from '@dojo/core/global'; +import global from '@dojo/shim/global'; import * as registerSuite from 'intern!object'; import * as assert from 'intern/chai!assert'; import { stub } from 'sinon'; diff --git a/tests/unit/meta/meta.ts b/tests/unit/meta/meta.ts index d2527382..9f043f69 100644 --- a/tests/unit/meta/meta.ts +++ b/tests/unit/meta/meta.ts @@ -1,4 +1,4 @@ -import global from '@dojo/core/global'; +import global from '@dojo/shim/global'; import * as registerSuite from 'intern!object'; import * as assert from 'intern/chai!assert'; import { v } from '../../../src/d'; diff --git a/tests/unit/mixins/Projector.ts b/tests/unit/mixins/Projector.ts index cf902307..6d37d80e 100644 --- a/tests/unit/mixins/Projector.ts +++ b/tests/unit/mixins/Projector.ts @@ -1,4 +1,4 @@ -import global from '@dojo/core/global'; +import global from '@dojo/shim/global'; import has from '@dojo/has/has'; import '@dojo/shim/Promise'; import { VNode } from '@dojo/interfaces/vdom'; diff --git a/tests/unit/util/DomWrapper.ts b/tests/unit/util/DomWrapper.ts index 314c567e..21e5de0c 100644 --- a/tests/unit/util/DomWrapper.ts +++ b/tests/unit/util/DomWrapper.ts @@ -2,7 +2,7 @@ import * as registerSuite from 'intern!object'; import { WidgetBase } from './../../../src/WidgetBase'; import { v, w } from './../../../src/d'; import { DomWrapper } from '../../../src/util/DomWrapper'; -import global from '@dojo/core/global'; +import global from '@dojo/shim/global'; import { stub } from 'sinon'; import * as assert from 'intern/chai!assert'; import ProjectorMixin from '../../../src/mixins/Projector';