From 1551f8880ec67fd660fb368c5b7c8987c59ee911 Mon Sep 17 00:00:00 2001 From: Jean Date: Sun, 26 Jan 2025 20:42:29 -0800 Subject: [PATCH] Adding extra verb libraries --- .gitignore | 3 ++- package-lock.json | 22 ++++++++++++++++++++++ package.json | 3 ++- rollup.config.js | 3 ++- src/replace-words.js | 7 +++++-- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4a50196..263e049 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ - *-update/* *.DS_Store node_modules src/content-script.js +src/.amo-upload-uuid +src/web-ext-artifacts diff --git a/package-lock.json b/package-lock.json index aacba8f..51e37c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "license": "GPL-3.0-or-later", "devDependencies": { "@rollup/plugin-commonjs": "28.0.2", + "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "15.3.0", "english-verbs-gerunds": "3.3.1", "english-verbs-helper": "3.3.1", @@ -415,6 +416,27 @@ } } }, + "node_modules/@rollup/plugin-json": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.1.0.tgz", + "integrity": "sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rollup/pluginutils": "^5.1.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, "node_modules/@rollup/plugin-node-resolve": { "version": "15.3.0", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.0.tgz", diff --git a/package.json b/package.json index 7ea8fd9..5cbd5f5 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "english-verbs-helper": "3.3.1", "english-verbs-irregular": "3.3.1", "rollup": "^4.27.3", - "web-ext": "^8.3.0" + "web-ext": "^8.3.0", + "@rollup/plugin-json": "^6.1.0" } } diff --git a/rollup.config.js b/rollup.config.js index dc328ac..b255b22 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,5 +1,6 @@ import resolve from '@rollup/plugin-node-resolve'; import commonjs from '@rollup/plugin-commonjs'; +import json from '@rollup/plugin-json'; export default { input: 'src/replace-words.js', @@ -8,5 +9,5 @@ export default { format: 'iife', name: 'contentScript' }, - plugins: [resolve(), commonjs()] + plugins: [resolve(), commonjs(), json()] }; diff --git a/src/replace-words.js b/src/replace-words.js index 7f72afd..0f0a1d3 100644 --- a/src/replace-words.js +++ b/src/replace-words.js @@ -1,4 +1,7 @@ const verbsHelper = require('english-verbs-helper'); +const verbsIrregular = require('english-verbs-irregular/dist/verbs.json'); +const verbsGerunds = require('english-verbs-gerunds/dist/gerunds.json'); +const verbsData = verbsHelper.mergeVerbsData(verbsIrregular, verbsGerunds); function replaceAll() { browser.storage.local.get(null, (options) => { @@ -234,7 +237,7 @@ function verbMethod(node, search_term, options) { if (match == null) { return; } const verb = match[1]; const tense = match[2].toUpperCase().replaceAll(" ", "_"); - const replace_value = verbsHelper.getConjugation(null, verb, tense, getPovIndex(options)); + const replace_value = verbsHelper.getConjugation(verbsData, verb, tense, getPovIndex(options)); node.nodeValue = node.nodeValue.replace(search_term, replace_value); verbMethod(node, search_term, options); } @@ -254,7 +257,7 @@ function pluralThirdVerbMethod(node, search_term, options) { tense = match[6]; } tense = tense.toUpperCase().replaceAll(" ", "_"); - const replace_verb = verbsHelper.getConjugation(null, verb, tense, 2); + const replace_verb = verbsHelper.getConjugation(verbsData, verb, tense, 2); let replace_value; if (wasBefore) { replace_value = options["name"] + " " + replace_verb;