From bcc80aeb71683994441094cb61ae458289f999ab Mon Sep 17 00:00:00 2001 From: Simon Reinisch Date: Mon, 22 Apr 2024 17:20:18 +0200 Subject: [PATCH] chore: unify indentation move contributing to .github folder --- CONTRIBUTING.md => .github/CONTRIBUTING.md | 0 .prettierrc | 6 +- package.json | 108 ++++++++++----------- tsconfig.json | 88 +++++++++++------ tsconfig.node.json | 15 +-- 5 files changed, 125 insertions(+), 92 deletions(-) rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%) diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md diff --git a/.prettierrc b/.prettierrc index 49200805..e9193395 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,5 @@ { - "singleQuote": true, - "trailingComma": "none", - "printWidth": 120 + "singleQuote": true, + "trailingComma": "none", + "printWidth": 120 } diff --git a/package.json b/package.json index d89fc287..1552486f 100644 --- a/package.json +++ b/package.json @@ -1,56 +1,56 @@ { - "name": "ocular", - "private": true, - "type": "module", - "version": "0.0.0", - "license": "MIT", - "author": "Simon Reinisch ", - "packageManager": "pnpm@8.0.0", - "engines": { - "node": "^20" - }, - "scripts": { - "dev": "vite --host", - "build": "vue-tsc --noEmit && vite build", - "preview": "vite preview", - "lint": "eslint '{scripts,src}/**/*.{js,ts,vue}' --no-error-on-unmatched-pattern", - "lint:fix": "pnpm run lint --fix", - "test:ci": "pnpm run lint:fix && pnpm run build" - }, - "dependencies": { - "@popperjs/core": "2.11.8", - "@remixicon/vue": "4.2.0", - "echarts": "5.5.0", - "papaparse": "5.4.1", - "vue": "3.4.21", - "vue-i18n": "9.10.1", - "vue-router": "4.3.0", - "yuppee": "0.3.0" - }, - "devDependencies": { - "@intlify/eslint-plugin-vue-i18n": "^2.0.0", - "@types/ackee-tracker": "5.0.4", - "@types/node": "20.11.25", - "@types/papaparse": "5.3.14", - "@typescript-eslint/eslint-plugin": "7.1.1", - "@typescript-eslint/parser": "7.1.1", - "@vitejs/plugin-vue": "5.0.4", - "@vue/eslint-config-prettier": "9.0.0", - "@vue/eslint-config-typescript": "13.0.0", - "eslint": "8.57.0", - "eslint-config-prettier": "9.1.0", - "eslint-import-resolver-typescript": "3.6.1", - "eslint-plugin-import": "2.29.1", - "eslint-plugin-prettier": "5.1.3", - "eslint-plugin-vue": "9.22.0", - "prettier": "3.2.5", - "sass": "1.71.1", - "typescript": "5.3.3", - "vite": "5.1.5", - "vite-plugin-optimize-css-modules": "1.0.6", - "vite-plugin-pwa": "0.19.2", - "vite-tsconfig-paths": "4.3.1", - "vue-tsc": "2.0.6", - "workbox-window": "7.0.0" - } + "name": "ocular", + "private": true, + "type": "module", + "version": "0.0.0", + "license": "MIT", + "author": "Simon Reinisch ", + "packageManager": "pnpm@8.0.0", + "engines": { + "node": "^20" + }, + "scripts": { + "dev": "vite --host", + "build": "vue-tsc --noEmit && vite build", + "preview": "vite preview", + "lint": "eslint '{scripts,src}/**/*.{js,ts,vue}' --no-error-on-unmatched-pattern", + "lint:fix": "pnpm run lint --fix", + "test:ci": "pnpm run lint:fix && pnpm run build" + }, + "dependencies": { + "@popperjs/core": "2.11.8", + "@remixicon/vue": "4.2.0", + "echarts": "5.5.0", + "papaparse": "5.4.1", + "vue": "3.4.21", + "vue-i18n": "9.10.1", + "vue-router": "4.3.0", + "yuppee": "0.3.0" + }, + "devDependencies": { + "@intlify/eslint-plugin-vue-i18n": "^2.0.0", + "@types/ackee-tracker": "5.0.4", + "@types/node": "20.11.25", + "@types/papaparse": "5.3.14", + "@typescript-eslint/eslint-plugin": "7.1.1", + "@typescript-eslint/parser": "7.1.1", + "@vitejs/plugin-vue": "5.0.4", + "@vue/eslint-config-prettier": "9.0.0", + "@vue/eslint-config-typescript": "13.0.0", + "eslint": "8.57.0", + "eslint-config-prettier": "9.1.0", + "eslint-import-resolver-typescript": "3.6.1", + "eslint-plugin-import": "2.29.1", + "eslint-plugin-prettier": "5.1.3", + "eslint-plugin-vue": "9.22.0", + "prettier": "3.2.5", + "sass": "1.71.1", + "typescript": "5.3.3", + "vite": "5.1.5", + "vite-plugin-optimize-css-modules": "1.0.6", + "vite-plugin-pwa": "0.19.2", + "vite-tsconfig-paths": "4.3.1", + "vue-tsc": "2.0.6", + "workbox-window": "7.0.0" + } } diff --git a/tsconfig.json b/tsconfig.json index 3c5295dc..fd76ed40 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,32 +1,62 @@ { - "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"], - "references": [{"path": "./tsconfig.node.json"}], - "compilerOptions": { - "target": "esnext", - "useDefineForClassFields": true, - "module": "esnext", - "moduleResolution": "node", - "strict": true, - "jsx": "preserve", - "sourceMap": true, - "skipLibCheck": true, - "resolveJsonModule": true, - "esModuleInterop": true, - "lib": ["esnext", "dom"], - "baseUrl": ".", - "types": [ - "vite-plugin-pwa/client" - ], - "paths": { - "@composables": ["./src/composables/index.ts"], - "@directives": ["./src/directives/index.ts"], - "@components/*": ["./src/app/components/*"], - "@app/*": ["./src/app/*"], - "@i18n/*": ["./src/i18n/*"], - "@storage/*": ["./src/storage/*"], - "@static/*": ["./src/static/*"], - "@utils": ["./src/utils/index.ts"], - "@store/*": ["./src/store/*"] - } + "include": [ + "src/**/*.ts", + "src/**/*.d.ts", + "src/**/*.tsx", + "src/**/*.vue" + ], + "references": [ + { + "path": "./tsconfig.node.json" } + ], + "compilerOptions": { + "target": "esnext", + "useDefineForClassFields": true, + "module": "esnext", + "moduleResolution": "node", + "strict": true, + "jsx": "preserve", + "sourceMap": true, + "skipLibCheck": true, + "resolveJsonModule": true, + "esModuleInterop": true, + "lib": [ + "esnext", + "dom" + ], + "baseUrl": ".", + "types": [ + "vite-plugin-pwa/client" + ], + "paths": { + "@composables": [ + "./src/composables/index.ts" + ], + "@directives": [ + "./src/directives/index.ts" + ], + "@components/*": [ + "./src/app/components/*" + ], + "@app/*": [ + "./src/app/*" + ], + "@i18n/*": [ + "./src/i18n/*" + ], + "@storage/*": [ + "./src/storage/*" + ], + "@static/*": [ + "./src/static/*" + ], + "@utils": [ + "./src/utils/index.ts" + ], + "@store/*": [ + "./src/store/*" + ] + } + } } diff --git a/tsconfig.node.json b/tsconfig.node.json index 3e9202f7..380868c8 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -1,8 +1,11 @@ { - "include": ["vite.config.ts", "./utils/*.ts"], - "compilerOptions": { - "composite": true, - "module": "esnext", - "moduleResolution": "node" - } + "include": [ + "vite.config.ts", + "./utils/*.ts" + ], + "compilerOptions": { + "composite": true, + "module": "esnext", + "moduleResolution": "node" + } }