Skip to content
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

Jump to bottom

fix(i18n): localised index pages are overwritten #10250

Merged
merged 3 commits into from
Feb 28, 2024
Merged

fix(i18n): localised index pages are overwritten #10250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9be6d22
fix(i18n): localised index pages are overwritten
log101 Feb 27, 2024
49dcab7
chore: add changeset
log101 Feb 27, 2024
7d0302f
chore: add pnpm lock
log101 Feb 27, 2024
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
5 changes: 5 additions & 0 deletions .changeset/loud-pianos-pretend.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Fixes the overwriting of localised index pages with redirects
19 changes: 13 additions & 6 deletions packages/astro/src/core/build/generate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,6 @@ async function getPathsForRoute(
if (route.pathname) {
paths.push(route.pathname);
builtPaths.add(route.pathname);
for (const virtualRoute of route.fallbackRoutes) {
if (virtualRoute.pathname) {
paths.push(virtualRoute.pathname);
builtPaths.add(virtualRoute.pathname);
}
}
} else {
const staticPaths = await callGetStaticPaths({
mod,
Expand Down Expand Up @@ -485,6 +479,19 @@ async function generatePath(
addPageName(pathname, options);
}

// Do not render the fallback route if there is already a translated page
// with the same path
if (
route.type === 'fallback' &&
// If route is index page, continue rendering. The index page should
// always be rendered
route.pathname !== '/' &&
// Check if there is a translated page with the same path
Object.values(options.allPages).some((val) => pathname.match(val.route.pattern))
) {
return;
}

const url = getUrlForPath(
pathname,
config.base,
Expand Down
15 changes: 15 additions & 0 deletions packages/astro/test/fixtures/i18n-routing-fallback-index/astro.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { defineConfig } from "astro/config";

export default defineConfig({
base: "new-site",
i18n: {
defaultLocale: 'en',
locales: [
'en', 'pt', 'it'
],
fallback: {
"it": "en",
pt: "en"
}
}
})
8 changes: 8 additions & 0 deletions packages/astro/test/fixtures/i18n-routing-fallback-index/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "@test/i18n-routing-fallback-index",
"version": "0.0.0",
"private": true,
"dependencies": {
"astro": "workspace:*"
}
}
13 changes: 13 additions & 0 deletions packages/astro/test/fixtures/i18n-routing-fallback-index/src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<html>
<head>
<title>Astro</title>
<script>
console.log("this is a script")
</script>
</head>
<body>
Hello
</body>
</html>


12 changes: 12 additions & 0 deletions packages/astro/test/fixtures/i18n-routing-fallback-index/src/pages/pt/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
const currentLocale = Astro.currentLocale;
---

<html>
<head>
<title>Astro</title>
</head>
<body>
Oi essa e index: {currentLocale}
</body>
</html>
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/i18n-routing-fallback/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@test/i18n-routing-fallabck",
"name": "@test/i18n-routing-fallback",
"version": "0.0.0",
"private": true,
"dependencies": {
Expand Down
31 changes: 31 additions & 0 deletions packages/astro/test/i18n-routing.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,37 @@ describe('[SSG] i18n routing', () => {
let $ = cheerio.load(html);
assert.equal($('script').text().includes('console.log("this is a script")'), true);
});

describe('with localised index pages', () => {
before(async () => {
fixture = await loadFixture({
root: './fixtures/i18n-routing-fallback-index/',
i18n: {
defaultLocale: 'en',
locales: [
'en',
'pt',
'it',
{
path: 'spanish',
codes: ['es', 'es-AR'],
},
],
fallback: {
it: 'en',
spanish: 'en',
},
},
});
await fixture.build();
});

it('should render correctly', async () => {
let html = await fixture.readFile('/pt/index.html');
let $ = cheerio.load(html);
assert.equal($('body').text().includes('Oi essa e index'), true);
});
})
});

describe('i18n routing with fallback and [pathname-prefix-always]', () => {
Expand Down
154 changes: 154 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading