From c6ba6ec4d9d439da9fa49b9aeae69206e1377280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= Date: Thu, 7 Jul 2022 23:06:44 +0200 Subject: [PATCH] fix: lint failing on astro and some integrations (#3794) * fix: lint failing on astro and some integrations * chore: fix telemetry lint * chore: fix turbo cache (thx nate) * chore: fix runtime server --- .github/workflows/ci.yml | 1 - packages/astro/src/cli/index.ts | 2 +- packages/integrations/image/src/index.ts | 1 + .../image/src/vite-plugin-astro-image.ts | 4 ++-- packages/integrations/sitemap/src/index.ts | 1 + packages/telemetry/src/index.ts | 2 +- packages/webapi/mod.d.ts | 24 +++++++++---------- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 96aecf6ac..f37251843 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,6 @@ defaults: env: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ secrets.TURBO_TEAM }} - TURBO_REMOTE_ONLY: true FORCE_COLOR: true ASTRO_TELEMETRY_DISABLED: true diff --git a/packages/astro/src/cli/index.ts b/packages/astro/src/cli/index.ts index 4b760100c..ed9e83fbf 100644 --- a/packages/astro/src/cli/index.ts +++ b/packages/astro/src/cli/index.ts @@ -198,6 +198,6 @@ async function throwAndExit(cmd: string, err: unknown) { setTimeout(exitWithErrorMessage, 400); // Wait for the telemetry event to send, then exit. Ignore any error. await telemetryPromise - .catch((err) => debug('telemetry', `record() error: ${err.message}`)) + .catch((err2) => debug('telemetry', `record() error: ${err2.message}`)) .then(exitWithErrorMessage); } diff --git a/packages/integrations/image/src/index.ts b/packages/integrations/image/src/index.ts index e44b7230b..32cfa7bf9 100644 --- a/packages/integrations/image/src/index.ts +++ b/packages/integrations/image/src/index.ts @@ -150,6 +150,7 @@ const createIntegration = (options: IntegrationOptions = {}): AstroIntegration = } if (!inputBuffer) { + // eslint-disable-next-line no-console console.warn(`"${transform.src}" image could not be fetched`); continue; } diff --git a/packages/integrations/image/src/vite-plugin-astro-image.ts b/packages/integrations/image/src/vite-plugin-astro-image.ts index f1b11ad09..2dfda8fa5 100644 --- a/packages/integrations/image/src/vite-plugin-astro-image.ts +++ b/packages/integrations/image/src/vite-plugin-astro-image.ts @@ -31,8 +31,8 @@ export function createPlugin(config: AstroConfig, options: Required { if (config.site) { finalSiteUrl = new URL(config.base, config.site); } else { + // eslint-disable-next-line no-console console.warn( 'The Sitemap integration requires the `site` astro.config option. Skipping.' ); diff --git a/packages/telemetry/src/index.ts b/packages/telemetry/src/index.ts index 583d7cae2..a0de3cb32 100644 --- a/packages/telemetry/src/index.ts +++ b/packages/telemetry/src/index.ts @@ -10,7 +10,7 @@ import { getSystemInfo, SystemInfo } from './system-info.js'; export type AstroTelemetryOptions = { astroVersion: string; viteVersion: string }; export type TelemetryEvent = { eventName: string; payload: Record }; -interface EventMeta extends SystemInfo {} +type EventMeta = SystemInfo interface EventContext extends ProjectInfo { anonymousId: string; anonymousSessionId: string; diff --git a/packages/webapi/mod.d.ts b/packages/webapi/mod.d.ts index 7150edbe7..a7cfcc032 100644 --- a/packages/webapi/mod.d.ts +++ b/packages/webapi/mod.d.ts @@ -1,12 +1,12 @@ -export { pathToPosix } from './lib/utils'; -export { AbortController, AbortSignal, alert, atob, Blob, btoa, ByteLengthQueuingStrategy, cancelAnimationFrame, cancelIdleCallback, CanvasRenderingContext2D, CharacterData, clearTimeout, Comment, CountQueuingStrategy, CSSStyleSheet, CustomElementRegistry, CustomEvent, Document, DocumentFragment, DOMException, Element, Event, EventTarget, fetch, File, FormData, Headers, HTMLBodyElement, HTMLCanvasElement, HTMLDivElement, HTMLDocument, HTMLElement, HTMLHeadElement, HTMLHtmlElement, HTMLImageElement, HTMLSpanElement, HTMLStyleElement, HTMLTemplateElement, HTMLUnknownElement, Image, ImageData, IntersectionObserver, MediaQueryList, MutationObserver, Node, NodeFilter, NodeIterator, OffscreenCanvas, ReadableByteStreamController, ReadableStream, ReadableStreamBYOBReader, ReadableStreamBYOBRequest, ReadableStreamDefaultController, ReadableStreamDefaultReader, Request, requestAnimationFrame, requestIdleCallback, ResizeObserver, Response, setTimeout, ShadowRoot, structuredClone, StyleSheet, Text, TransformStream, TreeWalker, URLPattern, Window, WritableStream, WritableStreamDefaultController, WritableStreamDefaultWriter } from './mod.js'; -export declare const polyfill: { - (target: any, options?: PolyfillOptions): any; - internals(target: any, name: string): any; -}; -interface PolyfillOptions { - exclude?: string | string[]; - override?: Record; -} +export { pathToPosix } from './lib/utils'; +export { AbortController, AbortSignal, alert, atob, Blob, btoa, ByteLengthQueuingStrategy, cancelAnimationFrame, cancelIdleCallback, CanvasRenderingContext2D, CharacterData, clearTimeout, Comment, CountQueuingStrategy, CSSStyleSheet, CustomElementRegistry, CustomEvent, Document, DocumentFragment, DOMException, Element, Event, EventTarget, fetch, File, FormData, Headers, HTMLBodyElement, HTMLCanvasElement, HTMLDivElement, HTMLDocument, HTMLElement, HTMLHeadElement, HTMLHtmlElement, HTMLImageElement, HTMLSpanElement, HTMLStyleElement, HTMLTemplateElement, HTMLUnknownElement, Image, ImageData, IntersectionObserver, MediaQueryList, MutationObserver, Node, NodeFilter, NodeIterator, OffscreenCanvas, ReadableByteStreamController, ReadableStream, ReadableStreamBYOBReader, ReadableStreamBYOBRequest, ReadableStreamDefaultController, ReadableStreamDefaultReader, Request, requestAnimationFrame, requestIdleCallback, ResizeObserver, Response, setTimeout, ShadowRoot, structuredClone, StyleSheet, Text, TransformStream, TreeWalker, URLPattern, Window, WritableStream, WritableStreamDefaultController, WritableStreamDefaultWriter, } from './mod.js'; +export declare const polyfill: { + (target: any, options?: PolyfillOptions): any; + internals(target: any, name: string): any; +}; +interface PolyfillOptions { + exclude?: string | string[]; + override?: Record; +} \ No newline at end of file