chore: revert JSON changes with new options
This commit is contained in:
parent
3fd60556ac
commit
6a3ce6c738
115 changed files with 1316 additions and 1323 deletions
|
@ -21,3 +21,4 @@ pnpm-lock.yaml
|
|||
*.mjs
|
||||
*.cjs
|
||||
*.json
|
||||
*.jsonc
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"$schema": "https://biomejs.dev/schemas/1.0.0/schema.json",
|
||||
"$schema": "https://biomejs.dev/schemas/1.2.1/schema.json",
|
||||
"organizeImports": {
|
||||
"enabled": true
|
||||
},
|
||||
|
@ -33,6 +33,9 @@
|
|||
"json": {
|
||||
"parser": {
|
||||
"allowComments": true
|
||||
},
|
||||
"formatter": {
|
||||
"indentStyle": "space"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,8 +15,7 @@
|
|||
"dev": "turbo run dev --concurrency=40 --parallel --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"",
|
||||
"format": "pnpm run format:code",
|
||||
"format:ci": "pnpm run format:imports && pnpm run format:code",
|
||||
"format:code": "prettier -w \"**/*\" --ignore-unknown --cache",
|
||||
"format:imports": "organize-imports-cli ./packages/*/tsconfig.json ./packages/*/*/tsconfig.json",
|
||||
"format:code": "biome check --apply-unsafe ./ && prettier -w \"**/*\" --ignore-unknown --cache",
|
||||
"test": "turbo run test --concurrency=1 --filter=astro --filter=create-astro --filter=\"@astrojs/*\"",
|
||||
"test:match": "cd packages/astro && pnpm run test:match",
|
||||
"test:unit": "cd packages/astro && pnpm run test:unit",
|
||||
|
@ -78,6 +77,7 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@astrojs/check": "^0.1.0",
|
||||
"@biomejs/biome": "1.2.1",
|
||||
"@changesets/changelog-github": "^0.4.8",
|
||||
"@changesets/cli": "^2.26.2",
|
||||
"@types/node": "^18.17.8",
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
import type { OutgoingHttpHeaders } from 'node:http';
|
||||
import type { AddressInfo } from 'node:net';
|
||||
import type {
|
||||
MarkdownHeading,
|
||||
MarkdownMetadata,
|
||||
|
@ -8,8 +10,6 @@ import type {
|
|||
ShikiConfig,
|
||||
} from '@astrojs/markdown-remark';
|
||||
import type * as babel from '@babel/core';
|
||||
import type { OutgoingHttpHeaders } from 'node:http';
|
||||
import type { AddressInfo } from 'node:net';
|
||||
import type * as rollup from 'rollup';
|
||||
import type { TsConfigJson } from 'tsconfig-resolver';
|
||||
import type * as vite from 'vite';
|
||||
|
@ -148,7 +148,7 @@ export interface CLIFlags {
|
|||
export interface AstroGlobal<
|
||||
Props extends Record<string, any> = Record<string, any>,
|
||||
Self = AstroComponentFactory,
|
||||
Params extends Record<string, string | undefined> = Record<string, string | undefined>,
|
||||
Params extends Record<string, string | undefined> = Record<string, string | undefined>
|
||||
> extends AstroGlobalPartial,
|
||||
AstroSharedContext<Props, Params> {
|
||||
/**
|
||||
|
@ -281,7 +281,7 @@ export interface AstroGlobal<
|
|||
}
|
||||
|
||||
/** Union type of supported markdown file extensions */
|
||||
type MarkdowFileExtension = (typeof SUPPORTED_MARKDOWN_FILE_EXTENSIONS)[number];
|
||||
type MarkdowFileExtension = typeof SUPPORTED_MARKDOWN_FILE_EXTENSIONS[number];
|
||||
|
||||
export interface AstroGlobalPartial {
|
||||
/**
|
||||
|
@ -1751,7 +1751,7 @@ export interface Page<T = any> {
|
|||
export type PaginateFunction = <
|
||||
PaginateData,
|
||||
AdditionalPaginateProps extends Props,
|
||||
AdditionalPaginateParams extends Params,
|
||||
AdditionalPaginateParams extends Params
|
||||
>(
|
||||
data: PaginateData[],
|
||||
args?: PaginateOptions<AdditionalPaginateProps, AdditionalPaginateParams>
|
||||
|
@ -1825,7 +1825,7 @@ export type ValidRedirectStatus = 300 | 301 | 302 | 303 | 304 | 307 | 308;
|
|||
// Shared types between `Astro` global and API context object
|
||||
interface AstroSharedContext<
|
||||
Props extends Record<string, any> = Record<string, any>,
|
||||
RouteParams extends Record<string, string | undefined> = Record<string, string | undefined>,
|
||||
RouteParams extends Record<string, string | undefined> = Record<string, string | undefined>
|
||||
> {
|
||||
/**
|
||||
* The address (usually IP address) of the user. Used with SSR only.
|
||||
|
@ -1864,7 +1864,7 @@ interface AstroSharedContext<
|
|||
|
||||
export interface APIContext<
|
||||
Props extends Record<string, any> = Record<string, any>,
|
||||
APIParams extends Record<string, string | undefined> = Record<string, string | undefined>,
|
||||
APIParams extends Record<string, string | undefined> = Record<string, string | undefined>
|
||||
> extends AstroSharedContext<Props, Params> {
|
||||
site: URL | undefined;
|
||||
generator: string;
|
||||
|
@ -2009,7 +2009,7 @@ export interface SSRLoadedRenderer extends AstroRenderer {
|
|||
|
||||
export type HookParameters<
|
||||
Hook extends keyof AstroIntegration['hooks'],
|
||||
Fn = AstroIntegration['hooks'][Hook],
|
||||
Fn = AstroIntegration['hooks'][Hook]
|
||||
> = Fn extends (...args: any) => any ? Parameters<Fn>[0] : never;
|
||||
|
||||
export interface AstroIntegration {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { deserializeRouteData } from '../routing/manifest/serialization.js';
|
||||
import type { RouteInfo, SerializedSSRManifest, SSRManifest } from './types.js';
|
||||
import type { RouteInfo, SSRManifest, SerializedSSRManifest } from './types.js';
|
||||
|
||||
export function deserializeManifest(serializedManifest: SerializedSSRManifest): SSRManifest {
|
||||
const routes: RouteInfo[] = [];
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import type { RouteData } from '../../@types/astro.js';
|
||||
import type { SerializedSSRManifest, SSRManifest } from './types.js';
|
||||
import type { SSRManifest, SerializedSSRManifest } from './types.js';
|
||||
|
||||
import * as fs from 'node:fs';
|
||||
import { IncomingMessage } from 'node:http';
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import type {
|
||||
RouteData,
|
||||
SerializedRouteData,
|
||||
SSRComponentMetadata,
|
||||
SSRLoadedRenderer,
|
||||
SSRResult,
|
||||
SerializedRouteData,
|
||||
} from '../../@types/astro.js';
|
||||
import type { SinglePageBuiltModule } from '../build/types.js';
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import glob from 'fast-glob';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import glob from 'fast-glob';
|
||||
import type { OutputChunk } from 'rollup';
|
||||
import { type Plugin as VitePlugin } from 'vite';
|
||||
import { runHookBuildSsr } from '../../../integrations/index.js';
|
||||
|
@ -9,7 +9,7 @@ import { joinPaths, prependForwardSlash } from '../../path.js';
|
|||
import { serializeRouteData } from '../../routing/index.js';
|
||||
import { addRollupInput } from '../add-rollup-input.js';
|
||||
import { getOutFile, getOutFolder } from '../common.js';
|
||||
import { cssOrder, mergeInlineCss, type BuildInternals } from '../internal.js';
|
||||
import { type BuildInternals, cssOrder, mergeInlineCss } from '../internal.js';
|
||||
import type { AstroBuildPlugin } from '../plugin.js';
|
||||
import type { StaticBuildOptions } from '../types.js';
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import type { AstroConfig } from '../../@types/astro.js';
|
||||
import { compile, type CompileProps, type CompileResult } from './compile.js';
|
||||
import { type CompileProps, type CompileResult, compile } from './compile.js';
|
||||
|
||||
type CompilationCache = Map<string, CompileResult>;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import yaml from 'js-yaml';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath, pathToFileURL } from 'node:url';
|
||||
import yaml from 'js-yaml';
|
||||
import type { AstroConfig, AstroSettings } from '../../@types/astro.js';
|
||||
import { getContentPaths } from '../../content/index.js';
|
||||
import { markdownContentEntryType } from '../../vite-plugin-markdown/content-entry-type.js';
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import type { EndpointHandler } from '../../../@types/astro.js';
|
||||
import { createRenderContext, type SSROptions } from '../../render/index.js';
|
||||
import { type SSROptions, createRenderContext } from '../../render/index.js';
|
||||
import { callEndpoint } from '../index.js';
|
||||
|
||||
export async function call(options: SSROptions) {
|
||||
|
|
|
@ -2,7 +2,7 @@ import type http from 'node:http';
|
|||
import { fileURLToPath } from 'node:url';
|
||||
import { performance } from 'perf_hooks';
|
||||
import enableDestroy from 'server-destroy';
|
||||
import { preview, type PreviewServer as VitePreviewServer } from 'vite';
|
||||
import { type PreviewServer as VitePreviewServer, preview } from 'vite';
|
||||
import type { AstroSettings } from '../../@types/astro.js';
|
||||
import type { Logger } from '../logger/core.js';
|
||||
import * as msg from '../messages.js';
|
||||
|
|
|
@ -6,7 +6,7 @@ import type {
|
|||
SSRLoadedRenderer,
|
||||
SSRResult,
|
||||
} from '../../@types/astro.js';
|
||||
import { renderSlotToString, type ComponentSlots } from '../../runtime/server/index.js';
|
||||
import { type ComponentSlots, renderSlotToString } from '../../runtime/server/index.js';
|
||||
import { renderJSX } from '../../runtime/server/jsx.js';
|
||||
import { chunkToString } from '../../runtime/server/render/index.js';
|
||||
import { AstroCookies } from '../cookies/index.js';
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { dim } from 'kleur/colors';
|
||||
import fsMod from 'node:fs';
|
||||
import { performance } from 'node:perf_hooks';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { createServer, type HMRPayload } from 'vite';
|
||||
import { dim } from 'kleur/colors';
|
||||
import { type HMRPayload, createServer } from 'vite';
|
||||
import type { AstroInlineConfig, AstroSettings } from '../../@types/astro.js';
|
||||
import { createContentTypesGenerator } from '../../content/index.js';
|
||||
import { globalContentConfigObserver } from '../../content/utils.js';
|
||||
|
|
|
@ -4,7 +4,7 @@ import type {
|
|||
SSRLoadedRenderer,
|
||||
SSRResult,
|
||||
} from '../../../@types/astro.js';
|
||||
import { createRenderInstruction, type RenderInstruction } from './instruction.js';
|
||||
import { type RenderInstruction, createRenderInstruction } from './instruction.js';
|
||||
|
||||
import { clsx } from 'clsx';
|
||||
import { AstroError, AstroErrorData } from '../../../core/errors/index.js';
|
||||
|
@ -14,21 +14,21 @@ import { serializeProps } from '../serialize.js';
|
|||
import { shorthash } from '../shorthash.js';
|
||||
import { isPromise } from '../util.js';
|
||||
import {
|
||||
type AstroComponentFactory,
|
||||
createAstroComponentInstance,
|
||||
isAstroComponentFactory,
|
||||
renderTemplate,
|
||||
type AstroComponentFactory,
|
||||
} from './astro/index.js';
|
||||
import {
|
||||
Fragment,
|
||||
Renderer,
|
||||
chunkToString,
|
||||
type RenderDestination,
|
||||
type RenderInstance,
|
||||
Renderer,
|
||||
chunkToString,
|
||||
} from './common.js';
|
||||
import { componentIsHTMLElement, renderHTMLElement } from './dom.js';
|
||||
import { maybeRenderHead } from './head.js';
|
||||
import { renderSlotToString, renderSlots, type ComponentSlots } from './slot.js';
|
||||
import { type ComponentSlots, renderSlotToString, renderSlots } from './slot.js';
|
||||
import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from './util.js';
|
||||
|
||||
const needsHeadRenderingSymbol = Symbol.for('astro.needsHeadRendering');
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import type { RouteData, SSRResult } from '../../../@types/astro.js';
|
||||
import { renderComponentToString, type NonAstroPageComponent } from './component.js';
|
||||
import { type NonAstroPageComponent, renderComponentToString } from './component.js';
|
||||
import type { AstroComponentFactory } from './index.js';
|
||||
|
||||
import { isAstroComponentFactory } from './astro/index.js';
|
||||
|
|
|
@ -12,9 +12,8 @@ export type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] };
|
|||
|
||||
// Name is pretty self descriptive, but it removes the index signature of an object
|
||||
export type OmitIndexSignature<ObjectType> = {
|
||||
[KeyType in keyof ObjectType as {} extends Record<KeyType, unknown>
|
||||
? never
|
||||
: KeyType]: ObjectType[KeyType];
|
||||
[KeyType in
|
||||
keyof ObjectType as {} extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
|
||||
};
|
||||
|
||||
// Transform a string into its kebab case equivalent (camelCase -> kebab-case). Useful for CSS-in-JS to CSS.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { transformWithEsbuild, type ESBuildTransformResult } from 'vite';
|
||||
import { type ESBuildTransformResult, transformWithEsbuild } from 'vite';
|
||||
import type { AstroConfig } from '../@types/astro.js';
|
||||
import { cachedCompilation, type CompileProps, type CompileResult } from '../core/compile/index.js';
|
||||
import { type CompileProps, type CompileResult, cachedCompilation } from '../core/compile/index.js';
|
||||
import type { Logger } from '../core/logger/core.js';
|
||||
import { getFileInfo } from '../vite-plugin-utils/index.js';
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import path from 'node:path';
|
||||
import { normalizePath, type ResolvedConfig, type Plugin as VitePlugin } from 'vite';
|
||||
import { type Plugin as VitePlugin, type ResolvedConfig, normalizePath } from 'vite';
|
||||
import type { AstroSettings } from '../@types/astro.js';
|
||||
|
||||
type Alias = {
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
import {
|
||||
createMarkdownProcessor,
|
||||
InvalidAstroDataError,
|
||||
type MarkdownProcessor,
|
||||
} from '@astrojs/markdown-remark';
|
||||
import matter from 'gray-matter';
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import {
|
||||
InvalidAstroDataError,
|
||||
type MarkdownProcessor,
|
||||
createMarkdownProcessor,
|
||||
} from '@astrojs/markdown-remark';
|
||||
import matter from 'gray-matter';
|
||||
import type { Plugin } from 'vite';
|
||||
import { normalizePath } from 'vite';
|
||||
import type { AstroSettings } from '../@types/astro.js';
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import type { TransformResult } from 'rollup';
|
||||
import { transformWithEsbuild, type Plugin, type ResolvedConfig } from 'vite';
|
||||
import { type Plugin, type ResolvedConfig, transformWithEsbuild } from 'vite';
|
||||
import type { AstroRenderer, AstroSettings } from '../@types/astro.js';
|
||||
import type { Logger } from '../core/logger/core.js';
|
||||
import type { PluginMetadata } from '../vite-plugin-astro/types.js';
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import ancestor from 'common-ancestor-path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import ancestor from 'common-ancestor-path';
|
||||
import type { AstroConfig } from '../@types/astro.js';
|
||||
import {
|
||||
appendExtension,
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import os from 'node:os';
|
||||
import { prompt } from '@astrojs/cli-kit';
|
||||
import { random } from '@astrojs/cli-kit/utils';
|
||||
import arg from 'arg';
|
||||
import os from 'node:os';
|
||||
|
||||
import { getName, getVersion } from '../messages.js';
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import type { Context } from './context.js';
|
||||
|
||||
import { color } from '@astrojs/cli-kit';
|
||||
import dns from 'node:dns/promises';
|
||||
import { color } from '@astrojs/cli-kit';
|
||||
import { bannerAbort, error, info, log } from '../messages.js';
|
||||
import { getTemplateTarget } from './template.js';
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* eslint no-console: 'off' */
|
||||
import { color, say as houston, label, spinner as load } from '@astrojs/cli-kit';
|
||||
import { align, sleep } from '@astrojs/cli-kit/utils';
|
||||
import { exec } from 'node:child_process';
|
||||
/* eslint no-console: 'off' */
|
||||
import { color, label, say as houston, spinner as load } from '@astrojs/cli-kit';
|
||||
import { align, sleep } from '@astrojs/cli-kit/utils';
|
||||
import stripAnsi from 'strip-ansi';
|
||||
import { shell } from './shell.js';
|
||||
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
import type { IncomingRequestCfProperties } from '@cloudflare/workers-types/experimental';
|
||||
import type { AstroAdapter, AstroConfig, AstroIntegration, RouteData } from 'astro';
|
||||
|
||||
import * as fs from 'node:fs';
|
||||
import * as os from 'node:os';
|
||||
import { sep } from 'node:path';
|
||||
import { fileURLToPath, pathToFileURL } from 'node:url';
|
||||
import { createRedirectsFromAstroRoutes } from '@astrojs/underscore-redirects';
|
||||
import { CacheStorage } from '@miniflare/cache';
|
||||
import { NoOpLog } from '@miniflare/shared';
|
||||
import { MemoryStorage } from '@miniflare/storage-memory';
|
||||
import { AstroError } from 'astro/errors';
|
||||
import esbuild from 'esbuild';
|
||||
import * as fs from 'node:fs';
|
||||
import * as os from 'node:os';
|
||||
import { sep } from 'node:path';
|
||||
import { fileURLToPath, pathToFileURL } from 'node:url';
|
||||
import glob from 'tiny-glob';
|
||||
import { getEnvVars } from './parser.js';
|
||||
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
* TODO: Tackle this file, once their is an decision on the upstream request
|
||||
*/
|
||||
|
||||
import * as fs from 'node:fs';
|
||||
import { dirname, resolve } from 'node:path';
|
||||
import TOML from '@iarna/toml';
|
||||
import dotenv from 'dotenv';
|
||||
import { findUpSync } from 'find-up';
|
||||
import * as fs from 'node:fs';
|
||||
import { dirname, resolve } from 'node:path';
|
||||
|
||||
function findWranglerToml(
|
||||
referencePath: string = process.cwd(),
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
import fs from 'node:fs/promises';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { markdownConfigDefaults, setVfileFrontmatter } from '@astrojs/markdown-remark';
|
||||
import type { PluggableList } from '@mdx-js/mdx/lib/core.js';
|
||||
import type { AstroIntegration, ContentEntryType, HookParameters, SSRError } from 'astro';
|
||||
import astroJSXRenderer from 'astro/jsx/renderer.js';
|
||||
import { parse as parseESM } from 'es-module-lexer';
|
||||
import fs from 'node:fs/promises';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import type { Options as RemarkRehypeOptions } from 'remark-rehype';
|
||||
import { VFile } from 'vfile';
|
||||
import type { Plugin as VitePlugin } from 'vite';
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import type { NodeApp } from 'astro/app/node';
|
||||
import type { ServerResponse } from 'node:http';
|
||||
import type { Readable } from 'stream';
|
||||
import type { NodeApp } from 'astro/app/node';
|
||||
import { createOutgoingHttpHeaders } from './createOutgoingHttpHeaders.js';
|
||||
import { responseIterator } from './response-iterator.js';
|
||||
import type { ErrorHandlerParams, Options, RequestHandlerParams } from './types.js';
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { preact, type PreactPluginOptions as VitePreactPluginOptions } from '@preact/preset-vite';
|
||||
import type { AstroIntegration, AstroRenderer, ViteUserConfig } from 'astro';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { type PreactPluginOptions as VitePreactPluginOptions, preact } from '@preact/preset-vite';
|
||||
import type { AstroIntegration, AstroRenderer, ViteUserConfig } from 'astro';
|
||||
|
||||
const babelCwd = new URL('../', import.meta.url);
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import type { AstroComponentMetadata } from 'astro';
|
||||
import { Component as BaseComponent, h, type VNode } from 'preact';
|
||||
import { Component as BaseComponent, type VNode, h } from 'preact';
|
||||
import { render } from 'preact-render-to-string';
|
||||
import { getContext } from './context.js';
|
||||
import { restoreSignalsOnProps, serializeSignals } from './signals.js';
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
import { basename } from 'node:path';
|
||||
import { fileURLToPath, pathToFileURL } from 'node:url';
|
||||
import type {
|
||||
AstroAdapter,
|
||||
AstroConfig,
|
||||
|
@ -7,24 +9,22 @@ import type {
|
|||
} from 'astro';
|
||||
import { AstroError } from 'astro/errors';
|
||||
import glob from 'fast-glob';
|
||||
import { basename } from 'node:path';
|
||||
import { fileURLToPath, pathToFileURL } from 'node:url';
|
||||
import {
|
||||
getAstroImageConfig,
|
||||
getDefaultImageConfig,
|
||||
type DevImageService,
|
||||
type VercelImageConfig,
|
||||
getAstroImageConfig,
|
||||
getDefaultImageConfig,
|
||||
} from '../image/shared.js';
|
||||
import { getVercelOutput, removeDir, writeJson } from '../lib/fs.js';
|
||||
import { copyDependenciesToFunction } from '../lib/nft.js';
|
||||
import { getRedirects } from '../lib/redirects.js';
|
||||
import {
|
||||
getSpeedInsightsViteConfig,
|
||||
type VercelSpeedInsightsConfig,
|
||||
getSpeedInsightsViteConfig,
|
||||
} from '../lib/speed-insights.js';
|
||||
import {
|
||||
getInjectableWebAnalyticsContent,
|
||||
type VercelWebAnalyticsConfig,
|
||||
getInjectableWebAnalyticsContent,
|
||||
} from '../lib/web-analytics.js';
|
||||
import { generateEdgeMiddleware } from './middleware.js';
|
||||
|
||||
|
@ -250,9 +250,7 @@ You can set functionPerRoute: false to prevent surpassing the limit.`
|
|||
const getRouteFuncName = (route: RouteData) => route.component.replace('src/pages/', '');
|
||||
|
||||
const getFallbackFuncName = (entryFile: URL) =>
|
||||
basename(entryFile.toString())
|
||||
.replace('entry.', '')
|
||||
.replace(/\.mjs$/, '');
|
||||
basename(entryFile.toString()).replace('entry.', '').replace(/\.mjs$/, '');
|
||||
|
||||
for (const [route, entryFile] of _entryPoints) {
|
||||
const func = route.component.startsWith('src/pages/')
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
import type { AstroAdapter, AstroConfig, AstroIntegration } from 'astro';
|
||||
|
||||
import {
|
||||
getAstroImageConfig,
|
||||
getDefaultImageConfig,
|
||||
type DevImageService,
|
||||
type VercelImageConfig,
|
||||
getAstroImageConfig,
|
||||
getDefaultImageConfig,
|
||||
} from '../image/shared.js';
|
||||
import { emptyDir, getVercelOutput, writeJson } from '../lib/fs.js';
|
||||
import { isServerLikeOutput } from '../lib/prerender.js';
|
||||
import { getRedirects } from '../lib/redirects.js';
|
||||
import {
|
||||
getSpeedInsightsViteConfig,
|
||||
type VercelSpeedInsightsConfig,
|
||||
getSpeedInsightsViteConfig,
|
||||
} from '../lib/speed-insights.js';
|
||||
import {
|
||||
getInjectableWebAnalyticsContent,
|
||||
type VercelWebAnalyticsConfig,
|
||||
getInjectableWebAnalyticsContent,
|
||||
} from '../lib/web-analytics.js';
|
||||
|
||||
const PACKAGE_NAME = '@astrojs/vercel/static';
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { loadFixture } from './test-utils.js';
|
||||
import { expect } from 'chai';
|
||||
import { loadFixture } from './test-utils.js';
|
||||
|
||||
describe('Vercel Speed Insights', () => {
|
||||
describe('output: server', () => {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { loadFixture } from './test-utils.js';
|
||||
import { expect } from 'chai';
|
||||
import { loadFixture } from './test-utils.js';
|
||||
|
||||
describe('Vercel Web Analytics', () => {
|
||||
describe('output: static', () => {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { createMarkdownProcessor } from '../dist/index.js';
|
||||
import chai from 'chai';
|
||||
import { createMarkdownProcessor } from '../dist/index.js';
|
||||
|
||||
describe('autolinking', () => {
|
||||
describe('plain md', async () => {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { createMarkdownProcessor } from '../dist/index.js';
|
||||
import { expect } from 'chai';
|
||||
import { createMarkdownProcessor } from '../dist/index.js';
|
||||
|
||||
describe('entities', async () => {
|
||||
const processor = await createMarkdownProcessor();
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { createMarkdownProcessor } from '../dist/index.js';
|
||||
import chai from 'chai';
|
||||
import { createMarkdownProcessor } from '../dist/index.js';
|
||||
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { createMarkdownProcessor } from '../dist/index.js';
|
||||
import chai from 'chai';
|
||||
import { createMarkdownProcessor } from '../dist/index.js';
|
||||
|
||||
describe('collect images', async () => {
|
||||
const processor = await createMarkdownProcessor();
|
||||
|
|
154
pnpm-lock.yaml
154
pnpm-lock.yaml
|
@ -21,6 +21,9 @@ importers:
|
|||
'@astrojs/check':
|
||||
specifier: ^0.1.0
|
||||
version: 0.1.0(prettier-plugin-astro@0.12.0)(prettier@3.0.3)(typescript@5.1.6)
|
||||
'@biomejs/biome':
|
||||
specifier: 1.2.1
|
||||
version: 1.2.1
|
||||
'@changesets/changelog-github':
|
||||
specifier: ^0.4.8
|
||||
version: 0.4.8
|
||||
|
@ -54,9 +57,6 @@ importers:
|
|||
only-allow:
|
||||
specifier: ^1.1.1
|
||||
version: 1.1.1
|
||||
organize-imports-cli:
|
||||
specifier: ^0.10.0
|
||||
version: 0.10.0
|
||||
prettier:
|
||||
specifier: ^3.0.3
|
||||
version: 3.0.3
|
||||
|
@ -6782,6 +6782,74 @@ packages:
|
|||
'@babel/helper-validator-identifier': 7.22.5
|
||||
to-fast-properties: 2.0.0
|
||||
|
||||
/@biomejs/biome@1.2.1:
|
||||
resolution: {integrity: sha512-olT0ldjncEQx+mtVLJ1LwJikrDtMYZakJ8dIMYXEoX9t10xjKpeY4OyKBa9Os8/EUHah9YmpYL64hQooza3WrA==}
|
||||
engines: {node: '>=14.*'}
|
||||
hasBin: true
|
||||
requiresBuild: true
|
||||
optionalDependencies:
|
||||
'@biomejs/cli-darwin-arm64': 1.2.1
|
||||
'@biomejs/cli-darwin-x64': 1.2.1
|
||||
'@biomejs/cli-linux-arm64': 1.2.1
|
||||
'@biomejs/cli-linux-x64': 1.2.1
|
||||
'@biomejs/cli-win32-arm64': 1.2.1
|
||||
'@biomejs/cli-win32-x64': 1.2.1
|
||||
dev: true
|
||||
|
||||
/@biomejs/cli-darwin-arm64@1.2.1:
|
||||
resolution: {integrity: sha512-lz/Hn/isGnnZqILhnPiwO3Hy4mhGr1APrjXkCBolONyYG67x1OT3l8T5yaNW62GsIEeblabWkwLl/MkoPJJXZQ==}
|
||||
engines: {node: '>=14.*'}
|
||||
cpu: [arm64]
|
||||
os: [darwin]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@biomejs/cli-darwin-x64@1.2.1:
|
||||
resolution: {integrity: sha512-mWJE2+sPiHJk0kHkuHby9ssTm2WR/R7USwJbbNmy7PM07DZdcciF2XbyLofO2ZGh0QI0LEW59OcjMwYChQnZbA==}
|
||||
engines: {node: '>=14.*'}
|
||||
cpu: [x64]
|
||||
os: [darwin]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@biomejs/cli-linux-arm64@1.2.1:
|
||||
resolution: {integrity: sha512-M81if0mY66Feq3nsOoNRa+o57k6YecCeH4EX2EqkU/ObqYfVLmWnIvFsgqEZE/e/bguNmqBoAIJaIV26PvyyJg==}
|
||||
engines: {node: '>=14.*'}
|
||||
cpu: [arm64]
|
||||
os: [linux]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@biomejs/cli-linux-x64@1.2.1:
|
||||
resolution: {integrity: sha512-gzTpmpvBmSFu6oeUeFKP8C34WpV91rha4gS+3swAuw5G+C4PosOTpAVPKnElbgl9iS0+stfP73tXARQUXySDPA==}
|
||||
engines: {node: '>=14.*'}
|
||||
cpu: [x64]
|
||||
os: [linux]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@biomejs/cli-win32-arm64@1.2.1:
|
||||
resolution: {integrity: sha512-SveEeHYjiXzRZhTE3HyURQ+CyZ3yLeKHUrggH4bSDQ1+b7rgDEF/XIEgMl+/3SWFlc+HdEpgbJWWZQCfSCqxww==}
|
||||
engines: {node: '>=14.*'}
|
||||
cpu: [arm64]
|
||||
os: [win32]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@biomejs/cli-win32-x64@1.2.1:
|
||||
resolution: {integrity: sha512-ooEjE+A6kbQhf0cPNvC8bXje1jk2uKWgJ8S3DgHZRBvr6DlBiUsU8C1ycURdhDiHZ5d6nOI98LFrj3WWR1ODzA==}
|
||||
engines: {node: '>=14.*'}
|
||||
cpu: [x64]
|
||||
os: [win32]
|
||||
requiresBuild: true
|
||||
dev: true
|
||||
optional: true
|
||||
|
||||
/@builder.io/partytown@0.8.0:
|
||||
resolution: {integrity: sha512-M6H7nSMwW2dHd1/MQ+9J1Jqdw22uhl1nKv90kIiL9G7gjFVqqouQp4qSS1oZclmtW1XjAa4Q5UnbHB4iytmxZA==}
|
||||
hasBin: true
|
||||
|
@ -8701,15 +8769,6 @@ packages:
|
|||
engines: {node: '>=10.13.0'}
|
||||
dev: false
|
||||
|
||||
/@ts-morph/common@0.20.0:
|
||||
resolution: {integrity: sha512-7uKjByfbPpwuzkstL3L5MQyuXPSKdoNG93Fmi2JoDcTf3pEP731JdRFAduRVkOs8oqxPsXKA+ScrWkdQ8t/I+Q==}
|
||||
dependencies:
|
||||
fast-glob: 3.3.1
|
||||
minimatch: 7.4.6
|
||||
mkdirp: 2.1.6
|
||||
path-browserify: 1.0.1
|
||||
dev: true
|
||||
|
||||
/@types/acorn@4.0.6:
|
||||
resolution: {integrity: sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==}
|
||||
dependencies:
|
||||
|
@ -9044,14 +9103,6 @@ packages:
|
|||
'@types/node': 18.17.8
|
||||
dev: true
|
||||
|
||||
/@types/strip-bom@3.0.0:
|
||||
resolution: {integrity: sha512-xevGOReSYGM7g/kUBZzPqCrR/KYAo+F0yiPc85WFTJa0MSLtyFTVTU6cJu/aV4mid7IffDIWqo69THF2o4JiEQ==}
|
||||
dev: true
|
||||
|
||||
/@types/strip-json-comments@0.0.30:
|
||||
resolution: {integrity: sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==}
|
||||
dev: true
|
||||
|
||||
/@types/trusted-types@2.0.3:
|
||||
resolution: {integrity: sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==}
|
||||
|
||||
|
@ -10465,10 +10516,6 @@ packages:
|
|||
engines: {node: '>=6'}
|
||||
dev: false
|
||||
|
||||
/code-block-writer@12.0.0:
|
||||
resolution: {integrity: sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==}
|
||||
dev: true
|
||||
|
||||
/code-red@1.0.4:
|
||||
resolution: {integrity: sha512-7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==}
|
||||
dependencies:
|
||||
|
@ -10535,6 +10582,7 @@ packages:
|
|||
|
||||
/commander@2.20.3:
|
||||
resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
|
||||
dev: false
|
||||
|
||||
/commander@4.1.1:
|
||||
resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
|
||||
|
@ -11079,16 +11127,6 @@ packages:
|
|||
resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
|
||||
dev: false
|
||||
|
||||
/editorconfig@0.15.3:
|
||||
resolution: {integrity: sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==}
|
||||
hasBin: true
|
||||
dependencies:
|
||||
commander: 2.20.3
|
||||
lru-cache: 4.1.5
|
||||
semver: 5.7.2
|
||||
sigmund: 1.0.1
|
||||
dev: true
|
||||
|
||||
/ee-first@1.1.1:
|
||||
resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
|
||||
|
||||
|
@ -14230,13 +14268,6 @@ packages:
|
|||
brace-expansion: 2.0.1
|
||||
dev: false
|
||||
|
||||
/minimatch@7.4.6:
|
||||
resolution: {integrity: sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==}
|
||||
engines: {node: '>=10'}
|
||||
dependencies:
|
||||
brace-expansion: 2.0.1
|
||||
dev: true
|
||||
|
||||
/minimist-options@4.1.0:
|
||||
resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
|
||||
engines: {node: '>= 6'}
|
||||
|
@ -14295,12 +14326,6 @@ packages:
|
|||
hasBin: true
|
||||
dev: false
|
||||
|
||||
/mkdirp@2.1.6:
|
||||
resolution: {integrity: sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==}
|
||||
engines: {node: '>=10'}
|
||||
hasBin: true
|
||||
dev: true
|
||||
|
||||
/mlly@1.4.0:
|
||||
resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==}
|
||||
dependencies:
|
||||
|
@ -14710,16 +14735,6 @@ packages:
|
|||
strip-ansi: 7.1.0
|
||||
dev: false
|
||||
|
||||
/organize-imports-cli@0.10.0:
|
||||
resolution: {integrity: sha512-cVyNEeiDxX/zA6gdK1QS2rr3TK1VymIkT0LagnAk4f6eE0IC0bo3BeUkMzm3q3GnCJzYC+6lfuMpBE0Cequ7Vg==}
|
||||
hasBin: true
|
||||
dependencies:
|
||||
chalk: 4.1.2
|
||||
editorconfig: 0.15.3
|
||||
ts-morph: 19.0.0
|
||||
tsconfig: 7.0.0
|
||||
dev: true
|
||||
|
||||
/os-tmpdir@1.0.2:
|
||||
resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
|
||||
engines: {node: '>=0.10.0'}
|
||||
|
@ -14881,10 +14896,6 @@ packages:
|
|||
tslib: 2.5.3
|
||||
dev: false
|
||||
|
||||
/path-browserify@1.0.1:
|
||||
resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
|
||||
dev: true
|
||||
|
||||
/path-exists@4.0.0:
|
||||
resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
|
||||
engines: {node: '>=8'}
|
||||
|
@ -16360,10 +16371,6 @@ packages:
|
|||
resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
|
||||
dev: false
|
||||
|
||||
/sigmund@1.0.1:
|
||||
resolution: {integrity: sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==}
|
||||
dev: true
|
||||
|
||||
/signal-exit@3.0.7:
|
||||
resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
|
||||
|
||||
|
@ -16734,6 +16741,7 @@ packages:
|
|||
/strip-json-comments@2.0.1:
|
||||
resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
|
||||
engines: {node: '>=0.10.0'}
|
||||
requiresBuild: true
|
||||
|
||||
/strip-json-comments@3.1.1:
|
||||
resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
|
||||
|
@ -17124,13 +17132,6 @@ packages:
|
|||
/ts-interface-checker@0.1.13:
|
||||
resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
|
||||
|
||||
/ts-morph@19.0.0:
|
||||
resolution: {integrity: sha512-D6qcpiJdn46tUqV45vr5UGM2dnIEuTGNxVhg0sk5NX11orcouwj6i1bMqZIz2mZTZB1Hcgy7C3oEVhAT+f6mbQ==}
|
||||
dependencies:
|
||||
'@ts-morph/common': 0.20.0
|
||||
code-block-writer: 12.0.0
|
||||
dev: true
|
||||
|
||||
/tsconfig-resolver@3.0.1:
|
||||
resolution: {integrity: sha512-ZHqlstlQF449v8glscGRXzL6l2dZvASPCdXJRWG4gHEZlUVx2Jtmr+a2zeVG4LCsKhDXKRj5R3h0C/98UcVAQg==}
|
||||
dependencies:
|
||||
|
@ -17141,15 +17142,6 @@ packages:
|
|||
strip-bom: 4.0.0
|
||||
type-fest: 3.0.0
|
||||
|
||||
/tsconfig@7.0.0:
|
||||
resolution: {integrity: sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==}
|
||||
dependencies:
|
||||
'@types/strip-bom': 3.0.0
|
||||
'@types/strip-json-comments': 0.0.30
|
||||
strip-bom: 3.0.0
|
||||
strip-json-comments: 2.0.1
|
||||
dev: true
|
||||
|
||||
/tslib@2.1.0:
|
||||
resolution: {integrity: sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==}
|
||||
dev: true
|
||||
|
|
|
@ -9,7 +9,7 @@ export default {
|
|||
plugins: ['prettier-plugin-astro'],
|
||||
overrides: [
|
||||
{
|
||||
files: ['.*', '*.json', '*.md', '*.toml', '*.yml'],
|
||||
files: ['.*', '*.md', '*.toml', '*.yml'],
|
||||
options: {
|
||||
useTabs: false,
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue