Merge branch 'master' into development

yomidevs · Dec 19, 2023 · f68b238 · f68b238
2 parents 5a2d95d + ae2e2db
commit f68b238
Show file tree

Hide file tree

Showing 20 changed files with 302 additions and 281 deletions.
diff --git a/dev/bin/generate-css-json.js b/dev/bin/generate-css-json.js
@@ -21,8 +21,8 @@ import {formatRulesJson, generateRules, getTargets} from '../generate-css-json.j
 
 /** */
 function main() {
-    for (const {cssFile, overridesCssFile, outputPath} of getTargets()) {
-        const json = formatRulesJson(generateRules(cssFile, overridesCssFile));
+    for (const {cssFilePath, overridesCssFilePath, outputPath} of getTargets()) {
+        const json = formatRulesJson(generateRules(cssFilePath, overridesCssFilePath));
         fs.writeFileSync(outputPath, json, {encoding: 'utf8'});
     }
 }

diff --git a/dev/generate-css-json.js b/dev/generate-css-json.js
@@ -24,18 +24,18 @@ import {fileURLToPath} from 'url';
 const dirname = path.dirname(fileURLToPath(import.meta.url));
 
 /**
- * @returns {{cssFile: string, overridesCssFile: string, outputPath: string}[]}
+ * @returns {{cssFilePath: string, overridesCssFilePath: string, outputPath: string}[]}
  */
 export function getTargets() {
     return [
         {
-            cssFile: path.join(dirname, '..', 'ext/css/structured-content.css'),
-            overridesCssFile: path.join(dirname, 'data/structured-content-overrides.css'),
+            cssFilePath: path.join(dirname, '..', 'ext/css/structured-content.css'),
+            overridesCssFilePath: path.join(dirname, 'data/structured-content-overrides.css'),
             outputPath: path.join(dirname, '..', 'ext/data/structured-content-style.json')
         },
         {
-            cssFile: path.join(dirname, '..', 'ext/css/display-pronunciation.css'),
-            overridesCssFile: path.join(dirname, 'data/display-pronunciation-overrides.css'),
+            cssFilePath: path.join(dirname, '..', 'ext/css/display-pronunciation.css'),
+            overridesCssFilePath: path.join(dirname, 'data/display-pronunciation-overrides.css'),
             outputPath: path.join(dirname, '..', 'ext/data/pronunciation-style.json')
         }
     ];
@@ -124,14 +124,14 @@ export function formatRulesJson(rules) {
 
 /**
  * Generates a CSS ruleset.
- * @param {string} cssFile
- * @param {string} overridesCssFile
+ * @param {string} cssFilePath
+ * @param {string} overridesCssFilePath
  * @returns {import('css-style-applier').RawStyleData}
  * @throws {Error}
  */
-export function generateRules(cssFile, overridesCssFile) {
-    const content1 = fs.readFileSync(cssFile, {encoding: 'utf8'});
-    const content2 = fs.readFileSync(overridesCssFile, {encoding: 'utf8'});
+export function generateRules(cssFilePath, overridesCssFilePath) {
+    const content1 = fs.readFileSync(cssFilePath, {encoding: 'utf8'});
+    const content2 = fs.readFileSync(overridesCssFilePath, {encoding: 'utf8'});
     const stylesheet1 = /** @type {css.StyleRules} */ (css.parse(content1, {}).stylesheet);
     const stylesheet2 = /** @type {css.StyleRules} */ (css.parse(content2, {}).stylesheet);
 

diff --git a/ext/js/app/content-script-main.js b/ext/js/app/content-script-main.js
@@ -22,7 +22,8 @@ import {yomitan} from '../yomitan.js';
 import {Frontend} from './frontend.js';
 import {PopupFactory} from './popup-factory.js';
 
-(async () => {
+/** Entry point. */
+async function main() {
     try {
         await yomitan.prepare();
 
@@ -57,4 +58,6 @@ import {PopupFactory} from './popup-factory.js';
     } catch (e) {
         log.error(e);
     }
-})();
+}
+
+await main();
diff --git a/ext/js/background/background-main.js b/ext/js/background/background-main.js
@@ -19,9 +19,12 @@
 import {yomitan} from '../yomitan.js';
 import {Backend} from './backend.js';
 
-(() => {
+/** Entry point. */
+async function main() {
     yomitan.prepare(true);
 
     const backend = new Backend();
-    backend.prepare();
-})();
+    await backend.prepare();
+}
+
+main();
diff --git a/ext/js/background/offscreen-main.js b/ext/js/background/offscreen-main.js
@@ -18,6 +18,9 @@
 
 import {Offscreen} from './offscreen.js';
 
-(() => {
+/** Entry point. */
+async function main() {
     new Offscreen();
-})();
+}
+
+await main();