diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/astro/src/core/dev/index.ts | 8 | ||||
| -rw-r--r-- | packages/astro/src/core/dev/util.ts | 6 | ||||
| -rw-r--r-- | packages/astro/src/core/logger.ts | 1 | ||||
| -rw-r--r-- | packages/astro/src/core/messages.ts | 22 | ||||
| -rw-r--r-- | packages/astro/src/core/preview/index.ts | 2 | ||||
| -rw-r--r-- | packages/astro/src/vite-plugin-jsx/index.ts | 2 | ||||
| -rw-r--r-- | packages/astro/test/cli.test.js | 4 | ||||
| -rw-r--r-- | packages/webapi/mod.d.ts | 95 | ||||
| -rw-r--r-- | packages/webapi/run/build.js | 14 | ||||
| -rw-r--r-- | packages/webapi/src/types.d.ts | 2 |
10 files changed, 54 insertions, 102 deletions
diff --git a/packages/astro/src/core/dev/index.ts b/packages/astro/src/core/dev/index.ts index 0a790c06e..ba86cba86 100644 --- a/packages/astro/src/core/dev/index.ts +++ b/packages/astro/src/core/dev/index.ts @@ -38,10 +38,14 @@ export default async function dev(config: AstroConfig, options: DevOptions = { l const viteServer = await vite.createServer(viteConfig); await viteServer.listen(config.devOptions.port); const address = viteServer.httpServer!.address() as AddressInfo; - const localAddress = getLocalAddress(address.address, config.devOptions.hostname) + const localAddress = getLocalAddress(address.address, config.devOptions.hostname); // Log to console const site = config.buildOptions.site ? new URL(config.buildOptions.site) : undefined; - info(options.logging, null, msg.devStart({ startupTime: performance.now() - devStart, port: address.port, localAddress, networkAddress: address.address, site, https: !!viteUserConfig.server?.https })); + info( + options.logging, + null, + msg.devStart({ startupTime: performance.now() - devStart, port: address.port, localAddress, networkAddress: address.address, site, https: !!viteUserConfig.server?.https }) + ); return { address, diff --git a/packages/astro/src/core/dev/util.ts b/packages/astro/src/core/dev/util.ts index 78d21ad02..97b622438 100644 --- a/packages/astro/src/core/dev/util.ts +++ b/packages/astro/src/core/dev/util.ts @@ -13,8 +13,8 @@ export function emoji(char: string, fallback: string) { export function getLocalAddress(serverAddress: string, configHostname: string): string { if (configHostname === 'localhost' || serverAddress === '127.0.0.1' || serverAddress === '0.0.0.0') { - return 'localhost' + return 'localhost'; } else { - return serverAddress + return serverAddress; } -}
\ No newline at end of file +} diff --git a/packages/astro/src/core/logger.ts b/packages/astro/src/core/logger.ts index 069630982..a1fd69565 100644 --- a/packages/astro/src/core/logger.ts +++ b/packages/astro/src/core/logger.ts @@ -35,7 +35,6 @@ export const defaultLogDestination = new Writable({ dest = process.stdout; } - let type = event.type; if (type) { // hide timestamp when type is undefined diff --git a/packages/astro/src/core/messages.ts b/packages/astro/src/core/messages.ts index b2d4d07f8..73f1d7d88 100644 --- a/packages/astro/src/core/messages.ts +++ b/packages/astro/src/core/messages.ts @@ -23,12 +23,26 @@ export function reload({ url, reqTime }: { url: string; reqTime: number }): stri } /** Display dev server host and startup time */ -export function devStart({ startupTime, port, localAddress, networkAddress, https, site }: { startupTime: number; port: number; localAddress: string; networkAddress: string; https: boolean; site: URL | undefined }): string { +export function devStart({ + startupTime, + port, + localAddress, + networkAddress, + https, + site, +}: { + startupTime: number; + port: number; + localAddress: string; + networkAddress: string; + https: boolean; + site: URL | undefined; +}): string { // PACAKGE_VERSION is injected at build-time const pkgVersion = process.env.PACKAGE_VERSION; const rootPath = site ? site.pathname : '/'; - const toDisplayUrl = (hostname: string) => `${https ? 'https' : 'http'}://${hostname}:${port}${rootPath}` + const toDisplayUrl = (hostname: string) => `${https ? 'https' : 'http'}://${hostname}:${port}${rootPath}`; const messages = [ ``, `${emoji('🚀 ', '')}${magenta(`astro ${pkgVersion}`)} ${dim(`started in ${Math.round(startupTime)}ms`)}`, @@ -36,8 +50,8 @@ export function devStart({ startupTime, port, localAddress, networkAddress, http `Local: ${bold(cyan(toDisplayUrl(localAddress)))}`, `Network: ${bold(cyan(toDisplayUrl(networkAddress)))}`, ``, - ] - return messages.join('\n') + ]; + return messages.join('\n'); } /** Display dev server host */ diff --git a/packages/astro/src/core/preview/index.ts b/packages/astro/src/core/preview/index.ts index de6e4e173..d53fe837a 100644 --- a/packages/astro/src/core/preview/index.ts +++ b/packages/astro/src/core/preview/index.ts @@ -128,7 +128,7 @@ export default async function preview(config: AstroConfig, { logging }: PreviewO httpServer = server.listen(port, hostname, async () => { if (!showedListenMsg) { const { address: networkAddress } = server.address() as AddressInfo; - const localAddress = getLocalAddress(networkAddress, hostname) + const localAddress = getLocalAddress(networkAddress, hostname); info(logging, null, msg.devStart({ startupTime: performance.now() - timerStart, port, localAddress, networkAddress, https: false, site: baseURL })); } diff --git a/packages/astro/src/vite-plugin-jsx/index.ts b/packages/astro/src/vite-plugin-jsx/index.ts index 9cb495422..b306bd73f 100644 --- a/packages/astro/src/vite-plugin-jsx/index.ts +++ b/packages/astro/src/vite-plugin-jsx/index.ts @@ -35,7 +35,7 @@ async function importJSXRenderers(config: AstroConfig): Promise<Map<string, Rend return import(resolveDependency(name, config)).then(({ default: renderer }) => { if (!renderer.jsxImportSource) return; renderers.set(renderer.jsxImportSource, renderer); - }) + }); }) ); return renderers; diff --git a/packages/astro/test/cli.test.js b/packages/astro/test/cli.test.js index 863cfcae2..13d66e4d6 100644 --- a/packages/astro/test/cli.test.js +++ b/packages/astro/test/cli.test.js @@ -19,11 +19,11 @@ describe('astro cli', () => { expect(proc.stdout).to.equal(pkgVersion); }); - [undefined, '0.0.0.0', '127.0.0.1'].forEach(hostname => { + [undefined, '0.0.0.0', '127.0.0.1'].forEach((hostname) => { it(`astro dev --hostname=${hostname}`, async () => { const projectRootURL = new URL('./fixtures/astro-basic/', import.meta.url); - const hostnameArgs = hostname ? ['--hostname', hostname] : [] + const hostnameArgs = hostname ? ['--hostname', hostname] : []; const proc = cli('dev', '--project-root', fileURLToPath(projectRootURL), ...hostnameArgs); let stdout = ''; diff --git a/packages/webapi/mod.d.ts b/packages/webapi/mod.d.ts index f61a47741..a9b9d832e 100644 --- a/packages/webapi/mod.d.ts +++ b/packages/webapi/mod.d.ts @@ -1,87 +1,12 @@ -export { - AbortController, - AbortSignal, - Blob, - ByteLengthQueuingStrategy, - CanvasRenderingContext2D, - CharacterData, - Comment, - CountQueuingStrategy, - CSSStyleSheet, - CustomElementRegistry, - CustomEvent, - DOMException, - Document, - DocumentFragment, - Element, - Event, - EventTarget, - File, - FormData, - HTMLDocument, - HTMLElement, - HTMLBodyElement, - HTMLCanvasElement, - HTMLDivElement, - HTMLHeadElement, - HTMLHtmlElement, - HTMLImageElement, - HTMLSpanElement, - HTMLStyleElement, - HTMLTemplateElement, - HTMLUnknownElement, - Headers, - IntersectionObserver, - Image, - ImageData, - MediaQueryList, - MutationObserver, - Node, - NodeFilter, - NodeIterator, - OffscreenCanvas, - ReadableByteStreamController, - ReadableStream, - ReadableStreamBYOBReader, - ReadableStreamBYOBRequest, - ReadableStreamDefaultController, - ReadableStreamDefaultReader, - Request, - ResizeObserver, - Response, - ShadowRoot, - StyleSheet, - Text, - TransformStream, - TreeWalker, - URLPattern, - WritableStream, - WritableStreamDefaultController, - WritableStreamDefaultWriter, - Window, - alert, - atob, - btoa, - cancelAnimationFrame, - cancelIdleCallback, - clearTimeout, - fetch, - requestAnimationFrame, - requestIdleCallback, - setTimeout, - structuredClone, -} from './mod.js' -export { pathToPosix } from './lib/utils' +export { AbortController, AbortSignal, Blob, ByteLengthQueuingStrategy, CanvasRenderingContext2D, CharacterData, Comment, CountQueuingStrategy, CSSStyleSheet, CustomElementRegistry, CustomEvent, DOMException, Document, DocumentFragment, Element, Event, EventTarget, File, FormData, HTMLDocument, HTMLElement, HTMLBodyElement, HTMLCanvasElement, HTMLDivElement, HTMLHeadElement, HTMLHtmlElement, HTMLImageElement, HTMLSpanElement, HTMLStyleElement, HTMLTemplateElement, HTMLUnknownElement, Headers, IntersectionObserver, Image, ImageData, MediaQueryList, MutationObserver, Node, NodeFilter, NodeIterator, OffscreenCanvas, ReadableByteStreamController, ReadableStream, ReadableStreamBYOBReader, ReadableStreamBYOBRequest, ReadableStreamDefaultController, ReadableStreamDefaultReader, Request, ResizeObserver, Response, ShadowRoot, StyleSheet, Text, TransformStream, TreeWalker, URLPattern, WritableStream, WritableStreamDefaultController, WritableStreamDefaultWriter, Window, alert, atob, btoa, cancelAnimationFrame, cancelIdleCallback, clearTimeout, fetch, requestAnimationFrame, requestIdleCallback, setTimeout, structuredClone, } from './mod.js'; +export { pathToPosix } from './lib/utils'; export declare const polyfill: { - (target: any, options?: PolyfillOptions | undefined): any - internals(target: any, name: string): any -} + (target: any, options?: PolyfillOptions | undefined): any; + internals(target: any, name: string): any; +}; interface PolyfillOptions { - exclude?: string | string[] - override?: Record< - string, - { - (...args: any[]): any - } - > -} + exclude?: string | string[]; + override?: Record<string, { + (...args: any[]): any; + }>; +}
\ No newline at end of file diff --git a/packages/webapi/run/build.js b/packages/webapi/run/build.js index 993bdcf2c..214dbe0ba 100644 --- a/packages/webapi/run/build.js +++ b/packages/webapi/run/build.js @@ -20,8 +20,18 @@ const readFile = (/** @type {string} */ id) => readFileCache[id] || (readFileCache[id] = nodeReadFile(id, 'utf8')) const pathToDOMException = path.resolve('src', 'lib', 'DOMException.js') -const pathToEventTargetShim = path.resolve('node_modules', 'event-target-shim', 'index.mjs') -const pathToStructuredClone = path.resolve('node_modules', '@ungap', 'structured-clone', 'esm', 'index.js') +const pathToEventTargetShim = path.resolve( + 'node_modules', + 'event-target-shim', + 'index.mjs' +) +const pathToStructuredClone = path.resolve( + 'node_modules', + '@ungap', + 'structured-clone', + 'esm', + 'index.js' +) const plugins = [ typescript({ diff --git a/packages/webapi/src/types.d.ts b/packages/webapi/src/types.d.ts index 8c725c57d..09c57387b 100644 --- a/packages/webapi/src/types.d.ts +++ b/packages/webapi/src/types.d.ts @@ -1,4 +1,4 @@ -declare module "node:*" +declare module 'node:*' declare module '@ungap/structured-clone/esm/index.js' declare module '@ungap/structured-clone/esm/deserialize.js' declare module '@ungap/structured-clone/esm/serialize.js' |