Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"astro": "astro"
},
"dependencies": {
"@builder.io/qwik": "^1.12.0",
"@builder.io/qwik": "^1.14.1",
"@qwikdev/astro": "workspace:*",
"astro": "5.1.1"
"astro": "5.8.0"
}
}
74 changes: 74 additions & 0 deletions apps/deno-demo/deno.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions apps/deno-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/deno": "^5.0.1",
"@astrojs/react": "^4.1.2",
"@builder.io/qwik": "^1.12.0",
"@astrojs/react": "^4.3.0",
"@builder.io/qwik": "^1.14.1",
"@qwikdev/astro": "workspace:*",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"astro": "^5.1.1",
"astro": "^5.8.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.7.2"
Expand Down
8 changes: 4 additions & 4 deletions apps/node-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/node": "9.0.0",
"@astrojs/react": "4.1.2",
"@builder.io/qwik": "^1.12.0",
"@astrojs/node": "9.2.2",
"@astrojs/react": "4.3.0",
"@builder.io/qwik": "^1.14.1",
"@qwikdev/astro": "workspace:*",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"astro": "5.1.1",
"astro": "5.8.0",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
Expand Down
49 changes: 25 additions & 24 deletions apps/website/.astro/content.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,21 @@ declare module 'astro:content' {
ContentEntryMap[C]
>['slug'];

export type ReferenceDataEntry<
C extends CollectionKey,
E extends keyof DataEntryMap[C] = string,
> = {
collection: C;
id: E;
};
export type ReferenceContentEntry<
C extends keyof ContentEntryMap,
E extends ValidContentEntrySlug<C> | (string & {}) = string,
> = {
collection: C;
slug: E;
};

/** @deprecated Use `getEntry` instead. */
export function getEntryBySlug<
C extends keyof ContentEntryMap,
Expand Down Expand Up @@ -61,19 +76,17 @@ declare module 'astro:content' {
export function getEntry<
C extends keyof ContentEntryMap,
E extends ValidContentEntrySlug<C> | (string & {}),
>(entry: {
collection: C;
slug: E;
}): E extends ValidContentEntrySlug<C>
>(
entry: ReferenceContentEntry<C, E>,
): E extends ValidContentEntrySlug<C>
? Promise<CollectionEntry<C>>
: Promise<CollectionEntry<C> | undefined>;
export function getEntry<
C extends keyof DataEntryMap,
E extends keyof DataEntryMap[C] | (string & {}),
>(entry: {
collection: C;
id: E;
}): E extends keyof DataEntryMap[C]
>(
entry: ReferenceDataEntry<C, E>,
): E extends keyof DataEntryMap[C]
? Promise<DataEntryMap[C][E]>
: Promise<CollectionEntry<C> | undefined>;
export function getEntry<
Expand All @@ -99,16 +112,10 @@ declare module 'astro:content' {

/** Resolve an array of entry references from the same collection */
export function getEntries<C extends keyof ContentEntryMap>(
entries: {
collection: C;
slug: ValidContentEntrySlug<C>;
}[],
entries: ReferenceContentEntry<C, ValidContentEntrySlug<C>>[],
): Promise<CollectionEntry<C>[]>;
export function getEntries<C extends keyof DataEntryMap>(
entries: {
collection: C;
id: keyof DataEntryMap[C];
}[],
entries: ReferenceDataEntry<C, keyof DataEntryMap[C]>[],
): Promise<CollectionEntry<C>[]>;

export function render<C extends keyof AnyEntryMap>(
Expand All @@ -120,14 +127,8 @@ declare module 'astro:content' {
): import('astro/zod').ZodEffects<
import('astro/zod').ZodString,
C extends keyof ContentEntryMap
? {
collection: C;
slug: ValidContentEntrySlug<C>;
}
: {
collection: C;
id: keyof DataEntryMap[C];
}
? ReferenceContentEntry<C, ValidContentEntrySlug<C>>
: ReferenceDataEntry<C, keyof DataEntryMap[C]>
>;
// Allow generic `string` to avoid excessive type errors in the config
// if `dev` is not running to update as you edit.
Expand Down
2 changes: 1 addition & 1 deletion apps/website/.astro/data-store.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[["Map",1,2],"meta::meta",["Map",3,4,5,6],"astro-version","5.1.1","astro-config-digest","{\"root\":{},\"srcDir\":{},\"publicDir\":{},\"outDir\":{},\"cacheDir\":{},\"compressHTML\":true,\"base\":\"/\",\"trailingSlash\":\"ignore\",\"output\":\"static\",\"scopedStyleStrategy\":\"attribute\",\"build\":{\"format\":\"directory\",\"client\":{},\"server\":{},\"assets\":\"_astro\",\"serverEntry\":\"entry.mjs\",\"redirects\":true,\"inlineStylesheets\":\"auto\",\"concurrency\":1},\"server\":{\"open\":false,\"host\":true,\"port\":4321,\"streaming\":true},\"redirects\":{},\"image\":{\"endpoint\":{\"route\":\"/_image\"},\"service\":{\"entrypoint\":\"astro/assets/services/sharp\",\"config\":{}},\"domains\":[],\"remotePatterns\":[]},\"devToolbar\":{\"enabled\":true},\"markdown\":{\"syntaxHighlight\":\"shiki\",\"shikiConfig\":{\"langs\":[],\"langAlias\":{},\"theme\":\"github-dark\",\"themes\":{},\"wrap\":false,\"transformers\":[]},\"remarkPlugins\":[],\"rehypePlugins\":[],\"remarkRehype\":{},\"gfm\":true,\"smartypants\":true},\"security\":{\"checkOrigin\":true},\"env\":{\"schema\":{},\"validateSecrets\":false},\"experimental\":{\"clientPrerender\":false,\"contentIntellisense\":false,\"responsiveImages\":false},\"legacy\":{\"collections\":false}}"]
[["Map",1,2],"meta::meta",["Map",3,4,5,6],"astro-version","5.8.0","astro-config-digest","{\"root\":{},\"srcDir\":{},\"publicDir\":{},\"outDir\":{},\"cacheDir\":{},\"compressHTML\":true,\"base\":\"/\",\"trailingSlash\":\"ignore\",\"output\":\"static\",\"scopedStyleStrategy\":\"attribute\",\"build\":{\"format\":\"directory\",\"client\":{},\"server\":{},\"assets\":\"_astro\",\"serverEntry\":\"entry.mjs\",\"redirects\":true,\"inlineStylesheets\":\"auto\",\"concurrency\":1},\"server\":{\"open\":false,\"host\":true,\"port\":4321,\"streaming\":true,\"allowedHosts\":[]},\"redirects\":{},\"image\":{\"endpoint\":{\"route\":\"/_image\"},\"service\":{\"entrypoint\":\"astro/assets/services/sharp\",\"config\":{}},\"domains\":[],\"remotePatterns\":[]},\"devToolbar\":{\"enabled\":true},\"markdown\":{\"syntaxHighlight\":{\"type\":\"shiki\",\"excludeLangs\":[\"math\"]},\"shikiConfig\":{\"langs\":[],\"langAlias\":{},\"theme\":\"github-dark\",\"themes\":{},\"wrap\":false,\"transformers\":[]},\"remarkPlugins\":[],\"rehypePlugins\":[],\"remarkRehype\":{},\"gfm\":true,\"smartypants\":true},\"security\":{\"checkOrigin\":true},\"env\":{\"schema\":{},\"validateSecrets\":false},\"experimental\":{\"clientPrerender\":false,\"contentIntellisense\":false,\"responsiveImages\":false,\"headingIdCompat\":false,\"preserveScriptOrder\":false},\"legacy\":{\"collections\":false}}"]
19 changes: 18 additions & 1 deletion apps/website/.astro/icon.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Automatically generated by astro-icon
// 632b0409652059c207b6b86f8296db3f6ecd60756c68a84c827176c38731cfb1
// 84540ed8e7b9c390cb4d0998d44328d1bf7166256810f69a0ad8301b6593e6fe

declare module 'virtual:astro-icon' {
export type Icon =
Expand Down Expand Up @@ -149,6 +149,7 @@ declare module 'virtual:astro-icon' {
| "lucide:battery-full"
| "lucide:battery-low"
| "lucide:battery-medium"
| "lucide:battery-plus"
| "lucide:battery-warning"
| "lucide:beaker"
| "lucide:bean"
Expand Down Expand Up @@ -374,6 +375,7 @@ declare module 'virtual:astro-icon' {
| "lucide:circle-power"
| "lucide:circle-slash"
| "lucide:circle-slash-2"
| "lucide:circle-small"
| "lucide:circle-stop"
| "lucide:circle-user"
| "lucide:circle-user-round"
Expand Down Expand Up @@ -408,6 +410,7 @@ declare module 'virtual:astro-icon' {
| "lucide:clock-alert"
| "lucide:clock-arrow-down"
| "lucide:clock-arrow-up"
| "lucide:clock-fading"
| "lucide:cloud"
| "lucide:cloud-alert"
| "lucide:cloud-cog"
Expand Down Expand Up @@ -681,6 +684,9 @@ declare module 'virtual:astro-icon' {
| "lucide:frown"
| "lucide:fuel"
| "lucide:fullscreen"
| "lucide:funnel"
| "lucide:funnel-plus"
| "lucide:funnel-x"
| "lucide:gallery-horizontal"
| "lucide:gallery-horizontal-end"
| "lucide:gallery-thumbnails"
Expand Down Expand Up @@ -901,6 +907,9 @@ declare module 'virtual:astro-icon' {
| "lucide:map-pin-x"
| "lucide:map-pin-x-inside"
| "lucide:map-pinned"
| "lucide:map-plus"
| "lucide:mars"
| "lucide:mars-stroke"
| "lucide:martini"
| "lucide:maximize"
| "lucide:maximize-2"
Expand Down Expand Up @@ -999,6 +1008,7 @@ declare module 'virtual:astro-icon' {
| "lucide:network"
| "lucide:newspaper"
| "lucide:nfc"
| "lucide:non-binary"
| "lucide:notebook"
| "lucide:notebook-pen"
| "lucide:notebook-tabs"
Expand Down Expand Up @@ -1183,6 +1193,7 @@ declare module 'virtual:astro-icon' {
| "lucide:sandwich"
| "lucide:satellite"
| "lucide:satellite-dish"
| "lucide:saudi-riyal"
| "lucide:save"
| "lucide:save-all"
| "lucide:save-off"
Expand Down Expand Up @@ -1239,6 +1250,7 @@ declare module 'virtual:astro-icon' {
| "lucide:shield-off"
| "lucide:shield-plus"
| "lucide:shield-question"
| "lucide:shield-user"
| "lucide:shield-x"
| "lucide:ship"
| "lucide:ship-wheel"
Expand All @@ -1248,6 +1260,7 @@ declare module 'virtual:astro-icon' {
| "lucide:shopping-cart"
| "lucide:shovel"
| "lucide:shower-head"
| "lucide:shrimp"
| "lucide:shrink"
| "lucide:shrub"
| "lucide:shuffle"
Expand Down Expand Up @@ -1339,6 +1352,7 @@ declare module 'virtual:astro-icon' {
| "lucide:square-plus"
| "lucide:square-power"
| "lucide:square-radical"
| "lucide:square-round-corner"
| "lucide:square-scissors"
| "lucide:square-sigma"
| "lucide:square-slash"
Expand Down Expand Up @@ -1446,6 +1460,7 @@ declare module 'virtual:astro-icon' {
| "lucide:train-front-tunnel"
| "lucide:train-track"
| "lucide:tram-front"
| "lucide:transgender"
| "lucide:trash"
| "lucide:trash-2"
| "lucide:tree-deciduous"
Expand Down Expand Up @@ -1510,6 +1525,8 @@ declare module 'virtual:astro-icon' {
| "lucide:vault"
| "lucide:vegan"
| "lucide:venetian-mask"
| "lucide:venus"
| "lucide:venus-and-mars"
| "lucide:vibrate"
| "lucide:vibrate-off"
| "lucide:video"
Expand Down
2 changes: 1 addition & 1 deletion apps/website/.astro/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_variables": {
"lastUpdateCheck": 1741474475166
"lastUpdateCheck": 1747946665529
}
}
1 change: 1 addition & 0 deletions apps/website/.astro/types.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/// <reference types="astro/client" />
/// <reference path="content.d.ts" />
4 changes: 2 additions & 2 deletions apps/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
},
"dependencies": {
"@astrojs/check": "^0.9.4",
"@builder.io/qwik": "^1.12",
"@builder.io/qwik": "^1.14.1",
"@fontsource-variable/unbounded": "^5.1.1",
"@iconify-json/lucide": "^1.2.23",
"@qwikdev/astro": "workspace:*",
"astro": "^5.1",
"astro": "^5.8.0",
"astro-icon": "^1.1.4",
"sharp": "^0.33.5"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/deno": "^5.0.1",
"@builder.io/qwik": "^1.12",
"@builder.io/qwik": "^1.14.1",
"@qwikdev/astro": "^0.7",
"astro": "^5.1",
"astro": "^5.8.0",
"typescript": "^5.4.3"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions libs/create-qwikdev-astro/stubs/templates/deno/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/deno": "^5.0.1",
"@builder.io/qwik": "^1.12",
"@builder.io/qwik": "^1.14.1",
"@qwikdev/astro": "^0.7",
"astro": "^5.1"
"astro": "^5.8.0"
},
"devDependencies": {
"@types/eslint": "^8.56.10",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
},
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/node": "^9.0.0",
"@builder.io/qwik": "^1.12",
"@astrojs/node": "^9.2.2",
"@builder.io/qwik": "^1.14.1",
"@qwikdev/astro": "^0.7",
"astro": "^5.1"
"astro": "^5.8.0"
},
"devDependencies": {
"@biomejs/biome": "^1.7.0"
Expand Down
6 changes: 3 additions & 3 deletions libs/create-qwikdev-astro/stubs/templates/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
},
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/node": "^9.0.0",
"@builder.io/qwik": "^1.12",
"@astrojs/node": "^9.2.2",
"@builder.io/qwik": "^1.14.1",
"@qwikdev/astro": "^0.7",
"astro": "^5.1"
"astro": "^5.8.0"
},
"devDependencies": {
"@types/eslint": "^8.56.10",
Expand Down
Loading