Updating to latest dojo/shim

dojo · Jul 25, 2017 · 29c4023 · 29c4023
1 parent 17c9c5c
commit 29c4023
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/cldr/load/webpack.ts b/src/cldr/load/webpack.ts
@@ -1,4 +1,4 @@
-import P from '@dojo/shim/Promise';
+import '@dojo/shim/Promise'; // imported for side effects
 import baseLoad, {
 	CldrData,
 	isLoaded as baseIsLoaded,
@@ -25,13 +25,13 @@ async function loadInjectedData() {
 /**
  * A webpack-specific function used to load CLDR data from a preset cache.
  */
-export default function loadCldrData(contextRequire: Function, data: CldrData | string[]): P<void>;
-export default function loadCldrData(data: CldrData | string[]): P<void>;
-export default function loadCldrData(dataOrRequire: Function | CldrData | string[], data?: CldrData | string[]): P<void> {
+export default function loadCldrData(contextRequire: Function, data: CldrData | string[]): Promise<void>;
+export default function loadCldrData(data: CldrData | string[]): Promise<void>;
+export default function loadCldrData(dataOrRequire: Function | CldrData | string[], data?: CldrData | string[]): Promise<void> {
 	data = typeof dataOrRequire === 'function' ? data : dataOrRequire;
 
 	if (Array.isArray(data)) {
-		return P.resolve();
+		return Promise.resolve();
 	}
 
 	loadInjectedData();

diff --git a/tsconfig.json b/tsconfig.json
@@ -15,6 +15,7 @@
 			"dom",
 			"es5",
 			"es2015.iterable",
+			"es2015.promise",
 			"es2015.symbol",
 			"es2015.symbol.wellknown"
 		],