feat(next): reference astro/client from astro/config (#11925)

.changeset/old-zebras-teach.md

@@ -13,7 +13,7 @@ To update your project to Astro's recommended TypeScript settings, please add th
 ```diff
 {
     "extends": "astro/tsconfigs/base",
-+    "include": ["**/*", ".astro/types.d.ts"],
++    "include": [".astro/types.d.ts", "**/*"],
 +    "exclude": ["dist"]
 }
 ```

.changeset/violet-goats-grab.md

@@ -0,0 +1,7 @@
+---
+'astro': minor
+---
+
+Updates `astro/config` import to reference `astro/client` types
+
+When importing `astro/config`, types from `astro/client` will be made automatically available to your project. If your project `tsconfig.json` changes how references behave, you'll still have access to these types after running `astro sync`.

examples/basics/src/env.d.ts

@@ -1 +0,0 @@
-/// <reference path="../.astro/types.d.ts" />

examples/basics/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/blog/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"],
   "compilerOptions": {
     "strictNullChecks": true

examples/component/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"],
   "compilerOptions": {
     "jsx": "preserve"

examples/container-with-vitest/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/framework-alpine/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/framework-multiple/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"],
   "compilerOptions": {
     // Needed for TypeScript intellisense in the template inside Vue files

examples/framework-preact/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"],
   "compilerOptions": {
     // Preact specific settings

examples/framework-react/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"],
   "compilerOptions": {
     "jsx": "react-jsx",

examples/framework-solid/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"],
   "compilerOptions": {
     // Solid specific settings

examples/framework-svelte/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/framework-vue/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"],
   "compilerOptions": {
     // Needed for TypeScript intellisense in the template inside Vue files

examples/hackernews/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/middleware/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/minimal/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/non-html-pages/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/portfolio/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/ssr/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/starlog/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/strict",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/view-transitions/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"],
   "compilerOptions": {
     "resolveJsonModule": true

examples/with-markdoc/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"],
   "compilerOptions": {
     "strictNullChecks": true

examples/with-markdown-plugins/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/with-markdown-shiki/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/with-mdx/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/with-nanostores/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"],
   "compilerOptions": {
     // Preact specific settings

examples/with-tailwindcss/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

examples/with-vitest/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/CHANGELOG.md

@@ -163,7 +163,7 @@
   ```diff
   {
       "extends": "astro/tsconfigs/base",
-  +    "include": ["**/*", ".astro/types.d.ts"],
+  +    "include": [".astro/types.d.ts", "**/*"],
   +    "exclude": ["dist"]
   }
   ```

packages/astro/config.d.ts

@@ -1,3 +1,4 @@
+/// <reference path='./client.d.ts' />
 type ViteUserConfig = import('vite').UserConfig;
 type ViteUserConfigFn = import('vite').UserConfigFn;
 type AstroUserConfig = import('./dist/types/public/config.js').AstroUserConfig;

packages/astro/e2e/fixtures/actions-blog/tsconfig.json

@@ -5,6 +5,6 @@
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/e2e/fixtures/actions-react-19/tsconfig.json

@@ -5,6 +5,6 @@
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/e2e/fixtures/client-only/tsconfig.json

@@ -2,6 +2,6 @@
   "compilerOptions": {
     "importsNotUsedAsValues": "error"
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/e2e/fixtures/custom-client-directives/tsconfig.json

@@ -4,6 +4,6 @@
     // This is only needed because we link Astro locally.
     "preserveSymlinks": true
   },
-  "include": ["./src/**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "./src/**/*"],
   "exclude": ["dist"]
 }

packages/astro/performance/fixtures/md/tsconfig.json

@@ -4,6 +4,6 @@
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/performance/fixtures/mdoc/tsconfig.json

@@ -4,6 +4,6 @@
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/performance/fixtures/mdx/tsconfig.json

@@ -4,6 +4,6 @@
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/performance/fixtures/utils/tsconfig.json

@@ -3,6 +3,6 @@
     "jsx": "react-jsx",              
     "jsxImportSource": "react"       
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]                           
 }

packages/astro/test/fixtures/alias-tsconfig-baseurl-only/tsconfig.json

@@ -2,6 +2,6 @@
   "compilerOptions": {
     "baseUrl": "./src"
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/alias-tsconfig/tsconfig.json

@@ -14,6 +14,6 @@
       ]
     }
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/astro-env-content-collections/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/astro-env-required-public/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/astro-env-server-fail/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/astro-env-server-secret/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/astro-env/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/core-image-base/tsconfig.json

@@ -8,6 +8,6 @@
       ]
     },
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/core-image-deletion/tsconfig.json

@@ -6,6 +6,6 @@
       "~/assets/*": ["src/assets/*"]
     },
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/core-image-infersize/tsconfig.json

@@ -3,6 +3,6 @@
   "compilerOptions": {
     "baseUrl": ".",
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/core-image-remark-imgattr/tsconfig.json

@@ -3,6 +3,6 @@
   "compilerOptions": {
     "baseUrl": ".",
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/core-image-ssg/tsconfig.json

@@ -6,6 +6,6 @@
       "~/assets/*": ["src/assets/*"]
     },
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/core-image-unconventional-settings/tsconfig.json

@@ -6,6 +6,6 @@
       "~/assets/*": ["src/assets/*"]
     },
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/core-image/tsconfig.json

@@ -8,6 +8,6 @@
       ]
     },
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/react-and-solid/tsconfig.json

@@ -4,6 +4,6 @@
     "jsxImportSource": "solid-js",
     "types": ["astro/client"]
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/astro/test/fixtures/ssr-prerender-chunks/tsconfig.json

@@ -4,6 +4,6 @@
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/db/test/fixtures/ticketing-example/tsconfig.json

@@ -4,6 +4,6 @@
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/integrations/markdoc/test/fixtures/image-assets/tsconfig.json

@@ -6,6 +6,6 @@
       "~/assets/*": ["src/assets/*"]
     },
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/integrations/markdoc/test/fixtures/render-with-components/tsconfig.json

@@ -4,6 +4,6 @@
     "jsx": "react-jsx",
     "jsxImportSource": "preact"
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }

packages/integrations/mdx/test/fixtures/mdx-images/tsconfig.json

@@ -6,6 +6,6 @@
       "~/assets/*": ["src/assets/*"]
     },
   },
-  "include": ["**/*", ".astro/types.d.ts"],
+  "include": [".astro/types.d.ts", "**/*"],
   "exclude": ["dist"]
 }