From df2c572235a53e2d3810103942e67a3d9d59f19d Mon Sep 17 00:00:00 2001 From: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com> Date: Mon, 19 Sep 2022 15:49:54 -0800 Subject: [PATCH 1/3] Moved `/legacy/` to `/src/lib/public/legacy/` --- package.json | 3 ++- src/lib/components/nav/bar.svelte | 2 +- src/lib/components/toaster/toasts.ts | 2 +- src/lib/{ => public}/legacy/README.md | 0 src/lib/{ => public}/legacy/acm-paths.test.ts | 0 src/lib/{ => public}/legacy/acm-paths.ts | 0 src/lib/{ => public}/legacy/spacing.svelte | 0 src/lib/{ => public}/legacy/theme.ts | 0 src/routes/+layout.svelte | 2 +- src/routes/+page.svelte | 2 +- src/routes/acm-paths.svelte | 2 +- 11 files changed, 7 insertions(+), 6 deletions(-) rename src/lib/{ => public}/legacy/README.md (100%) rename src/lib/{ => public}/legacy/acm-paths.test.ts (100%) rename src/lib/{ => public}/legacy/acm-paths.ts (100%) rename src/lib/{ => public}/legacy/spacing.svelte (100%) rename src/lib/{ => public}/legacy/theme.ts (100%) diff --git a/package.json b/package.json index 9f42571ec..4974b8cdd 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "url": "https://github.com/EthanThatOneKid/acmcsuf.com.git/" }, "scripts": { + "start": "npm run dev", "dev": "vite dev", "build": "vite build", "preview": "vite preview", @@ -23,7 +24,7 @@ "lint": "eslint . --fix", "format": "prettier --write .", "host": "npm run all && npm run preview", - "all": "npm run lint && npm run format && npm run check && npm t && npm run build" + "all": "npm run lint && npm run format && npm run check && npm run build && npm t" }, "devDependencies": { "@playwright/test": "^1.25.0", diff --git a/src/lib/components/nav/bar.svelte b/src/lib/components/nav/bar.svelte index 31acf6ca1..0e462d6a2 100644 --- a/src/lib/components/nav/bar.svelte +++ b/src/lib/components/nav/bar.svelte @@ -4,7 +4,7 @@ import Toggle from '$lib/components/toggle/toggle.svelte'; import ThemeLight from '$lib/components/svg/theme-light.svelte'; import ThemeDark from '$lib/components/svg/theme-dark.svelte'; - import { AcmTheme, theme } from '$lib/legacy/theme'; + import { AcmTheme, theme } from '$lib/public/legacy/theme'; let jsEnabled = false; onMount(() => (jsEnabled = true)); diff --git a/src/lib/components/toaster/toasts.ts b/src/lib/components/toaster/toasts.ts index 4af6acceb..69493c662 100644 --- a/src/lib/components/toaster/toasts.ts +++ b/src/lib/components/toaster/toasts.ts @@ -1,4 +1,4 @@ -import { acmGeneral } from '$lib/legacy/acm-paths'; +import { acmGeneral } from '$lib/public/legacy/acm-paths'; import { writable } from 'svelte/store'; const MAX_TOASTS = 4; diff --git a/src/lib/legacy/README.md b/src/lib/public/legacy/README.md similarity index 100% rename from src/lib/legacy/README.md rename to src/lib/public/legacy/README.md diff --git a/src/lib/legacy/acm-paths.test.ts b/src/lib/public/legacy/acm-paths.test.ts similarity index 100% rename from src/lib/legacy/acm-paths.test.ts rename to src/lib/public/legacy/acm-paths.test.ts diff --git a/src/lib/legacy/acm-paths.ts b/src/lib/public/legacy/acm-paths.ts similarity index 100% rename from src/lib/legacy/acm-paths.ts rename to src/lib/public/legacy/acm-paths.ts diff --git a/src/lib/legacy/spacing.svelte b/src/lib/public/legacy/spacing.svelte similarity index 100% rename from src/lib/legacy/spacing.svelte rename to src/lib/public/legacy/spacing.svelte diff --git a/src/lib/legacy/theme.ts b/src/lib/public/legacy/theme.ts similarity index 100% rename from src/lib/legacy/theme.ts rename to src/lib/public/legacy/theme.ts diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 5b559830f..30fefc776 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -2,7 +2,7 @@ import Navbar from '$lib/components/nav/bar.svelte'; import Footer from '$lib/components/footer/footer.svelte'; import AcmToaster from '$lib/components/toaster/toaster.svelte'; - import { AcmTheme, theme } from '$lib/legacy/theme'; + import { AcmTheme, theme } from '$lib/public/legacy/theme'; import { onMount } from 'svelte'; function changeTheme(event: MediaQueryListEvent) { diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index e95c97580..89c9732d7 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,5 +1,5 @@
From 385567f95dcbcdcb466f636b36f66244110e96c5 Mon Sep 17 00:00:00 2001 From: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com> Date: Mon, 19 Sep 2022 15:55:02 -0800 Subject: [PATCH 2/3] Using microsoft/playwright-github-action for Website Check See: --- .github/workflows/check_website.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check_website.yaml b/.github/workflows/check_website.yaml index 0f6c84920..8a5d6d464 100644 --- a/.github/workflows/check_website.yaml +++ b/.github/workflows/check_website.yaml @@ -47,6 +47,7 @@ jobs: run: npm run check - name: Test + uses: microsoft/playwright-github-action@v1 run: npm run test # info: https://etok.codes/acmcsuf.com/blob/main/CONTRIBUTING.md#npm-bloat From cb3e7dd294617cfba063c048681d4e8eb728110c Mon Sep 17 00:00:00 2001 From: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com> Date: Mon, 19 Sep 2022 16:04:56 -0800 Subject: [PATCH 3/3] Force comma-dangle for only-multiline --- .eslintrc.cjs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 5c988649e..9bc2de464 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -16,6 +16,8 @@ module.exports = { indent: ['error', 2, { SwitchCase: 1 }], 'func-style': ['error', 'declaration', { allowArrowFunctions: false }], 'prefer-arrow-callback': 'error', + 'comma-dangle': 'off', + '@typescript-eslint/comma-dangle': ['error', 'only-multiline'], '@typescript-eslint/no-unused-vars': 'error', '@typescript-eslint/consistent-type-definitions': ['error', 'interface'], },