Skip to content

Commit

Permalink
Merge pull request #234 from withastro/main
Browse files Browse the repository at this point in the history 
a230
  • Loading branch information
@akshit20421
akshit20421 authored Sep 30, 2024
2 parents cc34e2c + 12dae50 commit f854ad1
Show file tree
Hide file tree
Showing 53 changed files with 631 additions and 623 deletions.
5 changes: 5 additions & 0 deletions .changeset/afraid-candles-hear.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Adds missing filePath property on content layer entries
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 @@ -19,7 +19,7 @@
"vitest": "^2.1.1"
},
"devDependencies": {
"@types/react": "^18.3.9",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0"
}
}
4 changes: 2 additions & 2 deletions examples/framework-multiple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
"@astrojs/solid-js": "^4.4.2",
"@astrojs/svelte": "^5.7.1",
"@astrojs/vue": "^4.5.1",
"@types/react": "^18.3.9",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "^4.15.9",
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
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 @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/react": "^3.6.2",
"@types/react": "^18.3.9",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "^4.15.9",
"react": "^18.3.1",
Expand Down
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 @@ -13,6 +13,6 @@
"dependencies": {
"@astrojs/vue": "^4.5.1",
"astro": "^4.15.9",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion examples/server-islands/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@astrojs/tailwind": "^5.1.1",
"@fortawesome/fontawesome-free": "^6.6.0",
"@tailwindcss/forms": "^0.5.9",
"@types/react": "^18.3.9",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "^4.15.9",
"postcss": "^8.4.47",
Expand Down
2 changes: 1 addition & 1 deletion examples/starlog/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"astro": "^4.15.9",
"sass": "^1.79.3",
"sass": "^1.79.4",
"sharp": "^0.33.3"
}
}
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 @@ -14,7 +14,7 @@
"@astrojs/db": "workspace:*",
"@astrojs/node": "^8.3.4",
"@astrojs/react": "workspace:*",
"@types/react": "^18.3.9",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"react": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/astro-envs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
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 @@ -16,6 +16,6 @@
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/error-sass/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:*",
"sass": "^1.79.3"
"sass": "^1.79.4"
}
}
4 changes: 2 additions & 2 deletions packages/astro/e2e/fixtures/errors/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"preact": "^10.24.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass": "^1.79.3",
"sass": "^1.79.4",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/hmr/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"private": true,
"devDependencies": {
"astro": "workspace:*",
"sass": "^1.79.3"
"sass": "^1.79.4"
}
}
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 @@ -19,6 +19,6 @@
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
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 @@ -16,6 +16,6 @@
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
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 @@ -16,6 +16,6 @@
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
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 @@ -16,6 +16,6 @@
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
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 @@ -16,6 +16,6 @@
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
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 @@ -16,6 +16,6 @@
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
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 @@ -16,7 +16,7 @@
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
},
"scripts": {
"dev": "astro dev"
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/view-transitions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"svelte": "^4.2.19",
"vue": "^3.5.8",
"vue": "^3.5.10",
"solid-js": "^1.9.1"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/vue-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/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
10 changes: 5 additions & 5 deletions packages/astro/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
"acorn": "^8.12.1",
"aria-query": "^5.3.2",
"axobject-query": "^4.1.0",
"boxen": "7.1.1",
"boxen": "8.0.1",
"ci-info": "^4.0.0",
"clsx": "^2.1.1",
"common-ancestor-path": "^1.0.1",
Expand Down Expand Up @@ -170,9 +170,9 @@
"p-queue": "^8.0.1",
"preferred-pm": "^4.0.0",
"prompts": "^2.4.2",
"rehype": "^13.0.1",
"rehype": "^13.0.2",
"semver": "^7.6.3",
"shiki": "^1.19.0",
"shiki": "^1.21.0",
"string-width": "^7.2.0",
"strip-ansi": "^7.1.0",
"tinyexec": "^0.3.0",
Expand Down Expand Up @@ -222,8 +222,8 @@
"rehype-slug": "^6.0.0",
"rehype-toc": "^3.0.2",
"remark-code-titles": "^0.1.2",
"rollup": "^4.22.4",
"sass": "^1.79.3",
"rollup": "^4.22.5",
"sass": "^1.79.4",
"undici": "^6.19.8",
"unified": "^11.0.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/performance/fixtures/md/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"@astrojs/react": "workspace:*",
"@performance/utils": "workspace:*",
"@types/react": "^18.3.9",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"react": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/performance/fixtures/mdoc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@astrojs/markdoc": "workspace:*",
"@astrojs/react": "workspace:*",
"@performance/utils": "workspace:*",
"@types/react": "^18.3.9",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"react": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/performance/fixtures/mdx/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/react": "workspace:*",
"@performance/utils": "workspace:*",
"@types/react": "^18.3.9",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"react": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/content/types-generator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ async function writeContentFiles({
contentTypesStr += `};\n`;
break;
case CONTENT_LAYER_TYPE:
dataTypesStr += `${collectionKey}: Record<string, {\n id: string;\n collection: ${collectionKey};\n data: ${dataType};\n rendered?: RenderedContent \n}>;\n`;
dataTypesStr += `${collectionKey}: Record<string, {\n id: string;\n collection: ${collectionKey};\n data: ${dataType};\n rendered?: RenderedContent;\n filePath?: string \n}>;\n`;
break;
case 'data':
if (collectionEntryKeys.length === 0) {
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 @@ -10,6 +10,6 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/astro-children/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"astro": "workspace:*",
"preact": "^10.24.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/astro-envs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/astro-slots-nested/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/container-custom-renderers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"astro": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/fetch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"astro": "workspace:*",
"preact": "^10.24.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/jsx/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"react-dom": "^18.3.1",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/postcss/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"postcss": "^8.4.47",
"solid-js": "^1.9.1",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
},
"devDependencies": {
"postcss-preset-env": "^10.0.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/slots-vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/solid-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@astrojs/solid-js": "workspace:*",
"@solidjs/router": "^0.14.5",
"@solidjs/router": "^0.14.7",
"@test/solid-jsx-component": "file:./deps/solid-jsx-component",
"astro": "workspace:*",
"solid-js": "^1.9.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/ssr-prerender-chunks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dependencies": {
"@astrojs/react": "workspace:*",
"@test/ssr-prerender-chunks-test-adapter": "link:./deps/test-adapter",
"@types/react": "^18.3.9",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"react": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/vue-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/vue-jsx/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/vue-with-multi-renderer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"svelte": "^4.2.19",
"vue": "^3.5.8"
"vue": "^3.5.10"
}
}
2 changes: 1 addition & 1 deletion packages/db/test/fixtures/ticketing-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@astrojs/db": "workspace:*",
"@astrojs/node": "^8.3.4",
"@astrojs/react": "^3.6.2",
"@types/react": "^18.3.9",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"astro": "workspace:*",
"open-props": "^1.7.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/integrations/lit/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"astro-scripts": "workspace:*",
"cheerio": "1.0.0",
"lit": "^3.2.0",
"sass": "^1.79.3"
"sass": "^1.79.4"
},
"peerDependencies": {
"@webcomponents/template-shadowroot": "^0.2.1",
Expand Down
Loading

0 comments on commit f854ad1

Please sign in to comment.