summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Matthew Phillips <ematipico@users.noreply.github.com> 2024-07-18 15:04:30 +0000
committerGravatar astrobot-houston <fred+astrobot@astro.build> 2024-07-18 15:04:30 +0000
commita6371696680b8a4c9566cc1c68d7298ca9e3a7aa (patch)
tree26bb2b9e86ccc41fdc96dfb045498ddd7bbb2c88
parentfe3afebd652289ec1b65eed983e804dbb37ed092 (diff)
downloadastro-a6371696680b8a4c9566cc1c68d7298ca9e3a7aa.tar.gz
astro-a6371696680b8a4c9566cc1c68d7298ca9e3a7aa.tar.zst
astro-a6371696680b8a4c9566cc1c68d7298ca9e3a7aa.zip
[ci] format
-rw-r--r--packages/astro/src/core/build/index.ts10
-rw-r--r--packages/astro/src/core/routing/manifest/pattern.ts5
-rw-r--r--packages/astro/src/core/server-islands/endpoint.ts2
-rw-r--r--packages/astro/src/vite-plugin-astro-server/plugin.ts3
-rw-r--r--packages/integrations/vercel/test/server-islands.test.js14
5 files changed, 15 insertions, 19 deletions
diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts
index 23e7b7835..0d5fa91a0 100644
--- a/packages/astro/src/core/build/index.ts
+++ b/packages/astro/src/core/build/index.ts
@@ -27,12 +27,12 @@ import type { Logger } from '../logger/core.js';
import { levels, timerMessage } from '../logger/core.js';
import { apply as applyPolyfill } from '../polyfill.js';
import { createRouteManifest } from '../routing/index.js';
+import { getServerIslandRouteData } from '../server-islands/endpoint.js';
import { ensureProcessNodeEnv, isServerLikeOutput } from '../util.js';
import { collectPagesData } from './page-data.js';
import { staticBuild, viteBuild } from './static-build.js';
import type { StaticBuildOptions } from './types.js';
import { getTimeStat } from './util.js';
-import { getServerIslandRouteData } from '../server-islands/endpoint.js';
export interface BuildOptions {
/**
@@ -217,9 +217,11 @@ class AstroBuilder {
pages: pageNames,
routes: Object.values(allPages)
.flat()
- .map((pageData) => pageData.route).concat(
- this.settings.config.experimental.serverIslands ?
- [ getServerIslandRouteData(this.settings.config) ] : []
+ .map((pageData) => pageData.route)
+ .concat(
+ this.settings.config.experimental.serverIslands
+ ? [getServerIslandRouteData(this.settings.config)]
+ : []
),
logging: this.logger,
cacheManifest: internals.cacheManifestUsed,
diff --git a/packages/astro/src/core/routing/manifest/pattern.ts b/packages/astro/src/core/routing/manifest/pattern.ts
index 320d02e20..ee0cfaf65 100644
--- a/packages/astro/src/core/routing/manifest/pattern.ts
+++ b/packages/astro/src/core/routing/manifest/pattern.ts
@@ -1,7 +1,4 @@
-import type {
- AstroConfig,
- RoutePart,
-} from '../../../@types/astro.js';
+import type { AstroConfig, RoutePart } from '../../../@types/astro.js';
export function getPattern(
segments: RoutePart[][],
diff --git a/packages/astro/src/core/server-islands/endpoint.ts b/packages/astro/src/core/server-islands/endpoint.ts
index 1e01d0828..638e22882 100644
--- a/packages/astro/src/core/server-islands/endpoint.ts
+++ b/packages/astro/src/core/server-islands/endpoint.ts
@@ -38,8 +38,6 @@ export function getServerIslandRouteData(config: ConfigFields) {
return route;
}
-
-
export function ensureServerIslandRoute(config: ConfigFields, routeManifest: ManifestData) {
if (routeManifest.routes.some((route) => route.route === '/_server-islands/[name]')) {
return;
diff --git a/packages/astro/src/vite-plugin-astro-server/plugin.ts b/packages/astro/src/vite-plugin-astro-server/plugin.ts
index 56cba80ec..2d072b71f 100644
--- a/packages/astro/src/vite-plugin-astro-server/plugin.ts
+++ b/packages/astro/src/vite-plugin-astro-server/plugin.ts
@@ -35,7 +35,8 @@ export default function createVitePluginAstroServer({
configureServer(viteServer) {
const loader = createViteLoader(viteServer);
const manifest = createDevelopmentManifest(settings);
- let manifestData: ManifestData = injectDefaultRoutes(manifest,
+ let manifestData: ManifestData = injectDefaultRoutes(
+ manifest,
createRouteManifest({ settings, fsMod }, logger)
);
const pipeline = DevPipeline.create(manifestData, { loader, logger, manifest, settings });
diff --git a/packages/integrations/vercel/test/server-islands.test.js b/packages/integrations/vercel/test/server-islands.test.js
index 060492584..0306bb8b2 100644
--- a/packages/integrations/vercel/test/server-islands.test.js
+++ b/packages/integrations/vercel/test/server-islands.test.js
@@ -14,15 +14,13 @@ describe('Server Islands', () => {
});
it('server islands route is in the config', async () => {
- const config = JSON.parse(
- await fixture.readFile('../.vercel/output/config.json')
- );
+ const config = JSON.parse(await fixture.readFile('../.vercel/output/config.json'));
let found = null;
- for(let route of config.routes) {
- if(route.src?.includes('_server-islands')) {
- found = route;
- break;
- }
+ for (let route of config.routes) {
+ if (route.src?.includes('_server-islands')) {
+ found = route;
+ break;
+ }
}
assert.notEqual(found, null, 'Default server islands route included');
});