Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update all dependencies #77

Merged
merged 2 commits into from
Apr 19, 2024
Merged

chore: Update all dependencies #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4199c23
Update all dependencies
Fryuni Apr 19, 2024
2d51ef3
Update changesets
Fryuni Apr 19, 2024
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
17 changes: 17 additions & 0 deletions .changeset/cyan-tigers-warn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
"@example/inline-mod-astro": patch
"@example/custom-routing": patch
"@example/inline-mod-aik": patch
"@inox-tools/custom-routing": patch
"@example/sitemap-ext": patch
"@inox-tools/sitemap-ext": patch
"@examples/astro-when": patch
"@example/inline-mod": patch
"@inox-tools/astro-when": patch
"@inox-tools/inline-mod": patch
"@inox-tools/velox-luna": patch
"@inox-tools/aik-route-config": patch
"@inox-tools/aik-mod": patch
---

Bump all dependencies
6 changes: 6 additions & 0 deletions .changeset/short-buckets-sell.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@inox-tools/aik-route-config": patch
"@inox-tools/aik-mod": patch
---

Expand support for AIK 0.11
6 changes: 3 additions & 3 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"dependencies": {
"@astrojs/starlight": "^0.21.5",
"@vercel/analytics": "^1.2.2",
"astro": "^4.5.17",
"astro": "^4.6.3",
"sharp": "^0.33.3",
"starlight-links-validator": "^0.7.1"
"starlight-links-validator": "^0.8.0"
},
"devDependencies": {
"@astrojs/check": "^0.5.10",
"typescript": "~5.4.3"
"typescript": "~5.4.5"
}
}
4 changes: 2 additions & 2 deletions examples/astro-when/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@astrojs/check": "^0.5.10",
"@astrojs/node": "^8.2.5",
"@inox-tools/astro-when": "workspace:^",
"astro": "^4.5.17",
"typescript": "^5.4.4"
"astro": "^4.6.3",
"typescript": "^5.4.5"
}
}
8 changes: 4 additions & 4 deletions examples/custom-routing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
},
"dependencies": {
"@astrojs/check": "^0.5.10",
"@astrojs/mdx": "^2.2.4",
"@astrojs/mdx": "^2.3.1",
"@astrojs/rss": "^4.0.5",
"@astrojs/sitemap": "^3.1.2",
"astro": "^4.5.17",
"typescript": "^5.4.3"
"@astrojs/sitemap": "^3.1.4",
"astro": "^4.6.3",
"typescript": "^5.4.5"
},
"devDependencies": {
"@inox-tools/custom-routing": "workspace:*"
Expand Down
8 changes: 4 additions & 4 deletions examples/inline-mod-aik/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"dependencies": {
"@astrojs/check": "^0.5.10",
"@astrojs/node": "^8.2.5",
"astro": "^4.5.17",
"typescript": "^5.4.3",
"vite": "^5.2.7"
"astro": "^4.6.3",
"typescript": "^5.4.5",
"vite": "^5.2.9"
},
"devDependencies": {
"@inox-tools/aik-mod": "workspace:^",
"astro-integration-kit": "^0.10.0"
"astro-integration-kit": "^0.11.0"
},
"overrides": {
"vite": "$vite"
Expand Down
6 changes: 3 additions & 3 deletions examples/inline-mod-astro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"@astrojs/check": "^0.5.10",
"@astrojs/node": "^8.2.5",
"@astrojs/rss": "^4.0.5",
"astro": "^4.5.17",
"typescript": "^5.4.3",
"vite": "^5.2.7"
"astro": "^4.6.3",
"typescript": "^5.4.5",
"vite": "^5.2.9"
},
"devDependencies": {
"@inox-tools/inline-mod": "link:../../packages/inline-mod"
Expand Down
4 changes: 2 additions & 2 deletions examples/inline-mod/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@inox-tools/inline-mod": "workspace:*",
"typescript": "^5.4.3",
"vite": "^5.2.7"
"typescript": "^5.4.5",
"vite": "^5.2.9"
}
}
6 changes: 3 additions & 3 deletions examples/sitemap-ext/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
},
"dependencies": {
"@astrojs/check": "^0.5.10",
"@astrojs/mdx": "^2.2.4",
"@astrojs/mdx": "^2.3.1",
"@astrojs/node": "^8.2.5",
"@astrojs/rss": "^4.0.5",
"@inox-tools/sitemap-ext": "workspace:^",
"astro": "^4.5.17",
"typescript": "^5.4.3"
"astro": "^4.6.3",
"typescript": "^5.4.5"
}
}
4 changes: 1 addition & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.1",
"@types/node": "^20.11.30",
"esbuild": "^0.20.2",
"organize-imports-cli": "^0.10.0",
"prettier": "^3.2.5",
"prettier-plugin-astro": "^0.13.0",
"turbo": "^1.13.0",
"typescript": "^5.4.3"
"typescript": "^5.4.5"
},
"packageManager": "[email protected]+sha256.01c01eeb990e379b31ef19c03e9d06a14afa5250b82e81303f88721c99ff2e6f"
}
8 changes: 4 additions & 4 deletions packages/aik-mod/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
},
"devDependencies": {
"@types/node": "^20.11.30",
"astro": "^4.5.17",
"astro": "^4.6.3",
"tsup": "^8.0.2",
"typescript": "^5.4.3",
"vite": "^5.2.7"
"typescript": "^5.4.5",
"vite": "^5.2.9"
},
"peerDependencies": {
"astro": "^4.3.5",
"astro-integration-kit": "~0.10"
"astro-integration-kit": "~0.10 || ~0.11"
}
}
10 changes: 5 additions & 5 deletions packages/aik-route-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@
},
"dependencies": {
"recast": "^0.23.6",
"vite": "^5.2.7"
"vite": "^5.2.9"
},
"devDependencies": {
"@astrojs/compiler": "^2.7.1",
"@vitest/coverage-v8": "^1.4.0",
"@vitest/coverage-v8": "^1.5.0",
"ast-types": "^0.14.2",
"tsup": "^8.0.2",
"typescript": "^5.4.3",
"vitest": "^1.4.0"
"typescript": "^5.4.5",
"vitest": "^1.5.0"
},
"peerDependencies": {
"astro": "^4.3.5",
"astro-integration-kit": "~0.10"
"astro-integration-kit": "~0.10 || ~0.11"
}
}
110 changes: 56 additions & 54 deletions packages/aik-route-config/src/contextResolution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,65 +30,67 @@ const integration = defineIntegration({
let root!: URL;

return {
'astro:config:setup': (params) => {
const { config } = params;
root = config.root;

addVitePlugin(params, {
plugin: {
name: '@inox-tools/aik-route-config/context-resolution',
async writeBundle(outputOptions, bundle) {
const basePath = outputOptions.dir!;

for (const chunk of Object.values(bundle)) {
if (chunk.type !== 'chunk') continue;

const fileName = path.join(basePath, chunk.fileName);

for (const id of chunk.moduleIds) {
if (id.endsWith('.astro')) {
componentToChunkMapping.set(id, fileName);
hooks: {
'astro:config:setup': (params) => {
const { config } = params;
root = config.root;

addVitePlugin(params, {
plugin: {
name: '@inox-tools/aik-route-config/context-resolution',
async writeBundle(outputOptions, bundle) {
const basePath = outputOptions.dir!;

for (const chunk of Object.values(bundle)) {
if (chunk.type !== 'chunk') continue;

const fileName = path.join(basePath, chunk.fileName);

for (const id of chunk.moduleIds) {
if (id.endsWith('.astro')) {
componentToChunkMapping.set(id, fileName);
}
}
}
}
},
},
},
});
},
'astro:build:setup': ({ pages, target }) => {
if (target !== 'server') return;

for (const { route } of pages.values()) {
const fullComponentPath = normalizePath(fileURLToPath(new URL(route.component, root)));
const context = componentToContextMapping.get(fullComponentPath);

if (context) {
context.route.push(route.route);
context.routeData.push(route);
} else {
componentToContextMapping.set(fullComponentPath, {
route: [route.route],
routeData: [route],
component: route.component,
});
},
'astro:build:setup': ({ pages, target }) => {
if (target !== 'server') return;

for (const { route } of pages.values()) {
const fullComponentPath = normalizePath(fileURLToPath(new URL(route.component, root)));
const context = componentToContextMapping.get(fullComponentPath);

if (context) {
context.route.push(route.route);
context.routeData.push(route);
} else {
componentToContextMapping.set(fullComponentPath, {
route: [route.route],
routeData: [route],
component: route.component,
});
}
}
},
'astro:build:ssr': async ({ logger, manifest: { routes } }) => {
const ssrComponents = routes
.map((r) => r.routeData)
.filter((r) => r.type === 'page')
.map((r) => r.component)
.map((c) => fileURLToPath(new URL(c, root)))
.map((c) => componentToChunkMapping.get(c))
.filter((m) => !!m);

// Import SSR components so the hoisted logic gets executed
for (const module of ssrComponents) {
await import(/* @vite-ignore */ module!).catch((error) => {
logger.error(`Failed to import SSR component: ${module!} ${inspect(error)}`);
});
}
}
},
'astro:build:ssr': async ({ logger, manifest: { routes } }) => {
const ssrComponents = routes
.map((r) => r.routeData)
.filter((r) => r.type === 'page')
.map((r) => r.component)
.map((c) => fileURLToPath(new URL(c, root)))
.map((c) => componentToChunkMapping.get(c))
.filter((m) => !!m);

// Import SSR components so the hoisted logic gets executed
for (const module of ssrComponents) {
await import(/* @vite-ignore */ module!).catch((error) => {
logger.error(`Failed to import SSR component: ${module!} ${inspect(error)}`);
});
}
},
},
};
},
Expand Down
8 changes: 4 additions & 4 deletions packages/astro-when/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
"test": "echo 'No tests'"
},
"dependencies": {
"astro-integration-kit": "^0.10.0"
"astro-integration-kit": "^0.11.0"
},
"devDependencies": {
"@types/node": "^20.11.30",
"astro": "^4.5.17",
"astro": "^4.6.3",
"tsup": "^8.0.2",
"typescript": "^5.4.3",
"vite": "^5.2.7"
"typescript": "^5.4.5",
"vite": "^5.2.9"
},
"peerDependencies": {
"astro": "^4"
Expand Down
Loading
Loading