Skip to content

Commit

Permalink
Merge pull request #42 from Joery-M/41-general-fix-linting
Browse files Browse the repository at this point in the history
41 general fix linting
  • Loading branch information
Joery-M authored May 16, 2024
2 parents 2699f85 + da7fc23 commit df56805
Show file tree
Hide file tree
Showing 18 changed files with 7,723 additions and 5,782 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/dist/**/*
**/node_modules/**/*
1 change: 0 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"prettier"
],
"plugins": ["prettier", "@typescript-eslint/eslint-plugin", "eslint-plugin-tailwindcss"],
"ignorePatterns": ["dist"],
"rules": {
"no-unused-vars": "off",
"vue/multi-word-component-names": "off",
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Get installed Playwright version
run: echo "PLAYWRIGHT_VERSION=$(cat pnpm-lock.yaml | grep ' playwright@' | sed -r 's/(.*@)([0-9.]*)(:)/\2/' | head -1)" >> $GITHUB_ENV

Expand All @@ -59,7 +59,6 @@ jobs:
restore-keys: |
${{ runner.os }}-playwright-
- name: Install dependencies
if: steps.playwright-cache.outputs.cache-hit != 'true'
run: pnpm install
Expand Down
6 changes: 2 additions & 4 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{
"$schema": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/prettierrc.json",
"plugins": [
"prettier-plugin-tailwindcss"
],
"plugins": ["prettier-plugin-tailwindcss"],
"semi": true,
"tabWidth": 4,
"useTabs": false,
"singleQuote": true,
"printWidth": 100,
"trailingComma": "none",
"endOfLine": "auto"
}
}
17 changes: 15 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
"test:shared": "cd packages/shared && pnpm test:run",
"test:timeline": "cd packages/timeline && pnpm test:run",
"dev": "pnpm build:packages && cd packages/safelight && pnpm dev",
"dev:darkroom": "pnpm build:packages && cd packages/darkroom && pnpm dev:web"
"dev:darkroom": "pnpm build:packages && cd packages/darkroom && pnpm dev:web",
"lint": "pnpm run \"/lint:\"/",
"lint:prettier": "prettier . --write --ignore-path .gitignore",
"lint:eslint": "eslint ./packages/**/*{.ts,.js,.vue}"
},
"workspaces": [
"packages/timeline",
Expand All @@ -27,11 +30,21 @@
"packages/plugin-types"
],
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vitest/browser": "^1.6.0",
"@vitest/ui": "^1.6.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-tailwindcss": "^3.15.1",
"eslint-plugin-vue": "^9.25.0",
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.14",
"typescript-eslint": "^7.8.0",
"vite": "^5.2.11",
"vitest": "^1.6.0",
"vue": "^3.4.26"
}
}
}
6 changes: 3 additions & 3 deletions packages/darkroom/dev/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

"baseUrl": ".",
"paths": {
"@/*": ["./src/*"],
"@/*": ["./src/*"]
},
"allowSyntheticDefaultImports": true,
"resolveJsonModule": true,

"types": ["vite/client", "@types/node"],
"types": ["vite/client", "@types/node"]
}
}
}
2 changes: 1 addition & 1 deletion packages/darkroom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@
"vite-plugin-mkcert": "^1.17.5",
"vue-codemirror": "^6.1.1"
}
}
}
2 changes: 1 addition & 1 deletion packages/darkroom/tests/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
},
"include": ["./*.ts", "../lib/*", "../Manual.js"],
"exclude": ["dist"]
}
}
2 changes: 1 addition & 1 deletion packages/plugin-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"name": "@types/safelight-plugin",
"version": "1.0.0",
"types": "./index.d.ts"
}
}
4 changes: 4 additions & 0 deletions packages/safelight/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"root": false,
"ignorePatterns": ["dist", "generated", "**/*.scss"]
}
15 changes: 2 additions & 13 deletions packages/safelight/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
"build": "pnpm \"/^(generate-(?!all).*|type-check)/\" && pnpm build-only",
"preview": "vite preview",
"build-only": "vite build",
"type-check": "vue-tsc --noEmit",
"lint": "eslint . ./src/**/*[.ts,.js,.scss,.vue] --fix"
"type-check": "vue-tsc --noEmit"
},
"dependencies": {
"@phosphor-icons/vue": "^2.2.1",
Expand Down Expand Up @@ -50,29 +49,19 @@
"@types/luxon": "^3.4.2",
"@types/node": "^20.12.8",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/tsconfig": "^0.5.1",
"autoprefixer": "^10.4.19",
"browserslist": "^4.23.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-tailwindcss": "^3.15.1",
"eslint-plugin-vue": "^9.25.0",
"lightningcss": "^1.24.1",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.14",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.76.0",
"strip-ansi": "^7.1.0",
"tailwindcss": "^3.4.3",
"ts-node-dev": "^2.0.0",
"tsx": "^4.9.1",
"typescript": "^5.4.5",
"typescript-eslint": "^7.8.0",
"unplugin-auto-import": "^0.17.5",
"unplugin-turbo-console": "^1.8.6",
"unplugin-vue-components": "^0.26.0",
Expand All @@ -81,4 +70,4 @@
"vite-plugin-mkcert": "^1.17.5",
"vue-tsc": "^2.0.16"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -351,4 +351,4 @@
"token": "storage"
}
]
}
}
22 changes: 17 additions & 5 deletions packages/safelight/src/style.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@tailwind components;
@tailwind utilities;


/* color palette from <https://github.com/vuejs/theme> */
:root {
--vt-c-white: #ffffff;
Expand Down Expand Up @@ -58,10 +57,23 @@ body {
// color: var(--color-text);
// background: var(--color-background);
margin: 0;
transition: color 0.5s, background-color 0.5s;
transition:
color 0.5s,
background-color 0.5s;
line-height: 1.6;
font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
font-family:
Inter,
-apple-system,
BlinkMacSystemFont,
'Segoe UI',
Roboto,
Oxygen,
Ubuntu,
Cantarell,
'Fira Sans',
'Droid Sans',
'Helvetica Neue',
sans-serif;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
Expand All @@ -78,4 +90,4 @@ body {
html {
font-size: 14px;
min-height: 100%;
}
}
2 changes: 1 addition & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
"fake-indexeddb": "^5.0.2",
"happy-dom": "^14.7.1"
}
}
}
5 changes: 2 additions & 3 deletions packages/shared/src/UI/DnD/DnDdirectives.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import type { Directive } from "vue";
import type { Directive } from 'vue';

export const DragDirective: Directive = {
}
export const DragDirective: Directive = {};
2 changes: 1 addition & 1 deletion packages/timeline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@
"vitest": "^1.6.0",
"vue-tsc": "^2.0.16"
}
}
}
Loading

0 comments on commit df56805

Please sign in to comment.