From ad2bf18ab46f758cba9e262af286cb9decf91fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= <30625554+n3oney@users.noreply.github.com> Date: Fri, 16 Jun 2023 18:32:21 +0200 Subject: [PATCH 1/2] fix: fix loading custom themes with a custom LEMMY_UI_EXTRA_THEMES_FOLDER --- src/server/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/index.tsx b/src/server/index.tsx index 3a12ad7e..7fca89f2 100644 --- a/src/server/index.tsx +++ b/src/server/index.tsx @@ -87,7 +87,7 @@ server.get("/css/themes/:name", async (req, res) => { res.send("Theme must be a css file"); } - const customTheme = path.resolve(`./${extraThemesFolder}/${theme}`); + const customTheme = path.resolve(`${extraThemesFolder}/${theme}`); if (existsSync(customTheme)) { res.sendFile(customTheme); } else { From cc64a1fec9dac1ca83b1c98dfb41a5df406ad5a1 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Tue, 20 Jun 2023 17:40:14 -0400 Subject: [PATCH 2/2] feat: Drop dependency for tsconfig-paths-webpack-plugin --- package.json | 1 - tsconfig.json | 6 ++---- webpack.config.js | 7 +++++-- yarn.lock | 33 +-------------------------------- 4 files changed, 8 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index d3769f13..7b4f4621 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,6 @@ "sortpack": "^2.3.4", "style-loader": "^3.3.2", "terser": "^5.17.3", - "tsconfig-paths-webpack-plugin": "^4.0.1", "typescript": "^5.0.4", "webpack-dev-server": "4.15.0" }, diff --git a/tsconfig.json b/tsconfig.json index 600d33aa..a1c4fe5c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,10 +20,8 @@ "strictNullChecks": true, "noFallthroughCasesInSwitch": true, "paths": { - "@utils/roles": ["./shared/utils/roles/index"], - "@utils/browser": ["./shared/utils/browser/index"], - "@utils/helpers": ["./shared/utils/helpers/index"], - "@utils/types": ["./shared/utils/types/index"], + "@/*": ["/*"], + "@utils/*": ["shared/utils/*"], } }, "include": [ diff --git a/webpack.config.js b/webpack.config.js index fd210f05..ba3ea60d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,11 +1,11 @@ const webpack = require("webpack"); +const path = require("path"); const MiniCssExtractPlugin = require("mini-css-extract-plugin"); const nodeExternals = require("webpack-node-externals"); const CopyPlugin = require("copy-webpack-plugin"); const RunNodeWebpackPlugin = require("run-node-webpack-plugin"); const merge = require("lodash/merge"); const { ServiceWorkerPlugin } = require("service-worker-webpack"); -const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin"); const banner = ` hash:[contentHash], chunkhash:[chunkhash], name:[name], filebase:[base], query:[query], file:[file] Source code: https://github.com/LemmyNet/lemmy-ui @@ -20,8 +20,11 @@ const base = { hashFunction: "xxhash64", }, resolve: { - plugins: [new TsconfigPathsPlugin()], extensions: [".js", ".jsx", ".ts", ".tsx"], + alias: { + "@": path.resolve(__dirname, "src/"), + "@utils": path.resolve(__dirname, "src/shared/utils/"), + }, }, performance: { hints: false, diff --git a/yarn.lock b/yarn.lock index 1e31d7cf..8ed82982 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2714,7 +2714,7 @@ chalk@^2.0.0, chalk@^2.0.1: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -3578,14 +3578,6 @@ enhanced-resolve@^5.14.0: graceful-fs "^4.2.4" tapable "^2.2.0" -enhanced-resolve@^5.7.0: - version "5.15.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" - integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - entities@^4.2.0, entities@^4.4.0: version "4.5.0" resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" @@ -8694,11 +8686,6 @@ strip-ansi@^7.0.1: dependencies: ansi-regex "^6.0.1" -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== - strip-comments@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" @@ -8951,24 +8938,6 @@ tributejs@^5.1.3: resolved "https://registry.yarnpkg.com/tributejs/-/tributejs-5.1.3.tgz#980600fc72865be5868893078b4bfde721129eae" integrity sha512-B5CXihaVzXw+1UHhNFyAwUTMDk1EfoLP5Tj1VhD9yybZ1I8DZJEv8tZ1l0RJo0t0tk9ZhR8eG5tEsaCvRigmdQ== -tsconfig-paths-webpack-plugin@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.0.1.tgz#a24651d0f69668a1abad38d3c2489855c257460d" - integrity sha512-m5//KzLoKmqu2MVix+dgLKq70MnFi8YL8sdzQZ6DblmCdfuq/y3OqvJd5vMndg2KEVCOeNz8Es4WVZhYInteLw== - dependencies: - chalk "^4.1.0" - enhanced-resolve "^5.7.0" - tsconfig-paths "^4.1.2" - -tsconfig-paths@^4.1.2: - version "4.2.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c" - integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg== - dependencies: - json5 "^2.2.2" - minimist "^1.2.6" - strip-bom "^3.0.0" - tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"