From 31809058e65d2fc49c7c28016d0aca3e2ad03cca Mon Sep 17 00:00:00 2001 From: Vaker Date: Thu, 14 Dec 2023 00:21:25 +0300 Subject: [PATCH] Implemented centralized versioning --- Extensions/combined/_locales/cs/messages.json | 2 +- Extensions/combined/_locales/de/messages.json | 2 +- Extensions/combined/_locales/el/messages.json | 2 +- Extensions/combined/_locales/en/messages.json | 2 +- Extensions/combined/_locales/es/messages.json | 2 +- Extensions/combined/_locales/fr/messages.json | 2 +- Extensions/combined/_locales/it/messages.json | 2 +- Extensions/combined/_locales/ja/messages.json | 2 +- Extensions/combined/_locales/ko/messages.json | 2 +- Extensions/combined/_locales/nl/messages.json | 2 +- Extensions/combined/_locales/pl/messages.json | 2 +- .../combined/_locales/pt_BR/messages.json | 2 +- Extensions/combined/_locales/ru/messages.json | 2 +- .../combined/_locales/sv_SE/messages.json | 2 +- Extensions/combined/_locales/tr/messages.json | 2 +- Extensions/combined/_locales/uk/messages.json | 2 +- Extensions/combined/manifest-chrome.json | 2 +- Extensions/combined/manifest-firefox.json | 2 +- Extensions/combined/manifest-safari.json | 2 +- package.json | 2 +- webpack.config.js | 26 +++++++++++++++++++ 21 files changed, 46 insertions(+), 20 deletions(-) diff --git a/Extensions/combined/_locales/cs/messages.json b/Extensions/combined/_locales/cs/messages.json index edbd284e..a786b6a1 100644 --- a/Extensions/combined/_locales/cs/messages.json +++ b/Extensions/combined/_locales/cs/messages.json @@ -42,7 +42,7 @@ "message": "aktualizovat na" }, "version30installed": { - "message": "Verze 3.0.0.13 nainstalována" + "message": "Verze __RYD_VERSION__ nainstalována" }, "whatsnew": { "message": "Co je nového" diff --git a/Extensions/combined/_locales/de/messages.json b/Extensions/combined/_locales/de/messages.json index 8f223473..ebc680fa 100644 --- a/Extensions/combined/_locales/de/messages.json +++ b/Extensions/combined/_locales/de/messages.json @@ -36,7 +36,7 @@ "message": "aktualisieren auf" }, "version30installed": { - "message": "Version 3.0.0.13 installiert" + "message": "Version __RYD_VERSION__ installiert" }, "whatsnew": { "message": "Was ist neu" diff --git a/Extensions/combined/_locales/el/messages.json b/Extensions/combined/_locales/el/messages.json index 612627ce..2d8d0553 100644 --- a/Extensions/combined/_locales/el/messages.json +++ b/Extensions/combined/_locales/el/messages.json @@ -84,7 +84,7 @@ "message": "Ενημέρωση σε" }, "version30installed": { - "message": "Εκδοση 3.0.0.13 εγκαταστάθηκε" + "message": "Εκδοση __RYD_VERSION__ εγκαταστάθηκε" }, "whatsnew": { "message": "Τί νέο υπάρχει" diff --git a/Extensions/combined/_locales/en/messages.json b/Extensions/combined/_locales/en/messages.json index 0c8bc57b..e481943b 100644 --- a/Extensions/combined/_locales/en/messages.json +++ b/Extensions/combined/_locales/en/messages.json @@ -84,7 +84,7 @@ "message": "Update to" }, "version30installed": { - "message": "Version 3.0.0.13 installed" + "message": "Version __RYD_VERSION__ installed" }, "whatsnew": { "message": "What's new" diff --git a/Extensions/combined/_locales/es/messages.json b/Extensions/combined/_locales/es/messages.json index 7a2f1c85..d44c3e1f 100644 --- a/Extensions/combined/_locales/es/messages.json +++ b/Extensions/combined/_locales/es/messages.json @@ -84,7 +84,7 @@ "message": "actualizar a" }, "version30installed": { - "message": "Versión 3.0.0.13 instalada" + "message": "Versión __RYD_VERSION__ instalada" }, "whatsnew": { "message": "Novedades" diff --git a/Extensions/combined/_locales/fr/messages.json b/Extensions/combined/_locales/fr/messages.json index a329d619..126ff8bd 100644 --- a/Extensions/combined/_locales/fr/messages.json +++ b/Extensions/combined/_locales/fr/messages.json @@ -42,7 +42,7 @@ "message": "mettre à jour vers" }, "version30installed": { - "message": "Version 3.0.0.13 installée" + "message": "Version __RYD_VERSION__ installée" }, "whatsnew": { "message": "Quoi de neuf" diff --git a/Extensions/combined/_locales/it/messages.json b/Extensions/combined/_locales/it/messages.json index 3b0531a0..14107ef4 100644 --- a/Extensions/combined/_locales/it/messages.json +++ b/Extensions/combined/_locales/it/messages.json @@ -36,7 +36,7 @@ "message": "aggiorna a" }, "version30installed": { - "message": "Versione 3.0.0.13 installata" + "message": "Versione __RYD_VERSION__ installata" }, "whatsnew": { "message": "Quali sono le novità" diff --git a/Extensions/combined/_locales/ja/messages.json b/Extensions/combined/_locales/ja/messages.json index 97bfb461..2515a0bb 100644 --- a/Extensions/combined/_locales/ja/messages.json +++ b/Extensions/combined/_locales/ja/messages.json @@ -42,7 +42,7 @@ "message": "アップデート：" }, "version30installed": { - "message": "バージョン 3.0.0.13 がインストールされました。" + "message": "バージョン __RYD_VERSION__ がインストールされました。" }, "whatsnew": { "message": "新機能" diff --git a/Extensions/combined/_locales/ko/messages.json b/Extensions/combined/_locales/ko/messages.json index 7557ecc3..a1cc6fb5 100644 --- a/Extensions/combined/_locales/ko/messages.json +++ b/Extensions/combined/_locales/ko/messages.json @@ -84,7 +84,7 @@ "message": "업데이트" }, "version30installed": { - "message": "3.0.0.13 버전이 설치됨" + "message": "__RYD_VERSION__ 버전이 설치됨" }, "whatsnew": { "message": "새로운 점" diff --git a/Extensions/combined/_locales/nl/messages.json b/Extensions/combined/_locales/nl/messages.json index a7f04f63..4eaa5999 100644 --- a/Extensions/combined/_locales/nl/messages.json +++ b/Extensions/combined/_locales/nl/messages.json @@ -84,7 +84,7 @@ "message": "Update naar" }, "version30installed": { - "message": "Versie 3.0.0.13 geïnstalleerd" + "message": "Versie __RYD_VERSION__ geïnstalleerd" }, "whatsnew": { "message": "Wat is er nieuw" diff --git a/Extensions/combined/_locales/pl/messages.json b/Extensions/combined/_locales/pl/messages.json index d613adec..67cee3bb 100644 --- a/Extensions/combined/_locales/pl/messages.json +++ b/Extensions/combined/_locales/pl/messages.json @@ -84,7 +84,7 @@ "message": "Zaktualizuj do" }, "version30installed": { - "message": "Zainstalowana wersja 3.0.0.1" + "message": "Zainstalowana wersja __RYD_VERSION__" }, "whatsnew": { "message": "Co nowego" diff --git a/Extensions/combined/_locales/pt_BR/messages.json b/Extensions/combined/_locales/pt_BR/messages.json index d6d747ed..857dd489 100644 --- a/Extensions/combined/_locales/pt_BR/messages.json +++ b/Extensions/combined/_locales/pt_BR/messages.json @@ -42,7 +42,7 @@ "message": "Atualizar para" }, "version30installed": { - "message": "Versão 3.0.0.13 instalada" + "message": "Versão __RYD_VERSION__ instalada" }, "whatsnew": { "message": "O que há de novo?" diff --git a/Extensions/combined/_locales/ru/messages.json b/Extensions/combined/_locales/ru/messages.json index b2bd4286..85c45113 100644 --- a/Extensions/combined/_locales/ru/messages.json +++ b/Extensions/combined/_locales/ru/messages.json @@ -36,7 +36,7 @@ "message": "обновление до" }, "version30installed": { - "message": "Версия 3.0.0.13 установлена" + "message": "Версия __RYD_VERSION__ установлена" }, "whatsnew": { "message": "Что нового" diff --git a/Extensions/combined/_locales/sv_SE/messages.json b/Extensions/combined/_locales/sv_SE/messages.json index 35fa57c3..69ec0de8 100644 --- a/Extensions/combined/_locales/sv_SE/messages.json +++ b/Extensions/combined/_locales/sv_SE/messages.json @@ -84,7 +84,7 @@ "message": "Uppdatera till" }, "version30installed": { - "message": "Version 3.0.0.13 installerad" + "message": "Version __RYD_VERSION__ installerad" }, "whatsnew": { "message": "Vad är nytt" diff --git a/Extensions/combined/_locales/tr/messages.json b/Extensions/combined/_locales/tr/messages.json index a0ebde64..c5e0a698 100644 --- a/Extensions/combined/_locales/tr/messages.json +++ b/Extensions/combined/_locales/tr/messages.json @@ -84,7 +84,7 @@ "message": "Şu sürüme güncelle" }, "version30installed": { - "message": "Sürüm 3.0.0.13 yüklendi" + "message": "Sürüm __RYD_VERSION__ yüklendi" }, "whatsnew": { "message": "Yeni Ne Var" diff --git a/Extensions/combined/_locales/uk/messages.json b/Extensions/combined/_locales/uk/messages.json index 6c87e62c..b723cee3 100644 --- a/Extensions/combined/_locales/uk/messages.json +++ b/Extensions/combined/_locales/uk/messages.json @@ -84,7 +84,7 @@ "message": "Оновлення до" }, "version30installed": { - "message": "Версію 3.0.0.13 встановлено" + "message": "Версію __RYD_VERSION__ встановлено" }, "whatsnew": { "message": "Що нового" diff --git a/Extensions/combined/manifest-chrome.json b/Extensions/combined/manifest-chrome.json index 9dc609c9..3513a43d 100644 --- a/Extensions/combined/manifest-chrome.json +++ b/Extensions/combined/manifest-chrome.json @@ -2,7 +2,7 @@ "name": "__MSG_extensionName__", "description": "__MSG_extensionDesc__", "default_locale": "en", - "version": "3.0.0.12", + "version": "__RYD_VERSION__", "manifest_version": 3, "background": { "service_worker": "ryd.background.js" diff --git a/Extensions/combined/manifest-firefox.json b/Extensions/combined/manifest-firefox.json index 7f0fb23a..e34dd0f9 100644 --- a/Extensions/combined/manifest-firefox.json +++ b/Extensions/combined/manifest-firefox.json @@ -2,7 +2,7 @@ "name": "__MSG_extensionName__", "description": "__MSG_extensionDesc__", "default_locale": "en", - "version": "3.0.0.12", + "version": "__RYD_VERSION__", "manifest_version": 2, "background": { "scripts": ["ryd.background.js"] diff --git a/Extensions/combined/manifest-safari.json b/Extensions/combined/manifest-safari.json index 4a38cb3c..0c7f8e34 100644 --- a/Extensions/combined/manifest-safari.json +++ b/Extensions/combined/manifest-safari.json @@ -2,7 +2,7 @@ "name": "__MSG_extensionName__", "description": "__MSG_extensionDesc__", "default_locale": "en", - "version": "3.0.0.8", + "version": "__RYD_VERSION__", "manifest_version": 2, "background": { "scripts": ["ryd.background.js"], diff --git a/package.json b/package.json index fddd304c..a8830245 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "return-youtube-dislike", - "version": "2.0.0", + "version": "3.0.0-14", "description": "Chrome extension to return youtube dislikes", "main": "ryd.content-script.js", "scripts": { diff --git a/webpack.config.js b/webpack.config.js index a0ccf92b..2d297d59 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -2,6 +2,7 @@ const path = require("path"); const CopyPlugin = require("copy-webpack-plugin"); const FileManagerPlugin = require("filemanager-webpack-plugin"); +const extensionVersion = process.env.npm_package_version.replace('-', '.'); const entries = ["ryd.content-script", "ryd.background", "popup"]; const ignorePatterns = [ @@ -12,6 +13,25 @@ const ignorePatterns = [ ...entries.map((entry) => `**/${entry}.js`), ]; +const manifestTransform = (content, filename) => { + const filteredContent = content + .toString() + .split('\n') + .filter(str => !str.trimStart().startsWith("//")) + .join('\n'); + + const manifestData = JSON.parse(filteredContent); + manifestData.version = extensionVersion; + return JSON.stringify(manifestData, null, 2); +}; + +const i18nTransform = (content, filename) => { + if (!filename.endsWith('messages.json')) + return content; + + return content.toString().replace(/__RYD_VERSION__/g, extensionVersion); +}; + module.exports = { entry: Object.fromEntries( entries.map((entry) => [ @@ -40,10 +60,12 @@ module.exports = { globOptions: { ignore: ignorePatterns, }, + transform: i18nTransform }, { from: "./Extensions/combined/manifest-chrome.json", to: "./chrome/manifest.json", + transform: manifestTransform }, { from: "./Extensions/combined", @@ -51,10 +73,12 @@ module.exports = { globOptions: { ignore: ignorePatterns, }, + transform: i18nTransform }, { from: "./Extensions/combined/manifest-firefox.json", to: "./firefox/manifest.json", + transform: manifestTransform }, { from: "./Extensions/combined", @@ -62,10 +86,12 @@ module.exports = { globOptions: { ignore: ignorePatterns, }, + transform: i18nTransform }, { from: "./Extensions/combined/manifest-safari.json", to: "./safari/manifest.json", + transform: manifestTransform }, ], }),