Skip to content

Commit

Permalink
Merge pull request #62 from OpenShock/develop
Browse files Browse the repository at this point in the history
Svelte 5 master
  • Loading branch information
LucHeart authored Oct 29, 2024
2 parents 3e5ede8 + 360d042 commit f2183ae
Show file tree
Hide file tree
Showing 92 changed files with 2,221 additions and 1,115 deletions.
31 changes: 0 additions & 31 deletions .eslintrc.cjs

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ node_modules
vite.config.js.timestamp-*
vite.config.ts.timestamp-*
package-lock.json

# Test files
/test-results
File renamed without changes.
34 changes: 34 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import prettier from "eslint-config-prettier";
import js from '@eslint/js';
import svelte from 'eslint-plugin-svelte';
import globals from 'globals';
import ts from 'typescript-eslint';

export default ts.config(
js.configs.recommended,
...ts.configs.recommended,
...svelte.configs["flat/recommended"],
prettier,
...svelte.configs['flat/prettier'],
{
languageOptions: {
globals: {
...globals.browser,
...globals.node
}
}
},
{
files: ["**/*.svelte"],

languageOptions: {
parserOptions: {
parser: ts.parser,
ecmaVersion: 2020
}
}
},
{
ignores: ["build/", ".svelte-kit/", "dist/"]
}
);
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,40 +21,42 @@
"@openapitools/openapi-generator-cli": "^2.15.0",
"@playwright/test": "^1.48.2",
"@sentry/svelte": "^8.35.0",
"@skeletonlabs/skeleton": "2.10.3",
"@skeletonlabs/skeleton": "^2.10.3",
"@skeletonlabs/tw-plugin": "0.4.0",
"@sveltejs/adapter-cloudflare": "^4.7.4",
"@sveltejs/adapter-node": "^5.2.9",
"@sveltejs/kit": "^2.7.3",
"@sveltejs/vite-plugin-svelte": "^3.1.2",
"@sveltejs/vite-plugin-svelte": "^4.0.0",
"@tailwindcss/forms": "0.5.9",
"@tailwindcss/typography": "0.5.15",
"@types/crypto-js": "^4.2.2",
"@types/eslint": "^9.6.1",
"@types/node": "22.8.1",
"@types/node": "22.8.2",
"@types/w3c-web-serial": "^1.0.7",
"@vincjo/datatables": "^1.14.10",
"@vincjo/datatables": "^2.0.5",
"autoprefixer": "10.4.20",
"bowser": "^2.11.0",
"crypto-js": "^4.2.0",
"email-validator": "^2.0.4",
"eslint": "^9.13.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-svelte": "^2.46.0",
"globals": "^15.11.0",
"highlight.js": "^11.10.0",
"js-sha1": "^0.7.0",
"postcss": "8.4.47",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "^3.2.7",
"svelte": "^4.2.19",
"svelte": "^5.1.4",
"svelte-check": "^4.0.5",
"tailwindcss": "3.4.14",
"tslib": "^2.8.0",
"typescript": "^5.6.3",
"typescript-eslint": "^8.12.1",
"ua-parser-js": "^2.0.0-beta.3",
"vite-plugin-mkcert": "^1.17.6",
"vite-plugin-tailwind-purgecss": "0.3.3",
"vitest": "^2.1.3"
"vitest": "^2.1.4"
},
"dependencies": {
"esptool-js": "^0.4.6",
Expand Down
12 changes: 5 additions & 7 deletions playwright.config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import type { PlaywrightTestConfig } from '@playwright/test';
import { defineConfig } from '@playwright/test';

const config: PlaywrightTestConfig = {
export default defineConfig({
webServer: {
command: 'pnpm run build && pnpm run preview',
command: 'npm run build && npm run preview',
port: 4173
},
testDir: 'tests',
testMatch: /(.+\.)?(test|spec)\.[jt]s/
};

export default config;
testDir: 'e2e'
});
Loading

0 comments on commit f2183ae

Please sign in to comment.