commonscomputer/cal.diy
4
0
Fork 0
Code Issues Pull Requests Actions 2.2k Packages Projects Releases Wiki Activity

fix: rewrite /en/* paths to /* (#20331)

Browse Source 
* fix: add back i18n config to next.config.js

* add back localeDetection

* rewrite /en/* paths to /

* add e2e test

* add comment

* add test

---------

Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
This commit is contained in:
Benny Joo
2025-03-24 16:50:55 -03:00
committed by GitHub
co-authored by Anik Dhabal Babu
parent e4cfaa56f0
commit 0ec701f9e6
3 changed files with 80 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/next.config.js
+5
View File
@@ -288,6 +288,11 @@ const nextConfig = {
async rewrites() {
const { orgSlug } = nextJsOrgRewriteConfig;
const beforeFiles = [
{
// This should be the first item in `beforeFiles` to take precedence over other rewrites
source: "/en/:path*",
destination: "/:path*",
},
{
source: "/forms/:formQuery*",
destination: "/apps/routing-forms/routing-link/:formQuery*",
apps/web/playwright/i18n-routing.e2e.ts
+27
View File
@@ -0,0 +1,27 @@
import { expect } from "@playwright/test";
import { test } from "./lib/fixtures";
test.describe("/en/* pages must not 404", () => {
test("/en/login shouldn't 404", async ({ page }) => {
const response = await page.goto(`/en/login`);
expect(response?.status()).not.toBe(404);
});
test("/en/auth/login shouldn't 404", async ({ page }) => {
const response = await page.goto(`/en/auth/login`);
expect(response?.status()).not.toBe(404);
});
test("/en/[user] page shouldn't 404", async ({ page, users }) => {
const user = await users.create();
const response = await page.goto(`/en/${user.username}`);
expect(response?.status()).not.toBe(404);
});
test("/en/[user]/[type] page shouldn't 404", async ({ page, users }) => {
const user = await users.create();
const response = await page.goto(`/en/${user.username}/30-min`);
expect(response?.status()).not.toBe(404);
});
});
apps/web/playwright/unpublished.e2e.ts
+48 -35
View File
@@ -14,16 +14,24 @@ test.afterEach(async ({ users }) => {
await users.deleteAll();
});
const assertChecks = async (page: any, entityName: string, entityType: string) => {
await expect(page.locator('[data-testid="empty-screen"]')).toHaveCount(1);
await expect(page.locator(`h2:has-text("${title(entityName)}")`)).toHaveCount(1);
await expect(page.locator(`div:text("${description(entityType)}")`)).toHaveCount(1);
await expect(page.locator(`img`)).toHaveAttribute("src", /.*/);
};
test.describe("Unpublished", () => {
test("Regular team profile", async ({ page, users }) => {
const owner = await users.create(undefined, { hasTeam: true, isUnpublished: true });
const { team } = await owner.getFirstTeamMembership();
const { requestedSlug } = team.metadata as { requestedSlug: string };
await page.goto(`/team/${requestedSlug}`);
await expect(page.locator('[data-testid="empty-screen"]')).toHaveCount(1);
await expect(page.locator(`h2:has-text("${title(team.name)}")`)).toHaveCount(1);
await expect(page.locator(`div:text("${description("team")}")`)).toHaveCount(1);
await expect(page.locator(`img`)).toHaveAttribute("src", /.*/);
const prefixes = ["", "/en"];
for (const prefix of prefixes) {
await page.goto(`${prefix}/team/${requestedSlug}`);
await assertChecks(page, team.name, "team");
}
});
test("Regular team event type", async ({ page, users }) => {
@@ -35,22 +43,24 @@ test.describe("Unpublished", () => {
const { team } = await owner.getFirstTeamMembership();
const { requestedSlug } = team.metadata as { requestedSlug: string };
const { slug: teamEventSlug } = await owner.getFirstTeamEvent(team.id);
await page.goto(`/team/${requestedSlug}/${teamEventSlug}`);
await expect(page.locator('[data-testid="empty-screen"]')).toHaveCount(1);
await expect(page.locator(`h2:has-text("${title(team.name)}")`)).toHaveCount(1);
await expect(page.locator(`div:text("${description("team")}")`)).toHaveCount(1);
await expect(page.locator(`img`)).toHaveAttribute("src", /.*/);
const prefixes = ["", "/en"];
for (const prefix of prefixes) {
await page.goto(`${prefix}/team/${requestedSlug}/${teamEventSlug}`);
await assertChecks(page, team.name, "team");
}
});
test("Organization profile", async ({ users, page }) => {
const owner = await users.create(undefined, { hasTeam: true, isUnpublished: true, isOrg: true });
const { team: org } = await owner.getOrgMembership();
const { requestedSlug } = org.metadata as { requestedSlug: string };
await page.goto(`/org/${requestedSlug}`);
await expect(page.locator('[data-testid="empty-screen"]')).toHaveCount(1);
await expect(page.locator(`h2:has-text("${title(org.name)}")`)).toHaveCount(1);
await expect(page.locator(`div:text("${description("organization")}")`)).toHaveCount(1);
await expect(page.locator(`img`)).toHaveAttribute("src", /.*/);
const prefixes = ["", "/en"];
for (const prefix of prefixes) {
await page.goto(`${prefix}/org/${requestedSlug}`);
await assertChecks(page, org.name, "organization");
}
});
test("Organization sub-team", async ({ users, page }) => {
@@ -63,11 +73,12 @@ test.describe("Unpublished", () => {
const { team: org } = await owner.getOrgMembership();
const { requestedSlug } = org.metadata as { requestedSlug: string };
const [{ slug: subteamSlug }] = org.children as { slug: string }[];
await page.goto(`/org/${requestedSlug}/team/${subteamSlug}`);
await expect(page.locator('[data-testid="empty-screen"]')).toHaveCount(1);
await expect(page.locator(`h2:has-text("${title(org.name)}")`)).toHaveCount(1);
await expect(page.locator(`div:text("${description("organization")}")`)).toHaveCount(1);
await expect(page.locator(`img`)).toHaveAttribute("src", /.*/);
const prefixes = ["", "/en"];
for (const prefix of prefixes) {
await page.goto(`${prefix}/org/${requestedSlug}/team/${subteamSlug}`);
await assertChecks(page, org.name, "organization");
}
});
test("Organization sub-team event-type", async ({ users, page }) => {
@@ -81,23 +92,24 @@ test.describe("Unpublished", () => {
const { requestedSlug } = org.metadata as { requestedSlug: string };
const [{ slug: subteamSlug, id: subteamId }] = org.children as { slug: string; id: number }[];
const { slug: subteamEventSlug } = await owner.getFirstTeamEvent(subteamId);
await page.goto(`/org/${requestedSlug}/team/${subteamSlug}/${subteamEventSlug}`);
const prefixes = ["", "/en"];
await expect(page.locator('[data-testid="empty-screen"]')).toHaveCount(1);
await expect(page.locator(`h2:has-text("${title(org.name)}")`)).toHaveCount(1);
await expect(page.locator(`div:text("${description("organization")}")`)).toHaveCount(1);
await expect(page.locator(`img`)).toHaveAttribute("src", /.*/);
for (const prefix of prefixes) {
await page.goto(`${prefix}/org/${requestedSlug}/team/${subteamSlug}/${subteamEventSlug}`);
await assertChecks(page, org.name, "organization");
}
});
test("Organization user", async ({ users, page }) => {
const owner = await users.create(undefined, { hasTeam: true, isUnpublished: true, isOrg: true });
const { team: org } = await owner.getOrgMembership();
const { requestedSlug } = org.metadata as { requestedSlug: string };
await page.goto(`/org/${requestedSlug}/${owner.username}`);
await expect(page.locator('[data-testid="empty-screen"]')).toHaveCount(1);
await expect(page.locator(`h2:has-text("${title(org.name)}")`)).toHaveCount(1);
await expect(page.locator(`div:text("${description("organization")}")`)).toHaveCount(1);
await expect(page.locator(`img`)).toHaveAttribute("src", /.*/);
const prefixes = ["", "/en"];
for (const prefix of prefixes) {
await page.goto(`${prefix}/org/${requestedSlug}/${owner.username}`);
await assertChecks(page, org.name, "organization");
}
});
test("Organization user event-type", async ({ users, page }) => {
@@ -105,10 +117,11 @@ test.describe("Unpublished", () => {
const { team: org } = await owner.getOrgMembership();
const { requestedSlug } = org.metadata as { requestedSlug: string };
const [{ slug: ownerEventType }] = owner.eventTypes;
await page.goto(`/org/${requestedSlug}/${owner.username}/${ownerEventType}`);
await expect(page.locator('[data-testid="empty-screen"]')).toHaveCount(1);
await expect(page.locator(`h2:has-text("${title(org.name)}")`)).toHaveCount(1);
await expect(page.locator(`div:text("${description("organization")}")`)).toHaveCount(1);
await expect(page.locator(`img`)).toHaveAttribute("src", /.*/);
const prefixes = ["", "/en"];
for (const prefix of prefixes) {
await page.goto(`${prefix}/org/${requestedSlug}/${owner.username}/${ownerEventType}`);
await assertChecks(page, org.name, "organization");
}
});
});