diff options
| author |  Erika <3019731+Princesseuh@users.noreply.github.com>
| 2022-10-17 11:29:39 -0300 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-10-17 11:29:39 -0300 |
| commit | ce01225a700aff5b437d46f21161e5f557050e12 (patch) | |
| tree | 4e9ddd7fb2fa1b4b2a948aadf3af9c2c27b98637 | |
| parent | dd354f83e8d5191a5e962c999f0a0d859da94a7c (diff) | |
| download | astro-ce01225a700aff5b437d46f21161e5f557050e12.tar.gz astro-ce01225a700aff5b437d46f21161e5f557050e12.tar.zst astro-ce01225a700aff5b437d46f21161e5f557050e12.zip | |
Fix types not working properly when using `moduleResolution: 'node16'` (#5108)
* Fix imports failling under `moduleResolution: node16`
* Add changeset
* Revert comment about Vite 4
| -rw-r--r-- | .changeset/olive-jeans-shout.md | 5 | ||||
| -rw-r--r-- | packages/astro/astro-jsx.d.ts | 10 | ||||
| -rw-r--r-- | packages/astro/config.d.ts | 2 | ||||
| -rw-r--r-- | packages/astro/env.d.ts | 2 | ||||
| -rw-r--r-- | packages/astro/package.json | 5 |
5 files changed, 16 insertions, 8 deletions
diff --git a/.changeset/olive-jeans-shout.md b/.changeset/olive-jeans-shout.md new file mode 100644 index 000000000..423b11e00 --- /dev/null +++ b/.changeset/olive-jeans-shout.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix types not working properly when using `moduleResolution: 'node16'` diff --git a/packages/astro/astro-jsx.d.ts b/packages/astro/astro-jsx.d.ts index 893b92b2f..aa7c0a573 100644 --- a/packages/astro/astro-jsx.d.ts +++ b/packages/astro/astro-jsx.d.ts @@ -23,12 +23,12 @@ declare namespace astroHTML.JSX { children?: Children; } - type AstroBuiltinProps = import('./dist/@types/astro').AstroBuiltinProps; - type AstroBuiltinAttributes = import('./dist/@types/astro').AstroBuiltinAttributes; - type AstroDefineVarsAttribute = import('./dist/@types/astro').AstroDefineVarsAttribute; - type AstroScriptAttributes = import('./dist/@types/astro').AstroScriptAttributes & + type AstroBuiltinProps = import('./dist/@types/astro.js').AstroBuiltinProps; + type AstroBuiltinAttributes = import('./dist/@types/astro.js').AstroBuiltinAttributes; + type AstroDefineVarsAttribute = import('./dist/@types/astro.js').AstroDefineVarsAttribute; + type AstroScriptAttributes = import('./dist/@types/astro.js').AstroScriptAttributes & AstroDefineVarsAttribute; - type AstroStyleAttributes = import('./dist/@types/astro').AstroStyleAttributes & + type AstroStyleAttributes = import('./dist/@types/astro.js').AstroStyleAttributes & AstroDefineVarsAttribute; // This is an unfortunate use of `any`, but unfortunately we can't make a type that works for every framework diff --git a/packages/astro/config.d.ts b/packages/astro/config.d.ts index fab3fe946..6e081a224 100644 --- a/packages/astro/config.d.ts +++ b/packages/astro/config.d.ts @@ -1,5 +1,5 @@ type ViteUserConfig = import('vite').UserConfig; -type AstroUserConfig = import('./dist/@types/astro').AstroUserConfig; +type AstroUserConfig = import('./dist/@types/astro.js').AstroUserConfig; /** * See the full Astro Configuration API Documentation diff --git a/packages/astro/env.d.ts b/packages/astro/env.d.ts index 10a61b06f..659f2972b 100644 --- a/packages/astro/env.d.ts +++ b/packages/astro/env.d.ts @@ -4,7 +4,7 @@ // As such, if the typings you're trying to add should be available inside ex: React components, they should instead // be inside `client-base.d.ts` -type Astro = import('./dist/@types/astro').AstroGlobal; +type Astro = import('./dist/@types/astro.js').AstroGlobal; // We have to duplicate the description here because editors won't show the JSDoc comment from the imported type // However, they will for its properties, ex: Astro.request will show the AstroGlobal.request description diff --git a/packages/astro/package.json b/packages/astro/package.json index 805f92ac1..c3549db85 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -37,7 +37,10 @@ "./tsconfigs/*": "./tsconfigs/*.json", "./jsx/*": "./dist/jsx/*", "./jsx-runtime": "./dist/jsx-runtime/index.js", - "./config": "./config.mjs", + "./config": { + "types": "./config.d.ts", + "default": "./config.mjs" + }, "./app": "./dist/core/app/index.js", "./app/node": "./dist/core/app/node.js", "./client/*": "./dist/runtime/client/*", |