From 042677856f3895f135d06d77510529f74d55149d Mon Sep 17 00:00:00 2001 From: Jon McClure Date: Thu, 4 Jan 2024 17:30:48 +0000 Subject: [PATCH 1/9] lint workflow and eslint fixes --- .github/workflows/release.yaml | 35 +++ .vscode/settings.json | 2 +- package.json | 7 +- src/components/Article/Article.stories.svelte | 3 +- src/components/BeforeAfter/BeforeAfter.svelte | 14 +- src/components/Block/Block.stories.svelte | 3 +- .../BodyText/BodyText.stories.svelte | 27 +- .../EmbedPreviewerLink.svelte | 5 +- src/components/Framer/Framer.svelte | 2 +- src/components/Framer/Resizer/index.svelte | 1 + src/components/Framer/Typeahead/index.svelte | 41 +-- .../Headline/stories/graphic.svelte | 8 +- src/components/HeroHeadline/Hero.svelte | 20 -- .../stories/graphics/crash.svelte | 2 +- .../stories/graphics/quakemap.svelte | 6 - src/components/PhotoPack/docProps.ts | 24 +- src/components/Scroller/Embedded/index.svelte | 22 +- .../components/ai2svelte/ai-scroller-2.svelte | 7 +- .../components/ai2svelte/ai-scroller-3.svelte | 7 +- .../basic/InteractiveForeground.svelte | 6 +- .../stories/components/basic/Step.svelte | 17 +- src/components/Sharer/Sharer.svelte | 249 +++++++++--------- src/components/Video/Controls.svelte | 2 +- src/docs/docs-components/.eslintrc.cjs | 2 +- src/docs/utils/docsPage.js | 4 +- src/index.js | 4 +- tsconfig.json | 70 ++--- yarn.lock | 138 ++++++---- 28 files changed, 389 insertions(+), 339 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 92480385..5ecd6f85 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -6,6 +6,41 @@ on: workflow_dispatch: jobs: + lint: + name: Lint + runs-on: ubuntu-latest + steps: + - id: checkout + name: Checkout repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 + ref: ${{ github.event.repository.default_branch }} + + - id: setup-node + name: Setup Node.JS + uses: actions/setup-node@v3 + with: + node-version: 16 + cache: 'yarn' + + - id: cache + name: Cache node modules + uses: actions/cache@v3 + with: + path: node_modules + key: yarn-deps-${{ hashFiles('yarn.lock') }} + restore-keys: | + yarn-deps-${{ hashFiles('yarn.lock') }} + + - id: install-deps + name: Install dependencies + run: yarn install --frozen-lockfile + + - id: lint + name: Lint code + run: yarn run eslint --ext .ts,.js,.svelte src + release: name: Release runs-on: ubuntu-latest diff --git a/.vscode/settings.json b/.vscode/settings.json index 84a3065a..eafbee6d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,7 +4,7 @@ "eslint.validate": ["javascript", "svelte", "jsx"], "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "emmet.excludeLanguages": [ "markdown", diff --git a/package.json b/package.json index aefa9448..5991485a 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "scripts": { "start": "storybook dev -p 3000", "new": "node ./bin/newComponent/index.cjs", + "lint": "npx eslint --fix --ext .ts,.js,.svelte src", "build:package": "node ./bin/buildPackage/index.js", "build:chromatic": "storybook build -o docs", "build:docs": "storybook build -o docs && touch ./docs/.nojekyll", @@ -68,8 +69,8 @@ "colord": "^2.9.3", "css-color-converter": "^2.0.0", "deep-object-diff": "^1.1.9", - "eslint": "^8.42.0", - "eslint-config-prettier": "^8.8.0", + "eslint": "^8.56.0", + "eslint-config-prettier": "^9.1.0", "eslint-config-standard-jsx": "^11.0.0", "eslint-config-standard-react": "^13.0.0", "eslint-plugin-import": "^2.27.5", @@ -78,7 +79,7 @@ "eslint-plugin-promise": "^6.1.1", "eslint-plugin-react": "^7.32.2", "eslint-plugin-storybook": "^0.6.12", - "eslint-plugin-svelte": "^2.33.1", + "eslint-plugin-svelte": "^2.35.1", "fs-extra": "^11.1.1", "kleur": "^4.1.5", "mermaid": "^10.3.0", diff --git a/src/components/Article/Article.stories.svelte b/src/components/Article/Article.stories.svelte index 29877c43..efa0b4c4 100644 --- a/src/components/Article/Article.stories.svelte +++ b/src/components/Article/Article.stories.svelte @@ -75,8 +75,9 @@ + \ No newline at end of file + diff --git a/src/components/Framer/Framer.svelte b/src/components/Framer/Framer.svelte index 683980e7..cdd9acbc 100644 --- a/src/components/Framer/Framer.svelte +++ b/src/components/Framer/Framer.svelte @@ -28,7 +28,7 @@ $: embedTitles = getUniqNames(embeds); // @ts-ignore - let pymParent; + let pymParent; // eslint-disable-line no-unused-vars const reframe = (embed) => { // Bit of hack for handling adding query strings dynamically to embeds. diff --git a/src/components/Framer/Resizer/index.svelte b/src/components/Framer/Resizer/index.svelte index 7e950af5..92e2c6eb 100644 --- a/src/components/Framer/Resizer/index.svelte +++ b/src/components/Framer/Resizer/index.svelte @@ -106,6 +106,7 @@
', post: '', extract }; + $: results = + value !== '' + ? fuzzy + .filter(value, data, options) + .filter(({ score }) => score > 0) + .slice(0, limit) + .filter((result) => !filter(result.original)) + .map((result) => ({ ...result, disabled: disable(result.original) })) + : data.map((d) => ({ string: extract(d), original: d })); + + $: resultsId = results.map((result) => extract(result.original)).join(''); + $: showResults = !hideDropdown && results.length > 0 && isFocused; + $: if (showDropdownOnFocus) { + showResults = showResults && isFocused; + } + afterUpdate(() => { if (prevResults !== resultsId && autoselect) { selectedIndex = getNextNonDisabledIndex(); @@ -137,23 +154,6 @@ const open = () => (hideDropdown = false); const close = () => (hideDropdown = true); - - $: options = { pre: '', post: '', extract }; - $: results = - value !== '' - ? fuzzy - .filter(value, data, options) - .filter(({ score }) => score > 0) - .slice(0, limit) - .filter((result) => !filter(result.original)) - .map((result) => ({ ...result, disabled: disable(result.original) })) - : data.map((d) => ({ string: extract(d), original: d })); - - $: resultsId = results.map((result) => extract(result.original)).join(''); - $: showResults = !hideDropdown && results.length > 0 && isFocused; - $: if (showDropdownOnFocus) { - showResults = showResults && isFocused; - }
@@ -349,7 +346,6 @@
+ \ No newline at end of file + .step { + width: 100vw; + max-width: 100%; + margin: 0 auto; + height: 400px; + } + diff --git a/src/components/Sharer/Sharer.svelte b/src/components/Sharer/Sharer.svelte index 8651c74c..875e9c78 100644 --- a/src/components/Sharer/Sharer.svelte +++ b/src/components/Sharer/Sharer.svelte @@ -1,153 +1,150 @@ - -
-
+
+
- -
- \ No newline at end of file + @media only screen and (max-width: 600px) { + .sharetool button { + font-size: 1.75rem; + height: 3rem; + width: 3rem; + } + .drawer { + width: calc(3rem + 4px); + } + .drawer.active { + width: calc(9.5rem + 4px); + } + } + diff --git a/src/components/Video/Controls.svelte b/src/components/Video/Controls.svelte index 692a9665..b76e000d 100644 --- a/src/components/Video/Controls.svelte +++ b/src/components/Video/Controls.svelte @@ -29,7 +29,7 @@