Skip to content

refactor: simplify astro.config.mjs follow-up to Astro 7 upgrade #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masuP9 merged 4 commits into from
May 1, 2026
Merged

refactor: simplify astro.config.mjs follow-up to Astro 7 upgrade #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01cb069
chore: drop .npmrc legacy-peer-deps and use overrides instead
masuP9 May 1, 2026
8702fb5
refactor(config): remove obsolete options from astro.config.mjs
masuP9 May 1, 2026
7d5a81e
refactor(layout): use Astro.site as OGP siteUrl fallback
masuP9 May 1, 2026
8a4b57b
chore: apply prettier formatting to astro.config.mjs
masuP9 May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .npmrc
View file
Open in desktop

This file was deleted.

38 changes: 3 additions & 35 deletions astro.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import svelte from '@astrojs/svelte';
import tailwindcss from '@tailwindcss/vite';
import mdx from '@astrojs/mdx';

/** @typedef {'github-pages' | 'cloudflare-pages' | 'local'} DeployTarget */
/** @typedef {'github-pages' | 'cloudflare-pages'} DeployTarget */

/**
* Get dev server port from environment variable or generate from worktree path
Expand All @@ -30,7 +30,6 @@ function getDevPort() {
return 4321 + (hash % 79);
}

// Get port early so it can be used in siteConfig
const devPort = getDevPort();

/** @type {Record<DeployTarget, { site: string; base: string }>} */
Expand All @@ -43,19 +42,13 @@ const siteConfig = {
site: process.env.CF_PAGES_URL || 'https://apg-patterns-examples.pages.dev',
base: '/',
},
local: {
site: `http://localhost:${devPort}`,
base: '/',
},
};

// Deploy target: 'github-pages' (default for production) or 'cloudflare-pages'
const deployTargetEnv =
process.env.DEPLOY_TARGET || (process.env.NODE_ENV === 'production' ? 'github-pages' : 'local');
const deployTargetEnv = process.env.DEPLOY_TARGET || 'github-pages';

/** @type {DeployTarget} */
const deployTarget =
deployTargetEnv in siteConfig ? /** @type {DeployTarget} */ (deployTargetEnv) : 'local';
deployTargetEnv in siteConfig ? /** @type {DeployTarget} */ (deployTargetEnv) : 'github-pages';

const { site, base } = siteConfig[deployTarget];

Expand All @@ -80,35 +73,10 @@ export default defineConfig({

vite: {
plugins: [tailwindcss()],
environments: {
client: {
build: {
rollupOptions: {
output: {
// Split framework vendor chunks for better caching and build performance.
// Vite 8 removed the object form of manualChunks; use the function form.
manualChunks(id) {
if (
id.includes('/node_modules/react/') ||
id.includes('/node_modules/react-dom/')
) {
return 'react-vendor';
}
if (id.includes('/node_modules/vue/')) return 'vue-vendor';
if (id.includes('/node_modules/svelte/')) return 'svelte-vendor';
},
},
},
},
},
},
},

i18n: {
defaultLocale: 'en',
locales: ['en', 'ja'],
routing: {
prefixDefaultLocale: false,
},
},
});
Loading
Loading