diff --git a/Dockerfile b/Dockerfile index 92b3f7e..2b36581 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ COPY .git .git RUN echo "export const VERSION = '$(git describe --tag)';" > "src/shared/version.ts" RUN yarn --production --prefer-offline -RUN NODE_OPTIONS="--max-old-space-size=8192" yarn build:prod +RUN yarn build:prod # Prune the image RUN node-prune /usr/src/app/node_modules diff --git a/package.json b/package.json index 9acaba4..3bbc0b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lemmy-ui", - "version": "0.18.1-rc.5", + "version": "0.18.1-rc.3", "description": "An isomorphic UI for lemmy", "repository": "https://github.com/LemmyNet/lemmy-ui", "license": "AGPL-3.0", @@ -22,16 +22,9 @@ "translations:update": "git submodule update --remote --recursive" }, "lint-staged": { - "*.{ts,tsx,js}": [ - "prettier --write", - "eslint --fix" - ], - "*.{css, scss}": [ - "prettier --write" - ], - "package.json": [ - "sortpack" - ] + "*.{ts,tsx,js}": ["prettier --write", "eslint --fix"], + "*.{css, scss}": ["prettier --write"], + "package.json": ["sortpack"] }, "dependencies": { "@babel/plugin-proposal-decorators": "^7.21.0", diff --git a/src/server/index.tsx b/src/server/index.tsx index 458d7f0..e1b36e2 100644 --- a/src/server/index.tsx +++ b/src/server/index.tsx @@ -20,13 +20,7 @@ const [hostname, port] = process.env["LEMMY_UI_HOST"] server.use(express.json()); server.use(express.urlencoded({ extended: false })); -server.use( - getStaticDir(), - express.static(path.resolve("./dist"), { - maxAge: 24 * 60 * 60 * 1000, // 1 day - immutable: true, - }) -); +server.use(getStaticDir(), express.static(path.resolve("./dist"))); server.use(setCacheControl); if (!process.env["LEMMY_UI_DISABLE_CSP"] && !process.env["LEMMY_UI_DEBUG"]) { diff --git a/src/server/middleware.ts b/src/server/middleware.ts index 235f072..9815e71 100644 --- a/src/server/middleware.ts +++ b/src/server/middleware.ts @@ -1,4 +1,4 @@ -import type { NextFunction, Request, Response } from "express"; +import type { NextFunction, Response } from "express"; import { UserService } from "../shared/services"; export function setDefaultCsp({ @@ -18,33 +18,24 @@ export function setDefaultCsp({ // Set cache-control headers. If user is logged in, set `private` to prevent storing data in // shared caches (eg nginx) and leaking of private data. If user is not logged in, allow caching -// all responses for 5 seconds to reduce load on backend and database. The specific cache +// all responses for 60 seconds to reduce load on backend and database. The specific cache // interval is rather arbitrary and could be set higher (less server load) or lower (fresher data). // // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control -export function setCacheControl( - req: Request, - res: Response, - next: NextFunction -) { +export function setCacheControl({ + res, + next, +}: { + res: Response; + next: NextFunction; +}) { const user = UserService.Instance; let caching: string; - - if ( - process.env.NODE_ENV === "production" && - (req.path.match(/\.(js|css|txt|manifest\.webmanifest)\/?$/) || - req.path.includes("/css/themelist")) - ) { - // Static content gets cached publicly for a day - caching = "public, max-age=86400"; + if (user.auth()) { + caching = "private"; } else { - if (user.auth()) { - caching = "private"; - } else { - caching = "public, max-age=5"; - } + caching = "public, max-age=60"; } - res.setHeader("Cache-Control", caching); next(); diff --git a/src/server/utils/create-ssr-html.tsx b/src/server/utils/create-ssr-html.tsx index ba85228..f6d46b0 100644 --- a/src/server/utils/create-ssr-html.tsx +++ b/src/server/utils/create-ssr-html.tsx @@ -24,7 +24,7 @@ export async function createSsrHtml( if (!appleTouchIcon) { appleTouchIcon = site?.site_view.site.icon - ? `data:image/png;base64,${await sharp( + ? `data:image/png;base64,${sharp( await fetchIconPng(site.site_view.site.icon) ) .resize(180, 180) diff --git a/src/shared/components/home/home.tsx b/src/shared/components/home/home.tsx index 5e73367..5ef1a87 100644 --- a/src/shared/components/home/home.tsx +++ b/src/shared/components/home/home.tsx @@ -279,15 +279,13 @@ export class Home extends Component { trendingCommunitiesRes, commentsRes, postsRes, + tagline: getRandomFromList(this.state?.siteRes?.taglines ?? []) + ?.content, isIsomorphic: true, }; HomeCacheService.postsRes = postsRes; } - - this.state.tagline = getRandomFromList( - this.state?.siteRes?.taglines ?? [] - )?.content; } componentWillUnmount() { diff --git a/src/shared/components/home/tagline-form.tsx b/src/shared/components/home/tagline-form.tsx index f7cf99a..bdbe1e6 100644 --- a/src/shared/components/home/tagline-form.tsx +++ b/src/shared/components/home/tagline-form.tsx @@ -141,7 +141,7 @@ export class TaglineForm extends Component { handleEditTaglineClick(d: { i: TaglineForm; index: number }, event: any) { event.preventDefault(); - if (d.i.state.editingRow == d.index) { + if (this.state.editingRow == d.index) { d.i.setState({ editingRow: undefined }); } else { d.i.setState({ editingRow: d.index }); diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index 5c562a4..586403b 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -403,9 +403,8 @@ export class PostListing extends Component { createdLine() { const post_view = this.postView; - return ( -
+
diff --git a/src/shared/utils/app/is-auth-path.ts b/src/shared/utils/app/is-auth-path.ts index 5a201ac..0ec963a 100644 --- a/src/shared/utils/app/is-auth-path.ts +++ b/src/shared/utils/app/is-auth-path.ts @@ -1,5 +1,5 @@ export default function isAuthPath(pathname: string) { - return /^\/create_.*|inbox|settings|admin|reports|registration_applications/g.test( + return /create_.*|inbox|settings|admin|reports|registration_applications/g.test( pathname ); } diff --git a/webpack.config.js b/webpack.config.js index 0c9806d..9afdb52 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,7 +14,7 @@ const banner = ` @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL v3.0 `; -function getBase(env, mode) { +function getBase(env) { return { output: { filename: "js/server.js", @@ -54,7 +54,6 @@ function getBase(env, mode) { plugins: [ new webpack.DefinePlugin({ "process.env.COMMIT_HASH": `"${env.COMMIT_HASH}"`, - "process.env.NODE_ENV": `"${mode}"`, }), new MiniCssExtractPlugin({ filename: "styles/styles.css", @@ -70,7 +69,7 @@ function getBase(env, mode) { } const createServerConfig = (env, mode) => { - const base = getBase(env, mode); + const base = getBase(env); const config = merge({}, base, { mode, entry: "./src/server/index.tsx", @@ -98,7 +97,7 @@ const createServerConfig = (env, mode) => { }; const createClientConfig = (env, mode) => { - const base = getBase(env, mode); + const base = getBase(env); const config = merge({}, base, { mode, entry: "./src/client/index.tsx",