Skip to content

Commit

Permalink
Merge branch 'main' into azure-staging
Browse files Browse the repository at this point in the history
  • Loading branch information
OLILHR authored Oct 24, 2024
2 parents cbb8a54 + b64aac1 commit 51c647a
Show file tree
Hide file tree
Showing 16 changed files with 78 additions and 107 deletions.
11 changes: 0 additions & 11 deletions .dockerignore

This file was deleted.

41 changes: 0 additions & 41 deletions .eslintrc.cjs

This file was deleted.

13 changes: 0 additions & 13 deletions Dockerfile

This file was deleted.

11 changes: 0 additions & 11 deletions docker-compose.yaml

This file was deleted.

70 changes: 61 additions & 9 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,65 @@
import js from "@eslint/js";
import tsPlugin from "@typescript-eslint/eslint-plugin";
import tsParser from "@typescript-eslint/parser";
import sveltePlugin from "eslint-plugin-svelte";
import svelteParser from "svelte-eslint-parser";
import prettierConfig from "eslint-config-prettier";
import simpleImportSort from "eslint-plugin-simple-import-sort";
import importPlugin from "eslint-plugin-import";

export default [
js.configs.recommended,
{
ignores: [
"package.json",
"package-lock.json",
".svelte-kit/",
"node_modules/",
"test-results/",
"static/ebd/",
"build/*",
],
files: ["**/*.{js,ts,svelte}"],
plugins: {
"@typescript-eslint": tsPlugin,
svelte: sveltePlugin,
"simple-import-sort": simpleImportSort,
import: importPlugin,
},
languageOptions: {
parser: tsParser,
parserOptions: {
ecmaVersion: 2020,
sourceType: "module",
extraFileExtensions: [".svelte"],
},
globals: {
// Browser globals
window: "readonly",
document: "readonly",
console: "readonly",
fetch: "readonly",
setTimeout: "readonly",
clearTimeout: "readonly",
Blob: "readonly",
URL: "readonly",
HTMLDivElement: "readonly",
CustomEvent: "readonly",
// Node.js globals
process: "readonly",
},
},
rules: {
...tsPlugin.configs.recommended.rules,
...sveltePlugin.configs.recommended.rules,
"simple-import-sort/imports": "error",
"simple-import-sort/exports": "error",
"import/first": "error",
"import/newline-after-import": "error",
"import/no-duplicates": "error",
"svelte/no-at-html-tags": "warn", // Changed from 'error' to 'warn'
"no-undef": "error",
},
},
{
files: ["**/*.svelte"],
languageOptions: {
parser: svelteParser,
parserOptions: {
parser: tsParser,
},
},
},
prettierConfig,
];
15 changes: 0 additions & 15 deletions nginx.conf

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"format": "prettier '**/*.{svelte,js,jsx,ts,tsx,html,css,scss,json,yml,md}' --write",
"format:check": "prettier '**/*.{svelte,js,jsx,ts,tsx,html,css,scss,json,yml,md}' --check",
"lint": "eslint .",
"lint": "eslint 'src/**/*.{js,ts,svelte}'",
"postinstall": "npx playwright install",
"test": "npx playwright test"
},
Expand Down
1 change: 1 addition & 0 deletions src/lib/components/footer.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script>
import { base } from "$app/paths";
import { IconLogo } from "$lib";
export let background = "bg-secondary";
let currentYear = new Date().getFullYear();
Expand Down
1 change: 1 addition & 0 deletions src/lib/components/icon-logo.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script>
import { base } from "$app/paths";
export let size = 46;
</script>

Expand Down
4 changes: 2 additions & 2 deletions src/lib/features/ebd-form-header.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { base } from "$app/paths";
import { goto } from "$app/navigation";
import { IconLogo, EbdSelect, ExportButton, FormatVersionSelect } from "$lib";
import { base } from "$app/paths";
import { EbdSelect, ExportButton, FormatVersionSelect, IconLogo } from "$lib";
type FormatVersion = {
code: string;
Expand Down
3 changes: 2 additions & 1 deletion src/lib/features/export-button.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<script lang="ts">
import { base } from "$app/paths";
import { onMount } from "svelte";
import { base } from "$app/paths";
export let currentFormatVersion: string = "";
export let currentEbd: string = "";
Expand Down
1 change: 1 addition & 0 deletions src/routes/+layout.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script>
import "../app.scss";
import { Footer } from "$lib";
</script>

Expand Down
1 change: 1 addition & 0 deletions src/routes/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script>
import "../app.scss";
import { base } from "$app/paths";
import { ToolsBanner } from "$lib";
</script>
Expand Down
3 changes: 2 additions & 1 deletion src/routes/ebd/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<script lang="ts">
import { goto } from "$app/navigation";
import { base } from "$app/paths";
import { EbdSelect, Header, FormatVersionSelect } from "$lib";
import { EbdSelect, FormatVersionSelect, Header } from "$lib";
import type { PageData } from "./$types";
export let data: PageData;
Expand Down
3 changes: 2 additions & 1 deletion src/routes/ebd/[formatVersion]/[ebd]/+layout.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<script lang="ts">
import "../../../../app.scss";
import { EbdFormHeader } from "$lib";
import { page } from "$app/stores";
import { EbdFormHeader } from "$lib";
$: ({ formatVersions, ebds } = $page.data);
$: ({ formatVersion, ebd } = $page.params);
Expand Down
5 changes: 4 additions & 1 deletion src/routes/ebd/[formatVersion]/[ebd]/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<script lang="ts">
/* eslint-disable svelte/no-at-html-tags */
import { onMount } from "svelte";
import { page } from "$app/stores";
import { base } from "$app/paths";
import { page } from "$app/stores";
let svgContainer: HTMLDivElement;
let svgContent = "";
Expand Down

0 comments on commit 51c647a

Please sign in to comment.