diff --git a/web-client/.prettierrc.yaml b/web-client/.prettierrc.yaml new file mode 100644 index 00000000..e5f36e2e --- /dev/null +++ b/web-client/.prettierrc.yaml @@ -0,0 +1,28 @@ +# Prettier: +# - https://prettier.io/docs/en/options + +# prettier-plugin-svelte: +# - https://github.com/sveltejs/prettier-plugin-svelte +--- +useTabs: false +tabWidth: 4 +singleQuote: true +semi: true +trailingComma: all +printWidth: 120 + +plugins: + - prettier-plugin-svelte + +overrides: + - files: '*.svelte' + options: + parser: svelte + - files: + - '*.yml' + - '*.yaml' + - '*.json' + - '*.html' + - '*.md' + options: + tabWidth: 2 diff --git a/web-client/iron-remote-gui/.prettierignore b/web-client/iron-remote-gui/.prettierignore new file mode 100644 index 00000000..3c468d0a --- /dev/null +++ b/web-client/iron-remote-gui/.prettierignore @@ -0,0 +1,16 @@ +node_modules/ +.DS_Store +.env +.env.* +!.env.example + +/.svelte-kit +/package +/build +/static/bearcss +/static/material-icons + +# Ignore files for PNPM, NPM and YARN +pnpm-lock.yaml +package-lock.json +yarn.lock diff --git a/web-client/iron-remote-gui/package-lock.json b/web-client/iron-remote-gui/package-lock.json index 8940d677..4faf6727 100644 --- a/web-client/iron-remote-gui/package-lock.json +++ b/web-client/iron-remote-gui/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devolutions/iron-remote-gui", - "version": "0.7.2", + "version": "0.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@devolutions/iron-remote-gui", - "version": "0.7.2", + "version": "0.8.1", "dependencies": { "@types/ua-parser-js": "^0.7.36", "ua-parser-js": "^1.0.33" @@ -14,6 +14,8 @@ "devDependencies": { "@sveltejs/vite-plugin-svelte": "^2.0.0", "@tsconfig/svelte": "^3.0.0", + "prettier": "^3.0.3", + "prettier-plugin-svelte": "^3.0.3", "rxjs": "^6.6.7", "svelte": "^3.54.0", "svelte-check": "^2.10.0", @@ -1999,6 +2001,31 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/prettier": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-plugin-svelte": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.0.3.tgz", + "integrity": "sha512-dLhieh4obJEK1hnZ6koxF+tMUrZbV5YGvRpf2+OADyanjya5j0z1Llo8iGwiHmFWZVG/hLEw/AJD5chXd9r3XA==", + "dev": true, + "peerDependencies": { + "prettier": "^3.0.0", + "svelte": "^3.2.0 || ^4.0.0-next.0" + } + }, "node_modules/punycode": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz", @@ -4018,6 +4045,19 @@ "source-map-js": "^1.0.2" } }, + "prettier": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "dev": true + }, + "prettier-plugin-svelte": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.0.3.tgz", + "integrity": "sha512-dLhieh4obJEK1hnZ6koxF+tMUrZbV5YGvRpf2+OADyanjya5j0z1Llo8iGwiHmFWZVG/hLEw/AJD5chXd9r3XA==", + "dev": true, + "requires": {} + }, "punycode": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz", diff --git a/web-client/iron-remote-gui/package.json b/web-client/iron-remote-gui/package.json index b251d622..880d4666 100644 --- a/web-client/iron-remote-gui/package.json +++ b/web-client/iron-remote-gui/package.json @@ -16,11 +16,15 @@ "build-alone": "vite build", "pre-build": "node ./pre-build.js", "preview": "vite preview", - "check": "svelte-check --tsconfig ./tsconfig.json" + "check": "svelte-check --tsconfig ./tsconfig.json", + "lint": "tsc --noemit && prettier . --check .", + "format": "prettier . --write ." }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^2.0.0", "@tsconfig/svelte": "^3.0.0", + "prettier": "^3.0.3", + "prettier-plugin-svelte": "^3.0.3", "rxjs": "^6.6.7", "svelte": "^3.54.0", "svelte-check": "^2.10.0", diff --git a/web-client/iron-svelte-client/.prettierignore b/web-client/iron-svelte-client/.prettierignore index 38972655..5d6f8324 100644 --- a/web-client/iron-svelte-client/.prettierignore +++ b/web-client/iron-svelte-client/.prettierignore @@ -1,12 +1,15 @@ +node_modules/ .DS_Store -node_modules -/build -/.svelte-kit -/package .env .env.* !.env.example +/.svelte-kit +/package +/build +/static/beercss +/static/material-icons + # Ignore files for PNPM, NPM and YARN pnpm-lock.yaml package-lock.json diff --git a/web-client/iron-svelte-client/.prettierrc b/web-client/iron-svelte-client/.prettierrc deleted file mode 100644 index a77fddea..00000000 --- a/web-client/iron-svelte-client/.prettierrc +++ /dev/null @@ -1,9 +0,0 @@ -{ - "useTabs": true, - "singleQuote": true, - "trailingComma": "none", - "printWidth": 100, - "plugins": ["prettier-plugin-svelte"], - "pluginSearchDirs": ["."], - "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] -}