Skip to content

Commit

Permalink
Merge branch 'main' of github.com:unprintable123/astro into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@unprintable123
unprintable123 committed Jan 31, 2025
2 parents 6921e53 + c33eccb commit 1895db5
Show file tree
Hide file tree
Showing 69 changed files with 773 additions and 685 deletions.
5 changes: 5 additions & 0 deletions .changeset/itchy-roses-walk.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes a bug that caused injected endpoint routes to return not found when trailingSlash was set to always
4 changes: 2 additions & 2 deletions benchmark/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@astrojs/mdx": "workspace:*",
"@astrojs/node": "^9.0.1",
"@astrojs/node": "^9.0.2",
"@benchmark/timer": "workspace:*",
"@benchmark/adapter": "workspace:*",
"astro": "workspace:*",
Expand All @@ -25,6 +25,6 @@
},
"devDependencies": {
"@codspeed/vitest-plugin": "4.0.0",
"vitest": "^3.0.2"
"vitest": "^3.0.4"
}
}
2 changes: 1 addition & 1 deletion examples/container-with-vitest/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"astro": "^5.2.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vitest": "^3.0.2"
"vitest": "^3.0.4"
},
"devDependencies": {
"@types/react": "^18.3.18",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-multiple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion examples/framework-svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"dependencies": {
"@astrojs/svelte": "^7.0.4",
"astro": "^5.2.2",
"svelte": "^5.19.0"
"svelte": "^5.19.6"
}
}
2 changes: 1 addition & 1 deletion examples/hackernews/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/node": "^9.0.1",
"@astrojs/node": "^9.0.2",
"astro": "^5.2.2"
}
}
4 changes: 2 additions & 2 deletions examples/ssr/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"server": "node dist/server/entry.mjs"
},
"dependencies": {
"@astrojs/node": "^9.0.1",
"@astrojs/node": "^9.0.2",
"@astrojs/svelte": "^7.0.4",
"astro": "^5.2.2",
"svelte": "^5.19.0"
"svelte": "^5.19.6"
}
}
4 changes: 2 additions & 2 deletions examples/with-tailwindcss/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
},
"dependencies": {
"@astrojs/mdx": "^4.0.8",
"@tailwindcss/vite": "^4.0.0",
"@tailwindcss/vite": "^4.0.1",
"@types/canvas-confetti": "^1.9.0",
"astro": "^5.2.2",
"canvas-confetti": "^1.9.3",
"tailwindcss": "^4.0.0"
"tailwindcss": "^4.0.1"
}
}
2 changes: 1 addition & 1 deletion examples/with-vitest/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
},
"dependencies": {
"astro": "^5.2.2",
"vitest": "^3.0.2"
"vitest": "^3.0.4"
}
}
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,19 @@
"@astrojs/check": "^0.9.4",
"@biomejs/biome": "1.9.4",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.11",
"@changesets/cli": "^2.27.12",
"@types/node": "^18.17.8",
"esbuild": "^0.24.2",
"eslint": "^9.18.0",
"eslint": "^9.19.0",
"eslint-plugin-regexp": "^2.7.0",
"globby": "^14.0.2",
"only-allow": "^1.2.1",
"prettier": "^3.4.2",
"prettier-plugin-astro": "^0.14.1",
"publint": "^0.3.2",
"turbo": "^2.3.3",
"turbo": "^2.3.4",
"typescript": "~5.7.3",
"typescript-eslint": "^8.20.0"
"typescript-eslint": "^8.22.0"
},
"pnpm": {
"peerDependencyRules": {
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/actions-blog/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/db": "workspace:*",
"@astrojs/node": "^9.0.1",
"@astrojs/node": "^9.0.2",
"@astrojs/react": "workspace:*",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/actions-react-19/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/db": "workspace:*",
"@astrojs/node": "^9.0.1",
"@astrojs/node": "^9.0.2",
"@astrojs/react": "workspace:*",
"@types/react": "npm:types-react",
"@types/react-dom": "npm:types-react-dom",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/client-only/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/errors/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"react-dom": "^18.3.1",
"sass": "^1.83.4",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/i18n/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"astro": "workspace:*",
"@astrojs/node": "^9.0.1"
"@astrojs/node": "^9.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/multiple-frameworks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-in-preact/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-in-react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-in-solid/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-in-svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-in-vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-recursive/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/server-islands-key/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
},
"dependencies": {
"astro": "workspace:*",
"@astrojs/node": "^9.0.1"
"@astrojs/node": "^9.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/server-islands/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@astrojs/react": "workspace:*",
"astro": "workspace:*",
"@astrojs/mdx": "workspace:*",
"@astrojs/node": "^9.0.1",
"@astrojs/node": "^9.0.2",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/svelte-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/svelte": "workspace:*",
"astro": "workspace:*",
"svelte": "^5.19.0"
"svelte": "^5.19.6"
}
}
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/tailwindcss/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"private": true,
"dependencies": {
"@astrojs/tailwind": "workspace:*",
"@tailwindcss/vite": "^4.0.0",
"@tailwindcss/vite": "^4.0.1",
"astro": "workspace:*",
"tailwindcss": "^4.0.0"
"tailwindcss": "^4.0.1"
}
}
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/view-transitions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"@astrojs/node": "^9.0.1",
"@astrojs/node": "^9.0.2",
"@astrojs/react": "workspace:*",
"@astrojs/solid-js": "workspace:*",
"@astrojs/svelte": "workspace:*",
Expand All @@ -12,7 +12,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
24 changes: 12 additions & 12 deletions packages/astro/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"fast-glob": "^3.3.3",
"flattie": "^1.1.1",
"github-slugger": "^2.0.0",
"html-escaper": "^3.0.3",
"html-escaper": "3.0.3",
"http-cache-semantics": "^4.1.1",
"js-yaml": "^4.1.0",
"kleur": "^4.1.5",
Expand All @@ -156,12 +156,12 @@
"mrmime": "^2.0.0",
"neotraverse": "^0.6.18",
"p-limit": "^6.2.0",
"p-queue": "^8.0.1",
"preferred-pm": "^4.0.0",
"p-queue": "^8.1.0",
"preferred-pm": "^4.1.0",
"prompts": "^2.4.2",
"rehype": "^13.0.2",
"semver": "^7.6.3",
"shiki": "^1.29.1",
"semver": "^7.7.0",
"shiki": "^1.29.2",
"tinyexec": "^0.3.2",
"tsconfck": "^3.1.4",
"ultrahtml": "^1.5.3",
Expand All @@ -173,7 +173,7 @@
"which-pm": "^3.0.0",
"xxhash-wasm": "^1.1.0",
"yargs-parser": "^21.1.1",
"yocto-spinner": "^0.1.2",
"yocto-spinner": "^0.2.0",
"zod": "^3.24.1",
"zod-to-json-schema": "^3.24.1",
"zod-to-ts": "^1.2.0"
Expand All @@ -183,15 +183,15 @@
},
"devDependencies": {
"@astrojs/check": "^0.9.4",
"@playwright/test": "^1.49.1",
"@playwright/test": "^1.50.0",
"@types/aria-query": "^5.0.4",
"@types/common-ancestor-path": "^1.0.2",
"@types/cssesc": "^3.0.2",
"@types/debug": "^4.1.12",
"@types/diff": "^5.2.3",
"@types/dlv": "^1.1.5",
"@types/hast": "^3.0.4",
"@types/html-escaper": "^3.0.2",
"@types/html-escaper": "3.0.2",
"@types/http-cache-semantics": "^4.0.4",
"@types/js-yaml": "^4.0.9",
"@types/micromatch": "^4.0.9",
Expand All @@ -203,7 +203,7 @@
"eol": "^0.10.0",
"execa": "^8.0.1",
"expect-type": "^1.1.0",
"fs-fixture": "^2.6.0",
"fs-fixture": "^2.7.0",
"mdast-util-mdx": "^3.0.0",
"mdast-util-mdx-jsx": "^3.2.0",
"node-mocks-http": "^1.16.2",
Expand All @@ -212,11 +212,11 @@
"rehype-slug": "^6.0.0",
"rehype-toc": "^3.0.2",
"remark-code-titles": "^0.1.2",
"rollup": "^4.31.0",
"rollup": "^4.32.1",
"sass": "^1.83.4",
"undici": "^7.2.3",
"undici": "^7.3.0",
"unified": "^11.0.5",
"vitest": "^3.0.2"
"vitest": "^3.0.4"
},
"engines": {
"node": "^18.17.1 || ^20.3.0 || >=22.0.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/astro/src/core/routing/manifest/create.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,7 @@ function createInjectedRoutes({ settings, cwd }: CreateRouteManifestParams): Rou
});

const type = resolved.endsWith('.astro') ? 'page' : 'endpoint';
const isPage = type === 'page';
const trailingSlash = isPage ? config.trailingSlash : 'never';
const { trailingSlash } = config;

const pattern = getPattern(segments, settings.config.base, trailingSlash);
const generate = getRouteGenerator(segments, trailingSlash);
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/0-css/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"astro": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/svelte": "workspace:*",
"astro": "workspace:*",
"svelte": "^5.19.0"
"svelte": "^5.19.6"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/alias-tsconfig/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/svelte": "workspace:*",
"@test/namespace-package": "workspace:*",
"astro": "workspace:*",
"svelte": "^5.19.0"
"svelte": "^5.19.6"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/alias/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/svelte": "workspace:*",
"astro": "workspace:*",
"svelte": "^5.19.0"
"svelte": "^5.19.6"
}
}
Loading

0 comments on commit 1895db5

Please sign in to comment.