Skip to content

Commit

Permalink
chore migrate eslint + clean
Browse files Browse the repository at this point in the history
  • Loading branch information
erwanjugand committed Apr 27, 2024
1 parent b0e06cf commit 2ae9b40
Show file tree
Hide file tree
Showing 13 changed files with 69 additions and 85 deletions.
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

6 changes: 0 additions & 6 deletions .eslintrc

This file was deleted.

1 change: 1 addition & 0 deletions env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/// <reference types="vite/client" />
22 changes: 22 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import eslint from '@eslint/js'
import tsConfig from 'typescript-eslint'
import prettierConfig from 'eslint-config-prettier'
import vueConfig from 'eslint-plugin-vue'
import vueParser from 'vue-eslint-parser'

export default tsConfig.config(
eslint.configs.recommended,
...vueConfig.configs['flat/recommended'],
...tsConfig.configs.strict,
prettierConfig,
{
ignores: ['dist'],
languageOptions: {
parser: vueParser,
parserOptions: {
parser: tsConfig.parser,
sourceType: 'module',
},
},
},
)
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "vue-tsc --noEmit && vite build",
"preview": "vite preview",
"check:prettier": "prettier --check .",
"check:eslint": "eslint --ext .ts,.js,.vue .",
"check:eslint": "eslint .",
"check:ts": "vue-tsc --noEmit",
"check:all": "pnpm check:prettier && pnpm check:eslint && pnpm check:ts",
"fix:prettier": "prettier --loglevel warn --write .",
Expand All @@ -28,12 +28,12 @@
"@types/node": "20.12.7",
"@types/webfontloader": "1.6.38",
"@vitejs/plugin-vue": "5.0.4",
"@vue/eslint-config-typescript": "13.0.0",
"eslint": "9.1.1",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-vue": "9.25.0",
"prettier": "3.2.5",
"typescript": "5.4.5",
"typescript-eslint": "7.7.1",
"vite": "5.2.10",
"vite-plugin-vuetify": "2.0.3",
"vue-tsc": "2.0.14"
Expand Down
50 changes: 24 additions & 26 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

<script setup lang="ts">
import { computed, ref } from 'vue'
import GreySettings from './components/GreySettings.vue'
import GreySwatch from './components/GreySwatch.vue'
import { Settings } from './types/global'
import { useLocalTheme } from './composables/useLocalTheme'
import GreySettings from '@/components/GreySettings.vue'
import GreySwatch from '@/components/GreySwatch.vue'
import type { Settings } from '@/types/global'
import { useLocalTheme } from '@/composables/useLocalTheme'
useLocalTheme().getLocalTheme()
Expand Down
14 changes: 6 additions & 8 deletions src/components/GreyPreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,22 @@
</template>

<script setup lang="ts">
import { computed, ref, StyleValue } from 'vue'
import { computed, ref, type CSSProperties } from 'vue'
interface Props {
const props = defineProps<{
color: string
}
const componentProps = defineProps<Props>()
}>()
const showTooltip = ref<boolean>(false)
const style = computed<StyleValue>(() => ({
backgroundColor: componentProps.color,
const style = computed<CSSProperties>(() => ({
backgroundColor: props.color,
}))
const onClick = () => {
showTooltip.value = true
setTimeout(() => {
showTooltip.value = false
}, 2000)
navigator.clipboard.writeText(componentProps.color)
navigator.clipboard.writeText(props.color)
}
</script>
27 changes: 4 additions & 23 deletions src/components/GreySettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,30 +59,11 @@

<script setup lang="ts">
import { useLocalTheme } from '@/composables/useLocalTheme'
import { Settings } from '@/types/global'
import { computed, ref } from 'vue'
import { useTheme } from 'vuetify/lib/framework.mjs'
import type { Settings } from '@/types/global'
import { ref } from 'vue'
import { useTheme } from 'vuetify'
// Form
interface Props {
modelValue: Settings
}
interface Emit {
(e: 'update:modelValue', settings: Settings): void
}
const props = defineProps<Props>()
const emit = defineEmits<Emit>()
const form = computed({
get() {
return props.modelValue
},
set(value) {
emit('update:modelValue', value)
},
})
const form = defineModel<Settings>({ required: true })
// Set Theme
const theme = useTheme()
Expand Down
10 changes: 4 additions & 6 deletions src/components/GreySwatch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@

<script setup lang="ts">
import GreyPreview from '@/components/GreyPreview.vue'
import { Settings } from '@/types/global'
import { useColor } from '../composables/useColor'
import type { Settings } from '@/types/global'
import { useColor } from '@/composables/useColor'
interface Props {
defineProps<{
settings: Settings
}
defineProps<Props>()
}>()
</script>
2 changes: 1 addition & 1 deletion src/composables/useColor.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import convert from 'color-convert'
import { Settings } from '@/types/global'
import type { Settings } from '@/types/global'

export function useColor(settings: Settings, index: number) {
const colorHSL = convert.hex.hsl(settings.color)
Expand Down
2 changes: 1 addition & 1 deletion src/composables/useLocalTheme.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { computed } from 'vue'
import { useTheme } from 'vuetify/lib/framework.mjs'
import { useTheme } from 'vuetify'

export function useLocalTheme() {
const theme = useTheme()
Expand Down
7 changes: 0 additions & 7 deletions src/vite-env.d.ts

This file was deleted.

0 comments on commit 2ae9b40

Please sign in to comment.