Merge branch 'master' into reuse-modals

yomidevs · Sep 21, 2024 · 7c549b3 · 7c549b3
2 parents baac3bc + 6b7218d
commit 7c549b3
Show file tree

Hide file tree

Showing 21 changed files with 2,171 additions and 2,080 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -672,6 +672,28 @@
                 "crypto": "readonly",
                 "AbortController": "readonly"
             }
+        },
+        {
+            "files": [
+                "ext/data/recommended-dictionaries.json"
+            ],
+            "rules": {
+                "jsonc/sort-keys": ["error", {
+                    "pathPattern": ".*",
+                    "hasProperties": ["name"],
+                    "order": [
+                        "name",
+                        "description",
+                        "homepage",
+                        "downloadUrl"
+                    ]
+                }, {
+                    "pathPattern": ".*",
+                    "order": {
+                        "type": "asc"
+                    }
+                }]
+            }
         }
     ]
 }
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -21,9 +21,6 @@ on:
   schedule:
     - cron: '31 13 * * 3'
 
-permissions:
-  contents: read
-
 jobs:
   analyze:
     name: Analyze

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -30,5 +30,13 @@
     "files.trimTrailingWhitespace": true,
     "html-validate.validate": [
         "html"
+    ],
+    "json.schemas": [
+        {
+            "fileMatch": [
+                "/ext/data/recommended-dictionaries.json"
+            ],
+            "url": "/ext/data/schemas/recommended-dictionaries-schema.json"
+        }
     ]
 }
diff --git a/benches/japanese-language-transformer.bench.js b/benches/japanese-language-transformer.bench.js
@@ -133,7 +133,6 @@ describe('japanese language transformer', () => {
             'こさせない',
             'こささない',
             'こさせられない',
-            'くるな',
             'きまして',
             'くれば',
             'きちゃう',
@@ -203,7 +202,6 @@ describe('japanese language transformer', () => {
             'ささない',
             'させられない',
             'せさせられない',
-            'するな',
             'しまして',
             'すれば',
             'しちゃう',

diff --git a/docs/dictionaries.md b/docs/dictionaries.md
@@ -13,6 +13,7 @@ Be aware that non-English dictionaries generally contain fewer entries than thei
 - [JMnedict](https://github.com/themoeway/jmdict-yomitan#jmnedict-for-yomitan) - Lists readings of person/place/organization names and other proper nouns.
 - [KANJIDIC](https://github.com/themoeway/jmdict-yomitan#kanjidic-for-yomitan) - An English dictionary listing readings, meanings, and other info about kanji characters.
 - [BCCWJ Frequency Dictionary](https://github.com/Kuuuube/yomitan-dictionaries?tab=readme-ov-file#bccwj-suw-luw-combined) - A frequency dictionary based on the Balanced Corpus of Contemporary Written Japanese.
+- [JPDB Frequency Dictionary](https://github.com/Kuuuube/yomitan-dictionaries?tab=readme-ov-file#jpdb-v21-frequency) - A frequency dictionary based on the corpus from the online Japanese dictionary and SRS system at https://jpdb.io.
 
 #### Other Languages
 

diff --git a/ext/css/popup-outer.css b/ext/css/popup-outer.css
@@ -35,6 +35,9 @@ iframe.yomitan-popup[data-theme=dark] {
 iframe.yomitan-popup[data-outer-theme=dark] {
     box-shadow: 0 0 10em rgba(255, 255, 255, 0.5);
 }
+iframe.yomitan-popup[data-outer-theme=none] {
+    box-shadow: none;
+}
 iframe.yomitan-popup[data-popup-display-mode=full-width] {
     border-left: none;
     border-right: none;