Feliday/Feliday-UI
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Lint fix (#1035)

Browse source 
* User HTTP instead of HTTPS when fetching icon in docker internal network

* Add debug statement.

* Revert "Add debug statement."

This reverts commit 7fbb12a4bd.

* Revert "User HTTP instead of HTTPS when fetching icon in docker internal network"

This reverts commit 498de660ba.

* Always replace host with internal host

* Fix lint script

* Remove prettier from pre-commit

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
This commit is contained in:
SleeplessOne1917 2023-05-23 22:55:36 +00:00 committed by GitHub
parent ffe95ee1c6
commit ac2a83a7a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 74 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.babelrc
View file

@ -15,6 +15,6 @@
"plugins": [
"@babel/plugin-transform-runtime",
["babel-plugin-inferno", { "imports": true }],
["@babel/plugin-proposal-class-properties", { "loose": true }],
["@babel/plugin-proposal-class-properties", { "loose": true }]
]
}

4
.eslintignore
View file

@ -1,3 +1,7 @@
generate_translations.js
webpack.config.js
src/api_tests
**/*.png
**/*.svg
**/*.css
**/*.scss

4
.eslintrc.json
View file

@ -3,9 +3,7 @@
"env": {
"browser": true
},
"plugins": [
"@typescript-eslint"
],
"plugins": ["@typescript-eslint"],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",

12
.github/ISSUE_TEMPLATE/BUG_REPORT.md vendored
View file

@ -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?

5
.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md vendored
View file

@ -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)

5
.github/ISSUE_TEMPLATE/QUESTION.md vendored
View file

@ -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?

5
.github/ISSUE_TEMPLATE/hexbear.md vendored
View file

@ -1,10 +1,9 @@
---
name: Hexbear
about: For hexbear issues
title: ''
title: ""
labels: hexbear
assignees: ''
assignees: ""
---
For hexbear-related issues

1
.prettierignore
View file

@ -1 +1,2 @@
src/shared/translations
lemmy-translations

22
README.md
View file

@ -8,14 +8,14 @@ Based off of MrFoxPro's [inferno-isomorphic-template](https://github.com/MrFoxPr
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 `<head>`.
| `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 `<head>`. |

2
package.json
View file

@ -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"
},

2
src/server/index.tsx
View file

@ -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());

7
tsconfig.json
View file

@ -8,9 +8,7 @@
"sourceMap": true,
"moduleResolution": "node",
"lib": ["es2017", "dom"],
"types": [
"inferno"
],
"types": ["inferno"],
"jsx": "preserve",
"noUnusedLocals": true,
"baseUrl": "./src",
@ -23,7 +21,8 @@
"noFallthroughCasesInSwitch": true
},
"include": [
"src/**/*",
"src/**/*.ts",
"src/**/*.tsx",
"node_modules/inferno/dist/index.d.ts"
]
}