michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ci] format

Browse source
This commit is contained in:
ematipico 2023-08-25 11:25:46 +00:00 committed by astrobot-houston
parent 46d0a0b006
commit a35c21cfc8
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/astro/src/core/app/index.ts
View file

@ -9,7 +9,7 @@ import type {
import type { SinglePageBuiltModule } from '../build/types'; import type { SinglePageBuiltModule } from '../build/types';
import { getSetCookiesFromResponse } from '../cookies/index.js'; import { getSetCookiesFromResponse } from '../cookies/index.js';
import { consoleLogDestination } from '../logger/console.js'; import { consoleLogDestination } from '../logger/console.js';
import { error, type LogOptions, warn } from '../logger/core.js'; import { error, warn, type LogOptions } from '../logger/core.js';
import { import {
collapseDuplicateSlashes, collapseDuplicateSlashes,
prependForwardSlash, prependForwardSlash,

7
packages/astro/src/core/build/plugins/plugin-manifest.ts
View file

@ -239,8 +239,7 @@ function buildManifest(
} }
const isEdgeMiddleware = const isEdgeMiddleware =
// TODO: remove in Astro 4.0 // TODO: remove in Astro 4.0
settings.config.build.excludeMiddleware || settings.config.build.excludeMiddleware || settings.adapter?.adapterFeatures?.edgeMiddleware;
settings.adapter?.adapterFeatures?.edgeMiddleware;
const ssrManifest: SerializedSSRManifest = { const ssrManifest: SerializedSSRManifest = {
adapterName: opts.settings.adapter?.name ?? '', adapterName: opts.settings.adapter?.name ?? '',
@ -254,7 +253,9 @@ function buildManifest(
clientDirectives: Array.from(settings.clientDirectives), clientDirectives: Array.from(settings.clientDirectives),
entryModules, entryModules,
assets: staticFiles.map(prefixAssetPath), assets: staticFiles.map(prefixAssetPath),
middlewareEntryPoint: !isEdgeMiddleware ? internals.middlewareEntryPoint?.toString() : undefined, middlewareEntryPoint: !isEdgeMiddleware
? internals.middlewareEntryPoint?.toString()
: undefined,
}; };
return ssrManifest; return ssrManifest;

2
packages/astro/src/core/build/plugins/plugin-middleware.ts
View file

@ -1,10 +1,10 @@
import type { Plugin as VitePlugin } from 'vite'; import type { Plugin as VitePlugin } from 'vite';
import { getOutputDirectory } from '../../../prerender/utils.js';
import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../../constants.js'; import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../../constants.js';
import { addRollupInput } from '../add-rollup-input.js'; import { addRollupInput } from '../add-rollup-input.js';
import type { BuildInternals } from '../internal'; import type { BuildInternals } from '../internal';
import type { AstroBuildPlugin } from '../plugin'; import type { AstroBuildPlugin } from '../plugin';
import type { StaticBuildOptions } from '../types'; import type { StaticBuildOptions } from '../types';
import { getOutputDirectory } from '../../../prerender/utils.js';
export const MIDDLEWARE_MODULE_ID = '@astro-middleware'; export const MIDDLEWARE_MODULE_ID = '@astro-middleware';

3
packages/astro/test/middleware.test.js
View file

@ -220,7 +220,7 @@ describe('Middleware API in PROD mode, SSR', () => {
expect(text.includes('Error')).to.be.true; expect(text.includes('Error')).to.be.true;
expect(text.includes('bar')).to.be.true; expect(text.includes('bar')).to.be.true;
}); });
it('the integration should receive the path to the middleware', async () => { it('the integration should receive the path to the middleware', async () => {
fixture = await loadFixture({ fixture = await loadFixture({
root: './fixtures/middleware-dev/', root: './fixtures/middleware-dev/',
@ -245,7 +245,6 @@ describe('Middleware API in PROD mode, SSR', () => {
throw e; throw e;
} }
}); });
}); });
describe('Middleware with tailwind', () => { describe('Middleware with tailwind', () => {