From d0734ed5fe8c33dafad7c76e3edbbdbf168320ee Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2020 20:16:32 +0000
Subject: [PATCH 1/8] Bump jquery from 3.4.1 to 3.5.0 in /app
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.0)
Signed-off-by: dependabot-preview[bot]
---
app/package.json | 2 +-
app/yarn.lock | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/package.json b/app/package.json
index e2868329..1f966838 100644
--- a/app/package.json
+++ b/app/package.json
@@ -56,7 +56,7 @@
"custom-electron-titlebar": "^3.2.2-hotfix62",
"electron-dl": "^3.0.0",
"jimp": "^0.10.1",
- "jquery": "^3.4.1",
+ "jquery": "^3.5.0",
"jquery-ui-dist": "^1.12.1",
"json5": "^2.1.3",
"lodash": "^4.17.15",
diff --git a/app/yarn.lock b/app/yarn.lock
index b32fd52f..2124b388 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -1726,10 +1726,10 @@ isstream@~0.1.2:
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-itunes-nowplaying-mac@0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/itunes-nowplaying-mac/-/itunes-nowplaying-mac-0.3.1.tgz#3f5ee853aef843e66c20ae10b9439303bc1a4986"
- integrity sha512-kZ/ef1rMzl/CMc1RBh3z99wqijxQgz5Vn1gLCrE1OqRwj9bq2vbgeIqWjJC8iDWZHRolizdTPfKMAbp8yKYFTQ==
+"itunes-nowplaying-mac@git://github.com/cutls/itunes-nowplaying-mac":
+ version "0.2.3"
+ uid "86e64e528ef4b2afa8f5b4d008d11b967b113758"
+ resolved "git://github.com/cutls/itunes-nowplaying-mac#86e64e528ef4b2afa8f5b4d008d11b967b113758"
jimp@^0.10.1:
version "0.10.1"
@@ -1753,10 +1753,10 @@ jquery-ui-dist@^1.12.1:
resolved "https://registry.yarnpkg.com/jquery-ui-dist/-/jquery-ui-dist-1.12.1.tgz#5c0815d3cc6f90ff5faaf5b268a6e23b4ca904fa"
integrity sha1-XAgV08xvkP9fqvWyaKbiO0ypBPo=
-jquery@^3.4.1:
- version "3.4.1"
- resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
- integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
+jquery@^3.5.0:
+ version "3.5.0"
+ resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
+ integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
js-yaml@^3.13.1:
version "3.13.1"
From 4a704bc25759547442e771d449cc5797eb8fd1fc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2020 20:16:52 +0000
Subject: [PATCH 2/8] Bump sweetalert2 from 9.10.9 to 9.10.12 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.10.9 to 9.10.12.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.10.9...v9.10.12)
Signed-off-by: dependabot-preview[bot]
---
app/package.json | 2 +-
app/yarn.lock | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/package.json b/app/package.json
index e2868329..0c194ea8 100644
--- a/app/package.json
+++ b/app/package.json
@@ -62,7 +62,7 @@
"lodash": "^4.17.15",
"materialize-css": "git://github.com/cutls/materialize#v1-dev",
"sumchecker": "^3.0.1",
- "sweetalert2": "^9.10.9",
+ "sweetalert2": "^9.10.12",
"system-font-families": "^0.4.1",
"vue": "^2.6.11"
},
diff --git a/app/yarn.lock b/app/yarn.lock
index b32fd52f..7868aecb 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -1726,10 +1726,10 @@ isstream@~0.1.2:
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-itunes-nowplaying-mac@0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/itunes-nowplaying-mac/-/itunes-nowplaying-mac-0.3.1.tgz#3f5ee853aef843e66c20ae10b9439303bc1a4986"
- integrity sha512-kZ/ef1rMzl/CMc1RBh3z99wqijxQgz5Vn1gLCrE1OqRwj9bq2vbgeIqWjJC8iDWZHRolizdTPfKMAbp8yKYFTQ==
+"itunes-nowplaying-mac@git://github.com/cutls/itunes-nowplaying-mac":
+ version "0.2.3"
+ uid "86e64e528ef4b2afa8f5b4d008d11b967b113758"
+ resolved "git://github.com/cutls/itunes-nowplaying-mac#86e64e528ef4b2afa8f5b4d008d11b967b113758"
jimp@^0.10.1:
version "0.10.1"
@@ -2803,10 +2803,10 @@ supports-color@^7.1.0:
dependencies:
has-flag "^4.0.0"
-sweetalert2@^9.10.9:
- version "9.10.9"
- resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.10.9.tgz#a727178ea89a0976d3d1bf6ee9ea94d25cef59d1"
- integrity sha512-EvCwcS9omZHhxp8XXiWwPMGq2ywGcU0VXeBr3DCibUMmfRkh8f8SxBWFSKMtw57HnK0tKYDhyhQV/vFERtRciQ==
+sweetalert2@^9.10.12:
+ version "9.10.12"
+ resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.10.12.tgz#e3752fcbe13e7d23d0f85ee84b3c5fdc923da552"
+ integrity sha512-RnarmbDGTPmwecJbaVdq5LvlzbVReIOtPk0huPnXOE19G00xMxGcTY0wjt9AjwsexUnLivLXc3b6nD6+D6NlGg==
system-font-families@^0.4.1:
version "0.4.1"
From 34c189b3edb00f06413931cd28e031a79a237d66 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 16 Apr 2020 20:14:21 +0000
Subject: [PATCH 3/8] Bump electron-builder from 22.4.1 to 22.5.1 in /app
Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.4.1 to 22.5.1.
- [Release notes](https://github.com/electron-userland/electron-builder/releases)
- [Changelog](https://github.com/electron-userland/electron-builder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/electron-userland/electron-builder/commits/v22.5.1)
Signed-off-by: dependabot-preview[bot]
---
app/package.json | 2 +-
app/yarn.lock | 192 +++++++++++++++++++++++++++++------------------
2 files changed, 118 insertions(+), 76 deletions(-)
diff --git a/app/package.json b/app/package.json
index e2868329..387021c8 100644
--- a/app/package.json
+++ b/app/package.json
@@ -72,7 +72,7 @@
"devDependencies": {
"chokidar": "^3.3.1",
"electron": "^8.0.0",
- "electron-builder": "^22.4.1",
+ "electron-builder": "^22.5.1",
"electron-rebuild": "^1.10.1",
"readline-sync": "1.4.10"
},
diff --git a/app/yarn.lock b/app/yarn.lock
index b32fd52f..6cb43a02 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -14,13 +14,13 @@
dependencies:
regenerator-runtime "^0.13.2"
-"@develar/schema-utils@~2.1.0":
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.1.0.tgz#eceb1695bfbed6f6bb84666d5d3abe5e1fd54e17"
- integrity sha512-qjCqB4ctMig9Gz5bd6lkdFr3bO6arOdQqptdBSpF1ZpCnjofieCciEzkoS9ujY9cMGyllYSCSmBJ3x9OKHXzoA==
+"@develar/schema-utils@~2.6.5":
+ version "2.6.5"
+ resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6"
+ integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==
dependencies:
- ajv "^6.1.0"
- ajv-keywords "^3.1.0"
+ ajv "^6.12.0"
+ ajv-keywords "^3.4.1"
"@electron/get@^1.0.1":
version "1.7.0"
@@ -418,12 +418,22 @@ abbrev@1:
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-ajv-keywords@^3.1.0:
+ajv-keywords@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
-ajv@^6.1.0, ajv@^6.5.5:
+ajv@^6.12.0:
+ version "6.12.0"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
+ integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+ dependencies:
+ fast-deep-equal "^3.1.1"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.4.1"
+ uri-js "^4.2.2"
+
+ajv@^6.5.5:
version "6.10.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
@@ -488,35 +498,35 @@ anymatch@~3.1.1:
normalize-path "^3.0.0"
picomatch "^2.0.4"
-app-builder-bin@3.5.5:
- version "3.5.5"
- resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.5.tgz#c83200dccd8df5ccb2a5adcd41b2a76bacfb531a"
- integrity sha512-ZcHzJ9Xl+azPqdKzXZKdRZmkNmbxHHZyl4cbobNf8qMQpoPChpcov8riVrZSbu/0cT/JqJ8LOwJjy1OAwbChaQ==
+app-builder-bin@3.5.6:
+ version "3.5.6"
+ resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.6.tgz#61debd4531f60b07bd20296e7e0297b4a1f5f3b9"
+ integrity sha512-gY9ABoV5jh67IrPEwF81R8l9LwE3RqHUyU3rIKitwqMpKhplN5OZC6WEHOXO3XhwiLCIlr9LLI6OPhr3bmtQIg==
-app-builder-lib@22.4.1, app-builder-lib@~22.4.1:
- version "22.4.1"
- resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.4.1.tgz#9d73b2834e434fb65fc9571ae3fed3c1470b6915"
- integrity sha512-epwUzIM+2pcdy/If9koTP74CKx4v7xGPj75a2Z5cM4rrGN9yVZ3eDUBbfF0e0qE4Qmcv5pd0BAZJ26bGm8NWsQ==
+app-builder-lib@22.5.1:
+ version "22.5.1"
+ resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.5.1.tgz#d1c53f6c3627029c850c46405dc40108d92b7619"
+ integrity sha512-VtB/PD8actR1317D/0uGzuJIYbpw4pRrfMB6IyTLwGynUd3ihqiCFjejVWHjCwopgCct2kE0MvLwo8P49xHIeQ==
dependencies:
"7zip-bin" "~5.0.3"
- "@develar/schema-utils" "~2.1.0"
+ "@develar/schema-utils" "~2.6.5"
async-exit-hook "^2.0.1"
bluebird-lst "^1.0.9"
- builder-util "22.4.1"
- builder-util-runtime "8.6.2"
+ builder-util "22.5.1"
+ builder-util-runtime "8.7.0"
chromium-pickle-js "^0.2.0"
debug "^4.1.1"
- ejs "^3.0.1"
- electron-publish "22.4.1"
- fs-extra "^8.1.0"
+ ejs "^3.0.2"
+ electron-publish "22.5.1"
+ fs-extra "^9.0.0"
hosted-git-info "^3.0.4"
is-ci "^2.0.0"
- isbinaryfile "^4.0.4"
+ isbinaryfile "^4.0.5"
js-yaml "^3.13.1"
lazy-val "^1.0.4"
minimatch "^3.0.4"
normalize-package-data "^2.5.0"
- read-config-file "5.0.2"
+ read-config-file "6.0.0"
sanitize-filename "^1.6.3"
semver "^7.1.3"
temp-file "^3.3.7"
@@ -563,6 +573,11 @@ asynckit@^0.4.0:
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+at-least-node@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+ integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
aws-sign2@~0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -681,28 +696,28 @@ buffer@^5.2.0:
base64-js "^1.0.2"
ieee754 "^1.1.4"
-builder-util-runtime@8.6.2:
- version "8.6.2"
- resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.6.2.tgz#8270e15b012d8d3b110f3e327b0fd8b0e07b1686"
- integrity sha512-9QnIBISfhgQ2BxtRLidVqf/v5HD73vSKZDllpUmGd2L6VORGQk7cZAPmPtw4HQM3gPBelyVJ5yIjMNZ8xjmd1A==
+builder-util-runtime@8.7.0:
+ version "8.7.0"
+ resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.0.tgz#e48ad004835c8284662e8eaf47a53468c66e8e8d"
+ integrity sha512-G1AqqVM2vYTrSFR982c1NNzwXKrGLQjVjaZaWQdn4O6Z3YKjdMDofw88aD9jpyK9ZXkrCxR0tI3Qe9wNbyTlXg==
dependencies:
debug "^4.1.1"
sax "^1.2.4"
-builder-util@22.4.1, builder-util@~22.4.1:
- version "22.4.1"
- resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.4.1.tgz#49cce9f06a62cdccda66d5efa82077040fa1f462"
- integrity sha512-+ysLc7cC4w6P7rBxmZ5X2aU3QvcwFoWCl1us+mcUKdsGmJAtFUMPJqueeptdxjyPrPShIUOKHzA8uk5A3d1fHg==
+builder-util@22.5.1:
+ version "22.5.1"
+ resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.5.1.tgz#ad9a9178cf3561563ad1e36091413c194915c409"
+ integrity sha512-CelDTP3+fvDfZfbwy3PXif7mudPaWankJ8vrRg/NtCGvL+hXnwycnJZr46d5EQL7AgQcpJ27o9LTdfu61cxTFw==
dependencies:
"7zip-bin" "~5.0.3"
"@types/debug" "^4.1.5"
"@types/fs-extra" "^8.1.0"
- app-builder-bin "3.5.5"
+ app-builder-bin "3.5.6"
bluebird-lst "^1.0.9"
- builder-util-runtime "8.6.2"
+ builder-util-runtime "8.7.0"
chalk "^3.0.0"
debug "^4.1.1"
- fs-extra "^8.1.0"
+ fs-extra "^9.0.0"
is-ci "^2.0.0"
js-yaml "^3.13.1"
source-map-support "^0.5.16"
@@ -1009,15 +1024,14 @@ detect-node@^2.0.4:
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
-dmg-builder@22.4.1:
- version "22.4.1"
- resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.4.1.tgz#ab80d3d6e4ed8a1d38beddbfe97c8f7a794dd932"
- integrity sha512-hEemh7n0zoVt7zPPwvn7iOttP03oENjJ4ApttPmt8oDnX8T4q42MjGWyDlLkPMplMJfoTxkkNqmm296f0OYM8Q==
+dmg-builder@22.5.1:
+ version "22.5.1"
+ resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.5.1.tgz#bee832bf1c4b050a15afb47a6b9ee500efca4c1c"
+ integrity sha512-AwIiyGwgqhA8Ty/YnEU20aSzfrWZns6suOBTqddD+rLDI4jEASKGQadfvcXRSWgaK/VQW0GrhheXrhJpzZzt3g==
dependencies:
- app-builder-lib "~22.4.1"
- bluebird-lst "^1.0.9"
- builder-util "~22.4.1"
- fs-extra "^8.1.0"
+ app-builder-lib "22.5.1"
+ builder-util "22.5.1"
+ fs-extra "^9.0.0"
iconv-lite "^0.5.1"
js-yaml "^3.13.1"
sanitize-filename "^1.6.3"
@@ -1057,30 +1071,30 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0"
safer-buffer "^2.1.0"
-ejs@^3.0.1:
+ejs@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.0.2.tgz#745b01cdcfe38c1c6a2da3bbb2d9957060a31226"
integrity sha512-IncmUpn1yN84hy2shb0POJ80FWrfGNY0cxO9f4v+/sG7qcBvAtVWUA1IdzY/8EYUmOVhoKJVdJjNd3AZcnxOjA==
-electron-builder@^22.4.1:
- version "22.4.1"
- resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.4.1.tgz#7a7a2cbd9955c90cecc36de32ecba7f565265bab"
- integrity sha512-13CjZcGeJS+c3EKRwFT/Oty5Niif5g1FwDioBLEbjkPCPQgxdtDsr+rJtCu9qxkiKDYpAoPS+t/clNk0efONvQ==
+electron-builder@^22.5.1:
+ version "22.5.1"
+ resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.5.1.tgz#31bd321b61107148b11cf0347b52e240c654fef2"
+ integrity sha512-7gnHN8Ml5zecDerN8/ljAwUKtE+hhGLuT/X2/zO0FJM2q2hlLx/6ZgzESFILKqnPQFEBRxQ8SL1OxjdIY0HIrw==
dependencies:
"@types/yargs" "^15.0.4"
- app-builder-lib "22.4.1"
+ app-builder-lib "22.5.1"
bluebird-lst "^1.0.9"
- builder-util "22.4.1"
- builder-util-runtime "8.6.2"
+ builder-util "22.5.1"
+ builder-util-runtime "8.7.0"
chalk "^3.0.0"
- dmg-builder "22.4.1"
- fs-extra "^8.1.0"
+ dmg-builder "22.5.1"
+ fs-extra "^9.0.0"
is-ci "^2.0.0"
lazy-val "^1.0.4"
- read-config-file "5.0.2"
+ read-config-file "6.0.0"
sanitize-filename "^1.6.3"
update-notifier "^4.1.0"
- yargs "^15.1.0"
+ yargs "^15.3.1"
electron-dl@^3.0.0:
version "3.0.0"
@@ -1091,17 +1105,17 @@ electron-dl@^3.0.0:
pupa "^2.0.1"
unused-filename "^2.1.0"
-electron-publish@22.4.1:
- version "22.4.1"
- resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.4.1.tgz#a7fcf166786f7d5957f19a70ee8389f219769ba5"
- integrity sha512-nwKNum3KXm+01rtWX2pc1jhazdzDy2zYnQx+zmXphZchjd6UOMX3ZN0xyZUCKugw5ZliflT6LkgbrcBXBtYD3A==
+electron-publish@22.5.1:
+ version "22.5.1"
+ resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.5.1.tgz#04b3c90961226e687a588e743011b4b72cc6be56"
+ integrity sha512-g5bwLAHZT6A++yU1+Et+fncnFAdXXgkRao9rzTFAvhQ0QJBsmLiyOd0Ta2RI/EQcVoy6jyHtxFs7CWIXE5aZOA==
dependencies:
"@types/fs-extra" "^8.1.0"
bluebird-lst "^1.0.9"
- builder-util "~22.4.1"
- builder-util-runtime "8.6.2"
+ builder-util "22.5.1"
+ builder-util-runtime "8.7.0"
chalk "^3.0.0"
- fs-extra "^8.1.0"
+ fs-extra "^9.0.0"
lazy-val "^1.0.4"
mime "^2.4.4"
@@ -1256,6 +1270,11 @@ fast-deep-equal@^2.0.1:
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+fast-deep-equal@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+ integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+
fast-json-stable-stringify@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -1325,6 +1344,16 @@ fs-extra@^8.1.0:
jsonfile "^4.0.0"
universalify "^0.1.0"
+fs-extra@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3"
+ integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==
+ dependencies:
+ at-least-node "^1.0.0"
+ graceful-fs "^4.2.0"
+ jsonfile "^6.0.1"
+ universalify "^1.0.0"
+
fs-minipass@^1.2.5:
version "1.2.7"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -1711,7 +1740,7 @@ isarray@~1.0.0:
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-isbinaryfile@^4.0.4:
+isbinaryfile@^4.0.5:
version "4.0.6"
resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
@@ -1726,10 +1755,10 @@ isstream@~0.1.2:
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-itunes-nowplaying-mac@0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/itunes-nowplaying-mac/-/itunes-nowplaying-mac-0.3.1.tgz#3f5ee853aef843e66c20ae10b9439303bc1a4986"
- integrity sha512-kZ/ef1rMzl/CMc1RBh3z99wqijxQgz5Vn1gLCrE1OqRwj9bq2vbgeIqWjJC8iDWZHRolizdTPfKMAbp8yKYFTQ==
+"itunes-nowplaying-mac@git://github.com/cutls/itunes-nowplaying-mac":
+ version "0.2.3"
+ uid "86e64e528ef4b2afa8f5b4d008d11b967b113758"
+ resolved "git://github.com/cutls/itunes-nowplaying-mac#86e64e528ef4b2afa8f5b4d008d11b967b113758"
jimp@^0.10.1:
version "0.10.1"
@@ -1791,7 +1820,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-json5@^2.1.1, json5@^2.1.3:
+json5@^2.1.2, json5@^2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
@@ -1805,6 +1834,15 @@ jsonfile@^4.0.0:
optionalDependencies:
graceful-fs "^4.1.6"
+jsonfile@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
+ integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
+ dependencies:
+ universalify "^1.0.0"
+ optionalDependencies:
+ graceful-fs "^4.1.6"
+
jsprim@^1.2.2:
version "1.4.1"
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -2368,16 +2406,15 @@ rc@^1.2.8:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
-read-config-file@5.0.2:
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-5.0.2.tgz#55e005e5a447a9ce5806358d7b22cb7cefb6436d"
- integrity sha512-tVt1lsiSjs+FtL/vtfCivqtKR1UNk3BB3uPJQvJqkgtAYDvZjo0xyXFYSVmzaTcO+Jdi5G7O2K2vDV+p1M/oug==
+read-config-file@6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299"
+ integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA==
dependencies:
dotenv "^8.2.0"
dotenv-expand "^5.1.0"
- fs-extra "^8.1.0"
js-yaml "^3.13.1"
- json5 "^2.1.1"
+ json5 "^2.1.2"
lazy-val "^1.0.4"
readable-stream@^2.0.6, readable-stream@^2.2.2:
@@ -2934,6 +2971,11 @@ universalify@^0.1.0:
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+universalify@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
+ integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
+
unused-filename@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/unused-filename/-/unused-filename-2.1.0.tgz#33719c4e8d9644f32d2dec1bc8525c6aaeb4ba51"
@@ -3175,7 +3217,7 @@ yargs@^14.2.0:
y18n "^4.0.0"
yargs-parser "^15.0.0"
-yargs@^15.1.0:
+yargs@^15.3.1:
version "15.3.1"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
From 039799083dcdc40c89e9248a105b5b384e382941 Mon Sep 17 00:00:00 2001
From: cutls
Date: Tue, 21 Apr 2020 22:18:40 +0900
Subject: [PATCH 4/8] depend
---
app/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/package.json b/app/package.json
index dd5664fb..792b9bab 100644
--- a/app/package.json
+++ b/app/package.json
@@ -67,7 +67,7 @@
"vue": "^2.6.11"
},
"optionalDependencies": {
- "itunes-nowplaying-mac": "git://github.com/cutls/itunes-nowplaying-mac"
+ "itunes-nowplaying-mac": "0.3.1"
},
"devDependencies": {
"chokidar": "^3.3.1",
From cf00fefa6b0e4b0a2755551b5609913022259c70 Mon Sep 17 00:00:00 2001
From: cutls
Date: Tue, 21 Apr 2020 23:56:04 +0900
Subject: [PATCH 5/8] Accessibility
---
app/css/master.css | 15 +++-
app/js/common/keyshortcut.js | 7 ++
app/js/tl/directory.js | 2 +-
app/js/tl/filter.js | 2 +-
app/js/tl/list.js | 2 +-
app/js/tl/parse.js | 82 +++++++++++----------
app/js/tl/src.js | 2 +-
app/js/ui/layout.js | 22 +++---
app/js/ui/menu.js | 3 +-
app/js/ui/sort.js | 2 +-
app/view/make/acct.sample.html | 5 +-
app/view/make/index.sample.html | 108 ++++++++++++++--------------
app/view/make/language/en/acct.json | 1 +
app/view/make/language/en/main.json | 1 +
app/view/make/language/ja/acct.json | 1 +
app/view/make/language/ja/main.json | 1 +
16 files changed, 145 insertions(+), 111 deletions(-)
diff --git a/app/css/master.css b/app/css/master.css
index 2e37af9a..4c90049b 100644
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -342,21 +342,22 @@ blockquote:before,
#left-menu {
width: 230px;
}
-#left-menu div {
+#left-menu a {
padding-left: 5px;
width: 100%;
height: 50px;
display: flex;
align-items: center;
cursor: pointer;
+ color: var(--color);
}
-#left-menu div:hover {
+#left-menu a:hover {
background-color: var(--beforehover);
}
#left-menu span {
margin-left: 5px;
}
-#left-menu div.active {
+#left-menu a.active {
background-color: var(--emphasized);
}
#right-menu {
@@ -376,6 +377,7 @@ blockquote:before,
width: 170px;
height: 40px;
cursor: pointer;
+ color: var(--color);
}
#tltype .type span {
width: calc(100% - 30px);
@@ -514,6 +516,13 @@ textarea {
#pageSrcInput {
width: 160px;
}
+.voice {
+ clip: rect(1px, 1px, 1px, 1px);
+ position: absolute !important;
+ height: 1px;
+ width: 1px;
+ overflow: hidden;
+}
@media (max-width: 500px) {
#pageSrc {
diff --git a/app/js/common/keyshortcut.js b/app/js/common/keyshortcut.js
index b09fbce6..07722f61 100644
--- a/app/js/common/keyshortcut.js
+++ b/app/js/common/keyshortcut.js
@@ -115,6 +115,13 @@ $(function($) {
return false
}
}
+ //Ctrl+K:メニュー開閉
+ if (event.metaKey || event.ctrlKey) {
+ if (e.keyCode === 75) {
+ menu()
+ return false
+ }
+ }
//Ctrl+Space:読み込み
if (event.metaKey || event.ctrlKey) {
if (e.keyCode === 32) {
diff --git a/app/js/tl/directory.js b/app/js/tl/directory.js
index 85470633..e7d81d50 100644
--- a/app/js/tl/directory.js
+++ b/app/js/tl/directory.js
@@ -3,7 +3,7 @@
function dirMenu() {
$("#dir-contents").html("");
directory();
- $("#left-menu div").removeClass("active");
+ $("#left-menu a").removeClass("active");
$("#dirMenu").addClass("active");
$(".menu-content").addClass("hide");
$("#dir-box").removeClass("hide");
diff --git a/app/js/tl/filter.js b/app/js/tl/filter.js
index 61878950..d1eb29b4 100644
--- a/app/js/tl/filter.js
+++ b/app/js/tl/filter.js
@@ -101,7 +101,7 @@ function delreset(tlid) {
}
/*ワードフィルター機能*/
function filterMenu() {
- $('#left-menu div').removeClass('active')
+ $('#left-menu a').removeClass('active')
$('#filterMenu').addClass('active')
$('.menu-content').addClass('hide')
$('#filter-box').removeClass('hide')
diff --git a/app/js/tl/list.js b/app/js/tl/list.js
index 579bbfcb..c30bad4a 100644
--- a/app/js/tl/list.js
+++ b/app/js/tl/list.js
@@ -1,5 +1,5 @@
function listMenu() {
- $('#left-menu div').removeClass('active')
+ $('#left-menu a').removeClass('active')
$('#listMenu').addClass('active')
$('.menu-content').addClass('hide')
$('#list-box').removeClass('hide')
diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js
index 607b1212..636bb5ce 100644
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -241,7 +241,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
noticeavatar = toot.account.avatar_static
}
noticeavatar = `
-
+
`
if (toot.type == 'mention') {
var what = lang.lang_parse_mentioned
@@ -268,15 +268,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
} else {
var notfFilHide = ''
}
- var noticetext = `
-
+ var noticetext = `
+ ${lang.lang_parse_notffilter}
-
+ })" aria-hidden="true">
${date(toot.created_at, datetype)}
+ ${date(toot.created_at, 'absolute')}(${lang.lang_parse_notftime})
${dis_name}(@${toot.account.acct})
@@ -393,7 +393,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
} else {
noticeavatar = toot.account.avatar_static
}
- noticeavatar = `
+ noticeavatar = `
`
@@ -518,7 +518,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
var spoil = escapeHTML(toot.spoiler_text)
var spoiler = 'cw cw_hide'
var api_spoil = 'gray'
- var spoiler_show = `${lang.lang_parse_cwshow}
`
+ var spoiler_show = `${lang.lang_parse_cwshow}${lang.lang_parse_cwshow_acc}
`
} else {
if (content) {
var ct1 = content.split('
').length + content.split('
').length - 2
@@ -576,7 +576,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
}
if (urls) {
- var analyze = `
+ var analyze = `
${lang.lang_parse_url}
`
} else {
@@ -621,7 +621,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
viewer +
`
- `
} else {
if (media.type == 'unknown') {
@@ -634,7 +634,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
viewer +
'