From 4ee09a4604c08efc63385966bfe601e814435a8c Mon Sep 17 00:00:00 2001 From: AsPulse <84216737+AsPulse@users.noreply.github.com> Date: Sun, 4 Jun 2023 11:33:19 +0900 Subject: [PATCH 01/22] fix icon assign of yarn.lock (#1) --- assets/json/basename.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/json/basename.json b/assets/json/basename.json index 9c0b612..30a39df 100644 --- a/assets/json/basename.json +++ b/assets/json/basename.json @@ -48,5 +48,5 @@ "react.jsx": "", "requirements.txt": "", "rubydoc": "", - "yarn.lock": "" + "yarn.lock": "" } From 1ac9674b850884c65308716aafa8219816b2363c Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 11:38:17 +0900 Subject: [PATCH 02/22] add cjs, mjs --- assets/json/extension.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/json/extension.json b/assets/json/extension.json index 6d3333c..050f3eb 100644 --- a/assets/json/extension.json +++ b/assets/json/extension.json @@ -129,6 +129,8 @@ "jpg": "", "jpx": "", "js": "", + "cjs": "", + "mjs": "", "json": "", "jsx": "", "jxl": "", From 92bfd9cd0753c9e47ba7c3336bed0db6df753648 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 11:48:39 +0900 Subject: [PATCH 03/22] sort keys --- assets/json/extension.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/json/extension.json b/assets/json/extension.json index 050f3eb..5f2e98f 100644 --- a/assets/json/extension.json +++ b/assets/json/extension.json @@ -23,6 +23,7 @@ "cab": "", "cc": "", "cfg": "", + "cjs": "", "class": "", "clj": "", "cljc": "", @@ -129,8 +130,6 @@ "jpg": "", "jpx": "", "js": "", - "cjs": "", - "mjs": "", "json": "", "jsx": "", "jxl": "", From 88781bf0b047d5133dd80bbc4abb8876ba09b5fd Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 11:50:02 +0900 Subject: [PATCH 04/22] add editorconfig --- assets/json/basename.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/json/basename.json b/assets/json/basename.json index 30a39df..11d8b8a 100644 --- a/assets/json/basename.json +++ b/assets/json/basename.json @@ -2,6 +2,7 @@ ".bashprofile": "", ".bashrc": "", ".ds_store": "", + ".editorconfig": "", ".git": "", ".gitattributes": "", ".gitconfig": "", From b170a145a87e9570b3fae267d1c94eaaede70a5a Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 11:51:09 +0900 Subject: [PATCH 05/22] add package.json --- assets/json/basename.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/json/basename.json b/assets/json/basename.json index 11d8b8a..cbd5c02 100644 --- a/assets/json/basename.json +++ b/assets/json/basename.json @@ -43,6 +43,7 @@ "makefile": "", "mix.lock": "", "npmignore": "", + "package.json": "", "pkgbuild": "", "procfile": "", "rakefile": "", From afc2770b004325c5d1a54ed6f87582617e8890d5 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 11:55:21 +0900 Subject: [PATCH 06/22] add yarnrc --- assets/json/pattern.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/json/pattern.json b/assets/json/pattern.json index 5d19176..abdfd14 100644 --- a/assets/json/pattern.json +++ b/assets/json/pattern.json @@ -16,6 +16,7 @@ "/\\.github.$": "", "/\\.idea.$": "", "/\\.vscode.$": "", + "/\\.\\?yarnrc\\(\\.ya\\?ml\\)\\?$": "", "/bin.$": "", "/home.$": "", "/include.$": "", From 7e31d29bca4625d19fc18a4a67a6c31d10cf9a72 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 12:40:55 +0900 Subject: [PATCH 07/22] add tsconfig.json --- assets/json/basename.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/json/basename.json b/assets/json/basename.json index cbd5c02..06bfe50 100644 --- a/assets/json/basename.json +++ b/assets/json/basename.json @@ -50,5 +50,6 @@ "react.jsx": "", "requirements.txt": "", "rubydoc": "", + "tsconfig.json": "", "yarn.lock": "" } From 9e7cff88423191e2bdfa7e084bfeca19ae9b2946 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 12:42:29 +0900 Subject: [PATCH 08/22] add codecov --- assets/json/pattern.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/json/pattern.json b/assets/json/pattern.json index abdfd14..2d53b88 100644 --- a/assets/json/pattern.json +++ b/assets/json/pattern.json @@ -7,6 +7,7 @@ ".*mootools.*\\.js$": "", ".*require.*\\.js$": "", ".*vimrc.*": "", + "/codecov\\.ya\\?ml": "", "/Trash.$": "", "/Users.$": "", "/\\.Trash-\\d\\+.$": "", From 5c6858adcbef9ac05e2aad45c3f3541948373c62 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 12:52:24 +0900 Subject: [PATCH 09/22] add eslint config --- assets/json/pattern.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/json/pattern.json b/assets/json/pattern.json index 2d53b88..51b65e3 100644 --- a/assets/json/pattern.json +++ b/assets/json/pattern.json @@ -10,6 +10,8 @@ "/codecov\\.ya\\?ml": "", "/Trash.$": "", "/Users.$": "", + "/\\.eslintrc\\(\\.\\(c\\?js\\|ya\\?ml\\|json\\)\\)\\?": "󰱺", + "/eslint\\.config\\.js?": "󰱺", "/\\.Trash-\\d\\+.$": "", "/\\.atom.$": "", "/\\.config.$": "", From ac4f92b7eb663d06fe1225e347589624eb6de231 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 12:59:46 +0900 Subject: [PATCH 10/22] add renovate.json, robots.txt --- assets/json/basename.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/json/basename.json b/assets/json/basename.json index 06bfe50..4ff4652 100644 --- a/assets/json/basename.json +++ b/assets/json/basename.json @@ -48,7 +48,9 @@ "procfile": "", "rakefile": "", "react.jsx": "", + "renovate.json": "󰉼", "requirements.txt": "", + "robots.txt": "󰚩", "rubydoc": "", "tsconfig.json": "", "yarn.lock": "" From e0bdce30358c8584ffd2941e23736dac32ec3253 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 13:03:02 +0900 Subject: [PATCH 11/22] add env file --- assets/json/pattern.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/json/pattern.json b/assets/json/pattern.json index 51b65e3..f259cc4 100644 --- a/assets/json/pattern.json +++ b/assets/json/pattern.json @@ -10,8 +10,9 @@ "/codecov\\.ya\\?ml": "", "/Trash.$": "", "/Users.$": "", - "/\\.eslintrc\\(\\.\\(c\\?js\\|ya\\?ml\\|json\\)\\)\\?": "󰱺", - "/eslint\\.config\\.js?": "󰱺", + "/\\.eslintrc\\(\\.\\(c\\?js\\|ya\\?ml\\|json\\)\\)\\?$": "󰱺", + "/eslint\\.config\\.js?$": "󰱺", + "/\\..*env$": "", "/\\.Trash-\\d\\+.$": "", "/\\.atom.$": "", "/\\.config.$": "", From 097843710e22db83dbe04237951783cb3892c139 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 13:05:42 +0900 Subject: [PATCH 12/22] add gcp files --- assets/json/pattern.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/json/pattern.json b/assets/json/pattern.json index f259cc4..a52a3fc 100644 --- a/assets/json/pattern.json +++ b/assets/json/pattern.json @@ -10,6 +10,8 @@ "/codecov\\.ya\\?ml": "", "/Trash.$": "", "/Users.$": "", + "/\\cloudbuild\\.ya\\?ml$": "󱇶", + "/\\.gcloudignore$": "󱇶", "/\\.eslintrc\\(\\.\\(c\\?js\\|ya\\?ml\\|json\\)\\)\\?$": "󰱺", "/eslint\\.config\\.js?$": "󰱺", "/\\..*env$": "", From c8e3b40a7c55dea5f97ab0bdd51e4a715d969337 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 13:07:45 +0900 Subject: [PATCH 13/22] add d.ts files --- assets/json/pattern.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/json/pattern.json b/assets/json/pattern.json index a52a3fc..f44d865 100644 --- a/assets/json/pattern.json +++ b/assets/json/pattern.json @@ -1,6 +1,7 @@ { ".*angular.*\\.js$": "", ".*backbone.*\\.js$": "", + ".*\\.d\\.ts$": "", ".*jquery.*\\.js$": "", ".*materialize.*\\.css$": "", ".*materialize.*\\.js$": "", From 965a19860e2ce854a26aa402b7a72af43cc4a18e Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 13:12:04 +0900 Subject: [PATCH 14/22] Add Brewfile --- assets/json/basename.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/json/basename.json b/assets/json/basename.json index 4ff4652..a686e6e 100644 --- a/assets/json/basename.json +++ b/assets/json/basename.json @@ -16,6 +16,8 @@ ".zshrc": "", "_gvimrc": "", "_vimrc": "", + "Brewfile": "󱄖", + "Brewfile.lock.json": "󱄖", "cargo.lock": "", "cmakelists.txt": "", "config.ru": "", From aa94cda2ee4b66b1e948fa28f0100eebf61d9f12 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 13:12:36 +0900 Subject: [PATCH 15/22] Add jsonc --- assets/json/extension.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/json/extension.json b/assets/json/extension.json index 5f2e98f..63dc925 100644 --- a/assets/json/extension.json +++ b/assets/json/extension.json @@ -131,6 +131,7 @@ "jpx": "", "js": "", "json": "", + "jsonc": "", "jsx": "", "jxl": "", "ksh": "", From 6c0e3f70e06d0b3502a91cabbf119c268c0ef265 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 13:13:41 +0900 Subject: [PATCH 16/22] fix brewfile capital --- assets/json/basename.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/json/basename.json b/assets/json/basename.json index a686e6e..ce0853c 100644 --- a/assets/json/basename.json +++ b/assets/json/basename.json @@ -16,8 +16,8 @@ ".zshrc": "", "_gvimrc": "", "_vimrc": "", - "Brewfile": "󱄖", - "Brewfile.lock.json": "󱄖", + "brewfile": "󱄖", + "brewfile.lock.json": "󱄖", "cargo.lock": "", "cmakelists.txt": "", "config.ru": "", From 5c0e11e6035a935c4078c1b54a0ea0078c42506b Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 13:27:13 +0900 Subject: [PATCH 17/22] Add prettier --- assets/json/pattern.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/json/pattern.json b/assets/json/pattern.json index f44d865..3729858 100644 --- a/assets/json/pattern.json +++ b/assets/json/pattern.json @@ -9,12 +9,13 @@ ".*require.*\\.js$": "", ".*vimrc.*": "", "/codecov\\.ya\\?ml": "", + "/eslint\\.config\\.js?$": "󰱺", + "/prettier\\.config\\.c\\?js?$": "󰏣", "/Trash.$": "", "/Users.$": "", "/\\cloudbuild\\.ya\\?ml$": "󱇶", "/\\.gcloudignore$": "󱇶", "/\\.eslintrc\\(\\.\\(c\\?js\\|ya\\?ml\\|json\\)\\)\\?$": "󰱺", - "/eslint\\.config\\.js?$": "󰱺", "/\\..*env$": "", "/\\.Trash-\\d\\+.$": "", "/\\.atom.$": "", @@ -22,6 +23,7 @@ "/\\.git.$": "", "/\\.github.$": "", "/\\.idea.$": "", + "/\\.prettierrc\\(\\.\\(json5\\?\\|c\\?js\\|ya\\?ml\\|toml\\)\\)\\?": "󰏣", "/\\.vscode.$": "", "/\\.\\?yarnrc\\(\\.ya\\?ml\\)\\?$": "", "/bin.$": "", From c9001984c96d8fe1e4d1fb77c9ca94210bb0ccc9 Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 13:29:53 +0900 Subject: [PATCH 18/22] Add ignore file --- assets/json/basename.json | 3 +++ assets/json/pattern.json | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/json/basename.json b/assets/json/basename.json index ce0853c..585e00c 100644 --- a/assets/json/basename.json +++ b/assets/json/basename.json @@ -3,6 +3,8 @@ ".bashrc": "", ".ds_store": "", ".editorconfig": "", + ".eslintignore": "󰱺", + ".gcloudignore": "󱇶", ".git": "", ".gitattributes": "", ".gitconfig": "", @@ -10,6 +12,7 @@ ".gitlab-ci.yml": "", ".gitmodules": "", ".gvimrc": "", + ".prettierignore": "󰏣", ".rvm": "", ".vimrc": "", ".zprofile": "", diff --git a/assets/json/pattern.json b/assets/json/pattern.json index 3729858..f5cc444 100644 --- a/assets/json/pattern.json +++ b/assets/json/pattern.json @@ -14,7 +14,6 @@ "/Trash.$": "", "/Users.$": "", "/\\cloudbuild\\.ya\\?ml$": "󱇶", - "/\\.gcloudignore$": "󱇶", "/\\.eslintrc\\(\\.\\(c\\?js\\|ya\\?ml\\|json\\)\\)\\?$": "󰱺", "/\\..*env$": "", "/\\.Trash-\\d\\+.$": "", From b942f025bde49365ad915922fc1f5126aed4b07d Mon Sep 17 00:00:00 2001 From: AsPulse Date: Sun, 4 Jun 2023 13:37:57 +0900 Subject: [PATCH 19/22] fix .env files --- assets/json/extension.json | 1 - assets/json/pattern.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/json/extension.json b/assets/json/extension.json index 63dc925..e453bbd 100644 --- a/assets/json/extension.json +++ b/assets/json/extension.json @@ -63,7 +63,6 @@ "eex": "", "ejs": "", "elm": "", - "env": "", "eot": "", "epub": "", "erb": "", diff --git a/assets/json/pattern.json b/assets/json/pattern.json index f5cc444..d446513 100644 --- a/assets/json/pattern.json +++ b/assets/json/pattern.json @@ -15,7 +15,7 @@ "/Users.$": "", "/\\cloudbuild\\.ya\\?ml$": "󱇶", "/\\.eslintrc\\(\\.\\(c\\?js\\|ya\\?ml\\|json\\)\\)\\?$": "󰱺", - "/\\..*env$": "", + "/\\.env\\(\\.[A-z0-9]\\+\\)*$": "", "/\\.Trash-\\d\\+.$": "", "/\\.atom.$": "", "/\\.config.$": "", From 7507d9d754d140b2e571d58ca9ca061891c18b36 Mon Sep 17 00:00:00 2001 From: AsPulse <84216737+AsPulse@users.noreply.github.com> Date: Tue, 6 Jun 2023 09:00:20 +0000 Subject: [PATCH 20/22] Add shell script for sort --- assets/json/sort.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 assets/json/sort.sh diff --git a/assets/json/sort.sh b/assets/json/sort.sh new file mode 100644 index 0000000..55af9f7 --- /dev/null +++ b/assets/json/sort.sh @@ -0,0 +1,25 @@ +#/bin/sh +ESC=$(printf '\033') +printf '\n' + +terminate() { + printf '\n' + exit $1 +} + + +if ! command -v jq > /dev/null ; then + printf "${ESC}[1;31m%s ${ESC}[1;39m%s${ESC}[m\n" '🞬' 'jq is not installed. Please install it and try again.' + terminate 1 +fi + +printf "${ESC}[1;32m%s ${ESC}[1;39m%s${ESC}[m\n\n" '✓' 'jq is installed!' + + +for json in $(dirname $0)/*.json ; do + printf "${ESC}[1;39mSorting ${ESC}[0;39m%s... ${ESC}[m" $json + (rm $json && jq '.' --sort-keys > $json) < $json + printf "${ESC}[1;32mDONE!${ESC}[m\n" +done + +terminate 0 From de07736baf2808d0f0a797bf23710d5ae8257d86 Mon Sep 17 00:00:00 2001 From: AsPulse <84216737+AsPulse@users.noreply.github.com> Date: Tue, 6 Jun 2023 09:01:23 +0000 Subject: [PATCH 21/22] Run sort --- assets/json/pattern.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/json/pattern.json b/assets/json/pattern.json index d446513..bae8e74 100644 --- a/assets/json/pattern.json +++ b/assets/json/pattern.json @@ -1,31 +1,30 @@ { + ".*\\.d\\.ts$": "", ".*angular.*\\.js$": "", ".*backbone.*\\.js$": "", - ".*\\.d\\.ts$": "", ".*jquery.*\\.js$": "", ".*materialize.*\\.css$": "", ".*materialize.*\\.js$": "", ".*mootools.*\\.js$": "", ".*require.*\\.js$": "", ".*vimrc.*": "", - "/codecov\\.ya\\?ml": "", - "/eslint\\.config\\.js?$": "󰱺", - "/prettier\\.config\\.c\\?js?$": "󰏣", "/Trash.$": "", "/Users.$": "", - "/\\cloudbuild\\.ya\\?ml$": "󱇶", - "/\\.eslintrc\\(\\.\\(c\\?js\\|ya\\?ml\\|json\\)\\)\\?$": "󰱺", - "/\\.env\\(\\.[A-z0-9]\\+\\)*$": "", "/\\.Trash-\\d\\+.$": "", + "/\\.\\?yarnrc\\(\\.ya\\?ml\\)\\?$": "", "/\\.atom.$": "", "/\\.config.$": "", + "/\\.env\\(\\.[A-z0-9]\\+\\)*$": "", + "/\\.eslintrc\\(\\.\\(c\\?js\\|ya\\?ml\\|json\\)\\)\\?$": "󰱺", "/\\.git.$": "", "/\\.github.$": "", "/\\.idea.$": "", "/\\.prettierrc\\(\\.\\(json5\\?\\|c\\?js\\|ya\\?ml\\|toml\\)\\)\\?": "󰏣", "/\\.vscode.$": "", - "/\\.\\?yarnrc\\(\\.ya\\?ml\\)\\?$": "", + "/\\cloudbuild\\.ya\\?ml$": "󱇶", "/bin.$": "", + "/codecov\\.ya\\?ml": "", + "/eslint\\.config\\.js?$": "󰱺", "/home.$": "", "/include.$": "", "/lib.$": "", @@ -33,6 +32,7 @@ "/lib64.$": "", "/libexec.$": "", "/node_modules.$": "", + "/prettier\\.config\\.c\\?js?$": "󰏣", "/sbin.$": "", "/xbin.$": "", "Vagrantfile$": "" From a9cd9269df5fe2d3cb2b9e436ca7a6a976c00499 Mon Sep 17 00:00:00 2001 From: AsPulse <84216737+AsPulse@users.noreply.github.com> Date: Tue, 6 Jun 2023 19:25:41 +0900 Subject: [PATCH 22/22] Revert "Add shell script for sort" --- assets/json/sort.sh | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 assets/json/sort.sh diff --git a/assets/json/sort.sh b/assets/json/sort.sh deleted file mode 100644 index 55af9f7..0000000 --- a/assets/json/sort.sh +++ /dev/null @@ -1,25 +0,0 @@ -#/bin/sh -ESC=$(printf '\033') -printf '\n' - -terminate() { - printf '\n' - exit $1 -} - - -if ! command -v jq > /dev/null ; then - printf "${ESC}[1;31m%s ${ESC}[1;39m%s${ESC}[m\n" '🞬' 'jq is not installed. Please install it and try again.' - terminate 1 -fi - -printf "${ESC}[1;32m%s ${ESC}[1;39m%s${ESC}[m\n\n" '✓' 'jq is installed!' - - -for json in $(dirname $0)/*.json ; do - printf "${ESC}[1;39mSorting ${ESC}[0;39m%s... ${ESC}[m" $json - (rm $json && jq '.' --sort-keys > $json) < $json - printf "${ESC}[1;32mDONE!${ESC}[m\n" -done - -terminate 0