Develop -> Master release 0.5.29 (#849)

* Merged @adgrace pull request #410 * Merged @adgrace pull request #410 * Bugfix: zone country is detected incorrect if link is used * Bugfix: zone country is detected incorrect if link is used * Decrease build size * Order zones by name * Updated 2019c files * Updated changelog * Resolve es6 loading issue where moment is undefined * Removed node 4 and 6 from travis.yml * Corrected version numbers (#845) Version numbers were incorrect so fixed it. * Fixed changelog to represent proper release versions (#839) * Fixed changelog to represent proper release versions * Removed node v4 and 6 from travis build, because as pointed by other the ES6 syntax now included in the lib aren't supported with those earlier node versions. Co-authored-by: Alexandre Couillard <jackalex36@hotmail.com> * Resolves es6 module loading issue * Corrected version numbers (#845) Version numbers were incorrect so fixed it. * Resolves es6 module loading issue * Yet another PR adding TypeScript declarations (#530) * Adds TypeScript declarations for moment-timezone * Remove unnecessary `moment.` qualification in typings * Move exported types to top-level so that they can all be imported as named imports - Zone class must exist at `tz.Zone` because that's where it's exposed at runtime, but the `Zone` interface is still re-exported as a named export * tsc invocation always uses locally installed tsc Co-authored-by: Elena Sharovar <elenasharovar@gmail.com> * Release 0.5.29 * Release 0.5.29 Co-authored-by: Brinley Ang <brinley@unbolt.net> Co-authored-by: praneeth-m <praneeth.m@hotmail.com> Co-authored-by: Jackalex36 <beatboxace@gmail.com> Co-authored-by: Alexandre Couillard <jackalex36@hotmail.com> Co-authored-by: Andrew Bradley <cspotcode@gmail.com>
moment · May 16, 2020 · b6364f3 · b6364f3
1 parent 286646c
commit b6364f3
Show file tree

Hide file tree

Showing 20 changed files with 505 additions and 24 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -45,6 +45,10 @@ module.exports = function(grunt) {
 
 		clean: {
 			data: ['temp']
+		},
+
+		exec: {
+			'typing-tests': './node_modules/.bin/tsc --project ./typing-tests'
 		}
 	});
 
@@ -54,11 +58,13 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-contrib-jshint');
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-clean');
+	grunt.loadNpmTasks('grunt-exec');
+
+	grunt.registerTask('release', ['jshint', 'data', 'nodeunit', 'typing-tests', 'build', 'uglify']);
 
-	/** creates a release */
-	grunt.registerTask('release', ['jshint', 'data', 'nodeunit', 'build', 'uglify']);
+	grunt.registerTask('releaseNoData', ['jshint', 'nodeunit', 'typing-tests', 'build', 'uglify']);
 
-	grunt.registerTask('releaseNoData', ['jshint', 'nodeunit', 'build', 'uglify']);
+	grunt.registerTask('typing-tests', ['exec:typing-tests']);
 
-	grunt.registerTask('default', ['jshint', 'nodeunit']);
+	grunt.registerTask('default', ['jshint', 'nodeunit', 'typing-tests']);
 };
diff --git a/builds/moment-timezone-with-data-10-year-range.js b/builds/moment-timezone-with-data-10-year-range.js
@@ -1,5 +1,5 @@
 //! moment-timezone.js
-//! version : 0.5.28
+//! version : 0.5.29
 //! Copyright (c) JS Foundation and other contributors
 //! license : MIT
 //! github.com/moment/moment-timezone
@@ -18,13 +18,18 @@
 }(this, function (moment) {
 	"use strict";
 
+	// Resolves es6 module loading issue
+	if (moment.version === undefined && moment.default) {
+		moment = moment.default;
+	}
+
 	// Do not load moment-timezone a second time.
 	// if (moment.tz !== undefined) {
 	// 	logError('Moment Timezone ' + moment.tz.version + ' was already loaded ' + (moment.tz.dataVersion ? 'with data from ' : 'without any data') + moment.tz.dataVersion);
 	// 	return moment;
 	// }
 
-	var VERSION = "0.5.28",
+	var VERSION = "0.5.29",
 		zones = {},
 		links = {},
 		countries = {},

diff --git a/builds/moment-timezone-with-data-10-year-range.min.js b/builds/moment-timezone-with-data-10-year-range.min.js
diff --git a/builds/moment-timezone-with-data-1970-2030.js b/builds/moment-timezone-with-data-1970-2030.js
@@ -1,5 +1,5 @@
 //! moment-timezone.js
-//! version : 0.5.28
+//! version : 0.5.29
 //! Copyright (c) JS Foundation and other contributors
 //! license : MIT
 //! github.com/moment/moment-timezone
@@ -18,13 +18,18 @@
 }(this, function (moment) {
 	"use strict";
 
+	// Resolves es6 module loading issue
+	if (moment.version === undefined && moment.default) {
+		moment = moment.default;
+	}
+
 	// Do not load moment-timezone a second time.
 	// if (moment.tz !== undefined) {
 	// 	logError('Moment Timezone ' + moment.tz.version + ' was already loaded ' + (moment.tz.dataVersion ? 'with data from ' : 'without any data') + moment.tz.dataVersion);
 	// 	return moment;
 	// }
 
-	var VERSION = "0.5.28",
+	var VERSION = "0.5.29",
 		zones = {},
 		links = {},
 		countries = {},

diff --git a/builds/moment-timezone-with-data-1970-2030.min.js b/builds/moment-timezone-with-data-1970-2030.min.js
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.28
+//! version : 0.5.29
 //! Copyright (c) JS Foundation and other contributors
 //! license : MIT
 //! github.com/moment/moment-timezone
@@ -18,13 +18,18 @@
 }(this, function (moment) {
 	"use strict";
 
+	// Resolves es6 module loading issue
+	if (moment.version === undefined && moment.default) {
+		moment = moment.default;
+	}
+
 	// Do not load moment-timezone a second time.
 	// if (moment.tz !== undefined) {
 	// 	logError('Moment Timezone ' + moment.tz.version + ' was already loaded ' + (moment.tz.dataVersion ? 'with data from ' : 'without any data') + moment.tz.dataVersion);
 	// 	return moment;
 	// }
 
-	var VERSION = "0.5.28",
+	var VERSION = "0.5.29",
 		zones = {},
 		links = {},
 		countries = {},

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.29` _2020-05-16_
+* Merged fix of es6 module loading issue https://github.com/moment/moment-timezone/commit/1fd42349189b24e15c60f162dc8c40b42db79dfe
+* Merged PR with typescript declarations https://github.com/moment/moment-timezone/commit/ed529ea6fbcc70315c0c3f6d7c7cb70eadf56b03
+* Merged fixes to changelog https://github.com/moment/moment-timezone/commit/adb7d7b43c7328d814311ac1355bfeef88eab6e8
+
 ### `0.5.28` _2020-02-21_
 Merged pull request #410 from @adgrace:
 * Added a method `moment.tz.zonesForCountry(country_code)` which returns all timezones for the country

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.28",
+  "version": "0.5.29",
   "keywords": [
     "moment",
     "date",