Apply prettier after merge

duckduckgo · Nov 4, 2024 · 6b16914 · 6b16914
1 parent 6ebad46
commit 6b16914
Show file tree

Hide file tree

Showing 19 changed files with 183 additions and 209 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -8,21 +8,21 @@ export default tseslint.config(
     ...tseslint.configs.recommended,
     {
         ignores: [
-            "**/build/",
-            "**/docs/",
-            "injected/lib",
-            "Sources/ContentScopeScripts/dist/",
-            "injected/integration-test/extension/contentScope.js",
-            "injected/integration-test/test-pages/duckplayer/scripts/dist",
-            "special-pages/pages/**/public",
-            "special-pages/playwright-report/",
-            "special-pages/test-results/",
-            "special-pages/types/",
-            "special-pages/messages/",
-            "playwright-report",
-            "test-results",
-            "injected/src/types",
-            ".idea"
+            '**/build/',
+            '**/docs/',
+            'injected/lib',
+            'Sources/ContentScopeScripts/dist/',
+            'injected/integration-test/extension/contentScope.js',
+            'injected/integration-test/test-pages/duckplayer/scripts/dist',
+            'special-pages/pages/**/public',
+            'special-pages/playwright-report/',
+            'special-pages/test-results/',
+            'special-pages/types/',
+            'special-pages/messages/',
+            'playwright-report',
+            'test-results',
+            'injected/src/types',
+            '.idea',
         ],
     },
     {

diff --git a/special-pages/messages/new-tab/examples/stats.js b/special-pages/messages/new-tab/examples/stats.js
@@ -14,8 +14,8 @@ const privacyStatsData = {
  * @type {import("../../../types/new-tab").StatsConfig}
  */
 const minimumConfig = {
-    expansion: "expanded",
-    animation: { kind: "none" }
+    expansion: 'expanded',
+    animation: { kind: 'none' },
 }
 
 /**

diff --git a/special-pages/pages/new-tab/app/components/Components.jsx b/special-pages/pages/new-tab/app/components/Components.jsx
@@ -1,28 +1,26 @@
-import { Fragment, h } from "preact";
-import styles from "./Components.module.css";
-import { mainExamples, otherExamples } from "./Examples.jsx";
-import { updateNotificationExamples } from "../update-notification/UpdateNotification.examples.js";
-const url = new URL(window.location.href);
+import { Fragment, h } from 'preact'
+import styles from './Components.module.css'
+import { mainExamples, otherExamples } from './Examples.jsx'
+import { updateNotificationExamples } from '../update-notification/UpdateNotification.examples.js'
+const url = new URL(window.location.href)
 
 const list = {
     ...mainExamples,
     ...otherExamples,
-    ...updateNotificationExamples
+    ...updateNotificationExamples,
 }
 
-const entries = Object.entries(list);
+const entries = Object.entries(list)
 
 export function Components() {
-    const ids = url.searchParams.getAll("id");
-    const isolated = url.searchParams.has("isolate");
-    const e2e = url.searchParams.has("e2e");
-    const entryIds = entries.map(([id]) => id);
+    const ids = url.searchParams.getAll('id')
+    const isolated = url.searchParams.has('isolate')
+    const e2e = url.searchParams.has('e2e')
+    const entryIds = entries.map(([id]) => id)
 
     const validIds = ids.filter((id) => entryIds.includes(id))
 
-    const filtered = validIds.length
-        ? validIds.map((id) => /** @type {const} */([id, list[id]]))
-        : entries
+    const filtered = validIds.length ? validIds.map((id) => /** @type {const} */ ([id, list[id]])) : entries
 
     if (isolated) {
         return <Isolated entries={filtered} e2e={e2e} />

diff --git a/special-pages/pages/new-tab/app/components/Layout.js b/special-pages/pages/new-tab/app/components/Layout.js
@@ -1,9 +1,5 @@
 import { h } from 'preact'
 
-export function Centered ({ children }) {
-    return (
-        <div class="layout-centered">
-            {children}
-        </div>
-    )
+export function Centered({ children }) {
+    return <div class="layout-centered">{children}</div>
 }
diff --git a/special-pages/pages/new-tab/app/customizer/Customizer.js b/special-pages/pages/new-tab/app/customizer/Customizer.js
@@ -82,11 +82,11 @@ export function useContextMenu() {
             const items = getItems()
             /** @type {VisibilityMenuItem[]} */
             const simplified = items
-                .filter(x => x.id !== 'debug')
-                .map(item => {
+                .filter((x) => x.id !== 'debug')
+                .map((item) => {
                     return {
                         id: item.id,
-                        title: item.title
+                        title: item.title,
                     }
                 })
             messaging.contextMenu({ visibilityMenuItems: simplified })

diff --git a/special-pages/pages/new-tab/app/entry-points/favorites.js b/special-pages/pages/new-tab/app/entry-points/favorites.js
@@ -2,10 +2,10 @@ import { h } from 'preact'
 import { FavoritesCustomized } from '../favorites/Favorites.js'
 import { Centered } from '../components/Layout.js'
 
-export function factory () {
+export function factory() {
     return (
         <Centered>
-            <FavoritesCustomized/>
+            <FavoritesCustomized />
         </Centered>
     )
 }
diff --git a/special-pages/pages/new-tab/app/entry-points/privacyStats.js b/special-pages/pages/new-tab/app/entry-points/privacyStats.js
@@ -2,7 +2,7 @@ import { h } from 'preact'
 import { PrivacyStatsCustomized } from '../privacy-stats/PrivacyStats.js'
 import { Centered } from '../components/Layout.js'
 
-export function factory () {
+export function factory() {
     return (
         <Centered>
             <PrivacyStatsCustomized />

diff --git a/special-pages/pages/new-tab/app/entry-points/rmf.js b/special-pages/pages/new-tab/app/entry-points/rmf.js
@@ -3,11 +3,11 @@ import { Centered } from '../components/Layout.js'
 import { RMFConsumer } from '../remote-messaging-framework/RemoteMessagingFramework.js'
 import { RMFProvider } from '../remote-messaging-framework/RMFProvider.js'
 
-export function factory () {
+export function factory() {
     return (
         <Centered>
             <RMFProvider>
-                <RMFConsumer/>
+                <RMFConsumer />
             </RMFProvider>
         </Centered>
     )

diff --git a/special-pages/pages/new-tab/app/entry-points/updateNotification.js b/special-pages/pages/new-tab/app/entry-points/updateNotification.js
@@ -2,7 +2,7 @@ import { h } from 'preact'
 import { UpdateNotificationConsumer } from '../update-notification/UpdateNotification.js'
 import { UpdateNotificationProvider } from '../update-notification/UpdateNotificationProvider.js'
 
-export function factory () {
+export function factory() {
     return (
         <UpdateNotificationProvider>
             <UpdateNotificationConsumer />

diff --git a/special-pages/pages/new-tab/app/favorites/Favorites.js b/special-pages/pages/new-tab/app/favorites/Favorites.js
@@ -15,6 +15,8 @@ export function FavoritesCustomized() {
         return null
     }
     return (
-        <p>Favourites here... (id: <code>{id}</code>)</p>
+        <p>
+            Favourites here... (id: <code>{id}</code>)
+        </p>
     )
 }
diff --git a/special-pages/pages/new-tab/app/index.js b/special-pages/pages/new-tab/app/index.js
@@ -11,7 +11,7 @@ import enStrings from '../src/locales/en/newtab.json'
 import { WidgetConfigProvider } from './widget-list/widget-config.provider.js'
 import { Settings } from './settings.js'
 import { Components } from './components/Components.jsx'
-import { widgetEntryPoint } from "./widget-list/WidgetList.js";
+import { widgetEntryPoint } from './widget-list/WidgetList.js'
 
 /**
  * @param {import("../src/js").NewTabPage} messaging
@@ -67,7 +67,6 @@ export async function init(messaging, baseEnvironment) {
 
     document.body.dataset.platformName = settings.platform.name
 
-
     if (environment.display === 'components') {
         document.body.dataset.display = 'components'
         return render(
@@ -84,15 +83,15 @@ export async function init(messaging, baseEnvironment) {
 
     const entryPoints = await (async () => {
         try {
-            const loaders = init.widgets.map(widget => {
-                return widgetEntryPoint(widget.id).then(mod => [widget.id, mod]);
+            const loaders = init.widgets.map((widget) => {
+                return widgetEntryPoint(widget.id).then((mod) => [widget.id, mod])
             })
             const entryPoints = await Promise.all(loaders)
-            return Object.fromEntries(entryPoints);
+            return Object.fromEntries(entryPoints)
         } catch (e) {
-            const error = new Error('Error loading widget entry points:' + e.message);
+            const error = new Error('Error loading widget entry points:' + e.message)
             didCatch(error)
-            console.error(error);
+            console.error(error)
             return {}
         }
     })()
@@ -110,7 +109,12 @@ export async function init(messaging, baseEnvironment) {
                     <InitialSetupContext.Provider value={init}>
                         <SettingsProvider settings={settings}>
                             <TranslationProvider translationObject={strings} fallback={strings} textLength={environment.textLength}>
-                                <WidgetConfigProvider api={widgetConfigAPI} widgetConfigs={init.widgetConfigs} widgets={init.widgets} entryPoints={entryPoints}>
+                                <WidgetConfigProvider
+                                    api={widgetConfigAPI}
+                                    widgetConfigs={init.widgetConfigs}
+                                    widgets={init.widgets}
+                                    entryPoints={entryPoints}
+                                >
                                     <App />
                                 </WidgetConfigProvider>
                             </TranslationProvider>

diff --git a/special-pages/pages/new-tab/app/remote-messaging-framework/RemoteMessagingFramework.js b/special-pages/pages/new-tab/app/remote-messaging-framework/RemoteMessagingFramework.js
@@ -17,7 +17,7 @@ import { Cross } from '../components/Icons.js'
 export function RemoteMessagingFramework({ message, primaryAction, secondaryAction, dismiss }) {
     const { id, messageType, titleText, descriptionText } = message
     return (
-        <div id={id} class={cn(styles.root, (messageType !== 'small' && message.icon) && styles.icon)}>
+        <div id={id} class={cn(styles.root, messageType !== 'small' && message.icon && styles.icon)}>
             {messageType !== 'small' && message.icon && (
                 <span class={styles.iconBlock}>
                     <img src={`./icons/${message.icon}.svg`} alt="" />

diff --git a/special-pages/pages/new-tab/app/update-notification/UpdateNotification.examples.js b/special-pages/pages/new-tab/app/update-notification/UpdateNotification.examples.js
@@ -5,20 +5,12 @@ import { noop } from '../utils.js'
 export const updateNotificationExamples = {
     empty: {
         factory: () => {
-            return <UpdateNotification
-                notes={[]}
-                version={'1.2.3'}
-                dismiss={noop('dismiss!')}
-            />
-        }
+            return <UpdateNotification notes={[]} version={'1.2.3'} dismiss={noop('dismiss!')} />
+        },
     },
     populated: {
         factory: () => {
-            return <UpdateNotification
-                notes={['Bug Fixed and Updates']}
-                version={'1.2.3'}
-                dismiss={noop('dismiss!')}
-            />
-        }
-    }
+            return <UpdateNotification notes={['Bug Fixed and Updates']} version={'1.2.3'} dismiss={noop('dismiss!')} />
+        },
+    },
 }
diff --git a/special-pages/pages/new-tab/app/update-notification/UpdateNotification.js b/special-pages/pages/new-tab/app/update-notification/UpdateNotification.js
@@ -33,7 +33,7 @@ export function UpdateNotification({ notes, dismiss, version }) {
     )
 }
 
-export function WithNotes ({ notes, version }) {
+export function WithNotes({ notes, version }) {
     const id = useId()
     const ref = useRef(/** @type {HTMLDetailsElement|null} */ (null))
     const { t } = useTypedTranslation()
@@ -79,13 +79,7 @@ export function UpdateNotificationConsumer() {
 
     // `state.data.content` can be empty - meaning there's no message to display!
     if (state.status === 'ready' && state.data.content) {
-        return (
-            <UpdateNotification
-                notes={state.data.content.notes}
-                version={state.data.content.version}
-                dismiss={dismiss}
-            />
-        )
+        return <UpdateNotification notes={state.data.content.notes} version={state.data.content.version} dismiss={dismiss} />
     }
     return null
 }
diff --git a/special-pages/pages/new-tab/app/update-notification/update-notification.service.js b/special-pages/pages/new-tab/app/update-notification/update-notification.service.js
@@ -44,8 +44,8 @@ export class UpdateNotificationService {
      */
     dismiss() {
         this.ntp.messaging.notify('updateNotification_dismiss')
-         
-        this.dataService.update(_old => {
+
+        this.dataService.update((_old) => {
             return { content: null }
         })
     }

diff --git a/special-pages/pages/new-tab/app/widget-list/WidgetList.js b/special-pages/pages/new-tab/app/widget-list/WidgetList.js
@@ -2,30 +2,26 @@ import { Fragment, h } from 'preact'
 import { WidgetConfigContext, WidgetVisibilityProvider } from './widget-config.provider.js'
 import { useContext } from 'preact/hooks'
 import { Stack } from '../../../onboarding/app/components/Stack.js'
-import {
-    Customizer,
-    CustomizerMenuPositionedFixed
-} from '../customizer/Customizer.js'
+import { Customizer, CustomizerMenuPositionedFixed } from '../customizer/Customizer.js'
 
 /**
  * @param {string} id
  * @return {{factory: () => import("preact").ComponentChild}}
  */
-function placeholderWidget (id) {
+function placeholderWidget(id) {
     return {
         factory: () => {
             return <p>Entry point for {id} was not found. This is a bug.</p>
-        }
+        },
     }
 }
 
 /**
  * @param {string} id
  * @return {Promise<{factory: () => import("preact").ComponentChild}>}
  */
-export async function widgetEntryPoint (id) {
+export async function widgetEntryPoint(id) {
     try {
-
         const mod = await import(`../entry-points/${id}.js`)
         if (typeof mod.factory !== 'function') {
             console.error(`module found for ${id}, but missing 'factory' export`)
@@ -36,30 +32,22 @@ export async function widgetEntryPoint (id) {
         console.error(e)
         return placeholderWidget(id)
     }
-};
+}
 
-export function WidgetList () {
+export function WidgetList() {
     const { widgets, widgetConfigItems, entryPoints } = useContext(WidgetConfigContext)
 
     return (
         <Stack gap={'var(--sp-8)'}>
             {widgets.map((widget, index) => {
-                const matchingConfig = widgetConfigItems.find(item => item.id === widget.id)
+                const matchingConfig = widgetConfigItems.find((item) => item.id === widget.id)
                 const matchingEntryPoint = entryPoints[widget.id]
                 if (!matchingConfig) {
-                    return (
-                        <Fragment key={widget.id}>
-                            {matchingEntryPoint.factory?.()}
-                        </Fragment>
-                    )
+                    return <Fragment key={widget.id}>{matchingEntryPoint.factory?.()}</Fragment>
                 }
                 return (
                     <Fragment key={widget.id}>
-                        <WidgetVisibilityProvider
-                            visibility={matchingConfig.visibility}
-                            id={matchingConfig.id}
-                            index={index}
-                        >
+                        <WidgetVisibilityProvider visibility={matchingConfig.visibility} id={matchingConfig.id} index={index}>
                             {matchingEntryPoint.factory?.()}
                         </WidgetVisibilityProvider>
                     </Fragment>