From 1ae98afa344b2cca5bb387c2c84d6bc5725858a4 Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Mon, 17 Feb 2025 02:45:02 +0100 Subject: [PATCH] Move scripts into separate folders --- .eslintrc.cjs | 2 +- package.json | 12 ++++++------ tools/scripts/{ => dayjs}/generateDayJsLocales.ts | 4 ++-- .../{ => dayjs}/generateDayJsLocalesImport.ts | 4 ++-- tools/scripts/{ => release}/createCommitChangelog.ts | 2 +- .../scripts/{ => release}/createReleaseChangelog.ts | 6 +++--- .../{ => release}/createTranslationChangelog.ts | 4 ++-- tools/scripts/tsconfig.json | 2 +- tools/scripts/{ => weblate}/generatei18nResources.ts | 10 +++++----- 9 files changed, 23 insertions(+), 23 deletions(-) rename tools/scripts/{ => dayjs}/generateDayJsLocales.ts (82%) rename tools/scripts/{ => dayjs}/generateDayJsLocalesImport.ts (84%) rename tools/scripts/{ => release}/createCommitChangelog.ts (91%) rename tools/scripts/{ => release}/createReleaseChangelog.ts (87%) rename tools/scripts/{ => release}/createTranslationChangelog.ts (90%) rename tools/scripts/{ => weblate}/generatei18nResources.ts (85%) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 0de4a859..71e70afa 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -93,7 +93,7 @@ module.exports = { }, }, { - files: ['tools/scripts/*'], + files: ['tools/scripts/**/*'], rules: { 'no-relative-import-paths/no-relative-import-paths': 'off', 'import/no-extraneous-dependencies': ['error', { devDependencies: true }], diff --git a/package.json b/package.json index b512c3b6..ee2b1953 100644 --- a/package.json +++ b/package.json @@ -12,16 +12,16 @@ "build-md5": "find build -type f | sort | xargs md5sum | awk '{ print $1 }' | tr -d '\n' | md5sum| awk '{ print $1 }' > buildZip/md5sum ", "build-zip": "cd build && rev=$(git rev-list HEAD --count) && echo r$rev > revision && zip -9 -r ../buildZip/Suwayomi-WebUI-r$rev *", "lint": "eslint src --ext .ts,.tsx,.js,.jsx --max-warnings=0 --cache", - "createCommitChangelog": "tsx tools/scripts/createCommitChangelog.ts", - "createTranslationChangelog": "tsx tools/scripts/createTranslationChangelog.ts", - "createReleaseChangelog": "tsx tools/scripts/createReleaseChangelog.ts", + "createCommitChangelog": "tsx tools/scripts/release/createCommitChangelog.ts", + "createTranslationChangelog": "tsx tools/scripts/release/createTranslationChangelog.ts", + "createReleaseChangelog": "tsx tools/scripts/release/createReleaseChangelog.ts", "updateDeps": "tsx tools/scripts/updateDependencies.ts", "gql:codegen-base": "graphql-codegen --config gql_codegen.ts", "gql:codegen-formatter": "tsx tools/scripts/codegenFormatter.ts", "gql:codegen": "yarn gql:codegen-base & yarn gql:codegen-formatter", - "i18n:gen-resources": "tsx tools/scripts/generatei18nResources.ts", - "dayjs:gen-locales-array": "tsx tools/scripts/generateDayJsLocales.ts", - "dayjs:gen-locales-import": "tsx tools/scripts/generateDayJsLocalesImport.ts", + "i18n:gen-resources": "tsx tools/scripts/weblate/generatei18nResources.ts", + "dayjs:gen-locales-array": "tsx tools/scripts/dayjs/generateDayJsLocales.ts", + "dayjs:gen-locales-import": "tsx tools/scripts/dayjs/generateDayJsLocalesImport.ts", "dayjs:gen-locales": "yarn dayjs:gen-locales-array && yarn dayjs:gen-locales-import", "prepare": "husky" }, diff --git a/tools/scripts/generateDayJsLocales.ts b/tools/scripts/dayjs/generateDayJsLocales.ts similarity index 82% rename from tools/scripts/generateDayJsLocales.ts rename to tools/scripts/dayjs/generateDayJsLocales.ts index 0a70d8f0..50b3958e 100644 --- a/tools/scripts/generateDayJsLocales.ts +++ b/tools/scripts/dayjs/generateDayJsLocales.ts @@ -9,8 +9,8 @@ import path from 'path'; import fs from 'fs'; -const outputFilePath = path.join(import.meta.dirname, '../../src/lib/dayjs/Locales.ts'); -const resourcesDirPath = path.join(import.meta.dirname, '../../node_modules/dayjs/locale'); +const outputFilePath = path.join(import.meta.dirname, '../../../src/lib/dayjs/Locales.ts'); +const resourcesDirPath = path.join(import.meta.dirname, '../../../node_modules/dayjs/locale'); const dayjsLocaleFileNames = fs.readdirSync(resourcesDirPath); diff --git a/tools/scripts/generateDayJsLocalesImport.ts b/tools/scripts/dayjs/generateDayJsLocalesImport.ts similarity index 84% rename from tools/scripts/generateDayJsLocalesImport.ts rename to tools/scripts/dayjs/generateDayJsLocalesImport.ts index 4f6d1ade..fcb0be53 100644 --- a/tools/scripts/generateDayJsLocalesImport.ts +++ b/tools/scripts/dayjs/generateDayJsLocalesImport.ts @@ -9,8 +9,8 @@ import path from 'path'; import fs from 'fs'; -const outputFilePath = path.join(import.meta.dirname, '../../src/lib/dayjs/LocaleImporter.ts'); -const resourcesDirPath = path.join(import.meta.dirname, '../../node_modules/dayjs/locale'); +const outputFilePath = path.join(import.meta.dirname, '../../../src/lib/dayjs/LocaleImporter.ts'); +const resourcesDirPath = path.join(import.meta.dirname, '../../../node_modules/dayjs/locale'); const dayjsLocaleFileNames = fs.readdirSync(resourcesDirPath); diff --git a/tools/scripts/createCommitChangelog.ts b/tools/scripts/release/createCommitChangelog.ts similarity index 91% rename from tools/scripts/createCommitChangelog.ts rename to tools/scripts/release/createCommitChangelog.ts index 3c906573..50f3316c 100644 --- a/tools/scripts/createCommitChangelog.ts +++ b/tools/scripts/release/createCommitChangelog.ts @@ -8,7 +8,7 @@ import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; -import { createCommitChangelog } from './release/CommitChangelog.utils.ts'; +import { createCommitChangelog } from './CommitChangelog.utils.ts'; const { sha } = yargs(hideBin(process.argv)) .options({ diff --git a/tools/scripts/createReleaseChangelog.ts b/tools/scripts/release/createReleaseChangelog.ts similarity index 87% rename from tools/scripts/createReleaseChangelog.ts rename to tools/scripts/release/createReleaseChangelog.ts index cff9ab2c..f530de4b 100644 --- a/tools/scripts/createReleaseChangelog.ts +++ b/tools/scripts/release/createReleaseChangelog.ts @@ -9,9 +9,9 @@ import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; import dayjs from 'dayjs'; -import { createCommitChangelog } from './release/CommitChangelog.utils.ts'; -import { createTranslationChangelog } from './release/TranslationChangelog.utils.ts'; -import { validateWeblateDates } from './weblate/Weblate.utils.ts'; +import { createCommitChangelog } from './CommitChangelog.utils.ts'; +import { createTranslationChangelog } from './TranslationChangelog.utils.ts'; +import { validateWeblateDates } from '../weblate/Weblate.utils.ts'; const { sha, date } = yargs(hideBin(process.argv)) .options({ diff --git a/tools/scripts/createTranslationChangelog.ts b/tools/scripts/release/createTranslationChangelog.ts similarity index 90% rename from tools/scripts/createTranslationChangelog.ts rename to tools/scripts/release/createTranslationChangelog.ts index 6be67e55..0c471692 100644 --- a/tools/scripts/createTranslationChangelog.ts +++ b/tools/scripts/release/createTranslationChangelog.ts @@ -8,8 +8,8 @@ import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; -import { createTranslationChangelog } from './release/TranslationChangelog.utils.ts'; -import { TRANSLATION_CHANGELOG_YARG_OPTIONS_DEFAULT } from './weblate/Weblate.constants.ts'; +import { createTranslationChangelog } from './TranslationChangelog.utils.ts'; +import { TRANSLATION_CHANGELOG_YARG_OPTIONS_DEFAULT } from '../weblate/Weblate.constants.ts'; const { afterDate, beforeDate, requiredContributionCount, keepKnownContributors } = yargs(hideBin(process.argv)) .options({ diff --git a/tools/scripts/tsconfig.json b/tools/scripts/tsconfig.json index b5a51484..9be4cd76 100644 --- a/tools/scripts/tsconfig.json +++ b/tools/scripts/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "include": [ - "./*" + "./**/*" ], "compilerOptions": { "moduleResolution": "node" diff --git a/tools/scripts/generatei18nResources.ts b/tools/scripts/weblate/generatei18nResources.ts similarity index 85% rename from tools/scripts/generatei18nResources.ts rename to tools/scripts/weblate/generatei18nResources.ts index 1fd84b23..acea1db7 100644 --- a/tools/scripts/generatei18nResources.ts +++ b/tools/scripts/weblate/generatei18nResources.ts @@ -12,12 +12,12 @@ import { fetchWeblateLanguageStats, getWeblateLanguageStatsFor, meetsTranslatedPercentThreshold as meetsTranslatedPercentThresholdBase, -} from './weblate/Weblate.utils.ts'; -import { WeblateLanguageStatistic } from './weblate/Weblate.types.ts'; -import { TRANSLATED_PERCENT_THRESHOLD } from './weblate/Weblate.constants.ts'; +} from './Weblate.utils.ts'; +import { WeblateLanguageStatistic } from './Weblate.types.ts'; +import { TRANSLATED_PERCENT_THRESHOLD } from './Weblate.constants.ts'; -const outputFilePath = path.join(import.meta.dirname, '../../src/i18n/index.ts'); -const resourcesDirPath = path.join(import.meta.dirname, '../../public/locales'); +const outputFilePath = path.join(import.meta.dirname, '../../../src/i18n/index.ts'); +const resourcesDirPath = path.join(import.meta.dirname, '../../../public/locales'); const extractLanguageCode = (resourceFileNames: string): string => path.basename(resourceFileNames, path.extname(resourceFileNames));