update: AIK 0.8 (#59)

Co-authored-by: Florian Lefebvre <[email protected]>

.changeset/good-snails-cover.md

@@ -0,0 +1,5 @@
+---
+"@inox-tools/sitemap-ext": patch
+---
+
+Update to AIK 0.8

.changeset/violet-flies-bathe.md

@@ -0,0 +1,6 @@
+---
+"@inox-tools/aik-route-config": minor
+"@inox-tools/aik-mod": minor
+---
+
+Update to AIK 0.8

examples/inline-mod-aik/package.json

@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@inox-tools/aik-mod": "workspace:^",
-    "astro-integration-kit": "^0.7.1"
+    "astro-integration-kit": "^0.8.0"
   },
   "overrides": {
     "vite": "$vite"

packages/aik-mod/package.json

@@ -34,13 +34,12 @@
   "devDependencies": {
     "@types/node": "^20.11.25",
     "astro": "^4.4.15",
-    "astro-integration-kit": "^0.7.1",
     "tsup": "^8.0.2",
     "typescript": "^5.4.2",
     "vite": "^5.1.5"
   },
   "peerDependencies": {
     "astro": "^4.3.5",
-    "astro-integration-kit": "~0.7"
+    "astro-integration-kit": "~0.8"
   }
 }

packages/aik-route-config/package.json

@@ -43,6 +43,6 @@
   },
   "peerDependencies": {
     "astro": "^4.3.5",
-    "astro-integration-kit": "~0.7"
+    "astro-integration-kit": "~0.8"
   }
 }

packages/aik-route-config/src/contextResolution.ts

@@ -1,9 +1,7 @@
 import type { HookParameters, RouteData } from 'astro';
 import * as path from 'node:path';
-import { addIntegration } from 'astro-integration-kit/utilities';
 import { Once } from './once.js';
-import { defineIntegration } from 'astro-integration-kit';
-import { addVitePluginPlugin } from 'astro-integration-kit/plugins';
+import { defineIntegration, addIntegration, addVitePlugin } from 'astro-integration-kit';
 import { fileURLToPath } from 'node:url';
 import { normalizePath } from 'vite';
 
@@ -27,30 +25,32 @@ const componentToContextMapping = new Map<string, ConfigContext>();
 
 const integration = defineIntegration({
 	name: '@inox-tools/aik-route-config/context-resolution',
-	plugins: [addVitePluginPlugin],
 	setup: () => {
 		let root!: URL;
 
 		return {
-			'astro:config:setup': ({ addVitePlugin, config }) => {
+			'astro:config:setup': (params) => {
+				const { config } = params;
 				root = config.root;
 
-				addVitePlugin({
-					name: '@inox-tools/aik-route-config/context-resolution',
-					async writeBundle(outputOptions, bundle) {
-						const basePath = outputOptions.dir!;
+				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;
+							for (const chunk of Object.values(bundle)) {
+								if (chunk.type !== 'chunk') continue;
 
-							const fileName = path.join(basePath, chunk.fileName);
+								const fileName = path.join(basePath, chunk.fileName);
 
-							for (const id of chunk.moduleIds) {
-								if (id.endsWith('.astro')) {
-									componentToChunkMapping.set(id, fileName);
+								for (const id of chunk.moduleIds) {
+									if (id.endsWith('.astro')) {
+										componentToChunkMapping.set(id, fileName);
+									}
 								}
 							}
-						}
+						},
 					},
 				});
 			},
@@ -97,14 +97,9 @@ type IntegrateParams = HookParameters<'astro:config:setup'>;
 
 export function integrate(params: IntegrateParams) {
 	integrateOnce.do(() => {
-		addIntegration({
-			config: params.config,
-			logger: params.logger,
-			updateConfig: params.updateConfig,
+		addIntegration(params, {
 			integration: integration(),
-			options: {
-				ensureUnique: true,
-			},
+			ensureUnique: true,
 		});
 	});
 }

packages/aik-route-config/src/index.ts

@@ -1,5 +1,4 @@
-import { definePlugin } from 'astro-integration-kit';
-import { addVitePlugin } from 'astro-integration-kit/utilities';
+import { definePlugin, addVitePlugin } from 'astro-integration-kit';
 import { hoistGlobalPlugin } from './hoistGlobalPlugin.js';
 import { integrate, convertContext } from './contextResolution.js';
 import type { ConfigContext, InnerContext } from './contextResolution.js';
@@ -22,11 +21,11 @@ const globalHandlers: Map<string, InnerHandler<any>> = ((globalThis as any)[
 export default definePlugin({
 	name: 'defineRouteConfig',
 	hook: 'astro:config:setup',
-	implementation: (astroConfig) => {
-		const { logger, updateConfig, config, command } = astroConfig;
+	implementation: (params) => {
+		const { logger, command } = params;
 
 		return <T = any>(options: PerRouteConfigOptions<T>): void => {
-			integrate(astroConfig);
+			integrate(params);
 
 			const innerHandler: InnerHandler<T> = async (context, value) => {
 				// Do nothing while running dev or preview server
@@ -44,15 +43,12 @@ export default definePlugin({
 
 			globalHandlers.set(options.importName, innerHandler);
 
-			addVitePlugin({
+			addVitePlugin(params, {
 				plugin: hoistGlobalPlugin({
 					configImport: options.importName,
 					logger,
 				}),
 				warnDuplicated: true,
-				updateConfig,
-				config,
-				logger,
 			});
 		};
 	},

packages/sitemap-ext/index.ts

@@ -1,15 +1,10 @@
-import { defineIntegration } from 'astro-integration-kit';
+import { defineIntegration, addIntegration, hasIntegration } from 'astro-integration-kit';
 import routeConfigPlugin from '@inox-tools/aik-route-config';
 import { AstroError } from 'astro/errors';
 import { type RouteData } from 'astro';
 import { EnumChangefreq } from 'sitemap';
 import { z } from 'astro/zod';
 import * as path from 'node:path';
-import {
-	addVirtualImportsPlugin,
-	addIntegrationPlugin,
-	hasIntegrationPlugin,
-} from 'astro-integration-kit/plugins';
 import sitemap from '@astrojs/sitemap';
 import './virtual.d.ts';
 
@@ -33,7 +28,7 @@ export default defineIntegration({
 			priority: z.number().optional(),
 		})
 		.default({}),
-	plugins: [addVirtualImportsPlugin, addIntegrationPlugin, hasIntegrationPlugin, routeConfigPlugin],
+	plugins: [routeConfigPlugin],
 	setup: ({ options: { includeByDefault, customPages: _externalPages, ...options } }) => {
 		type InclusionRule =
 			| { type: 'regex'; regex: RegExp; decision: boolean }
@@ -65,8 +60,10 @@ export default defineIntegration({
 		let baseUrl!: URL;
 
 		return {
-			'astro:config:setup': ({ defineRouteConfig, hasIntegration, addIntegration, config }) => {
-				if (hasIntegration('@astrojs/sitemap')) {
+			'astro:config:setup': (params) => {
+				const { defineRouteConfig, config } = params;
+
+				if (hasIntegration(params, { name: '@astrojs/sitemap' })) {
 					throw new AstroError(
 						'Cannot use both `@inox-tools/declarative-sitemap` and `@astrojs/sitemap` integrations at the same time.',
 						'Remove the `@astrojs/sitemap` integration from your project to use `@inox-tools/declarative-sitemap`.'
@@ -99,8 +96,8 @@ export default defineIntegration({
 							},
 							setSitemap(routeOptions) {
 								for (const route of context.routeData) {
-									for (const { sitemap: decision, params } of routeOptions) {
-										makeDecision(decision ?? includeByDefault, route, [params]);
+									for (const { sitemap: decision, params: routeParams } of routeOptions) {
+										makeDecision(decision ?? includeByDefault, route, [routeParams]);
 									}
 								}
 							},
@@ -119,8 +116,9 @@ export default defineIntegration({
 				});
 
 				// The sitemap integration will run _after_ the build is done, so after the build re-mapping done below.
-				addIntegration(
-					sitemap({
+				addIntegration(params, {
+					ensureUnique: true,
+					integration: sitemap({
 						...options,
 						// This relies on an internal detail of the sitemap integration that the reference
 						// to the array is passed around without being copied.
@@ -137,8 +135,8 @@ export default defineIntegration({
 
 							return ruling?.decision ?? includeByDefault;
 						},
-					})
-				);
+					}),
+				});
 			},
 			'astro:build:done': async ({ pages }) => {
 				const extraPagesSet = new Set<string>(

packages/sitemap-ext/package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "@astrojs/sitemap": "^3.1.1",
     "@inox-tools/aik-route-config": "workspace:^",
-    "astro-integration-kit": "^0.7.1",
+    "astro-integration-kit": "^0.8.0",
     "sitemap": "^7.1.1"
   },
   "devDependencies": {