@fedify/init 2.4.0-dev.1666 → 2.4.0-dev.1668

package/dist/action/configs.js

@@ -66,7 +66,10 @@ const getDenoVersionFromCommand = () => {
 const getDenoVersionFromRuntime = () => pipe(globalThis, prop("Deno"), prop("version"), prop("deno"));
 const parseVersion = (deno) => pipe(deno.match(/^(\d+)\.(\d+)\.(\d+)/), unless(isNull, ([, ...segments]) => segments.map(Number)));
 const isLaterOrEqualThan = (basis) => (target) => pipe(zip(basis, target), filter(([b, t]) => t !== b), head, (a) => a ? a[0] < a[1] : true);
-const getLinks = ({ kv, mq, initializer, dir }) => pipe({ "@fedify/fedify": "" }, merge(initializer.dependencies), merge(kv.dependencies), merge(mq.dependencies), keys, filter((dep) => dep.includes("@fedify/")), map((dep) => dep.replace("@fedify/", "")), map((dep) => join(getPackagesPath(), dep)), map(realpathSync), map((realAbsolutePath) => relative(realpathSync(dir), realAbsolutePath)), toArray);
+const getLinks = ({ kv, mq, initializer, dir }) => pipe({
+	"@fedify/fedify": "",
+	"@fedify/vocab": ""
+}, merge(initializer.dependencies), merge(kv.dependencies), merge(mq.dependencies), keys, filter((dep) => dep.includes("@fedify/")), map((dep) => dep.replace("@fedify/", "")), map((dep) => join(getPackagesPath(), dep)), map(realpathSync), map((realAbsolutePath) => relative(realpathSync(dir), realAbsolutePath)), toArray);
 /**
 * Loads TypeScript configuration object for Node.js/Bun projects.
 * Uses compiler options from the framework initializer.

package/dist/action/deps.js

@@ -14,7 +14,7 @@ import { join as join$1 } from "node:path";
 *               message queue descriptions
 * @returns A record of dependencies with their versions
 */
-const getDependencies = ({ initializer, kv, mq, env, testMode, packageManager }) => pipe({
+const getDependencies = ({ initializer, kv, mq, env, testMode, packageManager, webFramework }) => pipe({
 	"@fedify/fedify": PACKAGE_VERSION,
 	"@fedify/vocab": PACKAGE_VERSION,
 	"@logtape/logtape": _logtape_logtape,
@@ -22,7 +22,8 @@ const getDependencies = ({ initializer, kv, mq, env, testMode, packageManager })
 		packageManager,
 		env
 	}) && { "@std/dotenv": _std_dotenv }
-}, merge(initializer.dependencies), merge(kv.dependencies), merge(mq.dependencies), when(always(testMode), isDeno({ packageManager }) ? removeFedifyDeps : addLocalFedifyDeps), normalizePackageNames(packageManager));
+}, merge(initializer.dependencies), merge(kv.dependencies), merge(mq.dependencies), when(always(packageManager === "deno" && webFramework === "astro"), useNpmForFedifyPackages), when(always(testMode), isDeno({ packageManager }) ? removeFedifyDeps : addLocalFedifyDeps), normalizePackageNames(packageManager));
+const useNpmForFedifyPackages = (deps) => pipe(deps, entries, map(([name, version]) => name.startsWith("@fedify/") && name !== "@fedify/lint" && !version.startsWith("npm:") ? [name, `npm:${name}@${version}`] : [name, version]), fromEntries);
 const removeFedifyDeps = (deps) => pipe(deps, entries, filter(([name]) => !name.includes("@fedify")), fromEntries);
 const addLocalFedifyDeps = (deps) => pipe(deps, entries, map(when(([name]) => name.includes("@fedify/"), ([name, _version]) => [name, convertFedifyToLocal(name)])), fromEntries);
 const convertFedifyToLocal = (name) => pipe(name, replace("@fedify/", ""), (pkg) => join$1(getPackagesPath(), pkg));

package/dist/action/utils.js

@@ -1,4 +1,5 @@
 import $ from "@david/dax";
+import { readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 //#region src/action/utils.ts
 /** Returns `true` if the current run is in dry-run mode. */
@@ -60,7 +61,21 @@ function stringifyEnvs(object) {
 * Runs `<packageManager> install` in the project directory to install all
 * dependencies. Logs an error message if the installation fails.
 */
-const installDependencies = ({ packageManager, dir }) => $`${packageManager} install`.cwd(dir).spawn();
+const installDependencies = async (data) => {
+	const { packageManager, dir, testMode } = data;
+	if (packageManager !== "deno" || !testMode) return await $`${packageManager} install`.cwd(dir).spawn();
+	const configPath = join(dir, "deno.json");
+	const config = JSON.parse(await readFile(configPath, "utf8"));
+	const links = config.links;
+	delete config.links;
+	await writeFile(configPath, JSON.stringify(config, null, 2) + "\n");
+	try {
+		return await $`${packageManager} install`.cwd(dir).spawn();
+	} finally {
+		config.links = links;
+		await writeFile(configPath, JSON.stringify(config, null, 2) + "\n");
+	}
+};
 /**
 * Runs the precommand specified in the initializer to set up the project.
 *

package/dist/deno.js

@@ -1,4 +1,4 @@
 //#region deno.json
-var version = "2.4.0-dev.1666+690d9b28";
+var version = "2.4.0-dev.1668+90797b01";
 //#endregion
 export { version };

package/dist/json/deps.js

@@ -3,12 +3,11 @@ var _hongminhee_x_forwarded_fetch = "^0.2.0";
 var _hono_hono = "^4.12.27";
 var _logtape_logtape = "^2.2.1";
 var _std_dotenv = "^0.225.7";
-var npm__astrojs_node = "^10.0.4";
-var npm__deno_astro_adapter = "^0.5.2";
+var npm__astrojs_node = "^11.0.2";
+var npm__deno_astro_adapter = "^0.6.0";
 var npm__dotenvx_dotenvx = "^1.75.1";
 var npm__elysiajs_node = "^1.4.5";
 var npm__hono_node_server = "^1.19.12";
-var npm__nurodev_astro_bun = "^2.1.2";
 var npm__sinclair_typebox = "^0.34.49";
 var npm__solidjs_router = "^0.16.1";
 var npm__solidjs_start = "^1.3.2";
@@ -17,6 +16,8 @@ var npm__types_express = "^4.17.21";
 var npm__types_node_20 = "^20.11.2";
 var npm__types_node_22 = "^22.17.0";
 var npm__types_node_25 = "^25.5.0";
+var npm_astro = "^7.0.7";
+var npm_create_astro = "^5.2.2";
 var npm_elysia = "^1.4.29";
 var npm_express = "^5.2.1";
 var npm_hono = "^4.12.27";
@@ -31,4 +32,4 @@ var npm_typescript = "^5.9.3";
 var npm_vinxi = "^0.5.11";
 var npm_x_forwarded_fetch = "^0.2.0";
 //#endregion
-export { _hongminhee_x_forwarded_fetch, _hono_hono, _logtape_logtape, _std_dotenv, npm__astrojs_node, npm__deno_astro_adapter, npm__dotenvx_dotenvx, npm__elysiajs_node, npm__hono_node_server, npm__nurodev_astro_bun, npm__sinclair_typebox, npm__solidjs_router, npm__solidjs_start, npm__types_bun, npm__types_express, npm__types_node_20, npm__types_node_22, npm__types_node_25, npm_elysia, npm_express, npm_hono, npm_openapi_types, npm_oxfmt, npm_oxlint, npm_prettier, npm_prettier_plugin_astro, npm_solid_js, npm_tsx, npm_typescript, npm_vinxi, npm_x_forwarded_fetch };
+export { _hongminhee_x_forwarded_fetch, _hono_hono, _logtape_logtape, _std_dotenv, npm__astrojs_node, npm__deno_astro_adapter, npm__dotenvx_dotenvx, npm__elysiajs_node, npm__hono_node_server, npm__sinclair_typebox, npm__solidjs_router, npm__solidjs_start, npm__types_bun, npm__types_express, npm__types_node_20, npm__types_node_22, npm__types_node_25, npm_astro, npm_create_astro, npm_elysia, npm_express, npm_hono, npm_openapi_types, npm_oxfmt, npm_oxlint, npm_prettier, npm_prettier_plugin_astro, npm_solid_js, npm_tsx, npm_typescript, npm_vinxi, npm_x_forwarded_fetch };

package/dist/json/deps.json

@@ -3,13 +3,12 @@
   "@hono/hono": "^4.12.27",
   "@logtape/logtape": "^2.2.1",
   "@std/dotenv": "^0.225.7",
-  "npm:@astrojs/node": "^10.0.4",
-  "npm:@deno/astro-adapter": "^0.5.2",
+  "npm:@astrojs/node": "^11.0.2",
+  "npm:@deno/astro-adapter": "^0.6.0",
   "npm:@dotenvx/dotenvx": "^1.75.1",
   "npm:@elysiajs/node": "^1.4.5",
   "npm:@hono/node-server": "^1.19.12",
   "npm:@nuxt/kit": "^4.4.8",
-  "npm:@nurodev/astro-bun": "^2.1.2",
   "npm:@sinclair/typebox": "^0.34.49",
   "npm:@solidjs/router": "^0.16.1",
   "npm:@solidjs/start": "^1.3.2",
@@ -18,7 +17,8 @@
   "npm:@types/node@20": "^20.11.2",
   "npm:@types/node@22": "^22.17.0",
   "npm:@types/node@25": "^25.5.0",
-  "npm:astro": "^6.1.1",
+  "npm:astro": "^7.0.7",
+  "npm:create-astro": "^5.2.2",
   "npm:elysia": "^1.4.29",
   "npm:express": "^5.2.1",
   "npm:h3": "^1.15.0",

package/dist/lib.js

@@ -87,6 +87,20 @@ const readTemplate = async (templatePath) => {
 * package manager (e.g., `"deno task dev"`, `"bun dev"`, `"npm run dev"`).
 */
 const getDevCommand = (pm) => pm === "deno" ? "deno task dev" : pm === "bun" ? "bun dev" : `${pm} run dev`;
+/** Returns the command to build for the given package manager. */
+const getBuildCommand = (pm) => pm === "deno" ? [
+	"deno",
+	"task",
+	"build"
+] : pm === "bun" ? [
+	"bun",
+	"run",
+	"build"
+] : [
+	pm,
+	"run",
+	"build"
+];
 async function isCommandAvailable({ checkCommand, outputPattern }) {
 	try {
 		const { stdout } = await $`${checkCommand}`.stdout("piped").spawn();
@@ -277,4 +291,4 @@ const isDirectory = async (path) => {
 /** Returns `true` if the current run is in test mode. */
 const isTest = ({ testMode }) => testMode;
 //#endregion
-export { PACKAGE_VERSION, createFile, getDevCommand, getInstallUrl, isDirectoryEmpty, isPackageManagerAvailable, isTest, kvStores, logger, messageQueues, packageManagers, readTemplate, runtimes, throwUnlessNotExists };
+export { PACKAGE_VERSION, createFile, getBuildCommand, getDevCommand, getInstallUrl, isDirectoryEmpty, isPackageManagerAvailable, isTest, kvStores, logger, messageQueues, packageManagers, readTemplate, runtimes, throwUnlessNotExists };

package/dist/templates/astro/astro.config.bun.ts.tpl

@@ -1,4 +1,4 @@
-import bun from "@nurodev/astro-bun";
+import node from "@astrojs/node";
 import { fedifyIntegration } from "@fedify/astro";
 import { defineConfig } from "astro/config";
 
@@ -6,5 +6,5 @@ import { defineConfig } from "astro/config";
 export default defineConfig({
   integrations: [fedifyIntegration()],
   output: "server",
-  adapter: bun(),
+  adapter: node({ mode: "standalone" }),
 });

package/dist/test/create.js

@@ -1,12 +1,12 @@
 import pm_default from "../json/pm.js";
 import { printErrorMessage, printMessage, product } from "../utils.js";
-import { kvStores, messageQueues } from "../lib.js";
+import { getBuildCommand, kvStores, messageQueues } from "../lib.js";
 import webFrameworks from "../webframeworks/mod.js";
 import { filter, isEmpty, pipe, toArray } from "@fxts/core";
 import process from "node:process";
 import $ from "@david/dax";
-import { appendFile, mkdir, stat } from "node:fs/promises";
-import { join as join$1, sep } from "node:path";
+import { appendFile, lstat, mkdir, readFile, stat, symlink } from "node:fs/promises";
+import { dirname, join as join$1, resolve, sep } from "node:path";
 import { values } from "@optique/core";
 //#region src/test/create.ts
 const BANNED_PMS = ["bun", "yarn"];
@@ -16,7 +16,7 @@ const createTestApp = (testDirPrefix, dry) => async (options) => {
 	const result = await $`${toArray(genInitCommand(testDir, dry, options))}`.cwd(join$1(import.meta.dirname, "..", "..")).stdin("null").stdout("piped").stderr("piped").noThrow().spawn();
 	await saveOutputs(testDir, result);
 	if (result.code === 0) {
-		if (!dry && !await validateDevToolScripts(testDir, options)) {
+		if (!dry && (!await validateDevToolScripts(testDir, options) || !await validateFrameworkBuild(testDir, options))) {
 			printMessage`  Fail: ${vals}`;
 			printMessage`    Check out these files for more details: \
 ${join$1(testDir, "out.txt")} and \
@@ -74,9 +74,18 @@ const saveOutputs = async (dirPath, { stdout, stderr }) => {
 	if (stderr) await appendFile(join$1(dirPath, "err.txt"), stderr + "\n", "utf8");
 };
 async function validateDevToolScripts(dir, options) {
-	const [, packageManager] = options;
+	const [webFramework, packageManager] = options;
 	if (packageManager === "deno") return true;
 	if (!await hasInstalledNodeDependencies(dir)) return true;
+	if (webFramework === "astro") {
+		const format = await $`${[
+			packageManager,
+			"run",
+			"format"
+		]}`.cwd(dir).stdin("null").stdout("piped").stderr("piped").noThrow().spawn();
+		await saveOutputs(dir, format);
+		if (format.code !== 0) return false;
+	}
 	for (const script of ["format:check", "lint"]) {
 		const result = await $`${[
 			packageManager,
@@ -95,6 +104,27 @@ async function hasInstalledNodeDependencies(dir) {
 		return false;
 	}
 }
+async function validateFrameworkBuild(dir, options) {
+	const [webFramework, packageManager] = options;
+	if (webFramework !== "astro") return true;
+	if (packageManager === "deno") await linkDenoWorkspacePackages(dir);
+	const result = await $`${getBuildCommand(packageManager)}`.cwd(dir).stdin("null").stdout("piped").stderr("piped").noThrow().spawn();
+	await saveOutputs(dir, result);
+	return result.code === 0;
+}
+async function linkDenoWorkspacePackages(dir) {
+	const config = JSON.parse(await readFile(join$1(dir, "deno.json"), "utf8"));
+	for (const link of config.links ?? []) {
+		const packageDir = resolve(dir, link);
+		const target = join$1(dir, "node_modules", ...JSON.parse(await readFile(join$1(packageDir, "package.json"), "utf8")).name.split("/"));
+		await mkdir(dirname(target), { recursive: true });
+		try {
+			await lstat(target);
+		} catch {
+			await symlink(packageDir, target, "junction");
+		}
+	}
+}
 function filterOptions(options) {
 	const [wf, pm, kv, mq] = options;
 	return [

package/dist/webframeworks/astro.js

@@ -1,6 +1,6 @@
 import { PACKAGE_VERSION, readTemplate } from "../lib.js";
 import { PACKAGE_MANAGER } from "../const.js";
-import { npm__astrojs_node, npm__deno_astro_adapter, npm__dotenvx_dotenvx, npm__nurodev_astro_bun, npm__types_node_22, npm_oxlint, npm_prettier, npm_prettier_plugin_astro, npm_typescript } from "../json/deps.js";
+import { _logtape_logtape, npm__astrojs_node, npm__deno_astro_adapter, npm__dotenvx_dotenvx, npm__types_node_22, npm_astro, npm_create_astro, npm_oxlint, npm_prettier, npm_prettier_plugin_astro, npm_typescript } from "../json/deps.js";
 import { defaultDenoDependencies } from "./const.js";
 import { getInstruction, pmToRt } from "./utils.js";
 //#region src/webframeworks/astro.ts
@@ -15,6 +15,14 @@ const astroNodeBunDevToolTasks = {
 	"format:check": "prettier --plugin prettier-plugin-astro --check .",
 	lint: "oxlint ."
 };
+const astroDenoCommand = `deno run -A npm:astro@${npm_astro}`;
+const ASTRO_NODE_VERSION_CHECK = `
+const [major, minor] = process.versions.node.split(".").map(Number);
+if (major < 22 || (major === 22 && minor < 12)) {
+  console.error("Astro 7 requires Node.js 22.12 or later.");
+  process.exit(1);
+}
+`.trim();
 const astroDescription = {
 	label: "Astro",
 	packageManagers: PACKAGE_MANAGER,
@@ -22,15 +30,21 @@ const astroDescription = {
 	init: async ({ packageManager: pm }) => {
 		const dependencies = pm === "deno" ? {
 			...defaultDenoDependencies,
+			"@fedify/fedify": `npm:@fedify/fedify@${PACKAGE_VERSION}`,
+			"@fedify/vocab": `npm:@fedify/vocab@${PACKAGE_VERSION}`,
+			"@logtape/logtape": `npm:@logtape/logtape@${_logtape_logtape}`,
+			astro: `npm:astro@${npm_astro}`,
 			"@deno/astro-adapter": `npm:@deno/astro-adapter@${npm__deno_astro_adapter}`,
-			"@fedify/astro": PACKAGE_VERSION
+			"@fedify/astro": `npm:@fedify/astro@${PACKAGE_VERSION}`
 		} : pm === "bun" ? {
+			"@astrojs/node": npm__astrojs_node,
 			"@fedify/astro": PACKAGE_VERSION,
-			"@nurodev/astro-bun": npm__nurodev_astro_bun
+			astro: npm_astro
 		} : {
 			"@astrojs/node": npm__astrojs_node,
 			"@fedify/astro": PACKAGE_VERSION,
-			"@dotenvx/dotenvx": npm__dotenvx_dotenvx
+			"@dotenvx/dotenvx": npm__dotenvx_dotenvx,
+			astro: npm_astro
 		};
 		return {
 			command: Array.from(getAstroInitCommand(pm)),
@@ -61,13 +75,21 @@ const astroDescription = {
 * by a template.
 */
 function* getAstroInitCommand(pm) {
+	if (pm !== "deno" && pm !== "bun") {
+		yield "node";
+		yield "-e";
+		yield ASTRO_NODE_VERSION_CHECK;
+		yield "&&";
+	}
 	yield* createAstroAppCommand(pm);
-	yield "astro@latest";
+	yield `astro@${npm_create_astro}`;
 	yield ".";
 	yield "--";
 	yield "--no-git";
 	yield "--skip-houston";
 	yield "-y";
+	yield "--ref";
+	yield `astro@${npm_astro.replace(/^\D+/, "")}`;
 	if (pm !== "deno") yield "--no-install";
 	yield "&&";
 	yield "rm";
@@ -82,9 +104,9 @@ const createAstroAppCommand = (pm) => pm === "deno" ? [
 ] : [pm, "create"];
 const TASKS = {
 	"deno": {
-		dev: "deno run -A npm:astro dev",
-		build: "deno run -A npm:astro build",
-		preview: "deno run -A npm:astro preview"
+		dev: `${astroDenoCommand} dev`,
+		build: `${astroDenoCommand} build`,
+		preview: `${astroDenoCommand} preview`
 	},
 	"bun": {
 		dev: "bunx --bun astro dev",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/init",
-  "version": "2.4.0-dev.1666+690d9b28",
+  "version": "2.4.0-dev.1668+90797b01",
   "description": "Project initializer for Fedify",
   "keywords": [
     "fedify",