Skip to content

Commit

Permalink
Merge branch 'main' into renovate/all
Browse files Browse the repository at this point in the history
  • Loading branch information
yacosta738 authored Feb 23, 2024
2 parents 2882548 + 1ef6a8d commit 57238f6
Show file tree
Hide file tree
Showing 17 changed files with 896 additions and 693 deletions.
28 changes: 25 additions & 3 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,38 @@ module.exports = {
es2022: true,
browser: true,
},
extends: ['eslint:recommended', 'plugin:astro/recommended'],
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:astro/recommended',
'plugin:astro/jsx-a11y-recommended',
'plugin:vue/vue3-recommended',
'prettier',
],
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
},
rules: {
'no-mixed-spaces-and-tabs': 'off',
},
plugins: ['vue'],
settings: {},
overrides: [
{
files: ['*.vue'],
parser: 'vue-eslint-parser',
parserOptions: {
parser: '@typescript-eslint/parser',
ecmaVersion: 'latest',
sourceType: 'module',
},
extends: ['plugin:@typescript-eslint/recommended'],
rules: {
'vue/multi-word-component-names': 'off',
'vue/require-default-prop': 'off',
},
},
{
files: ['*.astro'],
parser: 'astro-eslint-parser',
Expand All @@ -22,11 +44,11 @@ module.exports = {
extraFileExtensions: ['.astro'],
},
rules: {
'no-undef': 0,
'@typescript-eslint/ban-ts-comment': 'off',
},
},
{
files: ['*.ts'],
files: ['*.ts', '*.mts'],
parser: '@typescript-eslint/parser',
extends: ['plugin:@typescript-eslint/recommended'],
rules: {
Expand Down
3 changes: 3 additions & 0 deletions astro.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import NetlifyCMS from 'astro-netlify-cms';
import remarkToc from 'remark-toc';
import icon from 'astro-icon';
import { config } from './src/plugins/netlify-cms';
import vue from '@astrojs/vue';

const DEV_PORT: number = 3000;

// https://astro.build/config
Expand Down Expand Up @@ -52,6 +54,7 @@ export default defineConfig({
'akar-icons': ['*'],
},
}),
vue(),
],
vite: {
ssr: {
Expand Down
19 changes: 11 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
"astro-seo": "0.8.2",
"conventional-changelog-conventionalcommits": "^7.0.2",
"dompurify": "3.0.9",
"eslint": "8.56.0",
"eslint-config-standard": "17.1.0",
"eslint-plugin-astro": "0.31.4",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-n": "16.6.2",
"eslint-plugin-promise": "6.1.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-astro": "^0.31.4",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier-vue": "^5.0.0",
"eslint-plugin-vue": "^9.21.1",
"flowbite": "^2.3.0",
"husky": "9.0.11",
"locale-emoji": "0.3.0",
Expand All @@ -81,9 +81,12 @@
},
"dependencies": {
"@astrojs/ts-plugin": "^1.5.3",
"@astrojs/vue": "^4.0.8",
"@vueuse/integrations": "^10.8.0",
"fuse.js": "^7.0.0",
"sass": "1.71.1",
"sharp": "0.33.2"
"sharp": "0.33.2",
"vue": "^3.4.19"
},
"packageManager": "pnpm@8.15.3"
}
Loading

0 comments on commit 57238f6

Please sign in to comment.