summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
Diffstat (limited to 'dev')
-rw-r--r--dev/build-libs.js1
-rw-r--r--dev/build.js1
-rw-r--r--dev/css-to-json-util.js1
-rw-r--r--dev/data/display-pronunciation-overrides.css1
-rw-r--r--dev/data/manifest-variants.json248
-rw-r--r--dev/data/structured-content-overrides.css1
-rw-r--r--dev/database-vm.js1
-rw-r--r--dev/dictionary-validate.js1
-rw-r--r--dev/generate-css-json.js1
-rw-r--r--dev/lint/global-declarations.js1
-rw-r--r--dev/lint/html-scripts.js1
-rw-r--r--dev/manifest-util.js1
-rw-r--r--dev/patch-dependencies.js1
-rw-r--r--dev/schema-validate.js1
-rw-r--r--dev/translator-vm.js1
-rw-r--r--dev/util.js1
-rw-r--r--dev/vm.js1
17 files changed, 147 insertions, 117 deletions
diff --git a/dev/build-libs.js b/dev/build-libs.js
index 189a967d..36c07edd 100644
--- a/dev/build-libs.js
+++ b/dev/build-libs.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2020-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/build.js b/dev/build.js
index 496e5865..5222c4c8 100644
--- a/dev/build.js
+++ b/dev/build.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2020-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/css-to-json-util.js b/dev/css-to-json-util.js
index 71033f3a..79aae3c9 100644
--- a/dev/css-to-json-util.js
+++ b/dev/css-to-json-util.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2021-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/data/display-pronunciation-overrides.css b/dev/data/display-pronunciation-overrides.css
index 862f1320..7bba55e5 100644
--- a/dev/data/display-pronunciation-overrides.css
+++ b/dev/data/display-pronunciation-overrides.css
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2021-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/data/manifest-variants.json b/dev/data/manifest-variants.json
index 94b2077d..362650b8 100644
--- a/dev/data/manifest-variants.json
+++ b/dev/data/manifest-variants.json
@@ -1,10 +1,10 @@
{
"manifest": {
- "manifest_version": 2,
- "name": "Yomichan",
- "version": "22.10.23.0",
+ "manifest_version": 3,
+ "name": "Yomitan",
+ "version": "23.3.18.0",
"description": "Japanese dictionary with Anki integration",
- "author": "Alex Yatskov",
+ "author": "TheMoeWay",
"icons": {
"16": "images/icon16.png",
"19": "images/icon19.png",
@@ -14,7 +14,7 @@
"64": "images/icon64.png",
"128": "images/icon128.png"
},
- "browser_action": {
+ "action": {
"default_icon": {
"16": "images/icon16.png",
"19": "images/icon19.png",
@@ -24,12 +24,11 @@
"64": "images/icon64.png",
"128": "images/icon128.png"
},
- "default_title": "Yomichan",
+ "default_title": "Yomitan",
"default_popup": "action-popup.html"
},
"background": {
- "page": "background.html",
- "persistent": true
+ "service_worker": "sw.js"
},
"content_scripts": [
{
@@ -67,7 +66,7 @@
]
}
],
- "minimum_chrome_version": "57.0.0.0",
+ "minimum_chrome_version": "96.0.0.0",
"options_ui": {
"page": "settings.html",
"open_in_tab": true
@@ -75,21 +74,22 @@
"sandbox": {
"pages": [
"template-renderer.html"
- ],
- "content_security_policy": "sandbox allow-scripts; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'unsafe-inline'"
+ ]
},
"permissions": [
- "<all_urls>",
"storage",
"clipboardWrite",
"unlimitedStorage",
"webRequest",
- "webRequestBlocking"
+ "declarativeNetRequest",
+ "scripting"
],
"optional_permissions": [
"clipboardRead",
- "nativeMessaging",
- "webNavigation"
+ "nativeMessaging"
+ ],
+ "host_permissions": [
+ "<all_urls>"
],
"commands": {
"toggleTextScanning": {
@@ -115,10 +115,20 @@
}
},
"web_accessible_resources": [
- "popup.html",
- "template-renderer.html"
+ {
+ "resources": [
+ "popup.html",
+ "template-renderer.html"
+ ],
+ "matches": [
+ "<all_urls>"
+ ]
+ }
],
- "content_security_policy": "default-src 'self'; img-src blob: 'self'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *"
+ "content_security_policy": {
+ "extension_pages": "default-src 'self'; img-src blob: 'self'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *",
+ "sandbox": "sandbox allow-scripts; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'unsafe-inline'"
+ }
},
"defaultVariant": "base",
"variants": [
@@ -129,101 +139,107 @@
{
"name": "chrome",
"inherit": "base",
- "fileName": "yomichan-chrome.zip",
+ "fileName": "yomitan-chrome.zip",
"excludeFiles": [
- "sw.js",
- "js/dom/simple-dom-parser.js",
- "lib/parse5.js"
+ "background.html",
+ "js/dom/native-simple-dom-parser.js"
]
},
{
"name": "chrome-dev",
"inherit": "chrome",
- "fileName": "yomichan-chrome-dev.zip",
+ "fileName": "yomitan-chrome-dev.zip",
"modifications": [
{
"action": "replace",
- "path": ["name"],
+ "path": [
+ "name"
+ ],
"pattern": "^.*$",
"patternFlags": "",
"replacement": "$& (development build)"
},
{
"action": "replace",
- "path": ["description"],
+ "path": [
+ "description"
+ ],
"pattern": "^(.*)(?:\\.\\s*)?$",
"patternFlags": "",
- "replacement": "$1. This is a development build; get the stable version here: https://tinyurl.com/yaatdjmp"
+ "replacement": "$1. This is a development build."
}
]
},
{
- "name": "chrome-mv3",
- "inherit": "base",
- "fileName": "yomichan-chrome-mv3.zip",
- "modifications": [
- {"action": "set", "path": ["manifest_version"], "value": 3},
- {"action": "set", "path": ["minimum_chrome_version"], "value": "96.0.0.0"},
- {"action": "move", "path": ["browser_action"], "newPath": ["action"]},
- {"action": "delete", "path": ["background", "page"]},
- {"action": "delete", "path": ["background", "persistent"]},
- {"action": "set", "path": ["background", "service_worker"], "value": "sw.js"},
- {"action": "move", "path": ["content_security_policy"], "newPath": ["content_security_policy_old"]},
- {"action": "set", "path": ["content_security_policy"], "value": {}},
- {"action": "move", "path": ["content_security_policy_old"], "newPath": ["content_security_policy", "extension_pages"]},
- {"action": "move", "path": ["sandbox", "content_security_policy"], "newPath": ["content_security_policy", "sandbox"]},
- {"action": "remove", "path": ["permissions"], "item": "<all_urls>"},
- {"action": "remove", "path": ["permissions"], "item": "webRequestBlocking"},
- {"action": "add", "path": ["permissions"], "items": ["declarativeNetRequest", "scripting"]},
- {"action": "set", "path": ["host_permissions"], "value": ["<all_urls>"], "after": "optional_permissions"},
- {"action": "remove", "path": ["optional_permissions"], "item": "webNavigation"},
- {"action": "move", "path": ["web_accessible_resources"], "newPath": ["web_accessible_resources_old"]},
- {"action": "set", "path": ["web_accessible_resources"], "value": [{"resources": [], "matches": ["<all_urls>"]}], "after": "web_accessible_resources_old"},
- {"action": "move", "path": ["web_accessible_resources_old"], "newPath": ["web_accessible_resources", 0, "resources"]}
- ],
- "excludeFiles": [
- "background.html",
- "js/dom/native-simple-dom-parser.js"
- ]
- },
- {
"name": "firefox",
"inherit": "base",
- "fileName": "yomichan-firefox.xpi",
+ "fileName": "yomitan-firefox.zip",
"modifications": [
{
+ "action": "delete",
+ "path": [
+ "background",
+ "service_worker"
+ ]
+ },
+ {
+ "action": "set",
+ "path": [
+ "background",
+ "page"
+ ],
+ "value": "background.html"
+ },
+ {
"action": "remove",
- "path": ["web_accessible_resources"],
+ "path": [
+ "web_accessible_resources",
+ 0,
+ "resources"
+ ],
"item": "template-renderer.html"
},
{
"action": "delete",
- "path": ["sandbox"]
+ "path": [
+ "sandbox"
+ ]
},
{
"action": "set",
- "path": ["content_security_policy"],
+ "path": [
+ "content_security_policy",
+ "extension_pages"
+ ],
"value": "default-src 'self'; script-src 'self' 'unsafe-eval'; img-src blob: 'self'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *"
},
{
"action": "set",
- "path": ["browser_specific_settings"],
+ "path": [
+ "browser_specific_settings"
+ ],
"value": {
"gecko": {
- "id": "alex@foosoft.net",
- "strict_min_version": "57.0"
+ "id": "{cb7c0bec-7085-4f84-8422-7b55a7c4467c}",
+ "strict_min_version": "101.0"
}
}
},
{
"action": "remove",
- "path": ["optional_permissions"],
+ "path": [
+ "optional_permissions"
+ ],
"item": "nativeMessaging"
},
{
"action": "add",
- "path": ["permissions"],
- "items": ["nativeMessaging"]
+ "path": [
+ "permissions"
+ ],
+ "items": [
+ "nativeMessaging"
+ ]
}
],
"excludeFiles": [
@@ -235,31 +251,43 @@
{
"name": "firefox-dev",
"inherit": "firefox",
- "fileName": "yomichan-firefox-dev.xpi",
+ "fileName": "yomitan-firefox-dev.zip",
"modifications": [
{
"action": "replace",
- "path": ["name"],
+ "path": [
+ "name"
+ ],
"pattern": "^.*$",
"patternFlags": "",
"replacement": "$& (development build)"
},
{
"action": "replace",
- "path": ["description"],
+ "path": [
+ "description"
+ ],
"pattern": "^(.*)(?:\\.\\s*)?$",
"patternFlags": "",
- "replacement": "$1. This is a development build; get the stable version here: https://tinyurl.com/yaatdjmp"
+ "replacement": "$1. This is a development build."
},
{
"action": "set",
- "path": ["browser_specific_settings", "gecko", "id"],
- "value": "alex.testing@foosoft.net"
+ "path": [
+ "browser_specific_settings",
+ "gecko",
+ "id"
+ ],
+ "value": "{2d13e145-294e-4ead-9bce-b4644b203a00}"
},
{
"action": "set",
- "path": ["browser_specific_settings", "gecko", "update_url"],
- "value": "https://raw.githubusercontent.com/FooSoft/yomichan/metadata/updates.json"
+ "path": [
+ "browser_specific_settings",
+ "gecko",
+ "update_url"
+ ],
+ "value": "https://raw.githubusercontent.com/themoeway/yomitan/metadata/updates.json"
}
],
"excludeFiles": [
@@ -269,56 +297,42 @@
]
},
{
- "name": "firefox-mv3",
- "inherit": "firefox",
- "fileName": "yomichan-firefox-mv3.xpi",
+ "name": "safari",
+ "fileName": null,
"modifications": [
- {"action": "set", "path": ["manifest_version"], "value": 3},
- {"action": "set", "path": ["browser_specific_settings", "gecko", "strict_min_version"], "value": "101.0"},
- {"action": "move", "path": ["browser_action"], "newPath": ["action"]},
- {"action": "delete", "path": ["background", "persistent"]},
- {"action": "move", "path": ["content_security_policy"], "newPath": ["content_security_policy_old"]},
- {"action": "set", "path": ["content_security_policy"], "value": {}},
- {"action": "move", "path": ["content_security_policy_old"], "newPath": ["content_security_policy", "extension_pages"]},
- {"action": "remove", "path": ["permissions"], "item": "<all_urls>"},
- {"action": "add", "path": ["permissions"], "items": ["scripting"]},
- {"action": "set", "path": ["host_permissions"], "value": ["<all_urls>"], "after": "optional_permissions"},
- {"action": "remove", "path": ["optional_permissions"], "item": "webNavigation"},
- {"action": "move", "path": ["web_accessible_resources"], "newPath": ["web_accessible_resources_old"]},
{
- "action": "set",
- "path": ["web_accessible_resources"],
- "value": [
- {
- "resources": [],
- "matches": [
- "http://*/*",
- "https://*/*",
- "file://*/*"
- ]
- }
+ "action": "remove",
+ "path": [
+ "optional_permissions"
],
- "after": "web_accessible_resources_old"
+ "item": "clipboardRead"
+ },
+ {
+ "action": "remove",
+ "path": [
+ "permissions"
+ ],
+ "item": "webRequestBlocking"
+ },
+ {
+ "action": "delete",
+ "path": [
+ "content_scripts",
+ 0,
+ "match_about_blank"
+ ]
+ },
+ {
+ "action": "delete",
+ "path": [
+ "sandbox"
+ ]
},
- {"action": "move", "path": ["web_accessible_resources_old"], "newPath": ["web_accessible_resources", 0, "resources"]}
- ],
- "excludeFiles": [
- "sw.js",
- "js/dom/simple-dom-parser.js",
- "lib/parse5.js"
- ]
- },
- {
- "name": "safari",
- "fileName": null,
- "modifications": [
- {"action": "remove", "path": ["optional_permissions"], "item": "clipboardRead"},
- {"action": "remove", "path": ["permissions"], "item": "webRequestBlocking"},
- {"action": "delete", "path": ["content_scripts", 0, "match_about_blank"]},
- {"action": "delete", "path": ["sandbox"]},
{
"action": "set",
- "path": ["content_security_policy"],
+ "path": [
+ "content_security_policy"
+ ],
"value": "default-src 'self'; script-src 'self' 'unsafe-eval'; img-src blob: 'self'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *"
}
],
diff --git a/dev/data/structured-content-overrides.css b/dev/data/structured-content-overrides.css
index 811ed9cf..c0b14202 100644
--- a/dev/data/structured-content-overrides.css
+++ b/dev/data/structured-content-overrides.css
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2021-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/database-vm.js b/dev/database-vm.js
index 63350124..d5570691 100644
--- a/dev/database-vm.js
+++ b/dev/database-vm.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2020-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/dictionary-validate.js b/dev/dictionary-validate.js
index 7f31c61f..0c926acc 100644
--- a/dev/dictionary-validate.js
+++ b/dev/dictionary-validate.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2020-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/generate-css-json.js b/dev/generate-css-json.js
index b14849b2..787173ab 100644
--- a/dev/generate-css-json.js
+++ b/dev/generate-css-json.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2021-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/lint/global-declarations.js b/dev/lint/global-declarations.js
index b28f53cd..7f90d227 100644
--- a/dev/lint/global-declarations.js
+++ b/dev/lint/global-declarations.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2020-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/lint/html-scripts.js b/dev/lint/html-scripts.js
index b9752ceb..db6e6ca4 100644
--- a/dev/lint/html-scripts.js
+++ b/dev/lint/html-scripts.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2020-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/manifest-util.js b/dev/manifest-util.js
index 3fc8a770..082cf57c 100644
--- a/dev/manifest-util.js
+++ b/dev/manifest-util.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2021-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/patch-dependencies.js b/dev/patch-dependencies.js
index 0de9bf0c..81572c5c 100644
--- a/dev/patch-dependencies.js
+++ b/dev/patch-dependencies.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2021-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/schema-validate.js b/dev/schema-validate.js
index 1b47be8b..1d7607b7 100644
--- a/dev/schema-validate.js
+++ b/dev/schema-validate.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2020-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/translator-vm.js b/dev/translator-vm.js
index 91a362ab..e3b700ff 100644
--- a/dev/translator-vm.js
+++ b/dev/translator-vm.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2021-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/util.js b/dev/util.js
index 4bf3f746..65b1d982 100644
--- a/dev/util.js
+++ b/dev/util.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2020-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dev/vm.js b/dev/vm.js
index e9adc222..c3266443 100644
--- a/dev/vm.js
+++ b/dev/vm.js
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 Yomitan Authors
* Copyright (C) 2020-2022 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify