Skip to content

Commit 4eec0f1

Browse files
ematipicoematipico
authored
test: don't use tmp fixtures (#16177)
1 parent d0fe1ec commit 4eec0f1

65 files changed

Lines changed: 1071 additions & 2007 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/astro/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
"cheerio": "1.2.0",
199199
"eol": "^0.10.0",
200200
"expect-type": "^1.3.0",
201-
"fs-fixture": "^2.11.0",
201+
"fs-fixture": "^2.13.0",
202202
"mdast-util-mdx": "^3.0.0",
203203
"mdast-util-mdx-jsx": "^3.2.0",
204204
"node-mocks-http": "^1.17.2",

‎packages/astro/src/content/loaders/glob.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,12 @@ export function glob(globOptions: GlobOptions & { [secretLegacyFlag]?: boolean }
348348
const entryType = configForFile(changedPath);
349349
const baseUrl = pathToFileURL(basePath);
350350
const oldId = fileToIdMap.get(changedPath);
351-
await syncData(entry, baseUrl, entryType, oldId);
352-
logger.info(`Reloaded data from ${colors.green(entry)}`);
351+
try {
352+
await syncData(entry, baseUrl, entryType, oldId);
353+
logger.info(`Reloaded data from ${colors.green(entry)}`);
354+
} catch (e: any) {
355+
logger.error(`Failed to reload ${entry}: ${e.message}`);
356+
}
353357
}
354358

355359
watcher.on('change', onChange);

‎packages/astro/src/core/routing/dev.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export async function matchRoute(
2828
const matches = matchAllRoutes(pathname, routesList);
2929

3030
const preloadedMatches = getSortedPreloadedMatches({
31-
pipeline,
3231
matches,
3332
manifest,
3433
});

‎packages/astro/src/prerender/routing.ts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
import { routeIsRedirect } from '../core/routing/helpers.js';
22
import { routeComparator } from '../core/routing/priority.js';
33
import type { RouteData, SSRManifest } from '../types/public/internal.js';
4-
import type { RunnablePipeline } from '../vite-plugin-app/pipeline.js';
54

65
type GetSortedPreloadedMatchesParams = {
7-
pipeline: RunnablePipeline;
86
matches: RouteData[];
97
manifest: SSRManifest;
108
};
11-
export function getSortedPreloadedMatches({
12-
pipeline,
13-
matches,
14-
manifest,
15-
}: GetSortedPreloadedMatchesParams) {
9+
export function getSortedPreloadedMatches({ matches, manifest }: GetSortedPreloadedMatchesParams) {
1610
return preloadAndSetPrerenderStatus({
17-
pipeline,
1811
matches,
1912
manifest,
2013
})
@@ -23,7 +16,6 @@ export function getSortedPreloadedMatches({
2316
}
2417

2518
type PreloadAndSetPrerenderStatusParams = {
26-
pipeline: RunnablePipeline;
2719
matches: RouteData[];
2820
manifest: SSRManifest;
2921
};

‎packages/astro/src/vite-plugin-astro-server/plugin.ts‎

Lines changed: 1 addition & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,13 @@ import { AsyncLocalStorage } from 'node:async_hooks';
22
import { IncomingMessage } from 'node:http';
33
import type * as vite from 'vite';
44
import { isRunnableDevEnvironment, type RunnableDevEnvironment } from 'vite';
5-
import { toFallbackType } from '../core/app/common.js';
6-
import { toRoutingStrategy } from '../core/app/entrypoints/index.js';
7-
import type { SSRManifest, SSRManifestCSP, SSRManifestI18n } from '../core/app/types.js';
5+
import type { SSRManifest } from '../core/app/types.js';
86
import { ASTRO_VITE_ENVIRONMENT_NAMES, devPrerenderMiddlewareSymbol } from '../core/constants.js';
9-
import {
10-
getAlgorithm,
11-
getDirectives,
12-
getScriptHashes,
13-
getScriptResources,
14-
getStrictDynamic,
15-
getStyleHashes,
16-
getStyleResources,
17-
shouldTrackCspHashes,
18-
} from '../core/csp/common.js';
19-
import { createKey, getEnvironmentKey, hasEnvironmentKey } from '../core/encryption.js';
207
import { getViteErrorPayload } from '../core/errors/dev/index.js';
218
import { AstroError, AstroErrorData } from '../core/errors/index.js';
229
import type { Logger } from '../core/logger/core.js';
23-
import { NOOP_MIDDLEWARE_FN } from '../core/middleware/noop-middleware.js';
2410
import { createViteLoader } from '../core/module-loader/index.js';
2511
import { matchAllRoutes } from '../core/routing/match.js';
26-
import { resolveMiddlewareMode } from '../integrations/adapter-utils.js';
2712
import { SERIALIZED_MANIFEST_ID } from '../manifest/serialized.js';
2813
import type { AstroSettings } from '../types/astro.js';
2914
import { ASTRO_DEV_SERVER_APP_ID } from '../vite-plugin-app/index.js';
@@ -34,7 +19,6 @@ import { setRouteError } from './server-state.js';
3419
import { routeGuardMiddleware } from './route-guard.js';
3520
import { secFetchMiddleware } from './sec-fetch.js';
3621
import { trailingSlashMiddleware } from './trailing-slash.js';
37-
import { sessionConfigToManifest } from '../core/session/utils.js';
3822

3923
interface AstroPluginOptions {
4024
settings: AstroSettings;
@@ -201,107 +185,3 @@ export default function createVitePluginAstroServer({
201185
},
202186
};
203187
}
204-
205-
/**
206-
* It creates a `SSRManifest` from the `AstroSettings`.
207-
*
208-
* Renderers needs to be pulled out from the page module emitted during the build.
209-
* @param settings
210-
*/
211-
export async function createDevelopmentManifest(settings: AstroSettings): Promise<SSRManifest> {
212-
let i18nManifest: SSRManifestI18n | undefined;
213-
let csp: SSRManifestCSP | undefined;
214-
if (settings.config.i18n) {
215-
i18nManifest = {
216-
fallback: settings.config.i18n.fallback,
217-
strategy: toRoutingStrategy(settings.config.i18n.routing, settings.config.i18n.domains),
218-
defaultLocale: settings.config.i18n.defaultLocale,
219-
locales: settings.config.i18n.locales,
220-
domainLookupTable: {},
221-
fallbackType: toFallbackType(settings.config.i18n.routing),
222-
domains: settings.config.i18n.domains,
223-
};
224-
}
225-
226-
if (shouldTrackCspHashes(settings.config.security.csp)) {
227-
const styleHashes = [
228-
...getStyleHashes(settings.config.security.csp),
229-
...settings.injectedCsp.styleHashes,
230-
];
231-
232-
csp = {
233-
cspDestination: settings.adapter?.adapterFeatures?.staticHeaders ? 'adapter' : undefined,
234-
scriptHashes: getScriptHashes(settings.config.security.csp),
235-
scriptResources: getScriptResources(settings.config.security.csp),
236-
styleHashes,
237-
styleResources: getStyleResources(settings.config.security.csp),
238-
algorithm: getAlgorithm(settings.config.security.csp),
239-
directives: getDirectives(settings),
240-
isStrictDynamic: getStrictDynamic(settings.config.security.csp),
241-
};
242-
}
243-
244-
return {
245-
rootDir: settings.config.root,
246-
srcDir: settings.config.srcDir,
247-
cacheDir: settings.config.cacheDir,
248-
outDir: settings.config.outDir,
249-
buildServerDir: settings.config.build.server,
250-
buildClientDir: settings.config.build.client,
251-
publicDir: settings.config.publicDir,
252-
trailingSlash: settings.config.trailingSlash,
253-
buildFormat: settings.config.build.format,
254-
compressHTML: settings.config.compressHTML,
255-
assetsDir: settings.config.build.assets,
256-
serverLike: settings.buildOutput === 'server',
257-
middlewareMode: resolveMiddlewareMode(settings.adapter?.adapterFeatures),
258-
assets: new Set(),
259-
entryModules: {},
260-
routes: [],
261-
adapterName: settings?.adapter?.name ?? '',
262-
clientDirectives: settings.clientDirectives,
263-
renderers: [],
264-
base: settings.config.base,
265-
userAssetsBase: settings.config?.vite?.base,
266-
assetsPrefix: settings.config.build.assetsPrefix,
267-
site: settings.config.site,
268-
componentMetadata: new Map(),
269-
inlinedScripts: new Map(),
270-
i18n: i18nManifest,
271-
checkOrigin: settings.config.security?.checkOrigin ?? false,
272-
allowedDomains: settings.config.security?.allowedDomains,
273-
actionBodySizeLimit: settings.config.security?.actionBodySizeLimit
274-
? settings.config.security.actionBodySizeLimit
275-
: 1024 * 1024, // 1mb default
276-
serverIslandBodySizeLimit: settings.config.security?.serverIslandBodySizeLimit
277-
? settings.config.security.serverIslandBodySizeLimit
278-
: 1024 * 1024, // 1mb default
279-
key: hasEnvironmentKey() ? getEnvironmentKey() : createKey(),
280-
middleware() {
281-
return {
282-
onRequest: NOOP_MIDDLEWARE_FN,
283-
};
284-
},
285-
sessionConfig: sessionConfigToManifest(settings.config.session),
286-
csp,
287-
image: {
288-
objectFit: settings.config.image.objectFit,
289-
objectPosition: settings.config.image.objectPosition,
290-
layout: settings.config.image.layout,
291-
},
292-
devToolbar: {
293-
enabled:
294-
settings.config.devToolbar.enabled &&
295-
(await settings.preferences.get('devToolbar.enabled')),
296-
latestAstroVersion: settings.latestAstroVersion,
297-
debugInfoOutput: '',
298-
placement: settings.config.devToolbar.placement,
299-
},
300-
logLevel: settings.logLevel,
301-
shouldInjectCspMetaTags: false,
302-
experimentalQueuedRendering: {
303-
enabled: !!settings.config.experimental?.queuedRendering,
304-
poolSize: settings.config.experimental?.queuedRendering?.poolSize ?? 1000,
305-
},
306-
};
307-
}

‎packages/astro/test/fixtures/content-frontmatter/package.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "@test/content-frontmatter",
3+
"version": "0.0.0",
4+
"private": true,
5+
"dependencies": {
6+
"astro": "workspace:*"
7+
}
8+
}

‎packages/astro/test/fixtures/content-frontmatter/src/content.config.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { defineCollection } from 'astro:content';
2+
import { z } from 'astro/zod';
3+
import { glob } from 'astro/loaders';
4+
5+
const posts = defineCollection({
6+
loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/posts' }),
7+
schema: z.object({
8+
title: z.string(),
9+
}),
10+
});
11+
12+
export const collections = {
13+
posts
14+
};

‎packages/astro/test/fixtures/content-frontmatter/src/content/posts/blog.md‎

Lines changed: 3 additions & 0 deletions

‎packages/astro/test/fixtures/content-frontmatter/src/pages/index.astro‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
---
3+
<html>
4+
<head><title>Test</title></head>
5+
<body class="one">
6+
<h1>Test</h1>
7+
</body>
8+
</html>

‎packages/astro/test/fixtures/dev-container/package.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "@test/dev-container",
3+
"version": "0.0.0",
4+
"private": true,
5+
"dependencies": {
6+
"astro": "workspace:*"
7+
}
8+
}

0 commit comments

Comments
 (0)