Skip to content

Commit

Permalink
Merge branch 'no-astro-content-in-client' of github.com:withastro/ast…
Browse files Browse the repository at this point in the history 
…ro into no-astro-content-in-client
  • Loading branch information
@matthewp
matthewp committed Aug 27, 2024
2 parents 63b674c + b66a0f2 commit 5747564
Show file tree
Hide file tree
Showing 61 changed files with 508 additions and 113 deletions.
19 changes: 19 additions & 0 deletions .changeset/long-months-rule.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
'astro': major
---

Deprecate Astro.glob

The `Astro.glob` function has been deprecated in favor of Content Collections and `import.meta.glob`.

- If you want to query for markdown and MDX in your project, use Content Collections.
- If you want to query source files in your project, use `import.meta.glob`(https://vitejs.dev/guide/features.html#glob-import).

Also consider using glob packages from npm, like [fast-glob](https://www.npmjs.com/package/fast-glob), especially if statically generating your site, as it is faster for most use-cases.

The easiest path is to migrate to `import.meta.glob` like so:

```diff
- const posts = Astro.glob('./posts/*.md');
+ const posts = Object.values(import.meta.glob('./posts/*.md', { eager: true }));
```
25 changes: 25 additions & 0 deletions .changeset/nasty-crabs-worry.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
'astro': minor
---

Adds a new property to the globals `Astro` and `APIContext` called `routePattern`. The `routePattern` represents the current route (component)
that is being rendered by Astro. It's usually a path pattern will look like this: `blog/[slug]`:

```asto
---
// src/pages/blog/[slug].astro
const route = Astro.routePattern;
console.log(route); // it will log "blog/[slug]"
---
```

```js
// src/pages/index.js

export const GET = (ctx) => {
console.log(ctx.routePattern) // it will log src/pages/index.js
return new Response.json({ loreum: "ipsum" })
}
```


17 changes: 16 additions & 1 deletion .changeset/pre.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,30 @@
"@astrojs/upgrade": "0.3.1"
},
"changesets": [
"blue-boats-relax",
"chatty-teachers-sit",
"eighty-boxes-applaud",
"fair-rats-fail",
"healthy-ads-scream",
"itchy-toys-march",
"long-months-burn",
"many-garlics-lick",
"mighty-trees-teach",
"modern-bears-deny",
"new-pillows-kick",
"odd-donuts-impress",
"perfect-fans-fly",
"poor-frogs-dream",
"quick-ads-exercise",
"selfish-impalas-grin",
"small-ties-sort",
"smart-comics-doubt",
"smooth-melons-cough",
"spicy-houses-fry",
"spotty-garlics-cheat",
"ten-students-repair",
"weak-dancers-beam"
"tiny-lamps-lick",
"weak-dancers-beam",
"weak-masks-do"
]
}
2 changes: 1 addition & 1 deletion examples/basics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.0.0-alpha.0"
"astro": "^5.0.0-alpha.1"
}
}
4 changes: 2 additions & 2 deletions examples/blog/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^4.0.0-alpha.0",
"@astrojs/mdx": "^4.0.0-alpha.1",
"@astrojs/rss": "^4.0.7",
"@astrojs/sitemap": "^3.1.6",
"astro": "^5.0.0-alpha.0"
"astro": "^5.0.0-alpha.1"
}
}
2 changes: 1 addition & 1 deletion examples/component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^5.0.0-alpha.0"
"astro": "^5.0.0-alpha.1"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
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 @@ -12,7 +12,7 @@
"test": "vitest run"
},
"dependencies": {
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"@astrojs/react": "^3.6.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-alpine/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"@astrojs/alpinejs": "^0.4.0",
"@types/alpinejs": "^3.13.10",
"alpinejs": "^3.14.1",
"astro": "^5.0.0-alpha.0"
"astro": "^5.0.0-alpha.1"
}
}
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 @@ -18,7 +18,7 @@
"@astrojs/vue": "^5.0.0-alpha.0",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"preact": "^10.23.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/preact": "^3.5.1",
"@preact/signals": "^1.3.0",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"preact": "^10.23.2"
}
}
2 changes: 1 addition & 1 deletion examples/framework-react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@astrojs/react": "^3.6.2",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-solid/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/solid-js": "^4.4.1",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"solid-js": "^1.8.21"
}
}
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,7 +12,7 @@
},
"dependencies": {
"@astrojs/svelte": "^6.0.0-alpha.0",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"svelte": "^4.2.18"
}
}
2 changes: 1 addition & 1 deletion examples/framework-vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/vue": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"vue": "^3.4.38"
}
}
4 changes: 2 additions & 2 deletions examples/hackernews/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/node": "^9.0.0-alpha.0",
"astro": "^5.0.0-alpha.0"
"@astrojs/node": "^9.0.0-alpha.1",
"astro": "^5.0.0-alpha.1"
}
}
2 changes: 1 addition & 1 deletion examples/integration/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^5.0.0-alpha.0"
"astro": "^5.0.0-alpha.1"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/middleware/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"server": "node dist/server/entry.mjs"
},
"dependencies": {
"@astrojs/node": "^9.0.0-alpha.0",
"astro": "^5.0.0-alpha.0",
"@astrojs/node": "^9.0.0-alpha.1",
"astro": "^5.0.0-alpha.1",
"html-minifier": "^4.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.0.0-alpha.0"
"astro": "^5.0.0-alpha.1"
}
}
2 changes: 1 addition & 1 deletion examples/non-html-pages/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.0.0-alpha.0"
"astro": "^5.0.0-alpha.1"
}
}
2 changes: 1 addition & 1 deletion examples/portfolio/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.0.0-alpha.0"
"astro": "^5.0.0-alpha.1"
}
}
4 changes: 2 additions & 2 deletions examples/server-islands/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"astro": "astro"
},
"devDependencies": {
"@astrojs/node": "^9.0.0-alpha.0",
"@astrojs/node": "^9.0.0-alpha.1",
"@astrojs/react": "^3.6.2",
"@astrojs/tailwind": "^6.0.0-alpha.0",
"@fortawesome/fontawesome-free": "^6.6.0",
"@tailwindcss/forms": "^0.5.7",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"postcss": "^8.4.41",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
4 changes: 2 additions & 2 deletions examples/ssr/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"server": "node dist/server/entry.mjs"
},
"dependencies": {
"@astrojs/node": "^9.0.0-alpha.0",
"@astrojs/node": "^9.0.0-alpha.1",
"@astrojs/svelte": "^6.0.0-alpha.0",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"svelte": "^4.2.18"
}
}
2 changes: 1 addition & 1 deletion examples/starlog/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"sass": "^1.77.8",
"sharp": "^0.33.3"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/toolbar-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"./app": "./dist/app.js"
},
"devDependencies": {
"astro": "^5.0.0-alpha.0"
"astro": "^5.0.0-alpha.1"
}
}
4 changes: 2 additions & 2 deletions examples/view-transitions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"devDependencies": {
"@astrojs/tailwind": "^6.0.0-alpha.0",
"@astrojs/node": "^9.0.0-alpha.0",
"astro": "^5.0.0-alpha.0"
"@astrojs/node": "^9.0.0-alpha.1",
"astro": "^5.0.0-alpha.1"
}
}
2 changes: 1 addition & 1 deletion examples/with-markdoc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
},
"dependencies": {
"@astrojs/markdoc": "^1.0.0-alpha.0",
"astro": "^5.0.0-alpha.0"
"astro": "^5.0.0-alpha.1"
}
}
2 changes: 1 addition & 1 deletion examples/with-markdown-plugins/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/markdown-remark": "^6.0.0-alpha.0",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"hast-util-select": "^6.0.2",
"rehype-autolink-headings": "^7.1.0",
"rehype-slug": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/with-markdown-shiki/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.0.0-alpha.0"
"astro": "^5.0.0-alpha.1"
}
}
4 changes: 2 additions & 2 deletions examples/with-mdx/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^4.0.0-alpha.0",
"@astrojs/mdx": "^4.0.0-alpha.1",
"@astrojs/preact": "^3.5.1",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"preact": "^10.23.2"
}
}
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/preact": "^3.5.1",
"@nanostores/preact": "^0.5.2",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"nanostores": "^0.11.2",
"preact": "^10.23.2"
}
Expand Down
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 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^4.0.0-alpha.0",
"@astrojs/mdx": "^4.0.0-alpha.1",
"@astrojs/tailwind": "^6.0.0-alpha.0",
"@types/canvas-confetti": "^1.6.4",
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"autoprefixer": "^10.4.20",
"canvas-confetti": "^1.9.3",
"postcss": "^8.4.41",
Expand Down
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,7 +12,7 @@
"test": "vitest"
},
"dependencies": {
"astro": "^5.0.0-alpha.0",
"astro": "^5.0.0-alpha.1",
"vitest": "^2.0.5"
}
}
Loading

0 comments on commit 5747564

Please sign in to comment.