From 538fb5e28c55850266f30a927f092672d723ac7c Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 19 Oct 2023 20:47:28 -0400 Subject: [PATCH] Updating for new v19 changes. (#2191) * Updating for new v19 changes. WIP. * Fixing package json. * Updating for new lemmy-js-client. * Trying to add node-sass * Revert "Trying to add node-sass" This reverts commit 959ea0de13be414d48e86d8bc296bcaacecdc5bb. * Trying node:20-alpine --- .woodpecker.yml | 8 ++++---- Dockerfile | 4 ++-- dev.dockerfile | 4 ++-- lemmy-translations | 2 +- package.json | 4 ++-- src/shared/components/common/markdown-textarea.tsx | 2 +- src/shared/components/community/sidebar.tsx | 3 +-- src/shared/components/modlog.tsx | 7 +------ src/shared/components/person/settings.tsx | 2 -- src/shared/components/post/post-listing.tsx | 2 +- yarn.lock | 8 ++++---- 11 files changed, 19 insertions(+), 27 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index a40f529c..53949585 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,6 +1,6 @@ steps: fetch_git_submodules: - image: node:alpine + image: node:20-alpine commands: - apk add git - git submodule init @@ -8,17 +8,17 @@ steps: # - git fetch --tags yarn: - image: node:alpine + image: node:20-alpine commands: - yarn yarn_lint: - image: node:alpine + image: node:20-alpine commands: - yarn lint yarn_build_dev: - image: node:alpine + image: node:20-alpine commands: - yarn build:dev diff --git a/Dockerfile b/Dockerfile index 2ec9ebb9..671ab1e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:alpine as builder +FROM node:20-alpine as builder RUN apk update && apk add curl yarn python3 build-base gcc wget git --no-cache RUN curl -sf https://gobinaries.com/tj/node-prune | sh @@ -38,7 +38,7 @@ RUN rm -rf ./node_modules/npm RUN du -sh ./node_modules/* | sort -nr | grep '\dM.*' -FROM node:alpine as runner +FROM node:20-alpine as runner RUN apk update && apk add curl --no-cache COPY --from=builder /usr/src/app/dist /app/dist COPY --from=builder /usr/src/app/node_modules /app/node_modules diff --git a/dev.dockerfile b/dev.dockerfile index 881d9bc3..42d12400 100644 --- a/dev.dockerfile +++ b/dev.dockerfile @@ -1,4 +1,4 @@ -FROM node:20.2-alpine as builder +FROM node:20-alpine as builder RUN apk update && apk add curl yarn python3 build-base gcc wget git --no-cache WORKDIR /usr/src/app @@ -28,7 +28,7 @@ RUN echo "export const VERSION = 'dev';" > "src/shared/version.ts" RUN yarn --prefer-offline RUN yarn build:dev -FROM node:alpine as runner +FROM node:20-alpine as runner COPY --from=builder /usr/src/app/dist /app/dist COPY --from=builder /usr/src/app/node_modules /app/node_modules diff --git a/lemmy-translations b/lemmy-translations index d0f35483..abd40d47 160000 --- a/lemmy-translations +++ b/lemmy-translations @@ -1 +1 @@ -Subproject commit d0f3548379e446d2c333e582734bc68f8d684f4d +Subproject commit abd40d4737fa732321fd7b62e42bbfcd51081cb6 diff --git a/package.json b/package.json index b0f00ed2..0194059c 100644 --- a/package.json +++ b/package.json @@ -70,9 +70,10 @@ "inferno-router": "^8.2.2", "inferno-server": "^8.2.2", "jwt-decode": "^3.1.2", - "lemmy-js-client": "^0.19.0-rc.13", + "lemmy-js-client": "0.19.0-rc.14", "lodash.isequal": "^4.5.0", "markdown-it": "^13.0.1", + "markdown-it-bidi": "^0.1.0", "markdown-it-container": "^3.0.0", "markdown-it-emoji": "^2.0.2", "markdown-it-footnote": "^3.0.3", @@ -80,7 +81,6 @@ "markdown-it-ruby": "^0.1.1", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "markdown-it-bidi": "^0.1.0", "mini-css-extract-plugin": "^2.7.5", "register-service-worker": "^1.7.2", "run-node-webpack-plugin": "^1.3.0", diff --git a/src/shared/components/common/markdown-textarea.tsx b/src/shared/components/common/markdown-textarea.tsx index 725bfa7e..d032b5a5 100644 --- a/src/shared/components/common/markdown-textarea.tsx +++ b/src/shared/components/common/markdown-textarea.tsx @@ -258,7 +258,7 @@ export class MarkdownTextArea extends Component< value={this.state.imageUploadStatus.uploaded} max={this.state.imageUploadStatus.total} text={ - I18NextService.i18n.t("pictures_uploded_progess", { + I18NextService.i18n.t("pictures_uploaded_progess", { uploaded: this.state.imageUploadStatus.uploaded, total: this.state.imageUploadStatus.total, }) ?? undefined diff --git a/src/shared/components/community/sidebar.tsx b/src/shared/components/community/sidebar.tsx index 6fd6bfa6..810f9695 100644 --- a/src/shared/components/community/sidebar.tsx +++ b/src/shared/components/community/sidebar.tsx @@ -1,4 +1,4 @@ -import { getUnixTime, hostname } from "@utils/helpers"; +import { hostname } from "@utils/helpers"; import { amAdmin, amMod, amTopMod } from "@utils/roles"; import { Component, InfernoNode, linkEvent } from "inferno"; import { T } from "inferno-i18next-dess"; @@ -546,7 +546,6 @@ export class Sidebar extends Component { community_id: i.props.community_view.community.id, removed: !i.props.community_view.community.removed, reason: i.state.removeReason, - expires: getUnixTime(i.state.removeExpires), // TODO fix this }); } diff --git a/src/shared/components/modlog.tsx b/src/shared/components/modlog.tsx index 0b246a6e..58bf27ef 100644 --- a/src/shared/components/modlog.tsx +++ b/src/shared/components/modlog.tsx @@ -364,7 +364,7 @@ function renderModlogType({ type_, view }: ModlogType) { case "ModRemoveCommunity": { const mrco = view as ModRemoveCommunityView; const { - mod_remove_community: { reason, expires, removed }, + mod_remove_community: { reason, removed }, community, } = mrco; @@ -379,11 +379,6 @@ function renderModlogType({ type_, view }: ModlogType) {
reason: {reason}
)} - {expires && ( - -
expires: {formatPastDate(expires)}
- - )} ); } diff --git a/src/shared/components/person/settings.tsx b/src/shared/components/person/settings.tsx index 52200236..2e74aa09 100644 --- a/src/shared/components/person/settings.tsx +++ b/src/shared/components/person/settings.tsx @@ -249,7 +249,6 @@ export class Settings extends Component { show_bot_accounts, show_scores, show_read_posts, - show_new_post_notifs, send_notifications_to_email, email, }, @@ -285,7 +284,6 @@ export class Settings extends Component { show_bot_accounts, show_scores, show_read_posts, - show_new_post_notifs, email, bio, send_notifications_to_email, diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index 9a8bea09..18356073 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -1712,7 +1712,7 @@ export class PostListing extends Component { if (myAuth() && !i.props.post_view.read) { i.props.onMarkPostAsRead({ - post_id: i.props.post_view.post.id, + post_ids: [i.props.post_view.post.id], read: true, }); } diff --git a/yarn.lock b/yarn.lock index 7538b22d..1009595b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6064,10 +6064,10 @@ leac@^0.6.0: resolved "https://registry.yarnpkg.com/leac/-/leac-0.6.0.tgz#dcf136e382e666bd2475f44a1096061b70dc0912" integrity sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg== -lemmy-js-client@^0.19.0-rc.13: - version "0.19.0-rc.13" - resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.19.0-rc.13.tgz#e0e15ba6fe3a08cb85130eea7eec4bd2773999f9" - integrity sha512-JP9oEh1+Wfttqx5O5EMAVIR/hFVS66iVKmEo8/Uxw8fJfyUeQo7BhKvG8LTYegBE39Womgyu3KxXb7Jy9DRI5A== +lemmy-js-client@0.19.0-rc.14: + version "0.19.0-rc.14" + resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.19.0-rc.14.tgz#41885611c2d78e5cb6b01cf167d68205a471c215" + integrity sha512-U0KKFLrU0K+A7UlZr+k4olrXCXBxD+9cwMicu7L/wFyZ2aWHtGPaeO8V6mk6suv9vn2w2PWuimIIC+YICQ5xKg== dependencies: cross-fetch "^3.1.5" form-data "^4.0.0"