Updated version to 0.5.18

moment · Jun 18, 2018 · a237e9a · a237e9a
1 parent c3598f4
commit a237e9a
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 23 deletions.
diff --git a/builds/moment-timezone-with-data-2012-2022.js b/builds/moment-timezone-with-data-2012-2022.js
@@ -1,5 +1,5 @@
 //! moment-timezone.js
-//! version : 0.5.17
+//! version : 0.5.18
 //! Copyright (c) JS Foundation and other contributors
 //! license : MIT
 //! github.com/moment/moment-timezone
@@ -8,11 +8,10 @@
 	"use strict";
 
 	/*global define*/
-	if (typeof define === 'function' && define.amd) {
-		define(['moment'], factory);                 // AMD
-	} else if (typeof module === 'object' && module.exports) {
+	if (typeof module === 'object' && module.exports) {
 		module.exports = factory(require('moment')); // Node
-	} else {
+	} else if (typeof define === 'function' && define.amd) {
+		define(['moment'], factory);                 // AMD} else {
 		factory(root.moment);                        // Browser
 	}
 }(this, function (moment) {
@@ -24,14 +23,18 @@
 	// 	return moment;
 	// }
 
-	var VERSION = "0.5.17",
+	var VERSION = "0.5.18",
 		zones = {},
 		links = {},
 		names = {},
 		guesses = {},
-		cachedGuess,
+		cachedGuess;
 
-		momentVersion = moment.version.split('.'),
+	if (!moment || typeof moment.version !== 'string') {
+		logError('Moment Timezone requires Moment.js. See https://momentjs.com/timezone/docs/#/use-it/browser/');
+	}
+
+	var momentVersion = moment.version.split('.'),
 		major = +momentVersion[0],
 		minor = +momentVersion[1];
 
@@ -393,6 +396,10 @@
 	}
 
 	function getZone (name, caller) {
+		if (typeof name !== 'string') {
+			throw new Error('Time zone name must be a string, got ' + name + ' [' + typeof name + ']');
+		}
+
 		name = normalizeName(name);
 
 		var zone = zones[name];

diff --git a/builds/moment-timezone-with-data-2012-2022.min.js b/builds/moment-timezone-with-data-2012-2022.min.js
diff --git a/builds/moment-timezone-with-data.js b/builds/moment-timezone-with-data.js
diff --git a/builds/moment-timezone-with-data.min.js b/builds/moment-timezone-with-data.min.js
diff --git a/builds/moment-timezone.min.js b/builds/moment-timezone.min.js
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+### `0.5.18` _2018-06-18_
+* Return error when timezone name is not a string. #616
+* Moved moment to peerDependencies #628
+* Prefer nodejs to amd declaration #573
+
 ### `0.5.17` _2018-05-12_
 * Updated data to IANA TZDB `2018d`. #616
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "moment/moment-timezone",
   "description": "Parse and display dates in any timezone",
-  "version": "0.5.17",
+  "version": "0.5.18",
   "keywords": [
     "moment",
     "date",

diff --git a/moment-timezone.js b/moment-timezone.js
@@ -1,5 +1,5 @@
 //! moment-timezone.js
-//! version : 0.5.17
+//! version : 0.5.18
 //! Copyright (c) JS Foundation and other contributors
 //! license : MIT
 //! github.com/moment/moment-timezone
@@ -23,7 +23,7 @@
 	// 	return moment;
 	// }
 
-	var VERSION = "0.5.17",
+	var VERSION = "0.5.18",
 		zones = {},
 		links = {},
 		names = {},

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "moment-timezone",
-	"version": "0.5.17",
+	"version": "0.5.18",
 	"description": "Parse and display moments in any timezone.",
 	"homepage": "http://momentjs.com/timezone/",
 	"author": "Tim Wood <washwithcare@gmail.com> (http://timwoodcreates.com/)",