feta: Update to Astro 5 and Vite 6 (#173)

Fryuni · Dec 4, 2024 · 21e0744 · 21e0744
1 parent 7e20109
commit 21e0744
Show file tree

Hide file tree

Showing 87 changed files with 2,288 additions and 1,372 deletions.
diff --git a/.changeset/grumpy-coins-collect.md b/.changeset/grumpy-coins-collect.md
@@ -0,0 +1,5 @@
+---
+'@inox-tools/astro-tests': patch
+---
+
+Fix opt-out of Vite's dependency optimization during tests
diff --git a/.changeset/hot-pandas-dream.md b/.changeset/hot-pandas-dream.md
@@ -0,0 +1,5 @@
+---
+'@inox-tools/custom-routing': major
+---
+
+Bump support to Astro 5
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -0,0 +1,50 @@
+{
+  "mode": "exit",
+  "tag": "beta",
+  "initialVersions": {
+    "docs": "0.0.5",
+    "@examples/astro-when": "0.0.8",
+    "@example/content-injection": "0.0.12",
+    "@example/custom-routing": "0.0.2",
+    "@example/inline-mod": "0.0.1",
+    "@example/inline-mod-aik": "0.1.0",
+    "@example/inline-mod-astro": "0.0.2",
+    "@example/request-nanostores": "0.0.2",
+    "@example/request-state": "0.0.11",
+    "@example/sitemap-ext": "0.1.20",
+    "@inox-tools/aik-mod": "0.8.4",
+    "@inox-tools/aik-route-config": "0.7.4",
+    "@inox-tools/astro-tests": "0.1.5",
+    "@inox-tools/astro-when": "0.2.4",
+    "@astro-when/server-output": "0.0.0",
+    "@astro-when/static-output": "0.0.0",
+    "@inox-tools/content-utils": "0.7.3",
+    "@inox-tools/custom-routing": "0.4.1",
+    "@inox-tools/cut-short": "0.1.2",
+    "@cut-short/basic": "0.0.0",
+    "@inox-tools/inline-mod": "1.5.2",
+    "@inox-tools/modular-station": "0.3.3",
+    "@inox-tools/portal-gun": "0.1.0",
+    "@portal-gun/basic": "0.0.0",
+    "@inox-tools/request-nanostores": "0.1.4",
+    "@request-nanostores/basic": "0.0.0",
+    "@request-nanostores/race": "0.0.0",
+    "@inox-tools/request-state": "0.1.4",
+    "@request-state/basic": "0.0.0",
+    "@request-state/dev": "0.0.0",
+    "@request-state/view-transitions": "0.0.0",
+    "@inox-tools/runtime-logger": "0.3.4",
+    "@inox-tools/sitemap-ext": "0.3.5",
+    "@inox-tools/star-warp": "0.1.5",
+    "@inox-tools/utils": "0.2.0",
+    "@inox-tools/velox-luna": "0.3.2",
+    "templates": "1.0.0"
+  },
+  "changesets": [
+    "grumpy-coins-collect",
+    "hot-pandas-dream",
+    "sixty-chefs-itch",
+    "smooth-pets-grab",
+    "ten-fireants-peel"
+  ]
+}
diff --git a/.changeset/sixty-chefs-itch.md b/.changeset/sixty-chefs-itch.md
@@ -0,0 +1,6 @@
+---
+'@inox-tools/inline-mod': major
+'@inox-tools/utils': minor
+---
+
+Bump support to Vite 6
diff --git a/.changeset/smooth-pets-grab.md b/.changeset/smooth-pets-grab.md
@@ -0,0 +1,8 @@
+---
+'@inox-tools/astro-when': major
+'@inox-tools/portal-gun': major
+'@inox-tools/cut-short': major
+'@inox-tools/astro-tests': minor
+---
+
+Bump support to Astro 5
diff --git a/.changeset/ten-fireants-peel.md b/.changeset/ten-fireants-peel.md
@@ -0,0 +1,5 @@
+---
+'@inox-tools/utils': minor
+---
+
+Add utility for setting deeply nested values through optional fields
diff --git a/docs/astro.config.ts b/docs/astro.config.ts
@@ -1,9 +1,21 @@
 import { defineConfig } from 'astro/config';
 import starlight from '@astrojs/starlight';
+import type { StarlightConfig } from '@astrojs/starlight/types';
 import vercel from '@astrojs/vercel/serverless';
 import starWarp from '@inox-tools/star-warp';
 import starlightLinksValidator from 'starlight-links-validator';
 
+const badge = {
+	new: {
+		text: 'NEW',
+		variant: 'success',
+	},
+	updated: {
+		text: 'UPDATED',
+		variant: 'default',
+	},
+} satisfies Record<string, NonNullable<NonNullable<StarlightConfig['sidebar']>[number]['badge']>>;
+
 process.env.ASTRO_PROJECT_ROOT = new URL('../', import.meta.url).toString();
 
 const SITE =
@@ -32,12 +44,9 @@ export default defineConfig({
 				Head: './src/components/Head.astro',
 				PageTitle: './src/components/PageTitle.astro',
 				Sidebar: './src/components/Sidebar.astro',
+				MarkdownContent: './src/components/MarkdownContent.astro',
 			},
 			sidebar: [
-				{
-					label: 'BETA Docs (Astro 5)',
-					link: 'https://inox-tools-git-feat-astro-5-fryuni-pro.vercel.app/',
-				},
 				{
 					label: 'Tiny and Cute Integrations',
 					collapsed: false,

diff --git a/docs/package.json b/docs/package.json
@@ -17,14 +17,14 @@
     "@croct/plug": "^0.16.4",
     "@inox-tools/star-warp": "workspace:^",
     "@inox-tools/utils": "workspace:^",
-    "@vercel/analytics": "^1.3.2",
-    "astro": "catalog:",
+    "@vercel/analytics": "^1.4.1",
+    "astro": "^4.16.16",
     "sharp": "^0.33.5",
-    "starlight-links-validator": "^0.12.3",
-    "starlight-package-managers": "^0.7.0"
+    "starlight-links-validator": "^0.13.4",
+    "starlight-package-managers": "^0.8.0"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.4",
-    "typescript": "~5.6.3"
+    "typescript": "~5.7.2"
   }
 }
diff --git a/docs/src/components/Head.astro b/docs/src/components/Head.astro
@@ -1,6 +1,8 @@
 ---
 import StarlightHead from '@astrojs/starlight/components/Head.astro';
 export type { Props } from '@astrojs/starlight/props';
+
+Astro.locals.starlight = Astro.props;
 ---
 
 <StarlightHead {...Astro.props} />

diff --git a/docs/src/components/InstallCmd.astro b/docs/src/components/InstallCmd.astro
@@ -0,0 +1,81 @@
+---
+import { Aside, Code } from '@astrojs/starlight/components';
+import { AstroError } from 'astro/errors';
+import { PackageManagers } from 'starlight-package-managers';
+
+export type Props = {
+	type?: 'lib' | 'devLib' | 'integration';
+	packageName?: string;
+	inSteps?: boolean;
+	version?: string;
+};
+
+const { type: packageType = 'integration', inSteps, version = 'beta' } = Astro.props;
+const packageName: string | undefined =
+	Astro.locals.starlight.entry.data.packageName ?? Astro.props.packageName;
+
+if (!packageName) {
+	throw new AstroError('Missing package name.');
+}
+
+const packageSpec = version && version !== 'latest' ? `${packageName}@${version}` : packageName;
+
+// Taked from Astro source to show the exact code the user will see.
+const codemodBrokenIdent = packageSpec
+	.trim()
+	.replace(/[-_./]?astro(?:js)?[-_.]?/g, '')
+	.replace(/\.js/, '')
+	.replace(/[.\-_/]+([a-zA-Z])/g, (_, w) => w.toUpperCase())
+	.replace(/^[^a-zA-Z$_]+/, '');
+const codemodFixedIdent = codemodBrokenIdent.replace(/@.*$/, '');
+---
+
+{
+	inSteps && (
+		<>
+			Install <code dir="auto">{packageName}</code>:{' '}
+		</>
+	)
+}
+
+{
+	packageType === 'integration' && (
+		<>
+			<PackageManagers type="exec" pkg="astro" args={`add ${packageSpec}`} />
+			{codemodBrokenIdent !== codemodFixedIdent && (
+				<Aside type="caution" title="Invalid Codemod">
+					<p>
+						Installing the <code>{version}</code> version of the this package using
+						<code>astro add</code>
+						generates an invalid code for your Astro Config. After installing, remove the
+						<code>@{version}</code> added in the import and integrations section.
+					</p>
+					<Code
+						lang="ts"
+						title="astro.config.mjs"
+						del={{ range: '1,5' }}
+						ins={{ range: '2,6' }}
+						code={`
+import ${codemodBrokenIdent} from '${packageName}';
+import ${codemodFixedIdent} from '${packageName}';
+
+export default defineConfig({
+	integrations: [${codemodBrokenIdent}()],
+	integrations: [${codemodFixedIdent}()],
+});`.trim()}
+					/>
+					<p>
+						Follow <a href="https://github.com/withastro/astro/issues/12359">this issue</a> for more
+						information and updates.
+					</p>
+				</Aside>
+			)}
+		</>
+	)
+}
+
+{
+	packageType !== 'integration' && (
+		<PackageManagers dev={packageType === 'devLib'} pkg={packageSpec} />
+	)
+}
diff --git a/docs/src/components/MarkdownContent.astro b/docs/src/components/MarkdownContent.astro
@@ -0,0 +1,8 @@
+---
+import Default from '@astrojs/starlight/components/MarkdownContent.astro';
+export type { Props } from '@astrojs/starlight/props';
+
+Astro.locals.starlight = Astro.props;
+---
+
+<Default {...Astro.props}><slot /></Default>
diff --git a/docs/src/content/docs/astro-tests.mdx b/docs/src/content/docs/astro-tests.mdx
@@ -26,9 +26,9 @@ If the conversations ends in the decision of not having a test package provided
 
 ## How to install
 
-import { PackageManagers } from 'starlight-package-managers';
+import InstallCmd from '@/components/InstallCmd.astro';
 
-<PackageManagers dev pkg="@inox-tools/astro-tests" />
+<InstallCmd type="devLib" />
 
 ## Fixtures
 

diff --git a/docs/src/content/docs/astro-when.mdx b/docs/src/content/docs/astro-when.mdx
@@ -12,9 +12,9 @@ When/Where your code is running is made available as an exported constant, so yo
 
 This integration is needed during build time only, so you can install it as a dev dependency.
 
-import { PackageManagers } from 'starlight-package-managers';
+import InstallCmd from '@/components/InstallCmd.astro';
 
-<PackageManagers type="exec" pkg="astro" args="add @inox-tools/astro-when" />
+<InstallCmd />
 
 ## How to use
 

diff --git a/docs/src/content/docs/content-utils/git.mdx b/docs/src/content/docs/content-utils/git.mdx
@@ -12,14 +12,11 @@ Git is only necessary during build, so you can deploy your site anywhere. Even o
 
 ## How to use
 
-import { PackageManagers } from 'starlight-package-managers';
+import InstallCmd from '@/components/InstallCmd.astro';
 
 <Steps>
 
-1. Install `@inox-tools/content-utils`:
-
-   <PackageManagers type="exec" pkg="astro" args="add @inox-tools/content-utils" />
-
+1. <InstallCmd inSteps />
 2. Import the time getter you want from `@it-astro:content/git`:
 
    ```astro title="src/pages/blog/[...slug].astro"

diff --git a/docs/src/content/docs/custom-routing.mdx b/docs/src/content/docs/custom-routing.mdx
@@ -9,9 +9,9 @@ sidebar:
 
 This integration allows you to define custom routes for your Astro project independent of the file-system. Use whatever logic you want to define your routes.
 
-import { PackageManagers } from 'starlight-package-managers';
+import InstallCmd from '@/components/InstallCmd.astro';
 
-<PackageManagers pkg="@inox-tools/custom-routing" />
+<InstallCmd />
 
 ```ts
 // astro.config.mjs

diff --git a/docs/src/content/docs/cut-short.mdx b/docs/src/content/docs/cut-short.mdx
@@ -10,9 +10,9 @@ Keep the the custom response for specific conditions close to the conditions and
 
 ## Installing the integration
 
-import { PackageManagers } from 'starlight-package-managers';
+import InstallCmd from '@/components/InstallCmd.astro';
 
-<PackageManagers type="exec" pkg="astro" args="add @inox-tools/cut-short" />
+<InstallCmd />
 
 ## How to use
 

diff --git a/docs/src/content/docs/index.mdx b/docs/src/content/docs/index.mdx
@@ -2,10 +2,6 @@
 title: Inox Tools
 description: A collection of oxygen-free tools for Astronauts
 tableOfContents: false
-banner:
-  content: |
-    A beta version of all of Inox Tools is available to be used with Astro 5 and Vite 6.
-    <a href="https://inox-tools-git-feat-astro-5-fryuni-pro.vercel.app/">Check it out.</a>
 hero:
   tagline: A collection of oxygen-free tools for Astronauts
   image:

diff --git a/docs/src/content/docs/inline-mod/aik-plugin.mdx b/docs/src/content/docs/inline-mod/aik-plugin.mdx
@@ -7,9 +7,9 @@ sidebar:
 
 ## Installing the dependency
 
-import { PackageManagers } from 'starlight-package-managers';
+import InstallCmd from '@/components/InstallCmd.astro';
 
-<PackageManagers pkg="@inox-tools/aik-mod" />
+<InstallCmd type="lib" />
 
 ## Getting Started
 

diff --git a/docs/src/content/docs/modular-station/api.mdx b/docs/src/content/docs/modular-station/api.mdx
@@ -14,9 +14,9 @@ This utility allows you, as an integration author, to expose APIs for other inte
 
 ## Installing the dependency
 
-import { PackageManagers } from 'starlight-package-managers';
+import InstallCmd from '@/components/InstallCmd.astro';
 
-<PackageManagers pkg="@inox-tools/modular-station" />
+<InstallCmd />
 
 ## How to use as an author
 

diff --git a/docs/src/content/docs/modular-station/hooks.mdx b/docs/src/content/docs/modular-station/hooks.mdx
@@ -15,9 +15,9 @@ To avoid confusion, throughout this page you'll see these terms to refer to the
 
 ## Installing the dependency
 
-import { PackageManagers } from 'starlight-package-managers';
+import InstallCmd from '@/components/InstallCmd.astro';
 
-<PackageManagers pkg="@inox-tools/modular-station" />
+<InstallCmd />
 
 ## As a source integration
 

diff --git a/docs/src/content/docs/portal-gun.mdx b/docs/src/content/docs/portal-gun.mdx
@@ -8,9 +8,9 @@ When an element requires rendering outside of the usual component hierarchy, cha
 
 ## Installing the integration
 
-import { PackageManagers } from 'starlight-package-managers';
+import InstallCmd from '@/components/InstallCmd.astro';
 
-<PackageManagers type="exec" pkg="astro" args="add @inox-tools/portal-gun" />
+<InstallCmd />
 
 ## How to use
 

diff --git a/docs/src/content/docs/request-nanostores.mdx b/docs/src/content/docs/request-nanostores.mdx
@@ -13,9 +13,9 @@ This integration bridges this gap and enables the use of Nanostores in Astro acr
 
 ## Installing the dependency
 
-import { PackageManagers } from 'starlight-package-managers';
+import InstallCmd from '@/components/InstallCmd.astro';
 
-<PackageManagers type="exec" pkg="astro" args="add @inox-tools/request-nanostores" />
+<InstallCmd />
 
 ### Prerequisites
 

diff --git a/docs/src/content/docs/request-state.mdx b/docs/src/content/docs/request-state.mdx
@@ -17,9 +17,9 @@ This library provides a solution for those problems:
 
 ## Installing the dependency
 
-import { PackageManagers } from 'starlight-package-managers';
+import InstallCmd from '@/components/InstallCmd.astro';
 
-<PackageManagers type="exec" pkg="astro" args="add @inox-tools/request-state" />
+<InstallCmd />
 
 ### Prerequisites