Merge pull request #244 from spencermountain/dev

v6.10.1 rc

.eslintrc

@@ -1,4 +1,5 @@
 {
+  "root": true,
   "env": {
     "es6": true
   },

.github/workflows/build-and-test.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 13.x]
+        node-version: [10.x, 15.x]
 
     steps:
       - uses: actions/checkout@v2

_version.js

@@ -1 +1 @@
-module.exports = '6.10.0'
+module.exports = '6.10.1'

builds/spacetime.js

@@ -1,4 +1,4 @@
-/* spencermountain/spacetime 6.10.0 Apache 2.0 */
+/* spencermountain/spacetime 6.10.1 Apache 2.0 */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -341,7 +341,7 @@
   var toIana = function toIana(num) {
     num = Number(num);
 
-    if (num > -13 && num < 13) {
+    if (num >= -13 && num <= 13) {
       num = num * -1; //it's opposite!
 
       num = (num > 0 ? '+' : '') + num; //add plus sign
@@ -4171,7 +4171,7 @@
 
   var whereIts_1 = whereIts;
 
-  var _version = '6.10.0';
+  var _version = '6.10.1';
 
   var main$1 = function main(input, tz, options) {
     return new spacetime(input, tz, options);

builds/spacetime.mjs

@@ -1,4 +1,4 @@
-/* spencermountain/spacetime 6.10.0 Apache 2.0 */
+/* spencermountain/spacetime 6.10.1 Apache 2.0 */
 function _slicedToArray(arr, i) {
   return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
@@ -335,7 +335,7 @@ var gmtOffset = /gmt([\-+]?[0-9]+)/i;
 var toIana = function toIana(num) {
   num = Number(num);
 
-  if (num > -13 && num < 13) {
+  if (num >= -13 && num <= 13) {
     num = num * -1; //it's opposite!
 
     num = (num > 0 ? '+' : '') + num; //add plus sign
@@ -4165,7 +4165,7 @@ var whereIts = function whereIts(a, b) {
 
 var whereIts_1 = whereIts;
 
-var _version = '6.10.0';
+var _version = '6.10.1';
 
 var main$1 = function main(input, tz, options) {
   return new spacetime(input, tz, options);

changelog.md

@@ -7,6 +7,11 @@ This project follows semVer, where:
 <!-- [unreleased] 
 -->
 
+### v6.10.1
+- **[fix]** - keep yukon dst changes (for now!) #243
+- **[fix]** - support new-zealand time in '13h' format #242
+- update deps
+
 ### v6.10.0
 - **[fix]** - support whitespace between time and am/pm (thanks Andy!)
 - **[change]** - make empty array + obj equal to null inputs #240