diff options
| -rw-r--r-- | packages/astro/src/core/app/index.ts | 2 | ||||
| -rw-r--r-- | packages/astro/src/core/build/plugins/plugin-manifest.ts | 7 | ||||
| -rw-r--r-- | packages/astro/src/core/build/plugins/plugin-middleware.ts | 2 | ||||
| -rw-r--r-- | packages/astro/test/middleware.test.js | 3 |
4 files changed, 7 insertions, 7 deletions
diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts index 6b92bed92..2d738389d 100644 --- a/packages/astro/src/core/app/index.ts +++ b/packages/astro/src/core/app/index.ts @@ -9,7 +9,7 @@ import type { import type { SinglePageBuiltModule } from '../build/types'; import { getSetCookiesFromResponse } from '../cookies/index.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 { collapseDuplicateSlashes, prependForwardSlash, diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts index 1364ebf1e..def2ef7ac 100644 --- a/packages/astro/src/core/build/plugins/plugin-manifest.ts +++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts @@ -239,8 +239,7 @@ function buildManifest( } const isEdgeMiddleware = // TODO: remove in Astro 4.0 - settings.config.build.excludeMiddleware || - settings.adapter?.adapterFeatures?.edgeMiddleware; + settings.config.build.excludeMiddleware || settings.adapter?.adapterFeatures?.edgeMiddleware; const ssrManifest: SerializedSSRManifest = { adapterName: opts.settings.adapter?.name ?? '', @@ -254,7 +253,9 @@ function buildManifest( clientDirectives: Array.from(settings.clientDirectives), entryModules, assets: staticFiles.map(prefixAssetPath), - middlewareEntryPoint: !isEdgeMiddleware ? internals.middlewareEntryPoint?.toString() : undefined, + middlewareEntryPoint: !isEdgeMiddleware + ? internals.middlewareEntryPoint?.toString() + : undefined, }; return ssrManifest; diff --git a/packages/astro/src/core/build/plugins/plugin-middleware.ts b/packages/astro/src/core/build/plugins/plugin-middleware.ts index 7c945740c..99853c7b1 100644 --- a/packages/astro/src/core/build/plugins/plugin-middleware.ts +++ b/packages/astro/src/core/build/plugins/plugin-middleware.ts @@ -1,10 +1,10 @@ import type { Plugin as VitePlugin } from 'vite'; +import { getOutputDirectory } from '../../../prerender/utils.js'; import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../../constants.js'; import { addRollupInput } from '../add-rollup-input.js'; import type { BuildInternals } from '../internal'; import type { AstroBuildPlugin } from '../plugin'; import type { StaticBuildOptions } from '../types'; -import { getOutputDirectory } from '../../../prerender/utils.js'; export const MIDDLEWARE_MODULE_ID = '@astro-middleware'; diff --git a/packages/astro/test/middleware.test.js b/packages/astro/test/middleware.test.js index b09c686f4..9ca4841d4 100644 --- a/packages/astro/test/middleware.test.js +++ b/packages/astro/test/middleware.test.js @@ -220,7 +220,7 @@ describe('Middleware API in PROD mode, SSR', () => { expect(text.includes('Error')).to.be.true; expect(text.includes('bar')).to.be.true; }); - + it('the integration should receive the path to the middleware', async () => { fixture = await loadFixture({ root: './fixtures/middleware-dev/', @@ -245,7 +245,6 @@ describe('Middleware API in PROD mode, SSR', () => { throw e; } }); - }); describe('Middleware with tailwind', () => { |