From 1e0ebe9b7f277cf8f1a0af8c0901386c4bf32f02 Mon Sep 17 00:00:00 2001 From: cutls Date: Sun, 20 Oct 2019 13:11:03 +0900 Subject: [PATCH 1/9] Improve: profile --- app/css/userdata.css | 31 +++++++++++++++++-- app/js/userdata/showOnTL.js | 55 ++++++++++++++++++--------------- app/view/make/index.sample.html | 47 ++++++++++++++++++---------- 3 files changed, 88 insertions(+), 45 deletions(-) diff --git a/app/css/userdata.css b/app/css/userdata.css index af2b8422..3d8cc72c 100644 --- a/app/css/userdata.css +++ b/app/css/userdata.css @@ -4,6 +4,9 @@ background-image: url("../../loading.svg"); overflow-y: hidden; } +#his-data .btn .material-icons{ + float:left; +} #his-data-content { display: flex; justify-content: center; @@ -22,6 +25,7 @@ } #his-float-data { height: 100%; + overflow-y: hidden; } #his-leftside { width: 500px; @@ -60,10 +64,10 @@ padding: 0; padding-left: 5px; } -#his-data a span.ellipsis:after { +.his-var-content a span.ellipsis:after { content: "..."; } -#his-data a:not(.mention) span:last-of-type { +.his-var-content a:not(.mention) span:last-of-type { display: none; } #his-data a .rep_ct, @@ -99,7 +103,8 @@ width: 20px; } #his-plus-action .btn { - width: 170px; + padding-right: 5px; + padding-left: 5px; } .tabs { display: flex; @@ -107,10 +112,30 @@ .tabs .tab a { padding: 8px 12px; } +#his-des { + max-height: 250px; + overflow-y: scroll; +} +#his-sign-action { + border: 1px solid; + border-radius: 5px; + display: flex; + align-items: center; + padding-left: 10px; + padding-right: 10px; + flex-wrap: wrap; +} +#his-sign-action .btn { + flex-basis: 31.2%; +} #his-des .mention { color: #039be5; cursor: pointer; } +#his-table{ + max-height: 150px; + overflow-y: scroll; +} #his-float-blocked { display: flex; justify-content: center; diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js index 0746a993..2da0b6a9 100644 --- a/app/js/userdata/showOnTL.js +++ b/app/js/userdata/showOnTL.js @@ -139,8 +139,10 @@ function udg(user, acct_id) { $("#his-since").text(crat(json.created_at)); $("#his-openin").attr("data-href", json.url); if (json.fields) { + var table ="" if (json.fields.length > 0) { - note = note + '' + $("#his-des").css("max-height", "250px"); + table = '
' for (var i = 0; i < json.fields.length; i++) { var fname = json.fields[i].name; var fval = json.fields[i].value; @@ -151,16 +153,18 @@ function udg(user, acct_id) { var when = ""; var color = "inherit" } - note = note + ''; + table = table + ''; } - note = note + '
' + twemoji.parse(escapeHTML(fname)) + '' + twemoji.parse(fval) + '
' + escapeHTML(fname) + '' + fval + '
' + table = table + '' $("#his-des").html(twemoji.parse(note)); } else { - $("#his-des").html(twemoji.parse(note)); + $("#his-des").css("max-height", "400px"); } - } else { - $("#his-des").html(twemoji.parse(note)); + $("#his-table").html(twemoji.parse(table)); + }else { + $("#his-des").css("max-height", "400px"); } + $("#his-des").html(twemoji.parse(note)); if (json.bot) { $("#his-bot").html(lang.lang_showontl_botacct); } @@ -305,10 +309,10 @@ function misskeyUdg(user, acct_id) { if (json.isFollowing) { //自分がフォローしている $("#his-data").addClass("following"); - $("#his-follow-btn").text(lang.lang_status_unfollow); + $("#his-follow-btn-text").text(lang.lang_status_unfollow); hisList(user, acct_id); } else { - $("#his-follow-btn").text(lang.lang_status_follow); + $("#his-follow-btn-text").text(lang.lang_status_follow); } if (json.isFollowed) { //フォローされてる @@ -317,9 +321,9 @@ function misskeyUdg(user, acct_id) { $("#his-block-btn").hide(); if (json.isMuted) { $("#his-data").addClass("muting"); - $("#his-mute-btn").text(lang.lang_status_unmute); + $("#his-mute-btn-text").text(lang.lang_status_unmute); } else { - $("#his-mute-btn").text(lang.lang_status_mute); + $("#his-mute-btn-text").text(lang.lang_status_mute); } $(".only-my-data").hide(); $(".only-his-data").show(); @@ -362,10 +366,10 @@ function relations(user, acct_id) { if (json.following) { //自分がフォローしている $("#his-data").addClass("following"); - $("#his-follow-btn").text(lang.lang_status_unfollow); + $("#his-follow-btn-text").text(lang.lang_status_unfollow); hisList(user, acct_id); } else { - $("#his-follow-btn").text(lang.lang_status_follow); + $("#his-follow-btn-text").text(lang.lang_status_follow); } if (json.followed_by) { //フォローされてる @@ -373,35 +377,35 @@ function relations(user, acct_id) { } if (json.blocking) { $("#his-data").addClass("blocking"); - $("#his-block-btn").text(lang.lang_status_unblock); + $("#his-block-btn-text").text(lang.lang_status_unblock); } else { - $("#his-block-btn").text(lang.lang_status_block); + $("#his-block-btn-text").text(lang.lang_status_block); } if (json.muting) { $("#his-data").addClass("muting"); - $("#his-mute-btn").text(lang.lang_status_unmute); + $("#his-mute-btn-text").text(lang.lang_status_unmute); } else { - $("#his-mute-btn").text(lang.lang_status_mute); + $("#his-mute-btn-text").text(lang.lang_status_mute); } if (json.muting_notifications) { $("#his-data").addClass("mutingNotf"); - $("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_unmute); + $("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_unmute); } else { - $("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute); + $("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_mute); } if (json.domain_blocking) { $("#his-data").addClass("blockingDom"); - $("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_unblock); + $("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_unblock); } else { - $("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block); + $("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_block); } //Endorsed if (json.endorsed) { $("#his-end-btn").addClass("endorsed"); - $("#his-end-btn").text(lang.lang_status_unendorse) + $("#his-end-btn-text").text(lang.lang_status_unendorse) } else { $("#his-end-btn").removeClass("endorsed"); - $("#his-end-btn").text(lang.lang_status_endorse) + $("#his-end-btn-text").text(lang.lang_status_endorse) } //Blocked if (json.blocked_by) { @@ -452,6 +456,7 @@ function reset() { $("#his-data").removeClass("mutingNotf"); $("#his-data").removeClass("blockingDom"); $("#his-end-btn").removeClass("endorsed"); + $("#his-des").css("max-height", "250px"); $("#his-bot").html(""); $("#his-follow-btn").show(); $("#his-block-btn").show(); @@ -459,9 +464,9 @@ function reset() { $("#his-notf-btn").show(); $("#his-domain-btn").show(); $("#his-emp-btn").show(); - $("#his-follow-btn").text(lang.lang_status_follow); - $("#his-mute-btn").text(lang.lang_status_mute); - $("#his-block-btn").text(lang.lang_status_block); + $("#his-follow-btn-text").text(lang.lang_status_follow); + $("#his-mute-btn-text").text(lang.lang_status_mute); + $("#his-block-btn-text").text(lang.lang_status_block); $("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute); $("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block); $("#his-relation").text(""); diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 852f57bc..91aca59f 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -489,17 +489,36 @@

-
- @@empUser@@ - @@endorse@@
- @@openinbrowser@@ - @@mainacct@@
-
+

+
+ people@@follow@@ + voice_over_off@@mute@@ + block@@block@@ + + more_vert@@more@@ +
+ +
@@ -661,12 +680,6 @@
- @@follow@@ - @@mute@@ - @@block@@ @@close@@
From 81a3da550faac90c9461b193a73963b2e6e1f2b6 Mon Sep 17 00:00:00 2001 From: cutls Date: Sun, 20 Oct 2019 13:13:59 +0900 Subject: [PATCH 2/9] Fix: instance ticker --- app/js/tl/parse.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index e65ddfcf..ce574a33 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -90,9 +90,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { } //Ticker var tickerck = localStorage.getItem("ticker_ok"); - if (tickerck) { + if (tickerck=="yes") { var ticker = true; - } else { + } else if(!ticker || ticker == "no") { var ticker = false; } //Animation From 8784cae01cb584eabbf75c335c2c5581dd63ee68 Mon Sep 17 00:00:00 2001 From: cutls Date: Sun, 20 Oct 2019 13:27:19 +0900 Subject: [PATCH 3/9] Fix: mouseover --- app/css/tl.css | 13 +++++++++++++ app/js/tl/card.js | 20 ++++++++++++++++---- app/js/tl/parse.js | 4 ++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/app/css/tl.css b/app/css/tl.css index 44b8c44f..c2895acb 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -227,6 +227,18 @@ iframe, grid-template-rows: auto 1.6rem 1fr auto 2.5rem; grid-template-areas: "notice notice notice" "icon display_name display_name" "space toot toot" "space additional additional" "vis actions side"; } +.hide-actions{ + grid-template-rows: auto 1.6rem 1fr auto 0; +} +.hide-actions .area-actions{ + display:none; +} +.hide-actions .area-vis{ + display:none; +} +.hide-actions .area-side{ + display:none; +} .cvo h1, .cvo h2, .cvo h3, @@ -325,6 +337,7 @@ iframe, margin: 2px; grid-area: side; } + .quote-inline { display: none; } diff --git a/app/js/tl/card.js b/app/js/tl/card.js index ebd14da9..d768c801 100644 --- a/app/js/tl/card.js +++ b/app/js/tl/card.js @@ -238,6 +238,7 @@ function cardCheck(tlid) { } function mov(id, tlid, type) { + var click = false if (tlid == "notf") { var tlide = "[data-notf=" + acct_id + "]"; } else if (tlid == "user") { @@ -257,12 +258,21 @@ function mov(id, tlid, type) { } else { mouseover = "hide"; } + click=true } else if (mouseover == "no") { mouseover = ""; } if (mouseover == "hide") { - $(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide") - $(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide") + if(click){ + $(tlide + " [toot-id=" + id + "]").toggleClass("hide-actions") + }else{ + $(tlide + " [toot-id=" + id + "]").removeClass("hide-actions") + } + + //$(tlide + " [toot-id=" + id + "] .area-vis").toggleClass("hide") + //$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide") + //$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide") + } } @@ -278,8 +288,10 @@ function resetmv(type) { mouseover = "hide"; } if (mouseover == "hide") { - $(".area-actions").addClass("hide"); - $(".area-side").addClass("hide"); + $(".cvo").addClass("hide-actions") + //$(".area-vis").addClass("hide"); + //$(".area-actions").addClass("hide"); + //$(".area-side").addClass("hide"); } } \ No newline at end of file diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index ce574a33..744aa8fc 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -176,7 +176,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { if (!mouseover) { mouseover = ""; } else if (mouseover == "yes" || mouseover == "click") { - mouseover = "hide"; + mouseover = "hide-actions"; } else if (mouseover == "no") { mouseover = ""; } @@ -785,7 +785,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { } poll = poll + '
' + '
' + escapeHTML(quoteUser) + '
' + toot.quote.content + '
more_vert
'; } - templete = templete + '
" + '
' + notice + home + "
" + '
' + '' + noticeavatar + "
" + '
' + dis_name + ' @' + toot.account.acct + locked + "
" + '
' + date(toot.created_at, datetype) + "" + "
" + '
' + tickerdom + '' + spoil + "" + spoiler_show + '
' + content + "
" + poll + "" + viewer + "" + '
' + analyze + "" + "" + mentions + tags + "
" + '
' + vis + "
" + '
' + '
' + lang.lang_parse_det + "
" + '
' + lang.lang_parse_thread + "
" + '
' + replyct + "
" + '
' + toot.reblogs_count + "
" + '
' + '
' + toot.favourites_count + "
" + '
' + '
' + '
redo
' + trans + '
' + via + "" + '
expand_more
' + '
more_vert
' + "
" + ""; + templete = templete + '
" + '
' + notice + home + "
" + '
' + '' + noticeavatar + "
" + '
' + dis_name + ' @' + toot.account.acct + locked + "
" + '
' + date(toot.created_at, datetype) + "" + "
" + '
' + tickerdom + '' + spoil + "" + spoiler_show + '
' + content + "
" + poll + "" + viewer + "" + '
' + analyze + "" + "" + mentions + tags + "
" + '
' + vis + "
" + '
' + '
' + lang.lang_parse_det + "
" + '
' + lang.lang_parse_thread + "
" + '
' + replyct + "
" + '
' + toot.reblogs_count + "
" + '
' + '
' + toot.favourites_count + "
" + '
' + '
' + '
redo
' + trans + '
' + via + "" + '
expand_more
' + '
more_vert
' + "
" + ""; } }); if (mix == "mix") { From 3e5f9c51f5e3da61cd5975fff35ccae0c585e623 Mon Sep 17 00:00:00 2001 From: cutls Date: Sun, 20 Oct 2019 19:09:52 +0900 Subject: [PATCH 4/9] Fix #142 --- app/js/common/modal.js | 3 +++ app/js/ui/img.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/js/common/modal.js b/app/js/common/modal.js index fc319048..bebc7dcb 100644 --- a/app/js/common/modal.js +++ b/app/js/common/modal.js @@ -23,4 +23,7 @@ $(document).ready(function () { } ); $('.collapsible').collapsible(); + $('#videomodal').modal({ + onCloseEnd: stopVideo + }); }); \ No newline at end of file diff --git a/app/js/ui/img.js b/app/js/ui/img.js index 7bc247ba..badf241a 100644 --- a/app/js/ui/img.js +++ b/app/js/ui/img.js @@ -281,4 +281,7 @@ function dlImg() { } function openFinder(dir) { postMessage(["openFinder", dir], "*") +} +function stopVideo(){ + document.getElementById('video').pause() } \ No newline at end of file From 4f858cf7d625f1190ae86d5859393a3a09ffddfb Mon Sep 17 00:00:00 2001 From: cutls Date: Sun, 20 Oct 2019 19:36:44 +0900 Subject: [PATCH 5/9] Watch mode(not auto-reloaded) --- app/js/tl/datails.js | 2 +- app/package.json | 2 + app/view/make/make.js | 171 +++++++------ app/yarn.lock | 540 +++++++++++++++++++++++++----------------- 4 files changed, 422 insertions(+), 293 deletions(-) diff --git a/app/js/tl/datails.js b/app/js/tl/datails.js index ceeabc6e..569b152b 100644 --- a/app/js/tl/datails.js +++ b/app/js/tl/datails.js @@ -520,7 +520,7 @@ function detEx(url, acct_id) { } var domain = localStorage.getItem("domain_" + acct_id); var at = localStorage.getItem("acct_" + acct_id + "_at"); - var start = "https://" + domain + "/api/v1/search?resolve=true&q=" + url + var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + url fetch(start, { method: 'GET', headers: { diff --git a/app/package.json b/app/package.json index 0df3b7d7..df8d82fa 100644 --- a/app/package.json +++ b/app/package.json @@ -9,6 +9,7 @@ "construct": "cd view/make && node make --automatic && cd ../../", "dev": "electron ./ --dev", "dist": "build --linux snap", + "watchview": "node view/make/make.js --automatic --watch", "build:js": "node build.js", "build": "electron-builder", "build:all": "electron-builder --win --linux", @@ -65,6 +66,7 @@ "itunes-nowplaying-mac": "0.3.1" }, "devDependencies": { + "chokidar": "^3.2.2", "electron": "^6.0.12", "electron-builder": "^21.1.5", "electron-rebuild": "^1.8.6", diff --git a/app/view/make/make.js b/app/view/make/make.js index da4e4f2d..96a48c84 100644 --- a/app/view/make/make.js +++ b/app/view/make/make.js @@ -1,78 +1,103 @@ -const fs = require("fs") -let ver = "Usamin (18.11.2)" -const execSync = require('child_process').execSync; -let gitHash = execSync("git rev-parse HEAD").toString().trim() -fs.writeFileSync("../../git", gitHash) +let ver = "Usamin (18.11.2)"; if (process.argv.indexOf("--automatic") === -1) { - let input = require('readline-sync').question('version string [empty: ' + ver + ' (default)]? '); + let input = require("readline-sync").question("version string [empty: " + ver + " (default)]? "); if (input) { - ver = input + ver = input; } + var basefile="../../" +} else { + var basefile="./" } -console.log("Constructing view files " + ver + ": make sure to update package.json") -const langs = ["ja", "en", "bg", "cs", "de", "es-AR", "ps"] -const langsh = ["日本語", "English", "български", "Česky", "Deutsch", "Spanish, Argentina", "Crowdin translate system(beta)"] -const simples = ["acct", "index", "setting", "update", "setting"] -const samples = ["acct.sample.html", "index.sample.html", "setting.sample.html", "update.sample.html", "setting.sample.js"] -const pages = ["acct.html", "index.html", "setting.html", "update.html", "setting.vue.js"] -let langstr = "" -let refKey = [] -for (let n = 0; n < langs.length; n++) { - let lang = langs[n] - let targetDir = '../' + lang - if (!fs.existsSync(targetDir)) { - fs.mkdirSync(targetDir); - } - langstr = langstr + '' + langsh[n] + '' - fs.writeFileSync("../" + lang + "/main.js", fs.readFileSync("language/" + lang + "/main.json", 'utf8').replace(/^{/, "var lang = {")) +function main(ver, basefile) { + const fs = require("fs"); + const execSync = require("child_process").execSync; + let gitHash = execSync("git rev-parse HEAD") + .toString() + .trim(); + fs.writeFileSync(basefile + "git", gitHash); + console.log("Constructing view files " + ver + ": make sure to update package.json"); + const langs = ["ja", "en", "bg", "cs", "de", "es-AR", "ps"]; + const langsh = ["日本語", "English", "български", "Česky", "Deutsch", "Spanish, Argentina", "Crowdin translate system(beta)"]; + const simples = ["acct", "index", "setting", "update", "setting"]; + const samples = ["acct.sample.html", "index.sample.html", "setting.sample.html", "update.sample.html", "setting.sample.js"]; + const pages = ["acct.html", "index.html", "setting.html", "update.html", "setting.vue.js"]; + let langstr = ""; + let refKey = []; + for (let n = 0; n < langs.length; n++) { + let lang = langs[n]; + let targetDir = basefile + "view/" + lang; + if (!fs.existsSync(targetDir)) { + fs.mkdirSync(targetDir); + } + langstr = langstr + "' + langsh[n] + ""; + fs.writeFileSync(basefile + "view/" + lang + "/main.js", fs.readFileSync(basefile + "view/make/language/" + lang + "/main.json", "utf8").replace(/^{/, "var lang = {")); + } + for (let i = 0; i < samples.length; i++) { + let sample = samples[i]; + let sourceParent = fs.readFileSync(basefile +"view/make/" +sample, "utf8"); + let englishRefer = JSON.parse(fs.readFileSync(basefile +"view/make/language/en/" + simples[i] + ".json", "utf8")); + for (let j = 0; j < langs.length; j++) { + let source = sourceParent; + let lang = langs[j]; + let target = JSON.parse(fs.readFileSync(basefile +"view/make/language/" + lang + "/" + simples[i] + ".json", "utf8")); + if (lang == "ja") { + Object.keys(target).forEach(function(key) { + refKey.push(key); + let str = target[key]; + if (pages[i] == "setting.vue.js") { + str = str.replace(/"/g, '\\"'); + } + var regExp = new RegExp("@@" + key + "@@", "g"); + source = source.replace(regExp, str); + }); + } else { + for (let k = 0; k < refKey.length; k++) { + let tarKey = refKey[k]; + if (target[tarKey]) { + var str = target[tarKey]; + } else { + var str = englishRefer[tarKey]; + } + if (pages[i] == "setting.vue.js") { + if (str) { + str = str.replace(/"/g, '\\"'); + } + } + var regExp = new RegExp("@@" + tarKey + "@@", "g"); + source = source.replace(regExp, str); + } + } + if (lang == "ps") { + source = source.replace(/@@comment-start@@/g, ""); + source = source.replace(/@@comment-end@@/g, ""); + } else { + source = source.replace(/@@comment-start@@/g, ""); + } + source = source.replace(/@@versionLetter@@/g, ver); + source = source.replace(/@@gitHash@@/g, gitHash); + source = source.replace(/@@gitHashShort@@/g, gitHash.slice(0, 7)); + source = source.replace(/@@lang@@/g, lang); + source = source.replace(/@@langlist@@/g, langstr); + fs.writeFileSync(basefile +"view/" + lang + "/" + pages[i], source); + } + } +} +main(ver, basefile); + +//if --watch, to yarn dev +if (process.argv.indexOf("--watch") !== -1) { + const chokidar = require("chokidar"); + console.log("watch mode(not hot-watch): when construction files are changed, refresh view files but not reload. Please reload manually.") + const watcher = chokidar.watch(basefile +"view/make", { + ignored: "view/make/make.js", + persistent: true + }); + watcher.on("ready", function() { + console.log("watching..."); + watcher.on("change", function(path) { + console.log(path + " changed."); + main(ver, basefile); + }); + }); } -for (let i = 0; i < samples.length; i++) { - let sample = samples[i] - let sourceParent = fs.readFileSync(sample, 'utf8') - let englishRefer = JSON.parse(fs.readFileSync("language/en/" + simples[i] + ".json", 'utf8')) - for (let j = 0; j < langs.length; j++) { - let source = sourceParent - let lang = langs[j] - let target = JSON.parse(fs.readFileSync("language/" + lang + "/" + simples[i] + ".json", 'utf8')) - if (lang == "ja") { - Object.keys(target).forEach(function (key) { - refKey.push(key) - let str = target[key] - if(pages[i]=="setting.vue.js"){ - str = str.replace(/"/g, '\\"') - } - var regExp = new RegExp("@@" + key + "@@", "g") - source = source.replace(regExp, str) - }) - } else { - for (let k = 0; k < refKey.length; k++) { - let tarKey = refKey[k] - if (target[tarKey]) { - var str = target[tarKey] - } else { - var str = englishRefer[tarKey] - } - if(pages[i]=="setting.vue.js"){ - if(str){ - str = str.replace(/"/g, '\\"') - } - } - var regExp = new RegExp("@@" + tarKey + "@@", "g") - source = source.replace(regExp, str) - } - } - if (lang == "ps") { - source = source.replace(/@@comment-start@@/g, "") - source = source.replace(/@@comment-end@@/g, "") - } else { - source = source.replace(/@@comment-start@@/g, "") - } - source = source.replace(/@@versionLetter@@/g, ver) - source = source.replace(/@@gitHash@@/g, gitHash) - source = source.replace(/@@gitHashShort@@/g, gitHash.slice(0, 7)) - source = source.replace(/@@lang@@/g, lang) - source = source.replace(/@@langlist@@/g, langstr) - fs.writeFileSync("../" + lang + "/" + pages[i], source) - } -} \ No newline at end of file diff --git a/app/yarn.lock b/app/yarn.lock index 65b1f8e9..b4ae675d 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -20,21 +20,21 @@ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.2.tgz#8644bc25b19475779a7b7c1fc104bc0a794f4465" integrity sha512-XiUPoS79r1G7PcpnNtq85TJ7inJWe0v+b5oZJZKb0pGHNIV6+UiNeQWiFGmuQ0aj7GEhnD/v9iqxIsjuRKtEnQ== -"@jimp/bmp@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.8.4.tgz#3246e0c6b073b3e2d9b61075ac0146d9124c9277" - integrity sha512-Cf/V+SUyEVxCCP8q1emkarCHJ8NkLFcLp41VMqBihoR4ke0TIPfCSdgW/JXbM/28vvZ5a2bvMe6uOll6cFggvA== +"@jimp/bmp@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.8.5.tgz#94437fa0f4dda5cf0233005640f39f75647c53ba" + integrity sha512-o/23j1RODQGGjvb2xg+9ZQCHc9uXa5XIoJuXHN8kh8AJBGD7JZYiHMwNHaxJRJvadimCKUeA5udZUJAoaPwrYg== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" bmp-js "^0.1.0" core-js "^2.5.7" -"@jimp/core@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.8.4.tgz#fbdb3cb0823301381736e988674f14c282dc5c63" - integrity sha512-3fK5UEOEQsfSDhsrAgBT6W8Up51qkeCj9RVjusxUaEGmix34PO/KTVfzURlu6NOpOUvtfNXsCq9xS7cxBTWSCA== +"@jimp/core@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.8.5.tgz#925549488916f1b9d71a4f248b023f9e8f969d7f" + integrity sha512-Jto1IdL5HYg7uE15rpQjK6dfZJ6d6gRjUsVCPW50nIfXgWizaTibFEov90W9Bj+irwKrX2ntG3e3pZUyOC0COg== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" any-base "^1.1.0" buffer "^5.2.0" core-js "^2.5.7" @@ -46,229 +46,229 @@ pixelmatch "^4.0.2" tinycolor2 "^1.4.1" -"@jimp/custom@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.8.4.tgz#abd61281ce12194ae23046ee71d60b754b515bc8" - integrity sha512-iS/RB3QQKpm4QS8lxxtQzvYDMph9YvOn3d68gMM4pDKn95n3nt5/ySHFv6fQq/yzfox1OPdeYaXbOLvC3+ofqw== +"@jimp/custom@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.8.5.tgz#68131a5d7e8776d3aafc5aa7ba207405fde5c361" + integrity sha512-hS4qHOcOIL+N93IprsIhFgr8F4XnC2oYd+lRaOKEOg3ptS2vQnceSTtcXsC0//mhq8AV6lNjpbfs1iseEZuTqg== dependencies: - "@jimp/core" "^0.8.4" + "@jimp/core" "^0.8.5" core-js "^2.5.7" -"@jimp/gif@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.8.4.tgz#1429a71ed3b055f73d63c9b195fa7f0a46e947b5" - integrity sha512-YpHZ7aWzmrviY7YigXRolHs6oBhGJItRry8fh3zebAgKth06GMv58ce84yXXOKX4yQ+QGd6GgOWzePx+KMP9TA== +"@jimp/gif@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.8.5.tgz#18626bcb2d38b2ee7feb48b9c36acea094190dd1" + integrity sha512-Mj8jmv4AS76OY+Hx/Xoyihj02SUZ2ELk+O5x89pODz1+NeGtSWHHjZjnSam9HYAjycvVI/lGJdk/7w0nWIV/yQ== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" omggif "^1.0.9" -"@jimp/jpeg@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.8.4.tgz#effde867116f88f59ac20b44b1a526b11caca026" - integrity sha512-7exKk3LNPKJgsFzUPL+mOJtIEHcLp6yU9sVbULffVDjVUun6/Are2tCX8rCXZq28yiUhofzr61k5UqjkKFJXrA== +"@jimp/jpeg@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.8.5.tgz#07b3524dadb2d69d0b7cd862d9525a6f42cdcc28" + integrity sha512-7kjTY0BiCpwRywk+oPfpLto7cLI+9G0mf4N1bv1Hn+VLQwcXFy2fHyl4qjqLbbY6u4cyZgqN+R8Pg6GRRzv0kw== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" jpeg-js "^0.3.4" -"@jimp/plugin-blit@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.8.4.tgz#991b4199cc5506f0faae22b821b14ec93fbce1bb" - integrity sha512-H9bpetmOUgEHpkDSRzbXLMXQhr34i8YicYV3EDeuHU8mKlAjtMbVpbp5ZN4mcadTz+EYdTdVNfQNsRCcIb5Oeg== +"@jimp/plugin-blit@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.8.5.tgz#5a865ca39e2bd46d7f7250a86e44c67115b84bcf" + integrity sha512-r8Z1CwazaJwZCRbucQgrfprlGyH91tX7GubUsbWr+zy5/dRJAAgaPj/hcoHDwbh3zyiXp5BECKKzKW0x4reL4w== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-blur@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.8.4.tgz#460f79c45eda7f24adf624a691134d6192d3dbb4" - integrity sha512-gvEDWW7+MI9Hk1KKzuFliRdDPaofkxB4pRJ/n1hipDoOGcNYFqxx5FGNQ4wsGSDpQ+RiHZF+JGKKb+EIwHg+0Q== +"@jimp/plugin-blur@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.8.5.tgz#6a4675cdf50ed0add497af280b904858017b59b9" + integrity sha512-UH5ywpV4YooUh9HXEsrNKDtojLCvIAAV0gywqn8EQeFyzwBJyXAvRNARJp7zr5OPLr9uGXkRLDCO9YyzdlXZng== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-color@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.8.4.tgz#a9aa525421ea50bf2c1baec7618f73b7e4fc3464" - integrity sha512-DHCGMxInCI1coXMIfdZJ5G/4hpt5yZLNB5+oUIxT4aClzyhUjqD4xOcnO7hlPY6LuX8+FX7cYMHhdMfhTXB3Dg== +"@jimp/plugin-color@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.8.5.tgz#fd4a656fbf6bd9db9e86a6cd2e141d0bf2250a8b" + integrity sha512-7XHqcTQ8Y1zto1b9P1y8m1dzSjnOpBsD9OZG0beTpeJ5bgPX+hF5ZLmvcM6c5ljkINw5EUF1it07BYbkCxiGQA== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" tinycolor2 "^1.4.1" -"@jimp/plugin-contain@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.8.4.tgz#2db8c12de910490cd74f339e9414a968b8c9328e" - integrity sha512-3wwLXig5LkOMg5FrNZrX/r99ehaA+0s3dkro3CiRg0Ez6Y0fz067so+HdsmqmoG78WY/dCdgdps/xLOW2VV4DQ== +"@jimp/plugin-contain@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.8.5.tgz#e2fd426684790972596c9035b4ddb8594d5be627" + integrity sha512-ZkiPFx9L0yITiKtYTYLWyBsSIdxo/NARhNPRZXyVF9HmTWSLDUw1c2c1uvETKxDZTAVK+souYT14DwFWWdhsYA== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-cover@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.8.4.tgz#a09bfbbe88129754ca35e281707bc5ed3f3f0c63" - integrity sha512-U0xmSfGLmw0Ieiw00CM8DQ+XoQVBxbjsLE5To8EejnyLx5X+oNZ8r7E5EsQaushUlzij95IqMCloo+nCGhdYMw== +"@jimp/plugin-cover@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.8.5.tgz#25672884c5bf0bd6bbffbf288482f5f2cf53f50d" + integrity sha512-OdT4YAopLOhbhTUQV3R1v5ZZqIaUt3n3vJi/OfTbsak1t9UkPBVdmYPyhoont8zJdtdkF5dW16Ro1FTshytcww== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-crop@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.8.4.tgz#ca5bd359c4e4b2374777bae6130e8b94552932fa" - integrity sha512-Neqs0K4cr7SU9nSte2qvGVh/8+K9ArH8mH1fWhZw4Zq8qD9NicX+g5hqmpmeSjOKD73t/jOmwvBevfJDu2KKSA== +"@jimp/plugin-crop@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.8.5.tgz#68e2a72796148d32b18fd74d5f0d2dc049b5af84" + integrity sha512-E1Hb+gfu2k74Gkqh96apAyVljsP5MjCH4TY6lECAAEcYKGH/XRhz6lY2dSEjCYE7KtiqjTZzWwYkgAvkwojj9Q== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-displace@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.8.4.tgz#c6d5cff889e52cb64194979967e6bd7fff4d5d1b" - integrity sha512-qKCwAP2lAO3R8ofYaEF/Gh+sfcjzZLtEiYHzjx/mYvPpXS6Yvkvl28aUH8pwdJYT+QYGelHmOne0RJvjsac1NQ== +"@jimp/plugin-displace@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.8.5.tgz#af75a58939653c0b489ed57ea056fbde2cca5557" + integrity sha512-fVgVYTS1HZzAXkg8Lg06PuirSUG5oXYaYYGL+3ZU4tmZn1pyZ+mZyfejpwtymETEYZnmymHoCT4xto19E/IRvA== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-dither@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.8.4.tgz#a2320d6a8c467cf7697109e0c5ed4ee3d3898b73" - integrity sha512-19+y5VAO6d0keRne9eJCdOeB9X0LFuRdRSjgwl/57JtREeoPj+iKBg6REBl4atiSGd7/UCFg3wRtFOw24XFKgw== +"@jimp/plugin-dither@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.8.5.tgz#66ce78be90071ddef5ac2451da97b2c28d836960" + integrity sha512-KSj2y8E3yK7tldjT/8ejqAWw5HFBjtWW6QkcxfW7FdV4c/nsXZXDkMbhqMZ7FkDuSYoAPeWUFeddrH4yipC5iA== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-flip@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.8.4.tgz#08bf46470c3c0b4890691f554c28ccf17813746f" - integrity sha512-1BtKtc8cANuGgiWyOmltQZaR3Y5Og/GS/db8wBpFNLJ33Ir5UAGN2raDtx4EYEd5okuRVFj3OP+wAZl69m72LQ== +"@jimp/plugin-flip@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.8.5.tgz#ef9bd0b7126bc6d696bd60f8591071461eef993c" + integrity sha512-2QbGDkurPNAXZUeHLo/UA3tjh+AbAXWZKSdtoa1ArlASovRz8rqtA45YIRIkKrMH82TA3PZk8bgP2jaLKLrzww== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-gaussian@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.8.4.tgz#f3be12c5f16c5670959ab711e69b2963f66f7b4f" - integrity sha512-qYcVmiJn8l8uDZqk4FlB/qTV8fJgiJAh/xc/WKNEp2E8qFEgxoIPeimPHO8cJorEHqlh8I8l24OZkTkkEKaFfw== +"@jimp/plugin-gaussian@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.8.5.tgz#2de042c20def796276e46e3a0a4d576ceeeb6ddb" + integrity sha512-2zReC5GJcVAXtf3UgzFcHSYN277i02K9Yrhc1xJf3mti00s43uD++B5Ho7/mIo+HrntVvWhxqar7PARdq0lVIg== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-invert@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.8.4.tgz#fd4577beba2973f663164f5ee454b2172ca56b34" - integrity sha512-OQ/dFDbBUmEd935Gitl5Pmgz+nLVyszwS0RqL6+G1U9EHYBeiHDrmY2sj7NgDjDEJYlRLxGlBRsTIPHzF3tdNw== +"@jimp/plugin-invert@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.8.5.tgz#91044275df2101beecabd6d12416539724840f6a" + integrity sha512-GyMXPGheHdS14xfDceuZ9hrGm6gE9UG3PfTEjQbJmHMWippLC6yf8kombSudJlUf8q72YYSSXsSFKGgkHa67vA== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-mask@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.8.4.tgz#0dfe02a14530c3bddfc258e83bd3c979e53d15ef" - integrity sha512-uqLdRGShHwCd9RHv8bMntTfDNDI2pcEeE7+F868P6PngWLKrzQCpuAyTnK6WK0ZN95fSsgy7TzCoesYk+FchkQ== +"@jimp/plugin-mask@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.8.5.tgz#c7ce4961902c333f7a3adaa89e5d95204dc94193" + integrity sha512-inD/++XO+MkmwXl9JGYQ8X2deyOZuq9i+dmugH/557p16B9Q6tvUQt5X1Yg5w7hhkLZ00BKOAJI9XoyCC1NFvQ== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-normalize@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.8.4.tgz#aa2c3131082b6ceef2fb6222323db9f7d837447c" - integrity sha512-+ihgQeVD8syWxw12F5ngUUdtlIcGDqH7hEoHcwVVGOFfaJqR4YBQR4FM3QLFFFdi2X/uK2nGJt9cMh0UaINEgw== +"@jimp/plugin-normalize@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.8.5.tgz#4fe62178ae45ba987f638dde2da8230277318b19" + integrity sha512-8YRWJWBT4NoSAbPhnjQJXGeaeWVrJAlGDv39A54oNH8Ry47fHcE0EN6zogQNpBuM34M6hRnZl4rOv1FIisaWdg== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-print@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.8.4.tgz#c110d6e7632e3c9cf47ce395e36b0f3c1461a9ca" - integrity sha512-Wg5tZI3hW5DG9Caz4wg4ZolS3Lvv4MFAxORPAeWeahDpHs38XZ7ydJ0KR39p2oWJPP0yIFv1fETYpU7BiJPRRw== +"@jimp/plugin-print@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.8.5.tgz#702228f962bdfd53b38c17e49053e4124e8051c0" + integrity sha512-BviNpCiA/fEieOqsrWr1FkqyFuiG2izdyyg7zUqyeUTHPwqrTLvXO9cfP/ThG4hZpu5wMQ5QClWSqhZu1fAwxA== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" load-bmfont "^1.4.0" -"@jimp/plugin-resize@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.8.4.tgz#6690f50c98cfd89ac3682b58ba9623e7c46e0be6" - integrity sha512-z9tumvsQja/YFTSeGvofYLvVws8LZYLYVW8l17hBETzfZQdVEvPOdWKkXqsAsK5uY9m8M5rH7kR8NZbCDVbyzA== +"@jimp/plugin-resize@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.8.5.tgz#4949909d89a9e540725b7431abcbafd520ce32f4" + integrity sha512-gIdmISuNmZQ1QwprnRC5VXVWQfKIiWineVQGebpMAG/aoFOLDXrVl939Irg7Fb/uOlSFTzpAbt1zpJ8YG/Mi2w== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-rotate@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.8.4.tgz#bf3ea70d10123f1372507b74d06bfefb40b3e526" - integrity sha512-PVxpt3DjqaUnHP6Nd3tzZjl4SYe/FYXszGTshtx51AMuvZLnpvekrrclYyc7Dc1Ry3kx3ma6UuLCvmf85hrdmw== +"@jimp/plugin-rotate@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.8.5.tgz#279dbe2c5e51ec2b2861010cbcc38ce574b12f9c" + integrity sha512-8T9wnL3gb+Z0ogMZmtyI6h3y7TuqW2a5SpFbzFUVF+lTZoAabXjEfX3CAozizCLaT+Duc5H2FJVemAHiyr+Dbw== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugin-scale@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.8.4.tgz#2de9cc80d49f6a36e4177b22e0ab1d4305331c2e" - integrity sha512-PrBTOMJ5n4gbIvRNxWfc1MdgHw4vd5r1UOHRVuc6ZQ9Z/FueBuvIidnz7GBRHbsRm3IjckvsLfEL1nIK0Kqh3A== +"@jimp/plugin-scale@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.8.5.tgz#6c166575c085da31788acda7da460af3a60351b3" + integrity sha512-G+CDH9s7BsxJ4b+mKZ5SsiXwTAynBJ+7/9SwZFnICZJJvLd79Tws6VPXfSaKJZuWnGIX++L8jTGmFORCfLNkdg== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" -"@jimp/plugins@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.8.4.tgz#af24c0686aec327f3abcc50ba5bbae1df2113fb0" - integrity sha512-Vd0oCe0bj7c+crHL6ee178q2c1o50UnbCmc0imHYg7M+pY8S1kl4ubZWwkAg2W96FCarGrm9eqPvCUyAdFOi9w== +"@jimp/plugins@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.8.5.tgz#1d8d6521e67c527885833ffd5fab7d707ebce3c4" + integrity sha512-52na0wqfQ3uItIA+C9cJ1EXffhSmABgK7ETClDseUh9oGtynHzxZ97smnFf1ydLjXLrF89Gt+YBxWLyiBGgiZQ== dependencies: - "@jimp/plugin-blit" "^0.8.4" - "@jimp/plugin-blur" "^0.8.4" - "@jimp/plugin-color" "^0.8.4" - "@jimp/plugin-contain" "^0.8.4" - "@jimp/plugin-cover" "^0.8.4" - "@jimp/plugin-crop" "^0.8.4" - "@jimp/plugin-displace" "^0.8.4" - "@jimp/plugin-dither" "^0.8.4" - "@jimp/plugin-flip" "^0.8.4" - "@jimp/plugin-gaussian" "^0.8.4" - "@jimp/plugin-invert" "^0.8.4" - "@jimp/plugin-mask" "^0.8.4" - "@jimp/plugin-normalize" "^0.8.4" - "@jimp/plugin-print" "^0.8.4" - "@jimp/plugin-resize" "^0.8.4" - "@jimp/plugin-rotate" "^0.8.4" - "@jimp/plugin-scale" "^0.8.4" + "@jimp/plugin-blit" "^0.8.5" + "@jimp/plugin-blur" "^0.8.5" + "@jimp/plugin-color" "^0.8.5" + "@jimp/plugin-contain" "^0.8.5" + "@jimp/plugin-cover" "^0.8.5" + "@jimp/plugin-crop" "^0.8.5" + "@jimp/plugin-displace" "^0.8.5" + "@jimp/plugin-dither" "^0.8.5" + "@jimp/plugin-flip" "^0.8.5" + "@jimp/plugin-gaussian" "^0.8.5" + "@jimp/plugin-invert" "^0.8.5" + "@jimp/plugin-mask" "^0.8.5" + "@jimp/plugin-normalize" "^0.8.5" + "@jimp/plugin-print" "^0.8.5" + "@jimp/plugin-resize" "^0.8.5" + "@jimp/plugin-rotate" "^0.8.5" + "@jimp/plugin-scale" "^0.8.5" core-js "^2.5.7" timm "^1.6.1" -"@jimp/png@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.8.4.tgz#d150ddaaebafcda83d820390f62a4d3c409acc03" - integrity sha512-DLj260SwQr9ZNhSto1BacXGNRhIQiLNOESPoq5DGjbqiPCmYNxE7CPlXB1BVh0T3AmZBjnZkZORU0Y9wTi3gJw== +"@jimp/png@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.8.5.tgz#121debfb55c5ba2a44e9ffeeb901bbb97fd24f53" + integrity sha512-zT89ucu8I2rsD3FIMIPLgr1OyKn4neD+5umwD3MY8AOB8+6tX5bFtnmTm3FzGJaJuibkK0wFl87eiaxnb+Megw== dependencies: - "@jimp/utils" "^0.8.4" + "@jimp/utils" "^0.8.5" core-js "^2.5.7" pngjs "^3.3.3" -"@jimp/tiff@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.8.4.tgz#bc18c32cef996ad986a92bb7d926d6abd1db9d10" - integrity sha512-SQmf1B/TbCtbwzJReLw/lzGqbeu8MOfT+wkaia0XWS72H6bEW66PTQKhB4/3uzC/Xnmsep1WNQITlwcWdgc36Q== +"@jimp/tiff@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.8.5.tgz#b1eddfd8b7fd3171cbde8fbe133c36a9889b04c2" + integrity sha512-Z7uzDcbHuwDg+hy2+UJQ2s5O6sqYXmv6H1fmSf/2dxBrlGMzl8yTc2/BxLrGREeoidDDMcKmXYGAOp4uCsdJjw== dependencies: core-js "^2.5.7" utif "^2.0.1" -"@jimp/types@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.8.4.tgz#01df00a5adb955cb4ba79df1288408faa3bb40ed" - integrity sha512-BCehQ5hrTOGDGdeROwXOYqgFGAzJPkuXmVJXgMgBoW1YjoGWhXJ5iShaJ/l7DRErrdezoWUdAhTFlV5bJf51dg== +"@jimp/types@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.8.5.tgz#49058260cfe4227da39f4915c5e5c83b0dbcbf46" + integrity sha512-XUvpyebZGd1vyFiJyxUT4H9A3mKD7MV2MxjXnay3fNTrcow0UJJspmFw/w+G3TP/1dgrVC4K++gntjR6QWTzvg== dependencies: - "@jimp/bmp" "^0.8.4" - "@jimp/gif" "^0.8.4" - "@jimp/jpeg" "^0.8.4" - "@jimp/png" "^0.8.4" - "@jimp/tiff" "^0.8.4" + "@jimp/bmp" "^0.8.5" + "@jimp/gif" "^0.8.5" + "@jimp/jpeg" "^0.8.5" + "@jimp/png" "^0.8.5" + "@jimp/tiff" "^0.8.5" core-js "^2.5.7" timm "^1.6.1" -"@jimp/utils@^0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.8.4.tgz#a6bbdc13dba99b95d4cabf0bde87b1bcd2230d25" - integrity sha512-6Cwplao7IgwhFRijMvvyjdV7Sa7Fw71vS1aDsUDCVpi3XHsiLUM+nPTno6OKjzg2z2EufuolWPEvuq/GSte4lA== +"@jimp/utils@^0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.8.5.tgz#5aede22f51b56141d245bef1195013a1de9158bd" + integrity sha512-D3+H4BiopDkhUKvKkZTPPJ53voqOkfMuk3r7YZNcLtXGLkchjjukC4056lNo7B0DzjBgowTYsQM3JjKnYNIYeg== dependencies: core-js "^2.5.7" @@ -290,9 +290,9 @@ integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== "@types/node@^10.12.18": - version "10.14.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.18.tgz#b7d45fc950e6ffd7edc685e890d13aa7b8535dce" - integrity sha512-ryO3Q3++yZC/+b8j8BdKd/dn9JlzlHBPdm80656xwYUdmPkpTGTjkAdt6BByiNupGPE8w0FhBgvYy/fX9hRNGQ== + version "10.14.22" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.22.tgz#34bcdf6b6cb5fc0db33d24816ad9d3ece22feea4" + integrity sha512-9taxKC944BqoTVjE+UT3pQH0nHZlTvITwfsOZqyc+R3sfJuxaTtxWjfn1K2UlxyPcKHf0rnaXcVFrS9F9vf0bw== abbrev@1: version "1.1.1" @@ -348,6 +348,14 @@ any-base@^1.1.0: resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe" integrity sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg== +anymatch@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" + integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + app-builder-bin@3.4.3: version "3.4.3" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.4.3.tgz#58a74193eb882f029be6b7f0cd3f0c6805927a6b" @@ -455,6 +463,11 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" +binary-extensions@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c" + integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow== + bluebird-lst@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" @@ -463,9 +476,9 @@ bluebird-lst@^1.0.9: bluebird "^3.5.5" bluebird@^3.5.5: - version "3.5.5" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f" - integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w== + version "3.7.1" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de" + integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg== bmp-js@^0.1.0: version "0.1.0" @@ -494,6 +507,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + buffer-equal@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b" @@ -584,10 +604,25 @@ chalk@^2.0.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chokidar@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.2.2.tgz#a433973350021e09f2b853a2287781022c0dc935" + integrity sha512-bw3pm7kZ2Wa6+jQWYP/c7bAZy3i4GwiIiMO2EeRjrE48l8vBqC/WvFhSF0xyM8fQiPEGvwMY/5bqDG7sSEOuhg== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.2.0" + optionalDependencies: + fsevents "~2.1.1" + chownr@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6" - integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A== + version "1.1.3" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" + integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== chromium-pickle-js@^0.2.0: version "0.2.0" @@ -655,9 +690,9 @@ color-name@1.1.3: integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= colors@^1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d" - integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg== + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" @@ -699,9 +734,9 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= core-js@^2.5.7: - version "2.6.9" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" - integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== + version "2.6.10" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f" + integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -839,9 +874,9 @@ dotenv-expand@^5.1.0: integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== dotenv@^8.0.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.1.0.tgz#d811e178652bfb8a1e593c6dd704ec7e90d85ea2" - integrity sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA== + version "8.2.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" + integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== duplexer3@^0.1.4: version "0.1.4" @@ -947,9 +982,9 @@ emoji-regex@^7.0.1: integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== end-of-stream@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== dependencies: once "^1.4.0" @@ -966,9 +1001,9 @@ error-ex@^1.2.0: is-arrayish "^0.2.1" es-abstract@^1.13.0, es-abstract@^1.5.1: - version "1.14.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.14.2.tgz#7ce108fad83068c8783c3cdf62e504e084d8c497" - integrity sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg== + version "1.16.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d" + integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg== dependencies: es-to-primitive "^1.2.0" function-bind "^1.1.1" @@ -978,8 +1013,8 @@ es-abstract@^1.13.0, es-abstract@^1.5.1: is-regex "^1.0.4" object-inspect "^1.6.0" object-keys "^1.1.1" - string.prototype.trimleft "^2.0.0" - string.prototype.trimright "^2.0.0" + string.prototype.trimleft "^2.1.0" + string.prototype.trimright "^2.1.0" es-to-primitive@^1.2.0: version "1.2.0" @@ -1080,6 +1115,13 @@ file-type@^9.0.0: resolved "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz#a68d5ad07f486414dfb2c8866f73161946714a18" integrity sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw== +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -1162,6 +1204,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +fsevents@~2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.1.tgz#74c64e21df71721845d0c44fe54b7f56b82995a9" + integrity sha512-4FRPXWETxtigtJW/gxzEDsX1LVbPAM93VleB83kZB+ellqbHMkyt2aJfuzNLRvFPnGi6bcE5SvfxgbXPeKteJw== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -1217,6 +1264,13 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +glob-parent@~5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" + integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== + dependencies: + is-glob "^4.0.1" + glob@^7.0.3, glob@^7.1.3: version "7.1.4" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" @@ -1307,9 +1361,9 @@ has@^1.0.1, has@^1.0.3: function-bind "^1.1.1" hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: - version "2.8.4" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.4.tgz#44119abaf4bc64692a16ace34700fed9c03e2546" - integrity sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ== + version "2.8.5" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" + integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== http-cache-semantics@^4.0.0: version "4.0.3" @@ -1377,6 +1431,13 @@ is-arrayish@^0.2.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + is-callable@^1.1.3, is-callable@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" @@ -1394,6 +1455,11 @@ is-date-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + is-finite@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" @@ -1418,6 +1484,13 @@ is-function@^1.0.1: resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5" integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU= +is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + is-installed-globally@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" @@ -1431,6 +1504,11 @@ is-npm@^3.0.0: resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-3.0.0.tgz#ec9147bfb629c43f494cf67936a961edec7e8053" integrity sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA== +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + is-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" @@ -1513,13 +1591,13 @@ itunes-nowplaying-mac@0.3.1: integrity sha512-kZ/ef1rMzl/CMc1RBh3z99wqijxQgz5Vn1gLCrE1OqRwj9bq2vbgeIqWjJC8iDWZHRolizdTPfKMAbp8yKYFTQ== jimp@^0.8.4: - version "0.8.4" - resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.8.4.tgz#9c7c6ee4c8992e585a60914c62aee0c5e5c7955b" - integrity sha512-xCPvd2HIH8iR7+gWVnivzXwiQGnLBmLDpaEj5M0vQf3uur5MuLCOWbBduAdk6r3ur8X0kwgM4eEM0i7o+k9x9g== + version "0.8.5" + resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.8.5.tgz#59427688ccc8d7a89c2165fd10d0e4164f041a9d" + integrity sha512-BW7t/+TCgKpqZw/wHFwqF/A/Tyk43RmzRHyMBdqfOepqunUrajt0RTqowdWyFo4CS2FmD8pFiYfefWjpXFWrCA== dependencies: - "@jimp/custom" "^0.8.4" - "@jimp/plugins" "^0.8.4" - "@jimp/types" "^0.8.4" + "@jimp/custom" "^0.8.5" + "@jimp/plugins" "^0.8.5" + "@jimp/types" "^0.8.5" core-js "^2.5.7" regenerator-runtime "^0.13.3" @@ -1724,9 +1802,9 @@ mime-db@1.40.0: integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== mime-db@^1.28.0: - version "1.41.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.41.0.tgz#9110408e1f6aa1b34aef51f2c9df3caddf46b6a0" - integrity sha512-B5gxBI+2K431XW8C2rcc/lhppbuji67nf9v39eH8pkWoZDxnAL0PxdpH32KYRScniF8qDHBDlI+ipgg5WrCUYw== + version "1.42.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac" + integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ== mime-types@^2.1.12, mime-types@~2.1.19: version "2.1.24" @@ -1779,20 +1857,20 @@ minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= -minipass@^2.2.1, minipass@^2.6.0, minipass@^2.6.4: - version "2.6.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.6.5.tgz#1c245f9f2897f70fd4a219066261ce6c29f80b18" - integrity sha512-ewSKOPFH9blOLXx0YSE+mbrNMBFPS+11a2b03QZ+P4LVrUHW/GAlqeYC7DBknDyMWkHzrzTpDhUvy7MUxqyrPA== +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== dependencies: safe-buffer "^5.1.2" yallist "^3.0.0" minizlib@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.2.tgz#6f0ccc82fa53e1bf2ff145f220d2da9fa6e3a166" - integrity sha512-hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ== + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== dependencies: - minipass "^2.2.1" + minipass "^2.9.0" mkdirp@0.5.1, mkdirp@^0.5.0: version "0.5.1" @@ -1829,9 +1907,9 @@ node-abi@^2.9.0: semver "^5.4.1" node-gyp@^5.0.1: - version "5.0.3" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.3.tgz#80d64c23790244991b6d44532f0a351bedd3dd45" - integrity sha512-z/JdtkFGUm0QaQUusvloyYuGDub3nUbOo5de1Fz57cM++osBTvQatBUSTlF1k/w8vFHPxxXW6zxGvkxXSpaBkQ== + version "5.0.5" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.5.tgz#f6cf1da246eb8c42b097d7cd4d6c3ce23a4163af" + integrity sha512-WABl9s4/mqQdZneZHVWVG4TVr6QQJZUC6PAx47ITSk9lreZ1n+7Z9mMAIbA3vnO4J9W20P7LhCxtzfWsAD/KDw== dependencies: env-paths "^1.0.0" glob "^7.0.3" @@ -1842,7 +1920,7 @@ node-gyp@^5.0.1: request "^2.87.0" rimraf "2" semver "~5.3.0" - tar "^4.4.8" + tar "^4.4.12" which "1" "nopt@2 || 3": @@ -1862,10 +1940,15 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package- semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + normalize-url@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.3.0.tgz#9c49e10fc1876aeb76dba88bf1b2b5d9fa57b2ee" - integrity sha512-0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ== + version "4.5.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" + integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== npm-run-path@^2.0.0: version "2.0.2" @@ -2099,6 +2182,11 @@ phin@^2.9.1: resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c" integrity sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA== +picomatch@^2.0.4: + version "2.0.7" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6" + integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA== + pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -2264,6 +2352,13 @@ readable-stream@~1.1.9: isarray "0.0.1" string_decoder "~0.10.x" +readdirp@~3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839" + integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ== + dependencies: + picomatch "^2.0.4" + readline-sync@1.4.10: version "1.4.10" resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b" @@ -2581,7 +2676,7 @@ string.prototype.trim@^1.1.2: es-abstract "^1.13.0" function-bind "^1.1.1" -string.prototype.trimleft@^2.0.0: +string.prototype.trimleft@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634" integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw== @@ -2589,7 +2684,7 @@ string.prototype.trimleft@^2.0.0: define-properties "^1.1.3" function-bind "^1.1.1" -string.prototype.trimright@^2.0.0: +string.prototype.trimright@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg== @@ -2676,18 +2771,18 @@ supports-color@^5.3.0: has-flag "^3.0.0" sweetalert2@^8.18.4: - version "8.18.4" - resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-8.18.4.tgz#2b3ecf6ad455feed89a93b038c75e7a8c8095798" - integrity sha512-U5e2DWL4ljwqIojkA58It7T+pnFKiYeZYoNXavUwWPcn0JWJ2CKfN08Kb9ygxVBJJDMlk+NNV7DK9K9R5coefQ== + version "8.18.5" + resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-8.18.5.tgz#ed6a9e4647026333de8e7cc0df02f61ec5bb850f" + integrity sha512-GTP24XbiLqdT/Sd+lYac/bQLEJKqzWldV63hvyqPdWcqRimsDRSsumhWL3yyzLvqXMIwzoVbqpa1kWgg2/fm0g== -tar@^4.4.8: - version "4.4.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.11.tgz#7ac09801445a3cf74445ed27499136b5240ffb73" - integrity sha512-iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA== +tar@^4.4.12: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== dependencies: chownr "^1.1.1" fs-minipass "^1.2.5" - minipass "^2.6.4" + minipass "^2.8.6" minizlib "^1.2.1" mkdirp "^0.5.0" safe-buffer "^5.1.2" @@ -2736,6 +2831,13 @@ to-readable-stream@^1.0.0: resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + tough-cookie@~2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" @@ -3000,9 +3102,9 @@ yallist@^2.1.2: integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= yallist@^3.0.0, yallist@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" - integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== yargs-parser@^13.1.1: version "13.1.1" From 0e731c3e8ae3ef07e5aa204ef6a275751c1725c4 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sun, 20 Oct 2019 19:42:51 +0900 Subject: [PATCH 6/9] New translations main.json (Spanish, Argentina) --- app/view/make/language/es-AR/main.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/view/make/language/es-AR/main.json b/app/view/make/language/es-AR/main.json index cc550338..7289a384 100644 --- a/app/view/make/language/es-AR/main.json +++ b/app/view/make/language/es-AR/main.json @@ -56,9 +56,9 @@ "lang_postimg_previewdis": "no se puede previsualizar", "lang_postimg_aftupload": "No podés cambiar cuentas después de subir.", "lang_postimg_failupload": "Falló", - "lang_postimg_delete": "Click to add description, right-click to delete this", - "lang_postimg_desc": "Description", - "lang_postimg_leadContext": "right-click the thumbnail to delete this", + "lang_postimg_delete": "Hacé clic para agregar descripción, o clic secundario para eliminar esto", + "lang_postimg_desc": "Descripción", + "lang_postimg_leadContext": "hacé clic secundario sobre la miniatura para eliminar esto", "lang_post_tagTL": "Este toot no contiene una etiqueta predeterminada. Este toot no se mostrará en la línea temporal local. ¿Querés continuar?", "lang_post_tagVis": "Este toot (toot no público) no se muestra en la línea temporal de esta etiqueta.", "lang_post_cwtitle": "Alerta automática de Advertencia de contenido", From 7214ff001a3d70d4f2934b76c582000364806ea4 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sun, 20 Oct 2019 19:42:52 +0900 Subject: [PATCH 7/9] New translations setting.json (Spanish, Argentina) --- app/view/make/language/es-AR/setting.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/view/make/language/es-AR/setting.json b/app/view/make/language/es-AR/setting.json index a29b372e..cb389947 100644 --- a/app/view/make/language/es-AR/setting.json +++ b/app/view/make/language/es-AR/setting.json @@ -35,7 +35,7 @@ "themeSel": "Seleccionar tema", "customtheme": "Editar y agregar temas personalizados", "customthemeDirection": "Esquema de colores", - "advanced": "Advanced options(6 additional colors)", + "advanced": "Configuración avanzada (6 colores adicionales)", "advancedWarn": "Advanced options will be null if you set nothing, while basic 3 options will be white(fff). They(adv. options) will be reset if you saved with advanced panel closed.", "active": "Background of Show or CW buttons, selected options...", "modal": "Background of modals", From a52d7aee73e75b11dfcc1a4216c3e4ac99201c7a Mon Sep 17 00:00:00 2001 From: Cutls Date: Sun, 20 Oct 2019 19:53:44 +0900 Subject: [PATCH 8/9] New translations setting.json (Spanish, Argentina) --- app/view/make/language/es-AR/setting.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/view/make/language/es-AR/setting.json b/app/view/make/language/es-AR/setting.json index cb389947..2948c0b4 100644 --- a/app/view/make/language/es-AR/setting.json +++ b/app/view/make/language/es-AR/setting.json @@ -36,12 +36,12 @@ "customtheme": "Editar y agregar temas personalizados", "customthemeDirection": "Esquema de colores", "advanced": "Configuración avanzada (6 colores adicionales)", - "advancedWarn": "Advanced options will be null if you set nothing, while basic 3 options will be white(fff). They(adv. options) will be reset if you saved with advanced panel closed.", - "active": "Background of Show or CW buttons, selected options...", - "modal": "Background of modals", - "bottom": "Background of bottom bar", - "postbox": "Background of post box and menu", - "subcolor": "Subcolor, has harmony with secondary color", + "advancedWarn": "La configuración avanzada será nula si no establecés nada, mientras que la configuración básica será blanca (fff). La configuración avanzada será restablecida si se guarda con el panel cerrado.", + "active": "Fondo, botones de advertencia de contenido…", + "modal": "Fondo de modos", + "bottom": "Fondo de barra inferior", + "postbox": "Fondo de caja de publicación y menú", + "subcolor": "Subcolor, en armonía con el color secundario", "primary": "Color de fondo", "secondarycolor": "Fondo de componentes", "text": "Color del texto", @@ -152,10 +152,10 @@ "linkwarn": "TheDesk guarda tus datos en el servidor thedesk.top.", "connect": "Conectar", "disconnect": "Desconectar", - "templateedit": "Edit a template", + "templateedit": "Editar plantilla", "templateeditwarn": "", - "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify", - "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}", + "template1": "Spotify: {artist}: nombre del artista // {song}: nombre del tema // {album}: nombre del álbum // {url}: dirección web a Spotify", + "template2": "macOS: {artist}: nombre del artista // {song}: nombre del tema // {album}: nombre del álbum // {genre}: género // {composer}: compositor // {hz}: frecuencia de muestreo // {bitRate}: tasa de transferencia", "template3": "", "postartwork": "Adjuntar tapa desde Spotify", "tts": "Configuración de TTS (texto hablado)", From b3ca402842f7cb50d1ed99ac8a67a10e64552d2d Mon Sep 17 00:00:00 2001 From: cutls Date: Sun, 20 Oct 2019 20:04:00 +0900 Subject: [PATCH 9/9] About update-check #141 --- app/js/ui/settings.js | 38 +++++++++++++++++++++++++++++ app/view/make/language/en/main.json | 4 ++- app/view/make/language/ja/main.json | 4 ++- app/view/make/make.js | 18 +++++++++++--- app/view/make/setting.sample.html | 5 ++-- 5 files changed, 61 insertions(+), 8 deletions(-) diff --git a/app/js/ui/settings.js b/app/js/ui/settings.js index c2caf3bc..2ebcd4d5 100644 --- a/app/js/ui/settings.js +++ b/app/js/ui/settings.js @@ -715,3 +715,41 @@ window.onload = function () { function asReadEnd() { postMessage(["asReadComp", ""], "*") } +function checkupd(){ + var ver = localStorage.getItem("ver"); + var start = "https://thedesk.top/ver.json"; + fetch(start, { + method: 'GET' + }).then(function (response) { + return response.json(); + }).catch(function (error) { + todo(error); + console.error(error); + }).then(function (mess) { + console.table(mess); + if (mess) { + var platform = localStorage.getItem("platform"); + if (platform == "darwin") { + var newest = mess.desk_mac; + } else { + var newest = mess.desk; + } + if (newest == ver) { + Swal.fire({ + type: 'info', + title: lang.lang_setting_noupd, + html: ver + }) + } else if (ver.indexOf("beta") != -1 || winstore) { + Swal.fire({ + type: 'info', + title: lang.lang_setting_thisisbeta, + html: ver + }) + } else { + localStorage.removeItem("new-ver-skip") + location.href="index.html" + } + } + }); +} \ No newline at end of file diff --git a/app/view/make/language/en/main.json b/app/view/make/language/en/main.json index 3f573273..eec9cc73 100644 --- a/app/view/make/language/en/main.json +++ b/app/view/make/language/en/main.json @@ -249,5 +249,7 @@ "lang_setting_notftest": " Notification test ", "lang_setting_notftestprof": "Your icon is shown.", "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.", - "lang_setting_importwarn": "All data will be deleted." + "lang_setting_importwarn": "All data will be deleted.", + "lang_setting_noupd": "No available update", + "lang_setting_thisisbeta": "This is beta version. You have to update manually." } \ No newline at end of file diff --git a/app/view/make/language/ja/main.json b/app/view/make/language/ja/main.json index b2568819..f8f55c0c 100644 --- a/app/view/make/language/ja/main.json +++ b/app/view/make/language/ja/main.json @@ -249,5 +249,7 @@ "lang_setting_notftest": "通知テスト", "lang_setting_notftestprof": "アイコンはあなたのアカウントのものです。", "lang_setting_exportwarn": "重要なデータのみエクスポートされます。エクスポートされたデータは外部に公開しないでください。全ての認証データが含まれています。", - "lang_setting_importwarn": "全てのデータがリセットされます。" + "lang_setting_importwarn": "全てのデータがリセットされます。", + "lang_setting_noupd": "お使いのTheDeskは最新です", + "lang_setting_thisisbeta": "お使いのTheDeskはベータ版のため、アップデートは手動で行う必要があります。" } \ No newline at end of file diff --git a/app/view/make/make.js b/app/view/make/make.js index 96a48c84..30a47cab 100644 --- a/app/view/make/make.js +++ b/app/view/make/make.js @@ -4,10 +4,13 @@ if (process.argv.indexOf("--automatic") === -1) { if (input) { ver = input; } - var basefile="../../" + //var basefile="../../" } else { - var basefile="./" + //var basefile="./" } +//const { app } = require('electron'); +const path = require('path'); +const basefile = path.join(__dirname, "../../") function main(ver, basefile) { const fs = require("fs"); const execSync = require("child_process").execSync; @@ -23,6 +26,7 @@ function main(ver, basefile) { const pages = ["acct.html", "index.html", "setting.html", "update.html", "setting.vue.js"]; let langstr = ""; let refKey = []; + const enJson=JSON.parse(fs.readFileSync(basefile + "view/make/language/en/main.json", "utf8")) for (let n = 0; n < langs.length; n++) { let lang = langs[n]; let targetDir = basefile + "view/" + lang; @@ -30,7 +34,15 @@ function main(ver, basefile) { fs.mkdirSync(targetDir); } langstr = langstr + "' + langsh[n] + ""; - fs.writeFileSync(basefile + "view/" + lang + "/main.js", fs.readFileSync(basefile + "view/make/language/" + lang + "/main.json", "utf8").replace(/^{/, "var lang = {")); + let mainJson=JSON.parse(fs.readFileSync(basefile + "view/make/language/" + lang + "/main.json", "utf8")) + if(lang != "en"){ + Object.keys(enJson).forEach(function(key) { + if(!mainJson[key]){ + mainJson[key]=enJson[key] + } + }); + } + fs.writeFileSync(basefile + "view/" + lang + "/main.js", JSON.stringify(mainJson).replace(/^{/, "var lang = {")); } for (let i = 0; i < samples.length; i++) { let sample = samples[i]; diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html index 255de926..42f5ab4f 100644 --- a/app/view/make/setting.sample.html +++ b/app/view/make/setting.sample.html @@ -511,12 +511,11 @@ style="width:100%; max-width:500px;">Main author: Cutls@cutls.com
- TheDesk @ @@gitHash@@
+ TheDesk @ @@gitHash@@ - @@checkup@@

Kyash

- @@checkup@@