From 8d388bbd4b89bba0f801d5098b6736aecefa2883 Mon Sep 17 00:00:00 2001 From: Cutls Date: Tue, 4 Jun 2019 23:01:04 +0900 Subject: [PATCH] update and construct script --- app/package-lock.json | 39 +++++++++++++-------------------- app/package.json | 4 +++- app/view/en/index.html | 2 ++ app/view/ja/index.html | 2 ++ app/view/make/index.sample.html | 2 ++ app/view/make/make.js | 7 +++++- app/view/ps/index.html | 2 ++ 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 24262845..01eece8d 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -778,8 +778,7 @@ "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "optional": true + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "core-js": { "version": "2.6.7", @@ -1372,8 +1371,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "optional": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "function-bind": { "version": "1.1.1", @@ -1399,8 +1397,7 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "optional": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "is-fullwidth-code-point": { "version": "1.0.0", @@ -1426,7 +1423,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1463,7 +1459,6 @@ "version": "7.1.4", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", - "optional": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -1614,7 +1609,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "optional": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -1788,11 +1782,6 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, - "itunes-nowplaying-mac": { - "version": "0.2.3", - "resolved": "git+https://github.com/rinsuki/itunes-nowplaying-mac.git#138ba9851e8fef2cd0015a42637d6203e64fde4e", - "optional": true - }, "jimp": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.6.4.tgz", @@ -2035,7 +2024,7 @@ "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=" }, "mime-db": { "version": "1.40.0", @@ -2088,7 +2077,6 @@ "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2097,14 +2085,12 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "optional": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "optional": true + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" } } }, @@ -2510,8 +2496,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "optional": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { "version": "1.0.2", @@ -2756,7 +2741,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", @@ -2768,6 +2753,12 @@ "util-deprecate": "~1.0.1" } }, + "readline-sync": { + "version": "1.4.9", + "resolved": "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.9.tgz", + "integrity": "sha1-PtqOZfI80qF+YTAbHwADOWr17No=", + "dev": true + }, "redent": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", @@ -3606,7 +3597,7 @@ "xml2js": { "version": "0.4.19", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "integrity": "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c=", "requires": { "sax": ">=0.6.0", "xmlbuilder": "~9.0.1" diff --git a/app/package.json b/app/package.json index 258c0ce3..2b1e5a73 100644 --- a/app/package.json +++ b/app/package.json @@ -6,6 +6,7 @@ "main": "main.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", + "construct": "cd view/make && node make", "dist": "build --linux snap", "build:js": "node build.js", "build": "electron-builder", @@ -61,7 +62,8 @@ }, "devDependencies": { "electron": "^5.0.1", - "electron-builder": "^20.41.0" + "electron-builder": "^20.41.0", + "readline-sync": "1.4.9" }, "build": { "productName": "TheDesk", diff --git a/app/view/en/index.html b/app/view/en/index.html index 16b1f169..f3121367 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -683,6 +683,8 @@
Release Note Usamin (18.5.1)
・Misskeyの投稿範囲に関する不具合修正
・絵文字に関する不具合修正
+ ・要らんところに通知フィルターボタンが出ていた。
+ ・というか通知フィルターが動かなかった。
・支援をお願いするダイアログが1か月に1回出ます。ご理解のほどよろしくお願いいたします。

ThinkingDeskラベル
diff --git a/app/view/ja/index.html b/app/view/ja/index.html index 663ad2b2..1c1de5e2 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -683,6 +683,8 @@
Release Note Usamin (18.5.1)
・Misskeyの投稿範囲に関する不具合修正
・絵文字に関する不具合修正
+ ・要らんところに通知フィルターボタンが出ていた。
+ ・というか通知フィルターが動かなかった。
・支援をお願いするダイアログが1か月に1回出ます。ご理解のほどよろしくお願いいたします。

ThinkingDeskラベル
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index b265fdc7..5577fd17 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -683,6 +683,8 @@
Release Note Usamin (18.5.1)
・Misskeyの投稿範囲に関する不具合修正
・絵文字に関する不具合修正
+ ・要らんところに通知フィルターボタンが出ていた。
+ ・というか通知フィルターが動かなかった。
・支援をお願いするダイアログが1か月に1回出ます。ご理解のほどよろしくお願いいたします。

ThinkingDeskラベル
diff --git a/app/view/make/make.js b/app/view/make/make.js index f5ae93b1..afa56672 100644 --- a/app/view/make/make.js +++ b/app/view/make/make.js @@ -1,5 +1,10 @@ const fs = require("fs") -const ver = "Usamin (18.5.1)" +const readlineSync = require('readline-sync'); +let ver = readlineSync.question('version string (empty: default string)? '); +if (!ver) { + ver = "Usamin (18.5.1)" +} +console.log("Constructing view files " + ver + ": make sure to update package.json") const langs = ["ja", "en", "ps"] const langsh = ["日本語", "English", "Crowdin translate system(beta)"] const simples = ["acct", "index", "setting", "update", "setting"] diff --git a/app/view/ps/index.html b/app/view/ps/index.html index e8305969..79cbddaa 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -683,6 +683,8 @@
Release Note Usamin (18.5.1)
・Misskeyの投稿範囲に関する不具合修正
・絵文字に関する不具合修正
+ ・要らんところに通知フィルターボタンが出ていた。
+ ・というか通知フィルターが動かなかった。
・支援をお願いするダイアログが1か月に1回出ます。ご理解のほどよろしくお願いいたします。

ThinkingDeskラベル