Merge pull request #34 from add2cal/dev

Dev v1.4.0
add2cal · Oct 15, 2022 · 069958b · 069958b
2 parents f770173 + bbfdd9c
commit 069958b
Show file tree

Hide file tree

Showing 369 changed files with 634 additions and 2,646 deletions.
diff --git a/.npmignore b/.npmignore
@@ -23,8 +23,7 @@ sitemap.xml
 # plus all the maker stuff, which is not already ignored for Git
 
 tzdata/
-api/*.ics
-api/*/
+api/
 Makefile
 *.c
 *.tab

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,12 +1,11 @@
 const fs = require('fs');
 const tzDbPlaceholder = /let tzlibZonesDB,(\s)*tzlibZonesDetailsDB = {};/gm;
 const exportCodePlaceholder = /\/\/ PLACE EXPORT HERE/g;
-const zoneNamesPlaceholder = /\['%%PLACE ZONE NAMES HERE%%'\]/g;
 const tzDbContent = fs.readFileSync('./src/zonesdb.js', 'utf-8');
-const tzNamesList = fs.readFileSync('./api/zones.json', 'utf-8');
 
 function prepareFinalFile(content, exportPhrase = '') {
-  let newContent = content.replace(tzDbPlaceholder, tzDbContent).replace(zoneNamesPlaceholder, tzNamesList);
+  let newContent = content.replace(tzDbPlaceholder, tzDbContent);
+  // update export statement
   if (exportPhrase != '') {
     newContent = newContent.replace(
       exportCodePlaceholder,
@@ -15,6 +14,10 @@ function prepareFinalFile(content, exportPhrase = '') {
   } else {
     newContent = newContent.replace(exportCodePlaceholder, '');
   }
+  // remove regular comments
+  newContent = newContent.replace(/(^|(?<=;\s))\s*\/\/(?!\seslint).*$/gm, '');
+  // remove empty lines
+  newContent = newContent.replace(/^\s*$(?:\r\n?|\n)/gm, '');
   return newContent;
 }
 
@@ -32,17 +35,11 @@ module.exports = function (grunt) {
         },
         src: ['index.html'],
       },
-      generatorJS: {
+      js: {
         options: {
-          prefix: 'Version:.',
+          prefix: 'Version(.=..|:.)',
         },
-        src: ['generator.js'],
-      },
-      mainJS: {
-        options: {
-          prefix: 'Version.=..',
-        },
-        src: ['src/tzlib.js'],
+        src: ['generator.js', 'src/tzlib.js'],
       },
     },
     // cleans old built files
@@ -120,6 +117,9 @@ module.exports = function (grunt) {
         compress: true,
         mangle: true,
         sourceMap: true,
+        output: {
+          comments: 'some',
+        },
       },
       newBuild: {
         files: {

diff --git a/Readme.md b/Readme.md
@@ -26,7 +26,7 @@ Run ...
 sudo sh update-tzdata.sh tzVersionNumber
 ```
 
-... with _tzVersionNumber_ being the version of the IANA time zone database you want to use (e.g. sudo sh update-tzdata.sh 2022d).
+... with _tzVersionNumber_ being the version of the [IANA time zone database](https://www.iana.org/time-zones) you want to use (e.g. sudo sh update-tzdata.sh 2022e).
 
 <br />
 
@@ -165,6 +165,7 @@ Licensed under [Apache-2.0](LICENSE).
 
 ## ⚡ Changelog (without minor changes and fixes)
 
+- v1.4 : further minification via data mapping
 - v1.3 : bundle size optimization and API
 - v1.2 : providing tzblock as array with separate tzid
 - v1.1 : get-offset function

diff --git a/api/Africa/Abidjan.ics b/api/Africa/Abidjan.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Abidjan
 X-LIC-LOCATION:Africa/Abidjan
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:GMT
 TZOFFSETFROM:+0000

diff --git a/api/Africa/Algiers.ics b/api/Africa/Algiers.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Algiers
 X-LIC-LOCATION:Africa/Algiers
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:CET
 TZOFFSETFROM:+0100

diff --git a/api/Africa/Bissau.ics b/api/Africa/Bissau.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Bissau
 X-LIC-LOCATION:Africa/Bissau
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:GMT
 TZOFFSETFROM:+0000

diff --git a/api/Africa/Cairo.ics b/api/Africa/Cairo.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Cairo
 X-LIC-LOCATION:Africa/Cairo
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:EET
 TZOFFSETFROM:+0200

diff --git a/api/Africa/Casablanca.ics b/api/Africa/Casablanca.ics
@@ -2,7 +2,7 @@ BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Casablanca
 TZUNTIL:20870511T020001Z
 X-LIC-LOCATION:Africa/Casablanca
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:+01
 TZOFFSETFROM:+0100

diff --git a/api/Africa/Ceuta.ics b/api/Africa/Ceuta.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Ceuta
 X-LIC-LOCATION:Africa/Ceuta
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:DAYLIGHT
 TZNAME:CEST
 TZOFFSETFROM:+0100

diff --git a/api/Africa/El_Aaiun.ics b/api/Africa/El_Aaiun.ics
@@ -2,7 +2,7 @@ BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/El_Aaiun
 TZUNTIL:20870511T020001Z
 X-LIC-LOCATION:Africa/El_Aaiun
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:+01
 TZOFFSETFROM:+0100

diff --git a/api/Africa/Johannesburg.ics b/api/Africa/Johannesburg.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Johannesburg
 X-LIC-LOCATION:Africa/Johannesburg
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:SAST
 TZOFFSETFROM:+0200

diff --git a/api/Africa/Juba.ics b/api/Africa/Juba.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Juba
 X-LIC-LOCATION:Africa/Juba
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:CAT
 TZOFFSETFROM:+0200

diff --git a/api/Africa/Khartoum.ics b/api/Africa/Khartoum.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Khartoum
 X-LIC-LOCATION:Africa/Khartoum
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:CAT
 TZOFFSETFROM:+0200

diff --git a/api/Africa/Lagos.ics b/api/Africa/Lagos.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Lagos
 X-LIC-LOCATION:Africa/Lagos
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:WAT
 TZOFFSETFROM:+0100

diff --git a/api/Africa/Maputo.ics b/api/Africa/Maputo.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Maputo
 X-LIC-LOCATION:Africa/Maputo
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:CAT
 TZOFFSETFROM:+0200

diff --git a/api/Africa/Monrovia.ics b/api/Africa/Monrovia.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Monrovia
 X-LIC-LOCATION:Africa/Monrovia
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:GMT
 TZOFFSETFROM:+0000

diff --git a/api/Africa/Nairobi.ics b/api/Africa/Nairobi.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Nairobi
 X-LIC-LOCATION:Africa/Nairobi
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:EAT
 TZOFFSETFROM:+0300

diff --git a/api/Africa/Ndjamena.ics b/api/Africa/Ndjamena.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Ndjamena
 X-LIC-LOCATION:Africa/Ndjamena
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:WAT
 TZOFFSETFROM:+0100

diff --git a/api/Africa/Sao_Tome.ics b/api/Africa/Sao_Tome.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Sao_Tome
 X-LIC-LOCATION:Africa/Sao_Tome
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:GMT
 TZOFFSETFROM:+0000

diff --git a/api/Africa/Tripoli.ics b/api/Africa/Tripoli.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Tripoli
 X-LIC-LOCATION:Africa/Tripoli
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:EET
 TZOFFSETFROM:+0200

diff --git a/api/Africa/Tunis.ics b/api/Africa/Tunis.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Tunis
 X-LIC-LOCATION:Africa/Tunis
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:CET
 TZOFFSETFROM:+0100

diff --git a/api/Africa/Windhoek.ics b/api/Africa/Windhoek.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/Africa/Windhoek
 X-LIC-LOCATION:Africa/Windhoek
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:CAT
 TZOFFSETFROM:+0200

diff --git a/api/America/Adak.ics b/api/America/Adak.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Adak
 X-LIC-LOCATION:America/Adak
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:DAYLIGHT
 TZNAME:HDT
 TZOFFSETFROM:-1000

diff --git a/api/America/Anchorage.ics b/api/America/Anchorage.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Anchorage
 X-LIC-LOCATION:America/Anchorage
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:DAYLIGHT
 TZNAME:AKDT
 TZOFFSETFROM:-0900

diff --git a/api/America/Araguaina.ics b/api/America/Araguaina.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Araguaina
 X-LIC-LOCATION:America/Araguaina
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/Buenos_Aires.ics b/api/America/Argentina/Buenos_Aires.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/Buenos_Aires
 X-LIC-LOCATION:America/Argentina/Buenos_Aires
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/Catamarca.ics b/api/America/Argentina/Catamarca.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/Catamarca
 X-LIC-LOCATION:America/Argentina/Catamarca
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/Cordoba.ics b/api/America/Argentina/Cordoba.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/Cordoba
 X-LIC-LOCATION:America/Argentina/Cordoba
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/Jujuy.ics b/api/America/Argentina/Jujuy.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/Jujuy
 X-LIC-LOCATION:America/Argentina/Jujuy
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/La_Rioja.ics b/api/America/Argentina/La_Rioja.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/La_Rioja
 X-LIC-LOCATION:America/Argentina/La_Rioja
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/Mendoza.ics b/api/America/Argentina/Mendoza.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/Mendoza
 X-LIC-LOCATION:America/Argentina/Mendoza
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/Rio_Gallegos.ics b/api/America/Argentina/Rio_Gallegos.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/Rio_Gallegos
 X-LIC-LOCATION:America/Argentina/Rio_Gallegos
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/Salta.ics b/api/America/Argentina/Salta.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/Salta
 X-LIC-LOCATION:America/Argentina/Salta
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/San_Juan.ics b/api/America/Argentina/San_Juan.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/San_Juan
 X-LIC-LOCATION:America/Argentina/San_Juan
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/San_Luis.ics b/api/America/Argentina/San_Luis.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/San_Luis
 X-LIC-LOCATION:America/Argentina/San_Luis
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/Tucuman.ics b/api/America/Argentina/Tucuman.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/Tucuman
 X-LIC-LOCATION:America/Argentina/Tucuman
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Argentina/Ushuaia.ics b/api/America/Argentina/Ushuaia.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Argentina/Ushuaia
 X-LIC-LOCATION:America/Argentina/Ushuaia
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:STANDARD
 TZNAME:-03
 TZOFFSETFROM:-0300

diff --git a/api/America/Asuncion.ics b/api/America/Asuncion.ics
@@ -1,7 +1,7 @@
 BEGIN:VTIMEZONE
 TZID:/timezones-ical-library/America/Asuncion
 X-LIC-LOCATION:America/Asuncion
-LAST-MODIFIED:20220929T150625Z
+LAST-MODIFIED:20221015T115821Z
 BEGIN:DAYLIGHT
 TZNAME:-03
 TZOFFSETFROM:-0400