michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into prefetch-intent

Browse source
This commit is contained in:
Kory Smith 2023-03-20 10:50:51 -04:00 committed by GitHub
commit b4afcae5a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/soft-plants-hope.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Simplify internal resolver in dev

4
examples/blog/src/components/FormattedDate.astro
View file

@ -1,4 +1,8 @@
---
export interface Props {
date: Date;
}
const { date } = Astro.props;
---

55
examples/docs/README.md
View file

@ -46,7 +46,7 @@ Feel free to check [our documentation](https://docs.astro.build) or jump into ou
### Site metadata
`src/config.ts` contains several data objects that describe metadata about your site like title, description, default language, and Open Graph details. You can customize these to match your project.
`src/consts.ts` contains several data objects that describe metadata about your site like title, description, default language, and Open Graph details. You can customize these to match your project.
### CSS styling
@ -82,19 +82,18 @@ For more SEO related properties, look at `src/components/HeadSEO.astro`
### Sidebar navigation
The sidebar navigation is controlled by the `SIDEBAR` variable in your `src/config.ts` file. You can customize the sidebar by modifying this object. A default, starter navigation has already been created for you.
The sidebar navigation is controlled by the `SIDEBAR` variable in your `src/consts.ts` file. You can customize the sidebar by modifying this object. A default, starter navigation has already been created for you.
```ts
export const SIDEBAR = {
en: [
{ text: "Section Header", header: true },
{ text: "Introduction", link: "en/introduction" },
{ text: "Page 2", link: "en/page-2" },
{ text: "Page 3", link: "en/page-3" },
{ text: "Another Section", header: true },
{ text: "Page 4", link: "en/page-4" },
],
en: {
'Section Header': [
{ text: 'Introduction', link: 'en/introduction' },
{ text: 'Page 2', link: 'en/page-2' },
{ text: 'Page 3', link: 'en/page-3' },
],
'Another Section': [{ text: 'Page 4', link: 'en/page-4' }],
},
};
```
@ -118,10 +117,10 @@ To add a new language to your project, you'll want to extend the current `src/co
+ ┃ ┣ 📜 page-3.astro
```
You'll also need to add the new language name to the `KNOWN_LANGUAGES` map in your `src/config.ts` file. This will enable your new language switcher in the site header.
You'll also need to add the new language name to the `KNOWN_LANGUAGES` map in your `src/consts.ts` file. This will enable your new language switcher in the site header.
```diff
// src/config.ts
// src/consts.ts
export const KNOWN_LANGUAGES = {
English: 'en',
+ Spanish: 'es',
@ -133,18 +132,22 @@ Last step: you'll need to add a new entry to your sidebar, to create the table o
> Make sure the sidebar `link` value points to the correct language!
```diff
// src/config.ts
// src/consts.ts
export const SIDEBAR = {
en: [
{ text: 'Section Header', header: true, },
{ text: 'Introduction', link: 'en/introduction' },
// ...
],
+ es: [
+ { text: 'Encabezado de sección', header: true, },
+ { text: 'Introducción', link: 'es/introduction' },
+ // ...
+ ],
en: {
'Section Header': [
{ text: 'Introduction', link: 'en/introduction' },
// ...
],
// ...
},,
+ es: {
+ 'Encabezado de sección': [
+ { text: 'Introducción', link: 'en/introduction' },
+ // ...
+ ],
+ // ...
+ },
};
// ...
@ -169,8 +172,8 @@ If that single language is not English, you can just replace `en` in directory l
### Search (Powered by Algolia)
[Algolia](https://www.algolia.com/) offers a free service to qualified open source projects called [DocSearch](https://docsearch.algolia.com/). If you are accepted to the DocSearch program, provide your API Key & index name in `src/config.ts` and a search box will automatically appear in your site header.
[Algolia](https://www.algolia.com/) offers a free service to qualified open source projects called [DocSearch](https://docsearch.algolia.com/). If you are accepted to the DocSearch program, provide your API Key & index name in `src/consts.ts` and a search box will automatically appear in your site header.
Note that Aglolia and Astro are not affiliated. We have no say over acceptance to the DocSearch program.
Note that Algolia and Astro are not affiliated. We have no say over acceptance to the DocSearch program.
If you'd prefer to remove Algolia's search and replace it with your own, check out the `src/components/Header.astro` component to see where the component is added.

9
packages/astro/src/core/render/dev/resolve.ts
View file

@ -8,13 +8,6 @@ export function createResolve(loader: ModuleLoader, root: URL) {
// - /Users/macos/project/src/Foo.vue
// - C:/Windows/project/src/Foo.vue (normalized slash)
return async function (s: string) {
const url = await resolveIdToUrl(loader, s, root);
// Vite does not resolve .jsx -> .tsx when coming from hydration script import,
// clip it so Vite is able to resolve implicitly.
if (url.startsWith('/') && url.endsWith('.jsx')) {
return url.slice(0, -4);
} else {
return url;
}
return await resolveIdToUrl(loader, s, root);
};
}