Skip to content
This repository has been archived by the owner on Jul 30, 2018. It is now read-only.

Updating to latest dojo/shim #95

Merged
merged 1 commit into from
Jul 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/cldr/load/webpack.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import P from '@dojo/shim/Promise';
import '@dojo/shim/Promise'; // imported for side effects
import baseLoad, {
CldrData,
isLoaded as baseIsLoaded,
Expand All @@ -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();
Expand Down
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"dom",
"es5",
"es2015.iterable",
"es2015.promise",
"es2015.symbol",
"es2015.symbol.wellknown"
],
Expand Down