From 965b79a430b3eae4f9e42626c165e79eb37018cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wysoki=C5=84ski?= Date: Sun, 29 Jan 2023 09:43:27 +0100 Subject: [PATCH] refactor: rename files --- .terserrc.js | 9 ++++----- Caddyfile | 5 +++-- package.json | 15 ++++++++++----- src/common/{DialogTable.ts => dialog-table.ts} | 0 src/extended-player-profile.quickbar.ts | 2 ++ ...Profile.ts => extended-player-profile.user.ts} | 2 +- yarn.lock | 8 ++++---- 7 files changed, 24 insertions(+), 17 deletions(-) rename src/common/{DialogTable.ts => dialog-table.ts} (100%) create mode 100644 src/extended-player-profile.quickbar.ts rename src/{extendedPlayerProfile.ts => extended-player-profile.user.ts} (99%) diff --git a/.terserrc.js b/.terserrc.js index 9b82b24..3bc27c1 100644 --- a/.terserrc.js +++ b/.terserrc.js @@ -1,17 +1,16 @@ const preambles = { 'extended-player-profile': `// ==UserScript== // @name Extended player profile -// @version 1.0.1 +// @version 1.0.2 // @description Adds additional info and actions to a player's profile. // @author Dawid Wysokiński - Kichiyaki - contact@dwysokinski.me // @match https://*/game.php?*screen=info_player* -// @downloadURL ${process.env.PUBLIC_URL}/userscripts/extendedPlayerProfile.js -// @updateURL ${process.env.PUBLIC_URL}/userscripts/extendedPlayerProfile.js +// @downloadURL ${process.env.PUBLIC_URL}/extended-player-profile.user.js +// @updateURL ${process.env.PUBLIC_URL}/extended-player-profile.user.js // @icon https://www.google.com/s2/favicons?domain=plemiona.pl // @grant none // @run-at document-end -// ==/UserScript== -`, +// ==/UserScript==`, }; const preamble = preambles[process.env.PREAMBLE]; diff --git a/Caddyfile b/Caddyfile index e0cf8c1..ae8c1b4 100644 --- a/Caddyfile +++ b/Caddyfile @@ -3,6 +3,7 @@ file_server header -Server header Cache-Control max-age=3600 - header /quickbar/*.js Content-type "text/javascript; charset=UTF-8" - header /userscripts/*.js Content-type "text/javascript; charset=UTF-8" + header *.js Content-type "text/javascript; charset=UTF-8" + header /*.js Content-type "text/javascript; charset=UTF-8" + redir /userscripts/extendedPlayerProfile.js /extended-player-profile.user.js permanent } diff --git a/package.json b/package.json index 8745269..7f68637 100644 --- a/package.json +++ b/package.json @@ -3,14 +3,19 @@ "version": "0.1.0", "license": "MIT", "scripts": { - "build-userscript": "PUBLIC_URL=https://scripts.tribalwarshelp.com parcel build --dist-dir dist/userscripts", - "build-quickbar": "PUBLIC_URL=https://scripts.tribalwarshelp.com parcel build --dist-dir dist/quickbar", - "build:userscript:extended-player-profile": "PREAMBLE=extended-player-profile yarn build-userscript src/extendedPlayerProfile.ts", - "build:quickbar:extended-player-profile": "yarn build-quickbar src/extendedPlayerProfile.ts", + "build-single": "PUBLIC_URL=https://scripts.tribalwarshelp.com parcel build", + "build:userscript:extended-player-profile": "PREAMBLE=extended-player-profile yarn build-single ./src/extended-player-profile.user.ts", + "build:quickbar:extended-player-profile": "yarn build-single ./src/extended-player-profile.quickbar.ts", "build:userscript": "npm-run-all build:userscript:*", "build:quickbar": "npm-run-all build:quickbar:*", "build": "npm-run-all build:*" }, + "targets": { + "default": { + "distDir": "./dist", + "sourceMap": false + } + }, "author": { "name": "Dawid Wysokiński", "email": "contact@dwysokinski.me", @@ -26,7 +31,7 @@ "buffer": "^5.5.0", "npm-run-all": "^4.1.5", "parcel": "^2.8.1", - "prettier": "^2.8.1", + "prettier": "^2.8.3", "typescript": "^4.9.4" }, "dependencies": { diff --git a/src/common/DialogTable.ts b/src/common/dialog-table.ts similarity index 100% rename from src/common/DialogTable.ts rename to src/common/dialog-table.ts diff --git a/src/extended-player-profile.quickbar.ts b/src/extended-player-profile.quickbar.ts new file mode 100644 index 0000000..6040564 --- /dev/null +++ b/src/extended-player-profile.quickbar.ts @@ -0,0 +1,2 @@ +// Parcel doesn't have an option to rename output files +import './extended-player-profile.user'; diff --git a/src/extendedPlayerProfile.ts b/src/extended-player-profile.user.ts similarity index 99% rename from src/extendedPlayerProfile.ts rename to src/extended-player-profile.user.ts index 979f094..24cfedd 100644 --- a/src/extendedPlayerProfile.ts +++ b/src/extended-player-profile.user.ts @@ -1,7 +1,7 @@ // Extended player profile import { Player, PlayerSnapshot, TWHelpClient } from './lib/twhelp'; -import { DialogTable } from './common/DialogTable'; +import { DialogTable } from './common/dialog-table'; import { InADayClient } from './lib/tw'; import { createTranslationFunc } from './utils'; diff --git a/yarn.lock b/yarn.lock index f07a8c5..d17289c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1743,10 +1743,10 @@ posthtml@^0.16.4, posthtml@^0.16.5: posthtml-parser "^0.11.0" posthtml-render "^3.0.0" -prettier@^2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc" - integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg== +prettier@^2.8.3: + version "2.8.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.3.tgz#ab697b1d3dd46fb4626fbe2f543afe0cc98d8632" + integrity sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw== proxy-from-env@^1.1.0: version "1.1.0"