Skip to content

Commit ba51ea9

Browse files
jifalopsjifalops
committed
npm run format (after useTabs: false in .prettierrc)
1 parent 246f897 commit ba51ea9

14 files changed

+146
-144
lines changed

‎.vscode/settings.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"commands": [
2525
"npx local-cors-proxy --proxyUrl https://dummyjson.com --port 3099"
2626
]
27-
},
27+
}
2828
]
2929
},
3030
{
@@ -40,15 +40,15 @@
4040
"commands": [
4141
"npm install && npm run test:e2e && npm run preview -- --host"
4242
]
43-
},
43+
}
4444
]
4545
},
4646
{
4747
"splitTerminals": [
4848
{
4949
"name": "bash",
5050
"commands": []
51-
},
51+
}
5252
]
5353
}
5454
],

‎e2e/demo.test.ts

+2
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ import {
66
test('home page has expected <main>', async ({ page }) => {
77
await page.goto('/');
88
await expect(page.locator('main')).toBeVisible();
9+
await page.goto('/');
10+
await expect(page.locator('main')).toBeVisible();
911
});

‎package.json

+51-51
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
{
2-
"name": "svelte-static",
3-
"version": "0.0.1",
4-
"type": "module",
5-
"scripts": {
6-
"dev": "vite dev",
7-
"build": "vite build",
8-
"preview": "vite preview",
9-
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
10-
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
11-
"format": "prettier --write .",
12-
"lint": "prettier --check . && eslint .",
13-
"obfuscate": "javascript-obfuscator ./build --output ./build",
14-
"test:unit": "vitest",
15-
"test": "npm run test:unit -- --run && npm run test:e2e",
16-
"test:e2e": "playwright test"
17-
},
18-
"devDependencies": {
19-
"@iconify/json": "^2.2.273",
20-
"@playwright/test": "^1.45.3",
21-
"@sentry/browser": "^8.40.0",
22-
"@sveltejs/adapter-static": "^3.0.6",
23-
"@sveltejs/kit": "^2.0.0",
24-
"@sveltejs/vite-plugin-svelte": "^4.0.0",
25-
"@types/eslint": "^9.6.0",
26-
"autoprefixer": "^10.4.20",
27-
"eslint": "^9.7.0",
28-
"eslint-config-prettier": "^9.1.0",
29-
"eslint-plugin-svelte": "^2.36.0",
30-
"globals": "^15.0.0",
31-
"javascript-obfuscator": "^4.1.1",
32-
"luxon": "^3.5.0",
33-
"postcss": "^8.4.49",
34-
"postcss-import": "^16.1.0",
35-
"prettier": "^3.3.2",
36-
"prettier-plugin-svelte": "^3.2.6",
37-
"prettier-plugin-tailwindcss": "^0.6.5",
38-
"svelte": "^5.0.0",
39-
"svelte-check": "^4.0.0",
40-
"tailwindcss": "^3.4.9",
41-
"typescript": "^5.0.0",
42-
"typescript-eslint": "^8.0.0",
43-
"unplugin-icons": "^0.20.1",
44-
"vite": "^5.0.3",
45-
"vitest": "^2.0.4"
46-
},
47-
"dependencies": {
48-
"@tailwindcss/aspect-ratio": "^0.4.2",
49-
"@tailwindcss/container-queries": "^0.1.1",
50-
"@tailwindcss/forms": "^0.5.9",
51-
"@tailwindcss/typography": "^0.5.15"
52-
}
2+
"name": "svelte-static",
3+
"version": "0.0.1",
4+
"type": "module",
5+
"scripts": {
6+
"dev": "vite dev",
7+
"build": "vite build",
8+
"preview": "vite preview",
9+
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
10+
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
11+
"format": "prettier --write .",
12+
"lint": "prettier --check . && eslint .",
13+
"obfuscate": "javascript-obfuscator ./build --output ./build",
14+
"test:unit": "vitest",
15+
"test": "npm run test:unit -- --run && npm run test:e2e",
16+
"test:e2e": "playwright test"
17+
},
18+
"devDependencies": {
19+
"@iconify/json": "^2.2.273",
20+
"@playwright/test": "^1.45.3",
21+
"@sentry/browser": "^8.40.0",
22+
"@sveltejs/adapter-static": "^3.0.6",
23+
"@sveltejs/kit": "^2.0.0",
24+
"@sveltejs/vite-plugin-svelte": "^4.0.0",
25+
"@types/eslint": "^9.6.0",
26+
"autoprefixer": "^10.4.20",
27+
"eslint": "^9.7.0",
28+
"eslint-config-prettier": "^9.1.0",
29+
"eslint-plugin-svelte": "^2.36.0",
30+
"globals": "^15.0.0",
31+
"javascript-obfuscator": "^4.1.1",
32+
"luxon": "^3.5.0",
33+
"postcss": "^8.4.49",
34+
"postcss-import": "^16.1.0",
35+
"prettier": "^3.3.2",
36+
"prettier-plugin-svelte": "^3.2.6",
37+
"prettier-plugin-tailwindcss": "^0.6.5",
38+
"svelte": "^5.0.0",
39+
"svelte-check": "^4.0.0",
40+
"tailwindcss": "^3.4.9",
41+
"typescript": "^5.0.0",
42+
"typescript-eslint": "^8.0.0",
43+
"unplugin-icons": "^0.20.1",
44+
"vite": "^5.0.3",
45+
"vitest": "^2.0.4"
46+
},
47+
"dependencies": {
48+
"@tailwindcss/aspect-ratio": "^0.4.2",
49+
"@tailwindcss/container-queries": "^0.1.1",
50+
"@tailwindcss/forms": "^0.5.9",
51+
"@tailwindcss/typography": "^0.5.15"
52+
}
5353
}

‎src/app.css

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
}
3636

3737
@layer components {
38-
button,
39-
.btn {
40-
@apply inline-block rounded-md px-4 py-2 hover:ring-1 focus:ring-2;
41-
@apply bg-blue-600 text-white;
42-
@apply dark:bg-blue-500;
43-
}
38+
button,
39+
.btn {
40+
@apply inline-block rounded-md px-4 py-2 hover:ring-1 focus:ring-2;
41+
@apply bg-blue-600 text-white;
42+
@apply dark:bg-blue-500;
43+
}
4444
}

‎src/lib/ad_campaign/service.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** The driven port of the application for reporting events related to ad campaigns. */
22
export abstract class AdCampaignService {
3-
abstract trackClick(targetId: string): void;
4-
abstract trackConversion(label: string, value?: number): void;
3+
abstract trackClick(targetId: string): void;
4+
abstract trackConversion(label: string, value?: number): void;
55
}

‎src/lib/ad_campaign/service_google_ads.ts

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
import { AdCampaignService } from './service';
22

33
declare global {
4-
interface Window {
5-
dataLayer: any[];
6-
}
4+
interface Window {
5+
dataLayer: any[];
6+
}
77
}
88

99
/**
1010
* Google Ads (AdWords) adapter for the ad campaign service.
1111
*/
1212
export class AdCampaignServiceGoogleAds extends AdCampaignService {
13-
constructor(gtagId: string) {
14-
super();
15-
const script = document.createElement('script');
16-
script.async = true;
17-
script.src = `https://www.googletagmanager.com/gtag/js?id=${gtagId}`;
18-
document.head.appendChild(script);
19-
window.dataLayer = window.dataLayer || [];
20-
this.gtag('js', new Date());
21-
this.gtag('config', gtagId);
22-
}
13+
constructor(gtagId: string) {
14+
super();
15+
const script = document.createElement('script');
16+
script.async = true;
17+
script.src = `https://www.googletagmanager.com/gtag/js?id=${gtagId}`;
18+
document.head.appendChild(script);
19+
window.dataLayer = window.dataLayer || [];
20+
this.gtag('js', new Date());
21+
this.gtag('config', gtagId);
22+
}
2323

24-
private gtag(..._: any[]): void {
25-
window.dataLayer.push(arguments);
26-
}
24+
private gtag(..._: any[]): void {
25+
window.dataLayer.push(arguments);
26+
}
2727

28-
trackClick(targetId: string): void {
29-
this.gtag('event', 'click', { targetId });
30-
}
31-
trackConversion(label: string, value?: number): void {
32-
this.gtag('event', 'conversion', { label, value });
33-
}
28+
trackClick(targetId: string): void {
29+
this.gtag('event', 'click', { targetId });
30+
}
31+
trackConversion(label: string, value?: number): void {
32+
this.gtag('event', 'conversion', { label, value });
33+
}
3434
}

‎src/lib/ad_campaign/service_mock.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import { AdCampaignService } from './service';
66
* Mock adapter for the ad campaign service that logs to the console.
77
*/
88
export class AdCampaignServiceMock extends AdCampaignService {
9-
trackClick(targetId: string): void {
10-
log.debug('AdCampaign:', 'click', targetId);
11-
}
12-
trackConversion(label: string, value?: number): void {
13-
log.debug('AdCampaign:', 'conversion', label, value);
14-
}
9+
trackClick(targetId: string): void {
10+
log.debug('AdCampaign:', 'click', targetId);
11+
}
12+
trackConversion(label: string, value?: number): void {
13+
log.debug('AdCampaign:', 'conversion', label, value);
14+
}
1515
}

‎src/lib/ad_display/service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/** The driven port of the application for loading and showing ads. */
22
export abstract class AdDisplayService {
3-
abstract loadAd(element: HTMLElement, adSlot: string, format: string): Promise<void>;
3+
abstract loadAd(element: HTMLElement, adSlot: string, format: string): Promise<void>;
44
}

‎src/lib/ad_display/service_google_adsense.ts

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
import { AdDisplayService } from './service';
22

33
declare global {
4-
interface Window {
5-
adsbygoogle: any[];
6-
}
4+
interface Window {
5+
adsbygoogle: any[];
6+
}
77
}
88

99
/**
1010
* Google AdSense adapter for the ad display service.
1111
*/
1212
export class AdDisplayServiceGoogleAdsense extends AdDisplayService {
13-
private clientId: string;
13+
private clientId: string;
1414

15-
constructor(clientId: string) {
16-
super();
17-
this.clientId = clientId;
18-
window.adsbygoogle = window.adsbygoogle || [];
19-
const script = document.createElement('script');
20-
script.async = true;
21-
script.src = `https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=${this.clientId}`;
22-
script.crossOrigin = 'anonymous';
23-
document.head.appendChild(script);
24-
}
15+
constructor(clientId: string) {
16+
super();
17+
this.clientId = clientId;
18+
window.adsbygoogle = window.adsbygoogle || [];
19+
const script = document.createElement('script');
20+
script.async = true;
21+
script.src = `https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=${this.clientId}`;
22+
script.crossOrigin = 'anonymous';
23+
document.head.appendChild(script);
24+
}
2525

26-
async loadAd(element: HTMLElement, adSlot: string, format: string = 'auto'): Promise<void> {
27-
window.adsbygoogle.push({
28-
element,
29-
adUnitPath: adSlot,
30-
format: format
31-
});
32-
return new Promise((resolve) => {
33-
element.addEventListener('load', () => resolve());
34-
});
35-
}
26+
async loadAd(element: HTMLElement, adSlot: string, format: string = 'auto'): Promise<void> {
27+
window.adsbygoogle.push({
28+
element,
29+
adUnitPath: adSlot,
30+
format: format
31+
});
32+
return new Promise((resolve) => {
33+
element.addEventListener('load', () => resolve());
34+
});
35+
}
3636
}

‎src/lib/ad_display/service_mock.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import { AdDisplayService } from './service';
22

33
/** The mock adapter for the ad display service that shows a rectangular placeholder. */
44
export class AdDisplayServiceMock extends AdDisplayService {
5-
override async loadAd(element: HTMLElement, adSlot: string, format: string): Promise<void> {
6-
element.classList.add('block', 'bg-neutral-500', 'rounded-lg', 'overflow-hidden');
7-
element.innerHTML = `
5+
override async loadAd(element: HTMLElement, adSlot: string, format: string): Promise<void> {
6+
element.classList.add('block', 'bg-neutral-500', 'rounded-lg', 'overflow-hidden');
7+
element.innerHTML = `
88
<div class="flex items-center justify-center h-full">
99
<span>Ad Placeholder ${element.offsetWidth}x${element.offsetHeight}</span>
1010
</div>
1111
`;
12-
return Promise.resolve();
13-
}
12+
return Promise.resolve();
13+
}
1414
}

‎src/lib/reporting/service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/** The driven port of the application for reporting errors to an external service. */
22
export abstract class ReportingService {
3-
abstract reportError(error: any, message?: string): Promise<void>;
3+
abstract reportError(error: any, message?: string): Promise<void>;
44
}

‎src/lib/reporting/service_mock.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { ReportingService } from './service';
66
* Mock adapter for the reporting service that logs to the console.
77
*/
88
export class ReportingServiceMock extends ReportingService {
9-
override async reportError(error: any, message?: string): Promise<void> {
10-
log.error('Reporting:', message, error);
11-
}
9+
override async reportError(error: any, message?: string): Promise<void> {
10+
log.error('Reporting:', message, error);
11+
}
1212
}

‎src/lib/reporting/service_sentry.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import { ReportingService } from './service';
66
* Sentry adapter for the reporting service.
77
*/
88
export class ReportingServiceSentry extends ReportingService {
9-
constructor(dsn: string) {
10-
super();
11-
Sentry.init({ dsn });
12-
}
9+
constructor(dsn: string) {
10+
super();
11+
Sentry.init({ dsn });
12+
}
1313

14-
override async reportError(error: any, message?: string): Promise<void> {
15-
if (message) {
16-
Sentry.captureException(error, { extra: { message: message } });
17-
} else {
18-
Sentry.captureException(error);
19-
}
20-
}
14+
override async reportError(error: any, message?: string): Promise<void> {
15+
if (message) {
16+
Sentry.captureException(error, { extra: { message: message } });
17+
} else {
18+
Sentry.captureException(error);
19+
}
20+
}
2121
}

‎src/lib/telemetry/service_mock.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import { TelemetryService } from './service';
66
* Mock adapter for the telemetry service that logs to the console.
77
*/
88
export class TelemetryServiceMock extends TelemetryService {
9-
pageView(path: string): void {
10-
log.debug('Telemetry:', 'page_view', path);
11-
}
9+
pageView(path: string): void {
10+
log.debug('Telemetry:', 'page_view', path);
11+
}
1212

13-
event(name: string, params?: Record<string, any>): void {
14-
log.debug('Telemetry:', 'event', name, params);
15-
}
13+
event(name: string, params?: Record<string, any>): void {
14+
log.debug('Telemetry:', 'event', name, params);
15+
}
1616

17-
timing(name: string, value: number): void {
18-
log.debug('Telemetry:', 'timing_complete', name, value);
19-
}
17+
timing(name: string, value: number): void {
18+
log.debug('Telemetry:', 'timing_complete', name, value);
19+
}
2020
}

0 commit comments

Comments
 (0)