bower.json

@@ -16,7 +16,7 @@
     "make-plural": "eemeli/make-plural.js#2.1.2",
     "es5-shim": "3.4.0",
     "messageformat": "SlexAxton/messageformat.js#debeaf4",
-    "qunit": "1.12.0",
+    "qunit": "1.16.0",
     "requirejs": "2.1.9",
     "requirejs-plugins": "1.0.2",
     "requirejs-text": "2.0.10"

src/build/intro-currency.js

@@ -19,7 +19,8 @@
 			"cldr",
 			"../globalize",
 			"./number",
-			"cldr/event"
+			"cldr/event",
+			"cldr/supplemental"
 		], factory );
 	} else if ( typeof exports === "object" ) {
 

src/currency.js

@@ -14,7 +14,8 @@ define([
 	"./util/object/omit",
 
 	"./number",
-	"cldr/event"
+	"cldr/event",
+	"cldr/supplemental"
 ], function( Globalize, validateCldr, validateDefaultLocale, validateParameterPresence,
 	validateParameterTypeNumber, validateParameterTypeCurrency, validateParameterTypePlainObject,
 	validatePluralModulePresence, currencyCodeProperties, currencyNameFormat,

src/number.js

@@ -17,7 +17,8 @@ define([
 	"./number/symbol",
 	"./util/string/pad",
 
-	"cldr/event"
+	"cldr/event",
+	"cldr/supplemental"
 ], function( Globalize, createErrorUnsupportedFeature, validateCldr, validateDefaultLocale,
 	validateParameterPresence, validateParameterRange, validateParameterTypeNumber,
 	validateParameterTypePlainObject, validateParameterTypeString, numberFormat,

src/plural.js

@@ -8,6 +8,7 @@ define([
 	"./common/validate/parameter-type",
 	"./common/validate/parameter-type/number",
 
+	"cldr/event",
 	"cldr/supplemental"
 ], function( Cldr, MakePlural, Globalize, validateCldr, validateDefaultLocale,
 	validateParameterPresence, validateParameterType, validateParameterTypeNumber ) {

test/unit.js

@@ -5,7 +5,8 @@ require.config({
 		json: "../external/requirejs-plugins/src/json",
 		src: "../src",
 		text: "../external/requirejs-text/text"
-	}
+	},
+	waitSeconds: 30
 });
 
 require([
@@ -45,4 +46,9 @@ require([
 
 ], function() {
 	QUnit.start();
+}, function( error ) {
+  QUnit.test( "reqirejs load failure", function( assert ) {
+    assert.ok( false, "requirejs failed to load: " + QUnit.jsDump.parse( error ) );
+  });
+	QUnit.start();
 });

test/unit/core/locale.js

@@ -1,7 +1,9 @@
 define([
 	"cldr",
 	"src/core",
-	"json!cldr-data/supplemental/likelySubtags.json"
+	"json!cldr-data/supplemental/likelySubtags.json",
+
+	"cldr/event"
 ], function( Cldr, Globalize, likelySubtags ) {
 
 Cldr.load( likelySubtags );

test/unit/currency/code-properties.js

@@ -5,7 +5,10 @@ define([
 	"json!cldr-data/main/en/numbers.json",
 	"json!cldr-data/main/zh/numbers.json",
 	"json!cldr-data/supplemental/currencyData.json",
-	"json!cldr-data/supplemental/likelySubtags.json"
+	"json!cldr-data/supplemental/likelySubtags.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, properties, deNumbers, enNumbers, zhNumbers, currencyData, likelySubtags ) {
 
 var de, en, zh;

test/unit/currency/name-format.js

@@ -7,7 +7,10 @@ define([
 	"json!cldr-data/main/zh/currencies.json",
 	"json!cldr-data/main/zh/numbers.json",
 	"json!cldr-data/supplemental/currencyData.json",
-	"json!cldr-data/supplemental/likelySubtags.json"
+	"json!cldr-data/supplemental/likelySubtags.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, format, properties, enCurrencies, enNumbers, zhCurrencies, zhNumbers,
 	currencyData, likelySubtags ) {
 

test/unit/currency/name-properties.js

@@ -8,7 +8,10 @@ define([
 	"json!cldr-data/main/zh/currencies.json",
 	"json!cldr-data/main/zh/numbers.json",
 	"json!cldr-data/supplemental/currencyData.json",
-	"json!cldr-data/supplemental/likelySubtags.json"
+	"json!cldr-data/supplemental/likelySubtags.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, properties, deCurrencies, deNumbers, enCurrencies, enNumbers, zhCurrencies,
 	zhNumbers, currencyData, likelySubtags ) {
 

test/unit/currency/symbol-properties.js

@@ -8,7 +8,10 @@ define([
 	"json!cldr-data/main/zh/currencies.json",
 	"json!cldr-data/main/zh/numbers.json",
 	"json!cldr-data/supplemental/currencyData.json",
-	"json!cldr-data/supplemental/likelySubtags.json"
+	"json!cldr-data/supplemental/likelySubtags.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, symbolProperties, deCurrencies, deNumbers, enCurrencies, enNumbers, zhCurrencies,
 	zhNumbers, currencyData, likelySubtags ) {
 

test/unit/date/expand-pattern.js

@@ -2,7 +2,10 @@ define([
 	"cldr",
 	"src/date/expand-pattern",
 	"json!cldr-data/main/en/ca-gregorian.json",
-	"json!cldr-data/supplemental/likelySubtags.json"
+	"json!cldr-data/supplemental/likelySubtags.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, expandPattern, enCaGregorian, likelySubtags ) {
 
 var cldr;

test/unit/date/format-properties.js

@@ -6,6 +6,7 @@ define([
 	"json!cldr-data/supplemental/timeData.json",
 	"json!cldr-data/supplemental/weekData.json",
 
+	"cldr/event",
 	"cldr/supplemental"
 ], function( Cldr, properties, enCaGregorian, likelySubtags, timeData, weekData ) {
 

test/unit/date/format.js

@@ -9,6 +9,7 @@ define([
 	"json!cldr-data/supplemental/timeData.json",
 	"json!cldr-data/supplemental/weekData.json",
 
+	"cldr/event",
 	"cldr/supplemental"
 ], function( Cldr, format, formatProperties, stringPad, enCaGregorian, timeZoneNames, likelySubtags,
 	timeData, weekData ) {

test/unit/date/parse-properties.js

@@ -5,6 +5,7 @@ define([
 	"json!cldr-data/supplemental/likelySubtags.json",
 	"json!cldr-data/supplemental/timeData.json",
 
+	"cldr/event",
 	"cldr/supplemental"
 ], function( Cldr, parseProperties, enCaGregorian, likelySubtags, timeData ) {
 

test/unit/date/parse.js

@@ -11,6 +11,7 @@ define([
 	"json!cldr-data/supplemental/timeData.json",
 	"json!cldr-data/supplemental/weekData.json",
 
+	"cldr/event",
 	"cldr/supplemental"
 ], function( Cldr, parse, parseProperties, startOf, tokenizer, numberTokenizerProperties,
 	enCaGregorian, enNumbers, likelySubtags, timeData, weekData ) {

test/unit/date/tokenizer-properties.js

@@ -2,7 +2,10 @@ define([
 	"cldr",
 	"src/date/tokenizer-properties",
 	"json!cldr-data/main/en/ca-gregorian.json",
-	"json!cldr-data/supplemental/likelySubtags.json"
+	"json!cldr-data/supplemental/likelySubtags.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, tokenizerProperties, enCaGregorian, likelySubtags ) {
 
 var cldr;

test/unit/date/tokenizer.js

@@ -6,7 +6,10 @@ define([
 	"json!cldr-data/main/en/numbers.json",
 	"json!cldr-data/supplemental/likelySubtags.json",
 	"json!cldr-data/supplemental/timeData.json",
-	"json!cldr-data/supplemental/weekData.json"
+	"json!cldr-data/supplemental/weekData.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, tokenizer, tokenizerProperties, enCaGregorian, enNumbers, likelySubtags,
 	timeData, weekData ) {
 

test/unit/number/format-properties.js

@@ -3,7 +3,10 @@ define([
 	"src/number/format-properties",
 	"json!cldr-data/main/en/numbers.json",
 	"json!cldr-data/main/es/numbers.json",
-	"json!cldr-data/supplemental/likelySubtags.json"
+	"json!cldr-data/supplemental/likelySubtags.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, properties, enNumbers, esNumbers, likelySubtags ) {
 
 var en, es;

test/unit/number/format.js

@@ -7,7 +7,10 @@ define([
 	"json!cldr-data/main/es/numbers.json",
 	"json!cldr-data/main/zh/numbers.json",
 	"json!cldr-data/supplemental/likelySubtags.json",
-	"json!cldr-data/supplemental/numberingSystems.json"
+	"json!cldr-data/supplemental/numberingSystems.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, format, properties, arNumbers, enNumbers, esNumbers, zhNumbers, likelySubtags,
 	numberingSystems ) {
 

test/unit/number/parse-properties.js

@@ -3,7 +3,10 @@ define([
 	"src/number/parse-properties",
 	"json!cldr-data/main/en/numbers.json",
 	"json!cldr-data/main/es/numbers.json",
-	"json!cldr-data/supplemental/likelySubtags.json"
+	"json!cldr-data/supplemental/likelySubtags.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, properties, enNumbers, esNumbers, likelySubtags ) {
 
 var en, es;

test/unit/number/parse.js

@@ -9,7 +9,10 @@ define([
 	"json!cldr-data/main/sv/numbers.json",
 	"json!cldr-data/main/zh/numbers.json",
 	"json!cldr-data/supplemental/likelySubtags.json",
-	"json!cldr-data/supplemental/numberingSystems.json"
+	"json!cldr-data/supplemental/numberingSystems.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, parse, properties, arNumbers, enNumbers, esNumbers, ruNumbers, svNumbers,
 	zhNumbers, likelySubtags, numberingSystems ) {
 

test/unit/number/pattern-properties.js

@@ -2,7 +2,10 @@ define([
 	"cldr",
 	"src/number/format-properties",
 	"json!cldr-data/main/en/numbers.json",
-	"json!cldr-data/supplemental/likelySubtags.json"
+	"json!cldr-data/supplemental/likelySubtags.json",
+
+  "cldr/event",
+  "cldr/supplemental"
 ], function( Cldr, properties, enNumbers, likelySubtags ) {
 
 var en;