Skip to content

Commit

Permalink
Merge branch 'main' into agendabasel_api
Browse files Browse the repository at this point in the history
  • Loading branch information
maehr authored Oct 15, 2024
2 parents ceb2e73 + a955558 commit a33a3ea
Show file tree
Hide file tree
Showing 9 changed files with 573 additions and 706 deletions.
38 changes: 18 additions & 20 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
import eslintPluginSvelte from 'eslint-plugin-svelte';
import js from '@eslint/js';
import prettier from 'eslint-config-prettier';
import svelte from 'eslint-plugin-svelte';
import globals from 'globals';

/** @type {import('eslint').Linter.Config[]} */
export default [
// add more generic rule sets here, such as:
// js.configs.recommended,
...eslintPluginSvelte.configs['flat/recommended'],
js.configs.recommended,
...svelte.configs['flat/recommended'],
prettier,
...svelte.configs['flat/prettier'],
{
ignores: [
'.DS_Store',
'node_modules',
'/build',
'/.svelte-kit',
'/package',
'.env',
'.env.*',
'!.env.example',
'pnpm-lock.yaml',
'package-lock.json',
'yarn.lock'
],
rules: {
// override/add rules settings here, such as:
// 'svelte/rule-name': 'error'
languageOptions: {
globals: {
...globals.browser,
...globals.node
}
}
},
{
ignores: ['build/', '.svelte-kit/', 'dist/']
}
];
33 changes: 17 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,43 +44,44 @@
"clean": "rm -Rf static/files/* && touch static/files/.gitkeep && rm -Rf src/pages/* && touch src/pages/.gitkeep && rm -Rf src/posts/* && touch src/posts/.gitkeep"
},
"devDependencies": {
"@divriots/jampack": "^0.28.0",
"@playwright/test": "^1.47.2",
"@divriots/jampack": "^0.30.0",
"@playwright/test": "^1.48.0",
"@skeletonlabs/skeleton": "^2.10.2",
"@skeletonlabs/tw-plugin": "^0.4.0",
"@sveltejs/adapter-static": "^3.0.5",
"@sveltejs/kit": "^2.5.28",
"@sveltejs/kit": "^2.7.1",
"@sveltejs/vite-plugin-svelte": "^3.1.2",
"@tailwindcss/typography": "^0.5.15",
"autoprefixer": "^10.4.20",
"cheerio": "1.0.0-rc.12",
"dompurify": "^3.1.6",
"eslint": "^9.11.0",
"cheerio": "1.0.0",
"dompurify": "^3.1.7",
"eslint": "^9.12.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-svelte": "^2.44.0",
"eslint-plugin-svelte": "^2.44.1",
"globals": "^15.11.0",
"husky": "^9.1.6",
"js-yaml": "^4.1.0",
"jsdom": "^24.1.3",
"mdsvex": "^0.11.2",
"jsdom": "^25.0.1",
"mdsvex": "^0.12.3",
"node-fetch": "^3.3.2",
"postcss": "^8.4.47",
"prettier": "^3.3.3",
"prettier-plugin-organize-imports": "^4.1.0",
"prettier-plugin-svelte": "^3.2.6",
"prettier-plugin-tailwindcss": "^0.6.6",
"prettier-plugin-svelte": "^3.2.7",
"prettier-plugin-tailwindcss": "^0.6.8",
"rehype-autolink-headings": "^7.1.0",
"rehype-external-links": "^3.0.0",
"rehype-slug": "^6.0.0",
"remark-captions": "^2.2.4",
"svelte": "^4.2.19",
"svelte-check": "^3.8.6",
"svelte-maplibre": "^0.9.13",
"svelte-check": "^4.0.5",
"svelte-maplibre": "^0.9.14",
"tailwindcss": "^3.4.13",
"turndown": "^7.2.0",
"typescript": "^5.6.2",
"vite": "^5.4.7",
"typescript": "^5.6.3",
"vite": "^5.4.9",
"vite-plugin-tailwind-purgecss": "^0.3.3",
"vitest": "^2.1.1",
"vitest": "^2.1.3",
"xml2js": "^0.6.2"
},
"type": "module"
Expand Down
Loading

0 comments on commit a33a3ea

Please sign in to comment.