Skip to content

Commit

Permalink
Merge pull request #396 from spencermountain/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
spencermountain authored Aug 9, 2023
2 parents 8d17732 + 2757521 commit 55123b0
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 18 deletions.
6 changes: 3 additions & 3 deletions builds/spacetime.cjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* spencermountain/spacetime 7.4.5 Apache 2.0 */
/* spencermountain/spacetime 7.4.6 Apache 2.0 */
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
typeof define === 'function' && define.amd ? define(factory) :
Expand Down Expand Up @@ -116,7 +116,7 @@
"-7|n|03/12:02->11/05:02": "1/los_angeles,1/santa_isabel,1/tijuana,1/vancouver,1/ensenada,6/pacific,10/bajanorte,us/pacific-new,us/pacific",
"-7|n": "1/creston,1/dawson,1/dawson_creek,1/fort_nelson,1/hermosillo,1/mazatlan,1/phoenix,1/whitehorse,6/yukon,10/bajasur,us/arizona",
"-6|s|04/01:22->09/02:22": "11/easter,7/easterisland",
"-6|n|03/12:02->11/05:02": "1/boise,1/cambridge_bay,1/denver,1/edmonton,1/inuvik,1/north_dakota,1/ojinaga,1/yellowknife,1/shiprock,6/mountain,navajo,us/mountain",
"-6|n|03/12:02->11/05:02": "1/boise,1/cambridge_bay,1/denver,1/edmonton,1/inuvik,1/north_dakota,1/ojinaga,1/ciudad_juarez,1/yellowknife,1/shiprock,6/mountain,navajo,us/mountain",
"-6|n": "1/bahia_banderas,1/belize,1/chihuahua,1/costa_rica,1/el_salvador,1/guatemala,1/managua,1/merida,1/mexico_city,1/monterrey,1/regina,1/swift_current,1/tegucigalpa,11/galapagos,6/east-saskatchewan,6/saskatchewan,10/general",
"-5|s": "1/lima,1/rio_branco,1/porto_acre,5/acre",
"-5|n|03/12:02->11/05:02": "1/chicago,1/matamoros,1/menominee,1/rainy_river,1/rankin_inlet,1/resolute,1/winnipeg,1/indiana/knox,1/indiana/tell_city,1/north_dakota/beulah,1/north_dakota/center,1/north_dakota/new_salem,1/knox_in,6/central,us/central,us/indiana-starke",
Expand Down Expand Up @@ -4024,7 +4024,7 @@
};
var whereIts$1 = whereIts;

var version = '7.4.5';
var version = '7.4.6';

const main = (input, tz, options) => new Spacetime(input, tz, options);

Expand Down
2 changes: 1 addition & 1 deletion builds/spacetime.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/spacetime.mjs

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ This project follows semVer, where:
-->

### 7.4.6 [Aug 2023]
- **[change]** - add new dst for #395
- **[update]** - deps

### 7.4.5 [Jul 2023]
- **[fix]** - typescript node16 issue #393
- **[update]** - moroccan and palestinian dst dates
Expand All @@ -17,6 +21,7 @@ This project follows semVer, where:

### 7.4.4 [May 2023]
- **[fix]** - .week() results #387
- **[fix]** - .dayTime() results #388

### 7.4.3 [April 2023]
- **[fix]** - support leap-years in setting dayOfYear() #382
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "spacetime",
"version": "7.4.5",
"version": "7.4.6",
"description": "figure-out dates across timezones",
"main": "src/index.js",
"unpkg": "builds/spacetime.min.js",
Expand Down Expand Up @@ -59,7 +59,7 @@
"shelljs": "0.8.5",
"tap-dancer": "0.3.4",
"tape": "5.6.6",
"timekeeper": "2.2.0"
"timekeeper": "2.3.1"
},
"license": "Apache-2.0"
}
2 changes: 1 addition & 1 deletion src/_version.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default '7.4.5'
export default '7.4.6'
2 changes: 1 addition & 1 deletion zonefile/_build.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default {
"-7|n|03/12:02->11/05:02": "1/los_angeles,1/santa_isabel,1/tijuana,1/vancouver,1/ensenada,6/pacific,10/bajanorte,us/pacific-new,us/pacific",
"-7|n": "1/creston,1/dawson,1/dawson_creek,1/fort_nelson,1/hermosillo,1/mazatlan,1/phoenix,1/whitehorse,6/yukon,10/bajasur,us/arizona",
"-6|s|04/01:22->09/02:22": "11/easter,7/easterisland",
"-6|n|03/12:02->11/05:02": "1/boise,1/cambridge_bay,1/denver,1/edmonton,1/inuvik,1/north_dakota,1/ojinaga,1/yellowknife,1/shiprock,6/mountain,navajo,us/mountain",
"-6|n|03/12:02->11/05:02": "1/boise,1/cambridge_bay,1/denver,1/edmonton,1/inuvik,1/north_dakota,1/ojinaga,1/ciudad_juarez,1/yellowknife,1/shiprock,6/mountain,navajo,us/mountain",
"-6|n": "1/bahia_banderas,1/belize,1/chihuahua,1/costa_rica,1/el_salvador,1/guatemala,1/managua,1/merida,1/mexico_city,1/monterrey,1/regina,1/swift_current,1/tegucigalpa,11/galapagos,6/east-saskatchewan,6/saskatchewan,10/general",
"-5|s": "1/lima,1/rio_branco,1/porto_acre,5/acre",
"-5|n|03/12:02->11/05:02": "1/chicago,1/matamoros,1/menominee,1/rainy_river,1/rankin_inlet,1/resolute,1/winnipeg,1/indiana/knox,1/indiana/tell_city,1/north_dakota/beulah,1/north_dakota/center,1/north_dakota/new_salem,1/knox_in,6/central,us/central,us/indiana-starke",
Expand Down
5 changes: 5 additions & 0 deletions zonefile/iana.js
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,11 @@ export default {
"hem": "n",
"dst": "03/12:02->11/05:02"
},
"america/ciudad_juarez": {
"offset": -6,
"hem": "n",
"dst": "03/12:02->11/05:02"
},
"america/panama": {
"offset": -5,
"hem": "n"
Expand Down

0 comments on commit 55123b0

Please sign in to comment.