From 64cd5e53f43781246b7ba1d063620b06f935d4b4 Mon Sep 17 00:00:00 2001 From: Artur Carvalho <artur.carvalho@uni.lu> Date: Mon, 23 Jan 2023 15:28:15 +0100 Subject: [PATCH] Fix prettier (except tab error) --- .gitlab-ci.yml | 1 - .prettierrc.json | 2 +- index.html | 6 +++--- package.json | 3 ++- src/assets/base.css | 28 ++++++++++++++++++++++------ tsconfig.config.json | 7 ++++++- 6 files changed, 34 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1de720..2ddccd7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,6 @@ lint and format: - npm ci - npm run format - npm run lint - # https://playwright.dev/docs/ci#gitlab-ci # e2e tests: # stage: test diff --git a/.prettierrc.json b/.prettierrc.json index 9e26dfe..0967ef4 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1 +1 @@ -{} \ No newline at end of file +{} diff --git a/index.html b/index.html index 2fbe718..30d59eb 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,9 @@ <!DOCTYPE html> <html lang="en"> <head> - <meta charset="UTF-8"> - <link rel="icon" href="/favicon.ico"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta charset="UTF-8" /> + <link rel="icon" href="/favicon.ico" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <title>Vue Playground</title> </head> <body> diff --git a/package.json b/package.json index 52074f0..cf570da 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "build-only": "vite build", "type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false", "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore", - "format": "prettier --check ." + "format": "prettier --check .", + "format:fix": "prettier --write ." }, "dependencies": { "@tanstack/vue-table": "^8.7.6", diff --git a/src/assets/base.css b/src/assets/base.css index d028c41..72d10c9 100644 --- a/src/assets/base.css +++ b/src/assets/base.css @@ -6,29 +6,45 @@ Josh's Custom CSS Reset https://www.joshwcomeau.com/css/custom-css-reset/ */ -*, *::before, *::after { +*, +*::before, +*::after { box-sizing: border-box; } * { margin: 0; } -html, body { +html, +body { height: 100%; } body { line-height: 1.5; -webkit-font-smoothing: antialiased; } -img, picture, video, canvas, svg { +img, +picture, +video, +canvas, +svg { display: block; max-width: 100%; } -input, button, textarea, select { +input, +button, +textarea, +select { font: inherit; } -p, h1, h2, h3, h4, h5, h6 { +p, +h1, +h2, +h3, +h4, +h5, +h6 { overflow-wrap: break-word; } #root { isolation: isolate; -} \ No newline at end of file +} diff --git a/tsconfig.config.json b/tsconfig.config.json index 424084a..af77690 100644 --- a/tsconfig.config.json +++ b/tsconfig.config.json @@ -1,6 +1,11 @@ { "extends": "@vue/tsconfig/tsconfig.node.json", - "include": ["vite.config.*", "vitest.config.*", "cypress.config.*", "playwright.config.*"], + "include": [ + "vite.config.*", + "vitest.config.*", + "cypress.config.*", + "playwright.config.*" + ], "compilerOptions": { "composite": true, "types": ["node"] -- GitLab