From ac2a83a7a66974158ce77920525bea659301cbd2 Mon Sep 17 00:00:00 2001 From: SleeplessOne1917 Date: Tue, 23 May 2023 22:55:36 +0000 Subject: [PATCH] Lint fix (#1035) * User HTTP instead of HTTPS when fetching icon in docker internal network * Add debug statement. * Revert "Add debug statement." This reverts commit 7fbb12a4bde29d72c1bf55e0d0a954f19c863b4a. * Revert "User HTTP instead of HTTPS when fetching icon in docker internal network" This reverts commit 498de660bac1bffe15fef74a898c6d669794196a. * Always replace host with internal host * Fix lint script * Remove prettier from pre-commit --------- Co-authored-by: Dessalines --- .babelrc | 6 +-- .eslintignore | 4 ++ .eslintrc.json | 4 +- .github/ISSUE_TEMPLATE/BUG_REPORT.md | 12 ++--- .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 5 +- .github/ISSUE_TEMPLATE/QUESTION.md | 5 +- .github/ISSUE_TEMPLATE/hexbear.md | 5 +- .prettierignore | 3 +- .woodpecker.yml | 4 +- README.md | 42 ++++++++--------- package.json | 2 +- src/server/index.tsx | 2 +- tsconfig.json | 57 +++++++++++------------ 13 files changed, 74 insertions(+), 77 deletions(-) diff --git a/.babelrc b/.babelrc index 2da0dea..b96976f 100644 --- a/.babelrc +++ b/.babelrc @@ -10,11 +10,11 @@ } } ], - ["@babel/typescript", {"isTSX": true, "allExtensions": true}] + ["@babel/typescript", { "isTSX": true, "allExtensions": true }] ], "plugins": [ "@babel/plugin-transform-runtime", - ["babel-plugin-inferno", { "imports": true }], - ["@babel/plugin-proposal-class-properties", { "loose": true }], + ["babel-plugin-inferno", { "imports": true }], + ["@babel/plugin-proposal-class-properties", { "loose": true }] ] } diff --git a/.eslintignore b/.eslintignore index 439fa03..26ddcb5 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,7 @@ generate_translations.js webpack.config.js src/api_tests +**/*.png +**/*.svg +**/*.css +**/*.scss \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index 0c9a5f4..cc1bff1 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -3,9 +3,7 @@ "env": { "browser": true }, - "plugins": [ - "@typescript-eslint" - ], + "plugins": ["@typescript-eslint"], "extends": [ "eslint:recommended", "plugin:@typescript-eslint/recommended", diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md index 83c2ffa..69b116f 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -1,10 +1,9 @@ --- name: "\U0001F41E Bug Report" about: Create a report to help us improve Lemmy -title: '' +title: "" labels: bug -assignees: '' - +assignees: "" --- Found a bug? Please fill out the sections below. 👍 @@ -15,7 +14,6 @@ For backend issues, use [lemmy](https://github.com/LemmyNet/lemmy) A summary of the bug. - ### Steps to Reproduce 1. (for example) I clicked login, and an endless spinner show up. @@ -24,6 +22,6 @@ A summary of the bug. ### Technical details -* Please post your log: `sudo docker-compose logs > lemmy_log.out`. -* What OS are you trying to install lemmy on? -* Any browser console errors? +- Please post your log: `sudo docker-compose logs > lemmy_log.out`. +- What OS are you trying to install lemmy on? +- Any browser console errors? diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md index 9886d8a..bfeca29 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -1,10 +1,9 @@ --- name: "\U0001F680 Feature request" about: Suggest an idea for improving Lemmy -title: '' +title: "" labels: enhancement -assignees: '' - +assignees: "" --- For backend issues, use [lemmy](https://github.com/LemmyNet/lemmy) diff --git a/.github/ISSUE_TEMPLATE/QUESTION.md b/.github/ISSUE_TEMPLATE/QUESTION.md index b45f8f1..1532587 100644 --- a/.github/ISSUE_TEMPLATE/QUESTION.md +++ b/.github/ISSUE_TEMPLATE/QUESTION.md @@ -1,10 +1,9 @@ --- name: "? Question" about: General questions about Lemmy -title: '' +title: "" labels: question -assignees: '' - +assignees: "" --- What's the question you have about lemmy? diff --git a/.github/ISSUE_TEMPLATE/hexbear.md b/.github/ISSUE_TEMPLATE/hexbear.md index 3bb0623..65483df 100644 --- a/.github/ISSUE_TEMPLATE/hexbear.md +++ b/.github/ISSUE_TEMPLATE/hexbear.md @@ -1,10 +1,9 @@ --- name: Hexbear about: For hexbear issues -title: '' +title: "" labels: hexbear -assignees: '' - +assignees: "" --- For hexbear-related issues diff --git a/.prettierignore b/.prettierignore index a14ae90..e7a0d20 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,2 @@ -src/shared/translations \ No newline at end of file +src/shared/translations +lemmy-translations \ No newline at end of file diff --git a/.woodpecker.yml b/.woodpecker.yml index d9e3fa7..8d3c6f1 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -69,7 +69,7 @@ pipeline: publish_release_docker_manifest: image: plugins/manifest - settings: + settings: username: from_secret: docker_username password: @@ -85,7 +85,7 @@ pipeline: publish_latest_release_docker_manifest: image: plugins/manifest - settings: + settings: username: from_secret: docker_username password: diff --git a/README.md b/README.md index e1e6e1f..6c9ef63 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ -# lemmy-ui - -The official web app for [Lemmy](https://github.com/LemmyNet/lemmy), written in inferno. - -Based off of MrFoxPro's [inferno-isomorphic-template](https://github.com/MrFoxPro/inferno-isomorphic-template). - -## Configuration - -The following environment variables can be used to configure lemmy-ui: - -`ENV_VAR` | type | default | description ---- | --- | --- | --- -`LEMMY_UI_HOST` | `string` | `0.0.0.0:1234` | The IP / port that the lemmy-ui isomorphic node server is hosted at. -`LEMMY_UI_LEMMY_INTERNAL_HOST` | `string` | `0.0.0.0:8536` | The internal IP / port that lemmy is hosted at. Often `lemmy:8536` if using docker. -`LEMMY_UI_LEMMY_EXTERNAL_HOST` | `string` | `0.0.0.0:8536` | The external IP / port that lemmy is hosted at. Often `DOMAIN.TLD`. -`LEMMY_UI_LEMMY_WS_HOST` | `string` | `0.0.0.0:8536` | An alternate location for lemmy's websocket address. Not usually necessary. -`LEMMY_UI_HTTPS` | `bool` | `false` | Whether to use https. -`LEMMY_UI_EXTRA_THEMES_FOLDER` | `string` | `./extra_themes` | A location for additional lemmy css themes. -`LEMMY_UI_DEBUG` | `bool` | `false` | Loads the [Eruda](https://github.com/liriliri/eruda) debugging utility. -`LEMMY_UI_DISABLE_CSP` | `bool` | `false` | Disables CSP security headers -`LEMMY_UI_CUSTOM_HTML_HEADER` | `string` | | Injects a custom script into ``. +# lemmy-ui + +The official web app for [Lemmy](https://github.com/LemmyNet/lemmy), written in inferno. + +Based off of MrFoxPro's [inferno-isomorphic-template](https://github.com/MrFoxPro/inferno-isomorphic-template). + +## Configuration + +The following environment variables can be used to configure lemmy-ui: + +| `ENV_VAR` | type | default | description | +| ------------------------------ | -------- | ---------------- | ----------------------------------------------------------------------------------- | +| `LEMMY_UI_HOST` | `string` | `0.0.0.0:1234` | The IP / port that the lemmy-ui isomorphic node server is hosted at. | +| `LEMMY_UI_LEMMY_INTERNAL_HOST` | `string` | `0.0.0.0:8536` | The internal IP / port that lemmy is hosted at. Often `lemmy:8536` if using docker. | +| `LEMMY_UI_LEMMY_EXTERNAL_HOST` | `string` | `0.0.0.0:8536` | The external IP / port that lemmy is hosted at. Often `DOMAIN.TLD`. | +| `LEMMY_UI_LEMMY_WS_HOST` | `string` | `0.0.0.0:8536` | An alternate location for lemmy's websocket address. Not usually necessary. | +| `LEMMY_UI_HTTPS` | `bool` | `false` | Whether to use https. | +| `LEMMY_UI_EXTRA_THEMES_FOLDER` | `string` | `./extra_themes` | A location for additional lemmy css themes. | +| `LEMMY_UI_DEBUG` | `bool` | `false` | Loads the [Eruda](https://github.com/liriliri/eruda) debugging utility. | +| `LEMMY_UI_DISABLE_CSP` | `bool` | `false` | Disables CSP security headers | +| `LEMMY_UI_CUSTOM_HTML_HEADER` | `string` | | Injects a custom script into ``. | diff --git a/package.json b/package.json index 641a87a..62993df 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "build:prod": "webpack --mode=production", "clean": "yarn run rimraf dist", "dev": "yarn start", - "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src && prettier --check \"src/**/*.{ts,tsx,js,css,scss}\"", + "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx \"src/**\" && prettier --check \"src/**/*.{ts,tsx,js,css,scss}\"", "prepare": "husky install", "start": "yarn build:dev --watch" }, diff --git a/src/server/index.tsx b/src/server/index.tsx index 05988cf..9d91f14 100644 --- a/src/server/index.tsx +++ b/src/server/index.tsx @@ -356,7 +356,7 @@ export async function generateManifestBase64(site: Site) { async function fetchIconPng(iconUrl: string) { return await fetch( - iconUrl.replace(/https?:\/\/localhost:\d+/g, getHttpBaseInternal()) + iconUrl.replace(/https?:\/\/[^\/]+/g, getHttpBaseInternal()) ) .then(res => res.blob()) .then(blob => blob.arrayBuffer()); diff --git a/tsconfig.json b/tsconfig.json index d7c8803..3b7d3e4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,29 +1,28 @@ -{ - "compilerOptions": { - "pretty": true, - "target": "esnext", - "module": "esnext", - "allowSyntheticDefaultImports": true, - "preserveConstEnums": true, - "sourceMap": true, - "moduleResolution": "node", - "lib": ["es2017", "dom"], - "types": [ - "inferno" - ], - "jsx": "preserve", - "noUnusedLocals": true, - "baseUrl": "./src", - "noEmit": true, - "skipLibCheck": true, - "noUnusedParameters": true, - "noImplicitReturns": true, - "experimentalDecorators": true, - "strictNullChecks": true, - "noFallthroughCasesInSwitch": true - }, - "include": [ - "src/**/*", - "node_modules/inferno/dist/index.d.ts" - ] -} +{ + "compilerOptions": { + "pretty": true, + "target": "esnext", + "module": "esnext", + "allowSyntheticDefaultImports": true, + "preserveConstEnums": true, + "sourceMap": true, + "moduleResolution": "node", + "lib": ["es2017", "dom"], + "types": ["inferno"], + "jsx": "preserve", + "noUnusedLocals": true, + "baseUrl": "./src", + "noEmit": true, + "skipLibCheck": true, + "noUnusedParameters": true, + "noImplicitReturns": true, + "experimentalDecorators": true, + "strictNullChecks": true, + "noFallthroughCasesInSwitch": true + }, + "include": [ + "src/**/*.ts", + "src/**/*.tsx", + "node_modules/inferno/dist/index.d.ts" + ] +} -- 2.44.1