From 6cd76b9c1b4a48eb150ced67f6fee85dcc0531a1 Mon Sep 17 00:00:00 2001 From: Alexis Faizeau Date: Mon, 6 Dec 2021 16:10:35 +0100 Subject: [PATCH 1/2] Add Eslint check & Prettier on Svelte files --- front/{.eslintrc.json => .eslintrc.js} | 18 +++++++++++++++--- front/.prettierrc.json | 3 ++- front/package.json | 16 ++++++++++------ front/yarn.lock | 10 ++++++++++ 4 files changed, 37 insertions(+), 10 deletions(-) rename front/{.eslintrc.json => .eslintrc.js} (75%) diff --git a/front/.eslintrc.json b/front/.eslintrc.js similarity index 75% rename from front/.eslintrc.json rename to front/.eslintrc.js index 45b44456..33466012 100644 --- a/front/.eslintrc.json +++ b/front/.eslintrc.js @@ -1,4 +1,4 @@ -{ +module.exports = { "root": true, "env": { "browser": true, @@ -18,10 +18,18 @@ "parserOptions": { "ecmaVersion": 2018, "sourceType": "module", - "project": "./tsconfig.json" + "project": "./tsconfig.json", + "extraFileExtensions": [".svelte"] }, "plugins": [ - "@typescript-eslint" + "@typescript-eslint", + "svelte3" + ], + "overrides": [ + { + "files": ["*.svelte"], + "processor": "svelte3/svelte3" + } ], "rules": { "no-unused-vars": "off", @@ -34,5 +42,9 @@ "@typescript-eslint/no-unsafe-return": "off", "@typescript-eslint/no-unsafe-member-access": "off", "@typescript-eslint/restrict-template-expressions": "off" + }, + "settings": { + "svelte3/typescript": true, + "svelte3/ignore-styles": () => true } } diff --git a/front/.prettierrc.json b/front/.prettierrc.json index e8980d15..057ed062 100644 --- a/front/.prettierrc.json +++ b/front/.prettierrc.json @@ -1,4 +1,5 @@ { "printWidth": 120, - "tabWidth": 4 + "tabWidth": 4, + "plugins": ["prettier-plugin-svelte"] } diff --git a/front/package.json b/front/package.json index ec81d8a7..f3ceb211 100644 --- a/front/package.json +++ b/front/package.json @@ -16,6 +16,7 @@ "@typescript-eslint/parser": "^4.23.0", "css-loader": "^5.2.4", "eslint": "^7.26.0", + "eslint-plugin-svelte3": "^3.2.1", "fork-ts-checker-webpack-plugin": "^6.2.9", "html-webpack-plugin": "^5.3.1", "jasmine": "^3.5.0", @@ -24,6 +25,7 @@ "node-polyfill-webpack-plugin": "^1.1.2", "npm-run-all": "^4.1.5", "prettier": "^2.3.1", + "prettier-plugin-svelte": "^2.5.0", "sass": "^1.32.12", "sass-loader": "^11.1.0", "svelte": "^3.38.2", @@ -67,17 +69,19 @@ "build": "cross-env TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" NODE_ENV=production webpack", "build-typings": "cross-env TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" NODE_ENV=production BUILD_TYPINGS=1 webpack", "test": "cross-env TS_NODE_PROJECT=\"tsconfig-for-jasmine.json\" ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json", - "lint": "node_modules/.bin/eslint src/ . --ext .ts", - "fix": "node_modules/.bin/eslint --fix src/ . --ext .ts", + "lint": "node_modules/.bin/eslint src/ . --ext .ts,.svelte", + "fix": "node_modules/.bin/eslint --fix src/ . --ext .ts,.svelte", "precommit": "lint-staged", "svelte-check-watch": "svelte-check --fail-on-warnings --fail-on-hints --compiler-warnings \"a11y-no-onchange:ignore,a11y-autofocus:ignore,a11y-media-has-caption:ignore\" --watch", "svelte-check": "svelte-check --fail-on-warnings --fail-on-hints --compiler-warnings \"a11y-no-onchange:ignore,a11y-autofocus:ignore,a11y-media-has-caption:ignore\"", - "pretty": "yarn prettier --write 'src/**/*.{ts,tsx}'", - "pretty-check": "yarn prettier --check 'src/**/*.{ts,tsx}'" + "pretty": "yarn prettier --write 'src/**/*.{ts,svelte}'", + "pretty-check": "yarn prettier --check 'src/**/*.{ts,svelte}'" }, "lint-staged": { - "*.ts": [ - "prettier --write" + "*.{ts,svelte}": [ + "yarn run svelte-check", + "yarn run fix", + "yarn run pretty" ] } } diff --git a/front/yarn.lock b/front/yarn.lock index f94e659f..f1cbe4b9 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -2040,6 +2040,11 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +eslint-plugin-svelte3@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-svelte3/-/eslint-plugin-svelte3-3.2.1.tgz#f0f24150ecea3061c38c69e282bea26dc3e660c6" + integrity sha512-YoBR9mLoKCjGghJ/gvpnFZKaMEu/VRcuxpSRS8KuozuEo7CdBH7bmBHa6FmMm0i4kJnOyx+PVsaptz96K6H/4Q== + eslint-scope@^5.0.0, eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -4508,6 +4513,11 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== +prettier-plugin-svelte@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-2.5.0.tgz#7922534729f7febe59b4c56c3f5360539f0d8ab1" + integrity sha512-+iHY2uGChOngrgKielJUnqo74gIL/EO5oeWm8MftFWjEi213lq9QYTOwm1pv4lI1nA61tdgf80CF2i5zMcu1kw== + prettier@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.1.tgz#76903c3f8c4449bc9ac597acefa24dc5ad4cbea6" From c95e20c677937bcf33723e51abade7022bbbe93a Mon Sep 17 00:00:00 2001 From: Alexis Faizeau Date: Mon, 6 Dec 2021 16:12:37 +0100 Subject: [PATCH 2/2] Lint & Prettier fixes on Svelte files --- front/src/Components/App.svelte | 97 ++++---- .../AudioManager/AudioManager.svelte | 77 ++++--- front/src/Components/CameraControls.svelte | 39 ++-- front/src/Components/Chat/Chat.svelte | 125 +++++----- front/src/Components/Chat/ChatElement.svelte | 89 ++++---- .../Components/Chat/ChatMessageForm.svelte | 63 ++--- .../src/Components/Chat/ChatPlayerName.svelte | 42 ++-- front/src/Components/Chat/ChatSubMenu.svelte | 26 +-- .../CustomCharacterScene.svelte | 135 ++++++----- .../src/Components/EmoteMenu/EmoteMenu.svelte | 109 +++++---- .../EnableCamera/EnableCameraScene.svelte | 216 +++++++++--------- .../HorizontalSoundMeterWidget.svelte | 50 ++-- .../HelpCameraSettingsPopup.svelte | 31 ++- .../LayoutManager/LayoutManager.svelte | 74 +++--- front/src/Components/Login/LoginScene.svelte | 176 +++++++------- .../Components/Menu/AboutRoomSubMenu.svelte | 101 ++++---- .../Components/Menu/AudioGlobalMessage.svelte | 91 ++++---- .../src/Components/Menu/ContactSubMenu.svelte | 49 ++-- .../src/Components/Menu/CustomSubMenu.svelte | 29 ++- .../Menu/GlobalMessagesSubMenu.svelte | 109 ++++----- front/src/Components/Menu/GuestSubMenu.svelte | 74 +++--- front/src/Components/Menu/Menu.svelte | 176 +++++++------- front/src/Components/Menu/MenuIcon.svelte | 64 +++--- .../src/Components/Menu/ProfileSubMenu.svelte | 173 +++++++------- .../Components/Menu/SettingsSubMenu.svelte | 212 +++++++++-------- .../Components/Menu/TextGlobalMessage.svelte | 49 ++-- front/src/Components/MyCamera.svelte | 27 +-- .../Components/ReportMenu/BlockSubMenu.svelte | 15 +- .../Components/ReportMenu/ReportMenu.svelte | 140 ++++++------ .../ReportMenu/ReportSubMenu.svelte | 32 +-- .../SelectCompanionScene.svelte | 104 +++++---- front/src/Components/SoundMeterWidget.svelte | 34 +-- .../Components/TypeMessage/BanMessage.svelte | 122 +++++----- .../Components/TypeMessage/TextMessage.svelte | 62 ++--- front/src/Components/UI/AudioPlaying.svelte | 54 ++--- front/src/Components/UI/ErrorDialog.svelte | 57 +++-- front/src/Components/Video/ChatLayout.svelte | 20 +- .../Video/LocalStreamMediaBox.svelte | 13 +- front/src/Components/Video/MediaBox.svelte | 12 +- .../Video/PresentationLayout.svelte | 18 +- .../Video/ScreenSharingMediaBox.svelte | 26 +-- .../src/Components/Video/VideoMediaBox.svelte | 29 ++- .../src/Components/Video/VideoOverlay.svelte | 15 +- .../src/Components/VisitCard/VisitCard.svelte | 128 ++++++----- .../WarningContainer/WarningContainer.svelte | 50 ++-- .../SelectCharacterScene.svelte | 113 ++++----- 46 files changed, 1852 insertions(+), 1695 deletions(-) diff --git a/front/src/Components/App.svelte b/front/src/Components/App.svelte index ab8b6d3f..4886cc4e 100644 --- a/front/src/Components/App.svelte +++ b/front/src/Components/App.svelte @@ -1,147 +1,146 @@
{#if $loginSceneVisibleStore}
- +
{/if} {#if $selectCharacterSceneVisibleStore}
- +
{/if} {#if $customCharacterSceneVisibleStore}
- +
{/if} {#if $selectCompanionSceneVisibleStore}
- +
{/if} {#if $enableCameraSceneVisibilityStore}
- +
{/if} {#if $banMessageVisibleStore}
- +
{/if} {#if $textMessageVisibleStore}
- +
{/if} {#if $soundPlayingStore} -
- -
+
+ +
{/if} {#if $audioManagerVisibilityStore} -
- -
+
+ +
{/if} {#if $layoutManagerVisibilityStore}
- +
{/if} {#if $showReportScreenStore !== userReportEmpty}
- +
{/if} {#if $menuIconVisiblilityStore}
- +
{/if} {#if $menuVisiblilityStore}
- +
{/if} {#if $emoteMenuStore}
- +
{/if} {#if $gameOverlayVisibilityStore}
- - - + + +
{/if} {#if $helpCameraSettingsVisibleStore}
- +
{/if} {#if $requestVisitCardsStore} - + {/if} {#if $errorStore.length > 0} -
- -
+
+ +
{/if} {#if $chatVisibilityStore} - + {/if} {#if $warningContainerStore} - + {/if}
diff --git a/front/src/Components/AudioManager/AudioManager.svelte b/front/src/Components/AudioManager/AudioManager.svelte index e201254c..3253699e 100644 --- a/front/src/Components/AudioManager/AudioManager.svelte +++ b/front/src/Components/AudioManager/AudioManager.svelte @@ -1,10 +1,7 @@ -
- - - + + + + d="M11.536 14.01A8.473 8.473 0 0 0 14.026 8a8.473 8.473 0 0 0-2.49-6.01l-.708.707A7.476 7.476 0 0 1 13.025 8c0 2.071-.84 3.946-2.197 5.303l.708.707z" + /> + d="M10.121 12.596A6.48 6.48 0 0 0 12.025 8a6.48 6.48 0 0 0-1.904-4.596l-.707.707A5.483 5.483 0 0 1 11.025 8a5.483 5.483 0 0 1-1.61 3.89l.706.706z" + /> + d="M8.707 11.182A4.486 4.486 0 0 0 10.025 8a4.486 4.486 0 0 0-1.318-3.182L8 5.525A3.489 3.489 0 0 1 9.025 8 3.49 3.49 0 0 1 8 10.475l.707.707z" + /> - +
+
- \ No newline at end of file + diff --git a/front/src/Components/CameraControls.svelte b/front/src/Components/CameraControls.svelte index 728c84e9..232d42da 100644 --- a/front/src/Components/CameraControls.svelte +++ b/front/src/Components/CameraControls.svelte @@ -1,6 +1,6 @@ - + - -