From e23bc4d2e5ea43aa9e6725abeee5f6d12a333b3d Mon Sep 17 00:00:00 2001 From: Tim van der Lippe Date: Wed, 20 Oct 2021 12:21:56 +0100 Subject: [PATCH] Update Prettier Also manually run prettier on `src/` and `lib/` to ensure consistent formatting. --- lib/entry-data-plugin.js | 4 ++- package-lock.json | 14 ++++---- package.json | 2 +- .../lazy-app/Compress/Options/index.tsx | 31 +++++++++--------- .../encoders/oxiPNG/worker/oxipngEncode.ts | 8 +++-- .../custom-els/loading-spinner/index.ts | 4 +-- src/shared/custom-els/snack-bar/index.ts | 4 +-- src/sw/to-cache.ts | 32 ++++++++----------- 8 files changed, 49 insertions(+), 50 deletions(-) diff --git a/lib/entry-data-plugin.js b/lib/entry-data-plugin.js index f4bc86c5..d131e1ae 100644 --- a/lib/entry-data-plugin.js +++ b/lib/entry-data-plugin.js @@ -77,7 +77,9 @@ export default function entryDataPlugin() { } return JSON.stringify( - getDependencies(chunks, chunk).map((filename) => fileNameToURL(filename)), + getDependencies(chunks, chunk).map((filename) => + fileNameToURL(filename), + ), ); }, ); diff --git a/package-lock.json b/package-lock.json index cad3c5f8..8cbcdd20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "postcss-url": "^8.0.0", "preact": "^10.5.5", "preact-render-to-string": "^5.1.11", - "prettier": "^2.1.2", + "prettier": "^2.4.1", "rollup": "^2.38.0", "rollup-plugin-terser": "^7.0.2", "serve": "^11.3.2", @@ -7529,9 +7529,9 @@ } }, "node_modules/prettier": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", - "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", + "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -15029,9 +15029,9 @@ } }, "prettier": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", - "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", + "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", "dev": true }, "pretty-format": { diff --git a/package.json b/package.json index e381c971..701cc340 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "postcss-url": "^8.0.0", "preact": "^10.5.5", "preact-render-to-string": "^5.1.11", - "prettier": "^2.1.2", + "prettier": "^2.4.1", "rollup": "^2.38.0", "rollup-plugin-terser": "^7.0.2", "serve": "^11.3.2", diff --git a/src/client/lazy-app/Compress/Options/index.tsx b/src/client/lazy-app/Compress/Options/index.tsx index 7f531098..3c23e4dc 100644 --- a/src/client/lazy-app/Compress/Options/index.tsx +++ b/src/client/lazy-app/Compress/Options/index.tsx @@ -40,24 +40,23 @@ type PartialButNotUndefined = { [P in keyof T]: T[P]; }; -const supportedEncoderMapP: Promise> = (async () => { - const supportedEncoderMap: PartialButNotUndefined = { - ...encoderMap, - }; +const supportedEncoderMapP: Promise> = + (async () => { + const supportedEncoderMap: PartialButNotUndefined = { + ...encoderMap, + }; - // Filter out entries where the feature test fails - await Promise.all( - Object.entries(encoderMap).map(async ([encoderName, details]) => { - if ('featureTest' in details && !(await details.featureTest())) { - delete supportedEncoderMap[encoderName as keyof typeof encoderMap]; - } - }), - ); + // Filter out entries where the feature test fails + await Promise.all( + Object.entries(encoderMap).map(async ([encoderName, details]) => { + if ('featureTest' in details && !(await details.featureTest())) { + delete supportedEncoderMap[encoderName as keyof typeof encoderMap]; + } + }), + ); - return supportedEncoderMap; -})(); + return supportedEncoderMap; + })(); export default class Options extends Component { state: State = { diff --git a/src/features/encoders/oxiPNG/worker/oxipngEncode.ts b/src/features/encoders/oxiPNG/worker/oxipngEncode.ts index c71525ea..e047ed77 100644 --- a/src/features/encoders/oxiPNG/worker/oxipngEncode.ts +++ b/src/features/encoders/oxiPNG/worker/oxipngEncode.ts @@ -14,9 +14,11 @@ import { EncodeOptions } from '../shared/meta'; import { threads } from 'wasm-feature-detect'; async function initMT() { - const { default: init, initThreadPool, optimise } = await import( - 'codecs/oxipng/pkg-parallel/squoosh_oxipng' - ); + const { + default: init, + initThreadPool, + optimise, + } = await import('codecs/oxipng/pkg-parallel/squoosh_oxipng'); await init(); await initThreadPool(navigator.hardwareConcurrency); return optimise; diff --git a/src/shared/custom-els/loading-spinner/index.ts b/src/shared/custom-els/loading-spinner/index.ts index 2985b6d9..7cd1bb6f 100644 --- a/src/shared/custom-els/loading-spinner/index.ts +++ b/src/shared/custom-els/loading-spinner/index.ts @@ -2,9 +2,9 @@ import * as styles from './styles.css'; import 'add-css:./styles.css'; // So it doesn't cause an error when running in node -const HTMLEl = ((__PRERENDER__ +const HTMLEl = (__PRERENDER__ ? Object - : HTMLElement) as unknown) as typeof HTMLElement; + : HTMLElement) as unknown as typeof HTMLElement; /** * A simple spinner. This custom element has no JS API. Just put it in the document, and it'll diff --git a/src/shared/custom-els/snack-bar/index.ts b/src/shared/custom-els/snack-bar/index.ts index f8c5fd25..c844f35a 100644 --- a/src/shared/custom-els/snack-bar/index.ts +++ b/src/shared/custom-els/snack-bar/index.ts @@ -2,9 +2,9 @@ import * as style from './styles.css'; import 'add-css:./styles.css'; // So it doesn't cause an error when running in node -const HTMLEl = ((__PRERENDER__ +const HTMLEl = (__PRERENDER__ ? Object - : HTMLElement) as unknown) as typeof HTMLElement; + : HTMLElement) as unknown as typeof HTMLElement; export interface SnackOptions { timeout?: number; diff --git a/src/sw/to-cache.ts b/src/sw/to-cache.ts index bad10ef0..4f90bb4f 100644 --- a/src/sw/to-cache.ts +++ b/src/sw/to-cache.ts @@ -82,24 +82,20 @@ initialJs = subtractSets( export const initial = ['/', ...initialJs]; export const theRest = (async () => { - const [ - supportsThreads, - supportsSimd, - supportsWebP, - supportsAvif, - ] = await Promise.all([ - threads(), - simd(), - ...[webpDataUrl, avifDataUrl].map(async (dataUrl) => { - if (!self.createImageBitmap) return false; - const response = await fetch(dataUrl); - const blob = await response.blob(); - return createImageBitmap(blob).then( - () => true, - () => false, - ); - }), - ]); + const [supportsThreads, supportsSimd, supportsWebP, supportsAvif] = + await Promise.all([ + threads(), + simd(), + ...[webpDataUrl, avifDataUrl].map(async (dataUrl) => { + if (!self.createImageBitmap) return false; + const response = await fetch(dataUrl); + const blob = await response.blob(); + return createImageBitmap(blob).then( + () => true, + () => false, + ); + }), + ]); const items: string[] = [];