Skip to content

Commit

Permalink
Format files with updated lint config
Browse files Browse the repository at this point in the history
  • Loading branch information
zeppelin committed Jul 26, 2023
1 parent 48f370a commit 3b8aee8
Show file tree
Hide file tree
Showing 13 changed files with 134 additions and 81 deletions.
2 changes: 1 addition & 1 deletion playwright/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
Expand Down
4 changes: 1 addition & 3 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
]
"extends": ["config:base"]
}
12 changes: 6 additions & 6 deletions src/app.d.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// See https://kit.svelte.dev/docs/types#app
// for information about these interfaces
declare global {
namespace App {
// interface Error {}
// interface Locals {}
// interface PageData {}
// interface Platform {}
}
namespace App {
// interface Error {}
// interface Locals {}
// interface PageData {}
// interface Platform {}
}
}

export {};
20 changes: 10 additions & 10 deletions src/app.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
%sveltekit.head%
</head>
<body>
<div>%sveltekit.body%</div>
</body>
<head>
<meta charset="utf-8" />
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
%sveltekit.head%
</head>
<body>
<div>%sveltekit.body%</div>
</body>
</html>
4 changes: 2 additions & 2 deletions src/lib/ModalContainer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
$: updateOptions(options);
</script>

{#each $stack as modal, index}
<Modal modal={modal} bind:this={modal.componentInstance} />
{#each $stack as modal, _index}
<Modal {modal} bind:this={modal.componentInstance} />
{/each}
2 changes: 1 addition & 1 deletion src/lib/service.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import deepmerge from 'deepmerge';
import { BROWSER as browser } from 'esm-env';
import type { ComponentType } from 'svelte';
import { derived, get, writable } from 'svelte/store';

import { BROWSER as browser } from 'esm-env';
import { Modal } from './modal';
import type { ModalOptions } from './types';

Expand Down
30 changes: 17 additions & 13 deletions src/lib/svelte-promise-modals.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,27 @@
--spm-animation-backdrop-out-delay: 0s;
--spm-animation-modal-in-delay: 0s;
--spm-animation-modal-out-delay: 0s;
--spm-animation-backdrop-in: var(--spm-animation-backdrop-in-duration) ease var(--spm-animation-backdrop-in-delay) forwards spm-backdrop-in;
--spm-animation-backdrop-out: var(--spm-animation-backdrop-out-duration) ease var(--spm-animation-backdrop-out-delay) forwards spm-backdrop-out;
--spm-animation-modal-in: var(--spm-animation-modal-in-duration) ease-out var(--spm-animation-modal-in-delay) forwards spm-modal-in;
--spm-animation-modal-out: var(--spm-animation-modal-out-duration) ease-out var(--spm-animation-modal-out-delay) forwards spm-modal-out;
--spm-backdrop-background: #2d3748CD;
--spm-animation-backdrop-in: var(--spm-animation-backdrop-in-duration) ease
var(--spm-animation-backdrop-in-delay) forwards spm-backdrop-in;
--spm-animation-backdrop-out: var(--spm-animation-backdrop-out-duration) ease
var(--spm-animation-backdrop-out-delay) forwards spm-backdrop-out;
--spm-animation-modal-in: var(--spm-animation-modal-in-duration) ease-out
var(--spm-animation-modal-in-delay) forwards spm-modal-in;
--spm-animation-modal-out: var(--spm-animation-modal-out-duration) ease-out
var(--spm-animation-modal-out-delay) forwards spm-modal-out;
--spm-backdrop-background: #2d3748cd;
}

@media (prefers-reduced-motion: reduce) {
:root {
--spm-animation-backdrop-in-duration: 0.001s;
--spm-animation-backdrop-out-duration: 0.001s;
--spm-animation-modal-in-duration: 0.001s;
--spm-animation-modal-out-duration: 0.001s;
--spm-animation-backdrop-in-delay: 0.001s;
--spm-animation-backdrop-out-delay: 0.001s;
--spm-animation-modal-in-delay: 0.001s;
--spm-animation-modal-out-delay: 0.001s;
--spm-animation-backdrop-in-duration: 0.001s;
--spm-animation-backdrop-out-duration: 0.001s;
--spm-animation-modal-in-duration: 0.001s;
--spm-animation-modal-out-duration: 0.001s;
--spm-animation-backdrop-in-delay: 0.001s;
--spm-animation-backdrop-out-delay: 0.001s;
--spm-animation-modal-in-delay: 0.001s;
--spm-animation-modal-out-delay: 0.001s;
}
}

Expand Down
10 changes: 9 additions & 1 deletion src/routes/BarComponent.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
<h2>Modal 2</h2>

<p>
Sociis per justo neque pulvinar orci sagittis tristique tincidunt suspendisse cum est, rhoncus euismod velit interdum condimentum aenean sed hendrerit arcu venenatis, rutrum commodo elementum eros ac at non ullamcorper pellentesque turpis. Tincidunt consequat purus quam ante aliquam mattis scelerisque viverra suspendisse, tellus convallis mollis ornare primis penatibus montes dapibus sagittis fringilla, magna feugiat conubia luctus posuere suscipit praesent quis. Interdum a iaculis aliquet inceptos vulputate torquent dapibus, ultricies nisl congue leo molestie eu rutrum lectus, ac non pretium magna ad primis. Cursus dui tempus iaculis nostra habitant quis platea hendrerit, purus augue massa elementum dapibus morbi ridiculus, magna convallis pretium ac tincidunt inceptos cum.
Sociis per justo neque pulvinar orci sagittis tristique tincidunt suspendisse cum est, rhoncus
euismod velit interdum condimentum aenean sed hendrerit arcu venenatis, rutrum commodo elementum
eros ac at non ullamcorper pellentesque turpis. Tincidunt consequat purus quam ante aliquam
mattis scelerisque viverra suspendisse, tellus convallis mollis ornare primis penatibus montes
dapibus sagittis fringilla, magna feugiat conubia luctus posuere suscipit praesent quis.
Interdum a iaculis aliquet inceptos vulputate torquent dapibus, ultricies nisl congue leo
molestie eu rutrum lectus, ac non pretium magna ad primis. Cursus dui tempus iaculis nostra
habitant quis platea hendrerit, purus augue massa elementum dapibus morbi ridiculus, magna
convallis pretium ac tincidunt inceptos cum.
</p>
</div>
42 changes: 35 additions & 7 deletions src/routes/FooComponent.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { openModal } from "$lib/service";
import { openModal } from '$lib/service';
import BarComponent from "./BarComponent.svelte";
import BarComponent from './BarComponent.svelte';
export let data: unknown;
export let close: any;
Expand All @@ -17,22 +17,50 @@
<h2>Modal 1</h2>

<p>
Sociis per justo neque pulvinar orci sagittis tristique tincidunt suspendisse cum est, rhoncus euismod velit interdum condimentum aenean sed hendrerit arcu venenatis, rutrum commodo elementum eros ac at non ullamcorper pellentesque turpis. Tincidunt consequat purus quam ante aliquam mattis scelerisque viverra suspendisse, tellus convallis mollis ornare primis penatibus montes dapibus sagittis fringilla, magna feugiat conubia luctus posuere suscipit praesent quis. Interdum a iaculis aliquet inceptos vulputate torquent dapibus, ultricies nisl congue leo molestie eu rutrum lectus, ac non pretium magna ad primis. Cursus dui tempus iaculis nostra habitant quis platea hendrerit, purus augue massa elementum dapibus morbi ridiculus, magna convallis pretium ac tincidunt inceptos cum.
Sociis per justo neque pulvinar orci sagittis tristique tincidunt suspendisse cum est, rhoncus
euismod velit interdum condimentum aenean sed hendrerit arcu venenatis, rutrum commodo elementum
eros ac at non ullamcorper pellentesque turpis. Tincidunt consequat purus quam ante aliquam
mattis scelerisque viverra suspendisse, tellus convallis mollis ornare primis penatibus montes
dapibus sagittis fringilla, magna feugiat conubia luctus posuere suscipit praesent quis.
Interdum a iaculis aliquet inceptos vulputate torquent dapibus, ultricies nisl congue leo
molestie eu rutrum lectus, ac non pretium magna ad primis. Cursus dui tempus iaculis nostra
habitant quis platea hendrerit, purus augue massa elementum dapibus morbi ridiculus, magna
convallis pretium ac tincidunt inceptos cum.
</p>

<p>
<button type="button" data-testid="show-modal-2" on:click={() => openModal(BarComponent)}>Open another modal</button>
<button type="button" data-testid="show-modal-2" on:click={() => openModal(BarComponent)}
>Open another modal</button
>
</p>

<p>
Sociis per justo neque pulvinar orci sagittis tristique tincidunt suspendisse cum est, rhoncus euismod velit interdum condimentum aenean sed hendrerit arcu venenatis, rutrum commodo elementum eros ac at non ullamcorper pellentesque turpis. Tincidunt consequat purus quam ante aliquam mattis scelerisque viverra suspendisse, tellus convallis mollis ornare primis penatibus montes dapibus sagittis fringilla, magna feugiat conubia luctus posuere suscipit praesent quis. Interdum a iaculis aliquet inceptos vulputate torquent dapibus, ultricies nisl congue leo molestie eu rutrum lectus, ac non pretium magna ad primis. Cursus dui tempus iaculis nostra habitant quis platea hendrerit, purus augue massa elementum dapibus morbi ridiculus, magna convallis pretium ac tincidunt inceptos cum.
Sociis per justo neque pulvinar orci sagittis tristique tincidunt suspendisse cum est, rhoncus
euismod velit interdum condimentum aenean sed hendrerit arcu venenatis, rutrum commodo elementum
eros ac at non ullamcorper pellentesque turpis. Tincidunt consequat purus quam ante aliquam
mattis scelerisque viverra suspendisse, tellus convallis mollis ornare primis penatibus montes
dapibus sagittis fringilla, magna feugiat conubia luctus posuere suscipit praesent quis.
Interdum a iaculis aliquet inceptos vulputate torquent dapibus, ultricies nisl congue leo
molestie eu rutrum lectus, ac non pretium magna ad primis. Cursus dui tempus iaculis nostra
habitant quis platea hendrerit, purus augue massa elementum dapibus morbi ridiculus, magna
convallis pretium ac tincidunt inceptos cum.
</p>

<p>
Sociis per justo neque pulvinar orci sagittis tristique tincidunt suspendisse cum est, rhoncus euismod velit interdum condimentum aenean sed hendrerit arcu venenatis, rutrum commodo elementum eros ac at non ullamcorper pellentesque turpis. Tincidunt consequat purus quam ante aliquam mattis scelerisque viverra suspendisse, tellus convallis mollis ornare primis penatibus montes dapibus sagittis fringilla, magna feugiat conubia luctus posuere suscipit praesent quis. Interdum a iaculis aliquet inceptos vulputate torquent dapibus, ultricies nisl congue leo molestie eu rutrum lectus, ac non pretium magna ad primis. Cursus dui tempus iaculis nostra habitant quis platea hendrerit, purus augue massa elementum dapibus morbi ridiculus, magna convallis pretium ac tincidunt inceptos cum.
Sociis per justo neque pulvinar orci sagittis tristique tincidunt suspendisse cum est, rhoncus
euismod velit interdum condimentum aenean sed hendrerit arcu venenatis, rutrum commodo elementum
eros ac at non ullamcorper pellentesque turpis. Tincidunt consequat purus quam ante aliquam
mattis scelerisque viverra suspendisse, tellus convallis mollis ornare primis penatibus montes
dapibus sagittis fringilla, magna feugiat conubia luctus posuere suscipit praesent quis.
Interdum a iaculis aliquet inceptos vulputate torquent dapibus, ultricies nisl congue leo
molestie eu rutrum lectus, ac non pretium magna ad primis. Cursus dui tempus iaculis nostra
habitant quis platea hendrerit, purus augue massa elementum dapibus morbi ridiculus, magna
convallis pretium ac tincidunt inceptos cum.
</p>

<p>
<button type="button" data-test-submit on:click={() => close(data)}>Close with return data</button>
<button type="button" data-test-submit on:click={() => close(data)}
>Close with return data</button
>
</p>
</div>
35 changes: 21 additions & 14 deletions src/routes/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ small {

*:focus {
outline: 0;
box-shadow: 0 0 10px -2px #007EDF;
box-shadow: 0 0 10px -2px #007edf;
}

a {
Expand All @@ -180,19 +180,26 @@ a {
padding: 0.5rem 1.25rem;
font-weight: 700;
background: rgba(255, 255, 255, 0.95);
box-shadow: 0 1px 2px 0 rgba(0, 76, 134, 0.4), 0 5px 16px -4px rgba(0, 76, 134, 0.4);
box-shadow:
0 1px 2px 0 rgba(0, 76, 134, 0.4),
0 5px 16px -4px rgba(0, 76, 134, 0.4);
border-radius: 0.5625rem;
}

[type='button']:focus {
box-shadow: 0 0 10px -2px #007EDF, 0 1px 2px 0 rgba(0, 76, 134, 0.4), 0 5px 16px -4px rgba(0, 76, 134, 0.4);
box-shadow:
0 0 10px -2px #007edf,
0 1px 2px 0 rgba(0, 76, 134, 0.4),
0 5px 16px -4px rgba(0, 76, 134, 0.4);
outline: 0;
color: #007EDF;
color: #007edf;
}

[type='button']:active {
transform: translateY(1px);
box-shadow: 0 0 2px 0 rgba(0, 76, 134, 0.4), 0 4px 16px -4px rgba(0, 76, 134, 0.4);
box-shadow:
0 0 2px 0 rgba(0, 76, 134, 0.4),
0 4px 16px -4px rgba(0, 76, 134, 0.4);
}

.box {
Expand Down Expand Up @@ -234,13 +241,13 @@ a {
}

.visually-hidden {
position: absolute!important;
width: 1px!important;
height: 1px!important;
padding: 0!important;
margin: -1px!important;
overflow: hidden!important;
clip: rect(0,0,0,0)!important;
white-space: nowrap!important;
border: 0!important;
position: absolute !important;
width: 1px !important;
height: 1px !important;
padding: 0 !important;
margin: -1px !important;
overflow: hidden !important;
clip: rect(0, 0, 0, 0) !important;
white-space: nowrap !important;
border: 0 !important;
}
12 changes: 6 additions & 6 deletions svelte.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { vitePreprocess } from '@sveltejs/kit/vite';

/** @type {import('@sveltejs/kit').Config} */
const config = {
// Consult https://kit.svelte.dev/docs/integrations#preprocessors
// for more information about preprocessors
preprocess: vitePreprocess(),
// Consult https://kit.svelte.dev/docs/integrations#preprocessors
// for more information about preprocessors
preprocess: vitePreprocess(),

kit: {
adapter: adapter()
}
kit: {
adapter: adapter(),
},
};

export default config;
10 changes: 9 additions & 1 deletion tests-ct/OverlappingTestModal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
<h2>Modal 2</h2>

<p>
Sociis per justo neque pulvinar orci sagittis tristique tincidunt suspendisse cum est, rhoncus euismod velit interdum condimentum aenean sed hendrerit arcu venenatis, rutrum commodo elementum eros ac at non ullamcorper pellentesque turpis. Tincidunt consequat purus quam ante aliquam mattis scelerisque viverra suspendisse, tellus convallis mollis ornare primis penatibus montes dapibus sagittis fringilla, magna feugiat conubia luctus posuere suscipit praesent quis. Interdum a iaculis aliquet inceptos vulputate torquent dapibus, ultricies nisl congue leo molestie eu rutrum lectus, ac non pretium magna ad primis. Cursus dui tempus iaculis nostra habitant quis platea hendrerit, purus augue massa elementum dapibus morbi ridiculus, magna convallis pretium ac tincidunt inceptos cum.
Sociis per justo neque pulvinar orci sagittis tristique tincidunt suspendisse cum est, rhoncus
euismod velit interdum condimentum aenean sed hendrerit arcu venenatis, rutrum commodo elementum
eros ac at non ullamcorper pellentesque turpis. Tincidunt consequat purus quam ante aliquam
mattis scelerisque viverra suspendisse, tellus convallis mollis ornare primis penatibus montes
dapibus sagittis fringilla, magna feugiat conubia luctus posuere suscipit praesent quis.
Interdum a iaculis aliquet inceptos vulputate torquent dapibus, ultricies nisl congue leo
molestie eu rutrum lectus, ac non pretium magna ad primis. Cursus dui tempus iaculis nostra
habitant quis platea hendrerit, purus augue massa elementum dapibus morbi ridiculus, magna
convallis pretium ac tincidunt inceptos cum.
</p>
</div>
32 changes: 16 additions & 16 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": {
"types": ["vitest/globals", "@testing-library/jest-dom"],
"allowJs": true,
"checkJs": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true
}
// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
//
// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
// from the referenced tsconfig.json - TypeScript does not merge them in
"extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": {
"types": ["vitest/globals", "@testing-library/jest-dom"],
"allowJs": true,
"checkJs": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true
}
// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
//
// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
// from the referenced tsconfig.json - TypeScript does not merge them in
}

0 comments on commit 3b8aee8

Please sign in to comment.