diff --git a/.changeset/afraid-dots-whisper.md b/.changeset/afraid-dots-whisper.md new file mode 100644 index 000000000..81da436ad --- /dev/null +++ b/.changeset/afraid-dots-whisper.md @@ -0,0 +1,32 @@ +--- +'@astrojs/cloudflare': major +'@astrojs/partytown': major +'@astrojs/tailwind': major +'@astrojs/netlify': major +'@astrojs/sitemap': major +'@astrojs/preact': major +'@astrojs/svelte': major +'@astrojs/vercel': major +'@astrojs/react': major +'@astrojs/solid-js': major +'@astrojs/deno': major +'@astrojs/node': major +'@astrojs/lit': major +'@astrojs/vue': major +'create-astro': major +'@astrojs/prism': major +'@astrojs/rss': major +'@astrojs/telemetry': major +'@astrojs/webapi': major +'astro': major +'@astrojs/turbolinks': minor +'@astrojs/alpinejs': minor +'@astrojs/prefetch': minor +'@astrojs/markdoc': minor +'@astrojs/underscore-redirects': minor +'@astrojs/image': minor +'@astrojs/mdx': minor +'@astrojs/internal-helpers': minor +--- + +Remove support for Node 16. The lowest supported version by Astro and all integrations is now v18.14.1. As a reminder, Node 16 will be deprecated on the 11th September 2023. diff --git a/.github/ISSUE_TEMPLATE/---01-bug-report.yml b/.github/ISSUE_TEMPLATE/---01-bug-report.yml index a9786522b..15bc784f4 100644 --- a/.github/ISSUE_TEMPLATE/---01-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/---01-bug-report.yml @@ -10,7 +10,7 @@ body: Thank you for taking the time to file a bug report! Please fill out this form as completely as possible. ✅ I am using the **latest version of Astro** and all plugins. - ✅ I am using a version of Node that supports ESM (`v14.18.0+`, or `v16.12.0+`) + ✅ I am using a version of Node that Astro supports (`>=18.14.1`) - type: input id: astro-version attributes: diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 1f6f01e76..3f38b57b5 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -33,7 +33,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: "pnpm" - name: Install dependencies diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 329835b80..01c573e10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: strategy: matrix: OS: [ubuntu-latest, windows-latest] - NODE_VERSION: [16] + NODE_VERSION: [18] fail-fast: true steps: # Disable crlf so all OS can share the same Turbo cache @@ -85,7 +85,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: "pnpm" - name: Install dependencies @@ -108,12 +108,12 @@ jobs: strategy: matrix: OS: [ubuntu-latest] - NODE_VERSION: [16, 18] + NODE_VERSION: [18, 20] include: - os: macos-latest - NODE_VERSION: 16 + NODE_VERSION: 18 - os: windows-latest - NODE_VERSION: 16 + NODE_VERSION: 18 fail-fast: false env: NODE_VERSION: ${{ matrix.NODE_VERSION }} @@ -155,7 +155,7 @@ jobs: strategy: matrix: OS: [ubuntu-latest, windows-latest] - NODE_VERSION: [16] + NODE_VERSION: [18] fail-fast: false env: NODE_VERSION: ${{ matrix.NODE_VERSION }} @@ -192,7 +192,7 @@ jobs: strategy: matrix: OS: [ubuntu-latest, windows-latest] - NODE_VERSION: [16] + NODE_VERSION: [18] env: NODE_VERSION: ${{ matrix.NODE_VERSION }} steps: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e58b68975..961f4d997 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: "pnpm" - name: Install dependencies diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d160b7c0e..e30175ad7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: "pnpm" - name: Install dependencies diff --git a/.github/workflows/scripts.yml b/.github/workflows/scripts.yml index 056bf4e0a..a22ec467b 100644 --- a/.github/workflows/scripts.yml +++ b/.github/workflows/scripts.yml @@ -37,7 +37,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: "pnpm" - name: Install dependencies diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml index 5504978c6..29f8c7f11 100644 --- a/.github/workflows/snapshot-release.yml +++ b/.github/workflows/snapshot-release.yml @@ -58,7 +58,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 registry-url: "https://registry.npmjs.org" cache: "pnpm" diff --git a/.nvmrc b/.nvmrc index e65243f2e..617bcf916 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.19.0 +18.14.1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 25baacecb..c433a6833 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ We welcome contributions of any size and skill level. As an open source project, ### Prerequisites ```shell -node: "^>=16.12.0" +node: "^>=18.14.1" pnpm: "^8.6.2" # otherwise, your build will fail ``` diff --git a/benchmark/packages/timer/tsconfig.json b/benchmark/packages/timer/tsconfig.json index 44baf375c..af1b43564 100644 --- a/benchmark/packages/timer/tsconfig.json +++ b/benchmark/packages/timer/tsconfig.json @@ -3,8 +3,8 @@ "include": ["src"], "compilerOptions": { "allowJs": true, - "module": "ES2020", + "module": "ES2022", "outDir": "./dist", - "target": "ES2020" + "target": "ES2022" } } diff --git a/package.json b/package.json index 5ee1460e4..0f590c509 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "packages/*" ], "engines": { - "node": ">=16.12.0", + "node": ">=18.14.1", "pnpm": ">=8.6.2" }, "packageManager": "pnpm@8.6.2", @@ -82,7 +82,7 @@ "@types/node": "^18.16.18", "@typescript-eslint/eslint-plugin": "6.0.0", "@typescript-eslint/parser": "6.0.0", - "esbuild": "^0.17.19", + "esbuild": "^0.18.16", "eslint": "^8.43.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-no-only-tests": "^2.6.0", @@ -93,6 +93,6 @@ "prettier-plugin-astro": "^0.10.0", "tiny-glob": "^0.2.9", "turbo": "^1.10.3", - "typescript": "~5.0.2" + "typescript": "~5.1.6" } } diff --git a/packages/astro-prism/package.json b/packages/astro-prism/package.json index 4ad55bf7f..278d52482 100644 --- a/packages/astro-prism/package.json +++ b/packages/astro-prism/package.json @@ -14,7 +14,7 @@ "homepage": "https://docs.astro.build/en/reference/api-reference/#prism-", "main": "dist/index.js", "scripts": { - "build": "astro-scripts build \"src/**/*.ts\" && tsc", + "build": "astro-scripts build \"src/**/*.ts\" && tsc -p ./tsconfig.json", "build:ci": "astro-scripts build \"src/**/*.ts\"", "dev": "astro-scripts dev \"src/**/*.ts\"" }, @@ -39,6 +39,6 @@ "astro-scripts": "workspace:*" }, "engines": { - "node": ">=16.12.0" + "node": ">=18.14.1" } } diff --git a/packages/astro-prism/tsconfig.json b/packages/astro-prism/tsconfig.json index 569016e9d..fd652e629 100644 --- a/packages/astro-prism/tsconfig.json +++ b/packages/astro-prism/tsconfig.json @@ -3,7 +3,7 @@ "include": ["src"], "compilerOptions": { "allowJs": true, - "target": "ES2021", + "target": "ES2022", "module": "ES2022", "outDir": "./dist" } diff --git a/packages/astro-rss/tsconfig.json b/packages/astro-rss/tsconfig.json index f9da2a5bd..d8efd2fec 100644 --- a/packages/astro-rss/tsconfig.json +++ b/packages/astro-rss/tsconfig.json @@ -5,7 +5,7 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021", + "target": "ES2022", "strictNullChecks": true } } diff --git a/packages/astro/astro.js b/packages/astro/astro.js index 37ea869bc..631a7b9c8 100755 --- a/packages/astro/astro.js +++ b/packages/astro/astro.js @@ -13,8 +13,8 @@ const CI_INSTRUCTIONS = { }; // Hardcode supported Node.js version so we don't have to read differently in CJS & ESM. -const engines = '>=16.12.0'; -const skipSemverCheckIfAbove = 16; +const engines = '>=18.14.1'; +const skipSemverCheckIfAbove = 19; /** `astro *` */ async function main() { diff --git a/packages/astro/package.json b/packages/astro/package.json index b6651a013..2d6162f32 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -141,8 +141,8 @@ "devalue": "^4.3.2", "diff": "^5.1.0", "es-module-lexer": "^1.3.0", - "esbuild": "^0.17.19", - "estree-walker": "3.0.0", + "esbuild": "^0.18.16", + "estree-walker": "^3.0.3", "execa": "^6.1.0", "fast-glob": "^3.2.12", "github-slugger": "^2.0.0", @@ -224,7 +224,7 @@ } }, "engines": { - "node": ">=16.12.0", + "node": ">=18.14.1", "npm": ">=6.14.0" } } diff --git a/packages/astro/src/core/build/plugins/plugin-analyzer.ts b/packages/astro/src/core/build/plugins/plugin-analyzer.ts index c05328005..b62de1a2b 100644 --- a/packages/astro/src/core/build/plugins/plugin-analyzer.ts +++ b/packages/astro/src/core/build/plugins/plugin-analyzer.ts @@ -1,3 +1,4 @@ +import type { Node as ESTreeNode } from 'estree-walker'; import type { ModuleInfo, PluginContext } from 'rollup'; import type { Plugin as VitePlugin } from 'vite'; import type { PluginMetadata as AstroPluginMetadata } from '../../../vite-plugin-astro/types'; @@ -36,7 +37,7 @@ async function doesParentImportChild( const imports: Array = []; const exports: Array = []; - walk(parentInfo.ast, { + walk(parentInfo.ast as ESTreeNode, { enter(node) { if (node.type === 'ImportDeclaration') { imports.push(node as ImportDeclaration); diff --git a/packages/astro/src/vite-plugin-astro-postprocess/index.ts b/packages/astro/src/vite-plugin-astro-postprocess/index.ts index be8ddb7b0..6d7de9e2d 100644 --- a/packages/astro/src/vite-plugin-astro-postprocess/index.ts +++ b/packages/astro/src/vite-plugin-astro-postprocess/index.ts @@ -1,4 +1,5 @@ import { parse } from 'acorn'; +import type { Node as ESTreeNode } from 'estree-walker'; import { walk } from 'estree-walker'; import MagicString from 'magic-string'; import type { Plugin } from 'vite'; @@ -28,7 +29,7 @@ export default function astro(): Plugin { sourceType: 'module', }); - walk(ast, { + walk(ast as ESTreeNode, { enter(node: any) { // Transform `Astro.glob("./pages/*.astro")` to `Astro.glob(import.meta.glob("./pages/*.astro"), () => "./pages/*.astro")` // Also handle for `Astro2.glob()` diff --git a/packages/astro/tsconfig.json b/packages/astro/tsconfig.json index 839239eaf..63854a31d 100644 --- a/packages/astro/tsconfig.json +++ b/packages/astro/tsconfig.json @@ -6,7 +6,7 @@ "declarationDir": "./dist", "module": "ES2022", "outDir": "./dist", - "target": "ES2021", + "target": "ES2022", "jsx": "preserve", "types": ["@types/dom-view-transitions", "network-information-types"] } diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json index f20cde496..24c2a5409 100644 --- a/packages/create-astro/package.json +++ b/packages/create-astro/package.json @@ -47,6 +47,6 @@ "strip-json-comments": "^5.0.0" }, "engines": { - "node": ">=16.12.0" + "node": ">=18.14.1" } } diff --git a/packages/create-astro/tsconfig.json b/packages/create-astro/tsconfig.json index 720167fad..1ab34c5a2 100644 --- a/packages/create-astro/tsconfig.json +++ b/packages/create-astro/tsconfig.json @@ -5,7 +5,7 @@ "allowJs": true, "emitDeclarationOnly": false, "noEmit": true, - "target": "ES2021", + "target": "ES2022", "module": "ES2022", "outDir": "./dist", "declarationDir": "./dist/types" diff --git a/packages/integrations/alpinejs/tsconfig.json b/packages/integrations/alpinejs/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/alpinejs/tsconfig.json +++ b/packages/integrations/alpinejs/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 7e42c8455..5f2a2a38e 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -41,7 +41,7 @@ "dependencies": { "@astrojs/underscore-redirects": "^0.2.0", "@cloudflare/workers-types": "^4.20230518.0", - "esbuild": "^0.17.19", + "esbuild": "^0.18.16", "tiny-glob": "^0.2.9" }, "peerDependencies": { diff --git a/packages/integrations/cloudflare/tsconfig.json b/packages/integrations/cloudflare/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/cloudflare/tsconfig.json +++ b/packages/integrations/cloudflare/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/deno/tsconfig.json b/packages/integrations/deno/tsconfig.json index 64d4ef454..f3c96447a 100644 --- a/packages/integrations/deno/tsconfig.json +++ b/packages/integrations/deno/tsconfig.json @@ -5,6 +5,8 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022", + // TODO: Due to the shim for Deno imports in `server.ts`, we can't use moduleResolution: 'bundler' or the types get very weird. + "moduleResolution": "Node" } } diff --git a/packages/integrations/image/tsconfig.json b/packages/integrations/image/tsconfig.json index 56b6b4e2d..0a210b9fc 100644 --- a/packages/integrations/image/tsconfig.json +++ b/packages/integrations/image/tsconfig.json @@ -5,7 +5,7 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021", + "target": "ES2022", "typeRoots": ["node_modules/@types", "node_modules/@netlify"] } } diff --git a/packages/integrations/lit/tsconfig.json b/packages/integrations/lit/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/lit/tsconfig.json +++ b/packages/integrations/lit/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index bd936ba72..dabaf738f 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -66,7 +66,7 @@ "@astrojs/internal-helpers": "^0.1.0", "@astrojs/prism": "^2.1.2", "@markdoc/markdoc": "^0.3.0", - "esbuild": "^0.17.19", + "esbuild": "^0.18.16", "github-slugger": "^2.0.0", "gray-matter": "^4.0.3", "kleur": "^4.1.5", @@ -91,6 +91,6 @@ "vite": "^4.4.6" }, "engines": { - "node": ">=16.12.0" + "node": ">=18.14.1" } } diff --git a/packages/integrations/markdoc/src/content-entry-type.ts b/packages/integrations/markdoc/src/content-entry-type.ts index bb62a2035..973f543f1 100644 --- a/packages/integrations/markdoc/src/content-entry-type.ts +++ b/packages/integrations/markdoc/src/content-entry-type.ts @@ -1,18 +1,17 @@ import type { Config as MarkdocConfig, Node } from '@markdoc/markdoc'; import Markdoc from '@markdoc/markdoc'; import type { AstroConfig, ContentEntryType } from 'astro'; +import { emitESMImage } from 'astro/assets/utils'; import matter from 'gray-matter'; import fs from 'node:fs'; +import path from 'node:path'; import { fileURLToPath } from 'node:url'; +import type * as rollup from 'rollup'; import type { ErrorPayload as ViteErrorPayload } from 'vite'; import type { ComponentConfig } from './config.js'; -import { MarkdocError, isComponentConfig, isValidUrl, prependForwardSlash } from './utils.js'; -// @ts-expect-error Cannot get the types here without `moduleResolution: 'nodenext'` -import { emitESMImage } from 'astro/assets/utils'; -import path from 'node:path'; -import type * as rollup from 'rollup'; import type { MarkdocConfigResult } from './load-config.js'; import { setupConfig } from './runtime.js'; +import { MarkdocError, isComponentConfig, isValidUrl, prependForwardSlash } from './utils.js'; export async function getContentEntryType({ markdocConfigResult, @@ -190,8 +189,7 @@ async function emitOptimizedImages( const src = await emitESMImage( resolved.id, ctx.pluginContext.meta.watchMode, - ctx.pluginContext.emitFile, - { config: ctx.astroConfig } + ctx.pluginContext.emitFile ); node.attributes.__optimizedSrc = src; } else { diff --git a/packages/integrations/markdoc/src/extensions/prism.ts b/packages/integrations/markdoc/src/extensions/prism.ts index e28112c9a..5cfd628ca 100644 --- a/packages/integrations/markdoc/src/extensions/prism.ts +++ b/packages/integrations/markdoc/src/extensions/prism.ts @@ -1,8 +1,5 @@ -// leave space, so organize imports doesn't mess up comments -// @ts-expect-error Cannot find module 'astro/runtime/server/index.js' or its corresponding type declarations. -import { unescapeHTML } from 'astro/runtime/server/index.js'; - import { runHighlighterWithAstro } from '@astrojs/prism/dist/highlighter'; +import { unescapeHTML } from 'astro/runtime/server/index.js'; import { Markdoc, type AstroMarkdocConfig } from '../config.js'; export default function prism(): AstroMarkdocConfig { @@ -16,7 +13,7 @@ export default function prism(): AstroMarkdocConfig { // Use `unescapeHTML` to return `HTMLString` for Astro renderer to inline as HTML return unescapeHTML( `
${html}
` - ); + ) as any; }, }, }, diff --git a/packages/integrations/markdoc/src/extensions/shiki.ts b/packages/integrations/markdoc/src/extensions/shiki.ts index 1229a09fb..a553a6bae 100644 --- a/packages/integrations/markdoc/src/extensions/shiki.ts +++ b/packages/integrations/markdoc/src/extensions/shiki.ts @@ -1,9 +1,6 @@ -// leave space, so organize imports doesn't mess up comments -// @ts-expect-error Cannot find module 'astro/runtime/server/index.js' or its corresponding type declarations. -import { unescapeHTML } from 'astro/runtime/server/index.js'; - import Markdoc from '@markdoc/markdoc'; import type { ShikiConfig } from 'astro'; +import { unescapeHTML } from 'astro/runtime/server/index.js'; import type * as shikiTypes from 'shiki'; import { getHighlighter } from 'shiki'; import type { AstroMarkdocConfig } from '../config.js'; @@ -123,7 +120,7 @@ export default async function shiki({ } // Use `unescapeHTML` to return `HTMLString` for Astro renderer to inline as HTML - return unescapeHTML(html); + return unescapeHTML(html) as any; }, }, }, diff --git a/packages/integrations/markdoc/src/runtime.ts b/packages/integrations/markdoc/src/runtime.ts index 6a20a8740..32f1e2e09 100644 --- a/packages/integrations/markdoc/src/runtime.ts +++ b/packages/integrations/markdoc/src/runtime.ts @@ -6,7 +6,6 @@ import Markdoc, { type RenderableTreeNode, } from '@markdoc/markdoc'; import type { AstroInstance } from 'astro'; -// @ts-expect-error Cannot find module 'astro/runtime/server/index.js' or its corresponding type declarations. import { createComponent, renderComponent } from 'astro/runtime/server/index.js'; import type { AstroMarkdocConfig } from './config.js'; import { setupHeadingConfig } from './heading-ids.js'; @@ -179,5 +178,5 @@ export function createContentComponent( return renderComponent(result, Renderer.name, Renderer, { stringifiedAst, config }, {}); }, propagation: 'self', - }); + } as any); } diff --git a/packages/integrations/markdoc/tsconfig.json b/packages/integrations/markdoc/tsconfig.json index 44baf375c..af1b43564 100644 --- a/packages/integrations/markdoc/tsconfig.json +++ b/packages/integrations/markdoc/tsconfig.json @@ -3,8 +3,8 @@ "include": ["src"], "compilerOptions": { "allowJs": true, - "module": "ES2020", + "module": "ES2022", "outDir": "./dist", - "target": "ES2020" + "target": "ES2022" } } diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index 7e38cb1b6..a10249d53 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -78,6 +78,6 @@ "vite": "^4.4.6" }, "engines": { - "node": ">=16.12.0" + "node": ">=18.14.1" } } diff --git a/packages/integrations/mdx/src/remark-images-to-component.ts b/packages/integrations/mdx/src/remark-images-to-component.ts index 8a3166f49..bb9657f42 100644 --- a/packages/integrations/mdx/src/remark-images-to-component.ts +++ b/packages/integrations/mdx/src/remark-images-to-component.ts @@ -1,5 +1,5 @@ import type { MarkdownVFile } from '@astrojs/markdown-remark'; -import { type Image, type Parent } from 'mdast'; +import type { Image, Parent } from 'mdast'; import type { MdxJsxFlowElement, MdxjsEsm } from 'mdast-util-mdx'; import { visit } from 'unist-util-visit'; import { jsToTreeNode } from './utils.js'; diff --git a/packages/integrations/mdx/tsconfig.json b/packages/integrations/mdx/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/mdx/tsconfig.json +++ b/packages/integrations/mdx/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 2ee51e366..0776f3050 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -41,7 +41,7 @@ "@astrojs/underscore-redirects": "^0.2.0", "@astrojs/webapi": "^2.2.0", "@netlify/functions": "^1.6.0", - "esbuild": "^0.15.18" + "esbuild": "^0.18.16" }, "peerDependencies": { "astro": "workspace:^2.9.2" diff --git a/packages/integrations/netlify/tsconfig.json b/packages/integrations/netlify/tsconfig.json index 4442d4c36..66b0102c7 100644 --- a/packages/integrations/netlify/tsconfig.json +++ b/packages/integrations/netlify/tsconfig.json @@ -5,7 +5,7 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021", + "target": "ES2022", "typeRoots": ["node_modules/@types", "node_modules/@netlify"], "allowImportingTsExtensions": true } diff --git a/packages/integrations/node/tsconfig.json b/packages/integrations/node/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/node/tsconfig.json +++ b/packages/integrations/node/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/partytown/tsconfig.json b/packages/integrations/partytown/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/partytown/tsconfig.json +++ b/packages/integrations/partytown/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json index 9efc7d2c5..391fdb547 100644 --- a/packages/integrations/preact/package.json +++ b/packages/integrations/preact/package.json @@ -50,6 +50,6 @@ "preact": "^10.6.5" }, "engines": { - "node": ">=16.12.0" + "node": ">=18.14.1" } } diff --git a/packages/integrations/preact/tsconfig.json b/packages/integrations/preact/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/preact/tsconfig.json +++ b/packages/integrations/preact/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/prefetch/tsconfig.json b/packages/integrations/prefetch/tsconfig.json index 194a092ff..6457dfe8c 100644 --- a/packages/integrations/prefetch/tsconfig.json +++ b/packages/integrations/prefetch/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json index fa68cd5f0..dbcdadca9 100644 --- a/packages/integrations/react/package.json +++ b/packages/integrations/react/package.json @@ -62,6 +62,6 @@ "react-dom": "^17.0.2 || ^18.0.0" }, "engines": { - "node": ">=16.12.0" + "node": ">=18.14.1" } } diff --git a/packages/integrations/react/tsconfig.json b/packages/integrations/react/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/react/tsconfig.json +++ b/packages/integrations/react/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/sitemap/tsconfig.json b/packages/integrations/sitemap/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/sitemap/tsconfig.json +++ b/packages/integrations/sitemap/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index 407b0cc73..6f1db89e7 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -47,6 +47,6 @@ "solid-js": "^1.4.3" }, "engines": { - "node": ">=16.12.0" + "node": ">=18.14.1" } } diff --git a/packages/integrations/solid/tsconfig.json b/packages/integrations/solid/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/solid/tsconfig.json +++ b/packages/integrations/solid/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 8c3081d75..25deeb011 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -52,6 +52,6 @@ "svelte": "^3.55.0 || ^4.0.0" }, "engines": { - "node": ">=16.12.0" + "node": ">=18.14.1" } } diff --git a/packages/integrations/svelte/tsconfig.json b/packages/integrations/svelte/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/svelte/tsconfig.json +++ b/packages/integrations/svelte/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/tailwind/tsconfig.json b/packages/integrations/tailwind/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/tailwind/tsconfig.json +++ b/packages/integrations/tailwind/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/turbolinks/tsconfig.json b/packages/integrations/turbolinks/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/turbolinks/tsconfig.json +++ b/packages/integrations/turbolinks/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index fd58f5aaa..8e4c94a14 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -55,7 +55,7 @@ "@astrojs/webapi": "^2.2.0", "@vercel/analytics": "^0.1.11", "@vercel/nft": "^0.22.6", - "esbuild": "^0.17.19", + "esbuild": "^0.18.16", "fast-glob": "^3.2.12", "set-cookie-parser": "^2.6.0", "web-vitals": "^3.3.2" diff --git a/packages/integrations/vercel/src/image/dev-service.ts b/packages/integrations/vercel/src/image/dev-service.ts index 04df9932a..d812efb93 100644 --- a/packages/integrations/vercel/src/image/dev-service.ts +++ b/packages/integrations/vercel/src/image/dev-service.ts @@ -1,5 +1,4 @@ import type { LocalImageService } from 'astro'; -// @ts-expect-error import squooshService from 'astro/assets/services/squoosh'; import { sharedValidateOptions } from './shared'; @@ -14,7 +13,9 @@ const service: LocalImageService = { props.width = inputtedWidth; } - return squooshService.getHTMLAttributes(props, serviceOptions); + return squooshService.getHTMLAttributes + ? squooshService.getHTMLAttributes(props, serviceOptions) + : {}; }, getURL(options) { const fileSrc = typeof options.src === 'string' ? options.src : options.src.src; diff --git a/packages/integrations/vercel/tsconfig.json b/packages/integrations/vercel/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/vercel/tsconfig.json +++ b/packages/integrations/vercel/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index 574039395..05751b02d 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -60,6 +60,6 @@ "vue": "^3.2.30" }, "engines": { - "node": ">=16.12.0" + "node": ">=18.14.1" } } diff --git a/packages/integrations/vue/tsconfig.json b/packages/integrations/vue/tsconfig.json index 64d4ef454..af1b43564 100644 --- a/packages/integrations/vue/tsconfig.json +++ b/packages/integrations/vue/tsconfig.json @@ -5,6 +5,6 @@ "allowJs": true, "module": "ES2022", "outDir": "./dist", - "target": "ES2021" + "target": "ES2022" } } diff --git a/packages/internal-helpers/tsconfig.json b/packages/internal-helpers/tsconfig.json index 569016e9d..fd652e629 100644 --- a/packages/internal-helpers/tsconfig.json +++ b/packages/internal-helpers/tsconfig.json @@ -3,7 +3,7 @@ "include": ["src"], "compilerOptions": { "allowJs": true, - "target": "ES2021", + "target": "ES2022", "module": "ES2022", "outDir": "./dist" } diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index be9e88b13..a81906743 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -13,7 +13,10 @@ "bugs": "https://github.com/withastro/astro/issues", "homepage": "https://astro.build", "exports": { - ".": "./dist/index.js", + ".": { + "types": "./dist/types/index.d.ts", + "default": "./dist/index.js" + }, "./package.json": "./package.json" }, "scripts": { @@ -45,6 +48,6 @@ "mocha": "^9.2.2" }, "engines": { - "node": ">=16.12.0" + "node": ">=18.14.1" } } diff --git a/packages/telemetry/src/config.ts b/packages/telemetry/src/config.ts index d03f9102b..f0d855597 100644 --- a/packages/telemetry/src/config.ts +++ b/packages/telemetry/src/config.ts @@ -1,4 +1,5 @@ import dget from 'dlv'; +// @ts-expect-error `dset` is mispackaged: https://publint.dev/dset@3.1.2 import { dset } from 'dset'; import fs from 'node:fs'; import os from 'node:os'; diff --git a/packages/telemetry/tsconfig.json b/packages/telemetry/tsconfig.json index b35c3d244..451badc02 100644 --- a/packages/telemetry/tsconfig.json +++ b/packages/telemetry/tsconfig.json @@ -3,7 +3,7 @@ "include": ["src"], "compilerOptions": { "allowJs": true, - "target": "ES2021", + "target": "ES2022", "module": "ES2022", "outDir": "./dist", "declarationDir": "./dist/types" diff --git a/packages/underscore-redirects/tsconfig.json b/packages/underscore-redirects/tsconfig.json index 569016e9d..fd652e629 100644 --- a/packages/underscore-redirects/tsconfig.json +++ b/packages/underscore-redirects/tsconfig.json @@ -3,7 +3,7 @@ "include": ["src"], "compilerOptions": { "allowJs": true, - "target": "ES2021", + "target": "ES2022", "module": "ES2022", "outDir": "./dist" } diff --git a/packages/webapi/package.json b/packages/webapi/package.json index 730f5efb4..fcc3ec79d 100644 --- a/packages/webapi/package.json +++ b/packages/webapi/package.json @@ -67,7 +67,7 @@ "mocha": "^9.2.2", "rollup": "^2.79.1", "tslib": "^2.5.3", - "typescript": "~5.0.2", + "typescript": "~5.1.6", "urlpattern-polyfill": "^1.0.0-rc5" }, "scripts": { diff --git a/packages/webapi/tsconfig.json b/packages/webapi/tsconfig.json index 2d7e33d82..2348c6bfb 100644 --- a/packages/webapi/tsconfig.json +++ b/packages/webapi/tsconfig.json @@ -2,7 +2,7 @@ "include": ["src/*"], "exclude": ["node_modules"], "compilerOptions": { - "target": "ES2021", + "target": "ES2022", "module": "ES2022", "moduleResolution": "node", "esModuleInterop": true, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 215b1a41a..26b6d7a2d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,13 +32,13 @@ importers: version: 18.16.18 '@typescript-eslint/eslint-plugin': specifier: 6.0.0 - version: 6.0.0(@typescript-eslint/parser@6.0.0)(eslint@8.43.0)(typescript@5.0.2) + version: 6.0.0(@typescript-eslint/parser@6.0.0)(eslint@8.43.0)(typescript@5.1.6) '@typescript-eslint/parser': specifier: 6.0.0 - version: 6.0.0(eslint@8.43.0)(typescript@5.0.2) + version: 6.0.0(eslint@8.43.0)(typescript@5.1.6) esbuild: - specifier: ^0.17.19 - version: 0.17.19 + specifier: ^0.18.16 + version: 0.18.16 eslint: specifier: ^8.43.0 version: 8.43.0 @@ -70,8 +70,8 @@ importers: specifier: ^1.10.3 version: 1.10.3 typescript: - specifier: ~5.0.2 - version: 5.0.2 + specifier: ~5.1.6 + version: 5.1.6 benchmark: dependencies: @@ -564,11 +564,11 @@ importers: specifier: ^1.3.0 version: 1.3.0 esbuild: - specifier: ^0.17.19 - version: 0.17.19 + specifier: ^0.18.16 + version: 0.18.16 estree-walker: - specifier: 3.0.0 - version: 3.0.0 + specifier: ^3.0.3 + version: 3.0.3 execa: specifier: ^6.1.0 version: 6.1.0 @@ -3645,8 +3645,8 @@ importers: specifier: ^4.20230518.0 version: 4.20230518.0 esbuild: - specifier: ^0.17.19 - version: 0.17.19 + specifier: ^0.18.16 + version: 0.18.16 tiny-glob: specifier: ^0.2.9 version: 0.2.9 @@ -4021,8 +4021,8 @@ importers: specifier: ^0.3.0 version: 0.3.0 esbuild: - specifier: ^0.17.19 - version: 0.17.19 + specifier: ^0.18.16 + version: 0.18.16 github-slugger: specifier: ^2.0.0 version: 2.0.0 @@ -4286,7 +4286,7 @@ importers: version: 10.1.0 remark-shiki-twoslash: specifier: ^3.1.3 - version: 3.1.3(typescript@5.0.2) + version: 3.1.3(typescript@5.1.6) remark-toc: specifier: ^8.0.1 version: 8.0.1 @@ -4435,8 +4435,8 @@ importers: specifier: ^1.6.0 version: 1.6.0 esbuild: - specifier: ^0.15.18 - version: 0.15.18 + specifier: ^0.18.16 + version: 0.18.16 devDependencies: '@netlify/edge-functions': specifier: ^2.0.0 @@ -4849,7 +4849,7 @@ importers: version: 2.4.2(svelte@3.59.1)(vite@4.4.6) svelte2tsx: specifier: ^0.6.15 - version: 0.6.15(svelte@3.59.1)(typescript@5.0.2) + version: 0.6.15(svelte@3.59.1)(typescript@5.1.6) devDependencies: astro: specifier: workspace:* @@ -4917,8 +4917,8 @@ importers: specifier: ^0.22.6 version: 0.22.6 esbuild: - specifier: ^0.17.19 - version: 0.17.19 + specifier: ^0.18.16 + version: 0.18.16 fast-glob: specifier: ^3.2.12 version: 3.2.12 @@ -5394,7 +5394,7 @@ importers: version: 13.3.0(rollup@2.79.1) '@rollup/plugin-typescript': specifier: ^8.5.0 - version: 8.5.0(rollup@2.79.1)(tslib@2.5.3)(typescript@5.0.2) + version: 8.5.0(rollup@2.79.1)(tslib@2.5.3)(typescript@5.1.6) '@types/chai': specifier: ^4.3.5 version: 4.3.5 @@ -5426,8 +5426,8 @@ importers: specifier: ^2.5.3 version: 2.5.3 typescript: - specifier: ~5.0.2 - version: 5.0.2 + specifier: ~5.1.6 + version: 5.1.6 urlpattern-polyfill: specifier: ^1.0.0-rc5 version: 1.0.0-rc5 @@ -5441,8 +5441,8 @@ importers: specifier: ^5.0.2 version: 5.0.2 esbuild: - specifier: ^0.17.19 - version: 0.17.19 + specifier: ^0.18.16 + version: 0.18.16 globby: specifier: ^12.2.0 version: 12.2.0 @@ -5467,7 +5467,7 @@ importers: version: 7.0.0 esbuild-plugin-copy: specifier: ^2.1.1 - version: 2.1.1(esbuild@0.17.19) + version: 2.1.1(esbuild@0.18.16) execa: specifier: ^6.1.0 version: 6.1.0 @@ -7538,6 +7538,7 @@ packages: cpu: [arm64] os: [android] requiresBuild: true + dev: false optional: true /@esbuild/android-arm64@0.18.16: @@ -7563,6 +7564,7 @@ packages: cpu: [arm] os: [android] requiresBuild: true + dev: false optional: true /@esbuild/android-arm@0.18.16: @@ -7579,6 +7581,7 @@ packages: cpu: [x64] os: [android] requiresBuild: true + dev: false optional: true /@esbuild/android-x64@0.18.16: @@ -7595,6 +7598,7 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true + dev: false optional: true /@esbuild/darwin-arm64@0.18.16: @@ -7611,6 +7615,7 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true + dev: false optional: true /@esbuild/darwin-x64@0.18.16: @@ -7627,6 +7632,7 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true + dev: false optional: true /@esbuild/freebsd-arm64@0.18.16: @@ -7643,6 +7649,7 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true + dev: false optional: true /@esbuild/freebsd-x64@0.18.16: @@ -7659,6 +7666,7 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-arm64@0.18.16: @@ -7675,6 +7683,7 @@ packages: cpu: [arm] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-arm@0.18.16: @@ -7691,6 +7700,7 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-ia32@0.18.16: @@ -7716,6 +7726,7 @@ packages: cpu: [loong64] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-loong64@0.18.16: @@ -7732,6 +7743,7 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-mips64el@0.18.16: @@ -7748,6 +7760,7 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-ppc64@0.18.16: @@ -7764,6 +7777,7 @@ packages: cpu: [riscv64] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-riscv64@0.18.16: @@ -7780,6 +7794,7 @@ packages: cpu: [s390x] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-s390x@0.18.16: @@ -7796,6 +7811,7 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-x64@0.18.16: @@ -7812,6 +7828,7 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true + dev: false optional: true /@esbuild/netbsd-x64@0.18.16: @@ -7828,6 +7845,7 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true + dev: false optional: true /@esbuild/openbsd-x64@0.18.16: @@ -7844,6 +7862,7 @@ packages: cpu: [x64] os: [sunos] requiresBuild: true + dev: false optional: true /@esbuild/sunos-x64@0.18.16: @@ -7860,6 +7879,7 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true + dev: false optional: true /@esbuild/win32-arm64@0.18.16: @@ -7876,6 +7896,7 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true + dev: false optional: true /@esbuild/win32-ia32@0.18.16: @@ -7892,6 +7913,7 @@ packages: cpu: [x64] os: [win32] requiresBuild: true + dev: false optional: true /@esbuild/win32-x64@0.18.16: @@ -8104,7 +8126,7 @@ packages: estree-util-build-jsx: 2.2.2 estree-util-is-identifier-name: 2.1.0 estree-util-to-js: 1.2.0 - estree-walker: 3.0.0 + estree-walker: 3.0.3 hast-util-to-estree: 2.3.2 markdown-extensions: 1.1.1 periscopic: 3.1.0 @@ -8627,7 +8649,7 @@ packages: rollup: 3.20.1 dev: false - /@rollup/plugin-typescript@8.5.0(rollup@2.79.1)(tslib@2.5.3)(typescript@5.0.2): + /@rollup/plugin-typescript@8.5.0(rollup@2.79.1)(tslib@2.5.3)(typescript@5.1.6): resolution: {integrity: sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ==} engines: {node: '>=8.0.0'} peerDependencies: @@ -8644,7 +8666,7 @@ packages: resolve: 1.22.2 rollup: 2.79.1 tslib: 2.5.3 - typescript: 5.0.2 + typescript: 5.1.6 dev: true /@rollup/pluginutils@3.1.0(rollup@2.79.1): @@ -9152,7 +9174,7 @@ packages: /@types/yargs-parser@21.0.0: resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} - /@typescript-eslint/eslint-plugin@6.0.0(@typescript-eslint/parser@6.0.0)(eslint@8.43.0)(typescript@5.0.2): + /@typescript-eslint/eslint-plugin@6.0.0(@typescript-eslint/parser@6.0.0)(eslint@8.43.0)(typescript@5.1.6): resolution: {integrity: sha512-xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -9164,10 +9186,10 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.5.1 - '@typescript-eslint/parser': 6.0.0(eslint@8.43.0)(typescript@5.0.2) + '@typescript-eslint/parser': 6.0.0(eslint@8.43.0)(typescript@5.1.6) '@typescript-eslint/scope-manager': 6.0.0 - '@typescript-eslint/type-utils': 6.0.0(eslint@8.43.0)(typescript@5.0.2) - '@typescript-eslint/utils': 6.0.0(eslint@8.43.0)(typescript@5.0.2) + '@typescript-eslint/type-utils': 6.0.0(eslint@8.43.0)(typescript@5.1.6) + '@typescript-eslint/utils': 6.0.0(eslint@8.43.0)(typescript@5.1.6) '@typescript-eslint/visitor-keys': 6.0.0 debug: 4.3.4 eslint: 8.43.0 @@ -9177,13 +9199,13 @@ packages: natural-compare: 1.4.0 natural-compare-lite: 1.4.0 semver: 7.5.3 - ts-api-utils: 1.0.1(typescript@5.0.2) - typescript: 5.0.2 + ts-api-utils: 1.0.1(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@6.0.0(eslint@8.43.0)(typescript@5.0.2): + /@typescript-eslint/parser@6.0.0(eslint@8.43.0)(typescript@5.1.6): resolution: {integrity: sha512-TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -9195,11 +9217,11 @@ packages: dependencies: '@typescript-eslint/scope-manager': 6.0.0 '@typescript-eslint/types': 6.0.0 - '@typescript-eslint/typescript-estree': 6.0.0(typescript@5.0.2) + '@typescript-eslint/typescript-estree': 6.0.0(typescript@5.1.6) '@typescript-eslint/visitor-keys': 6.0.0 debug: 4.3.4 eslint: 8.43.0 - typescript: 5.0.2 + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -9212,7 +9234,7 @@ packages: '@typescript-eslint/visitor-keys': 6.0.0 dev: true - /@typescript-eslint/type-utils@6.0.0(eslint@8.43.0)(typescript@5.0.2): + /@typescript-eslint/type-utils@6.0.0(eslint@8.43.0)(typescript@5.1.6): resolution: {integrity: sha512-ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -9222,12 +9244,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.0.0(typescript@5.0.2) - '@typescript-eslint/utils': 6.0.0(eslint@8.43.0)(typescript@5.0.2) + '@typescript-eslint/typescript-estree': 6.0.0(typescript@5.1.6) + '@typescript-eslint/utils': 6.0.0(eslint@8.43.0)(typescript@5.1.6) debug: 4.3.4 eslint: 8.43.0 - ts-api-utils: 1.0.1(typescript@5.0.2) - typescript: 5.0.2 + ts-api-utils: 1.0.1(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -9237,7 +9259,7 @@ packages: engines: {node: ^16.0.0 || >=18.0.0} dev: true - /@typescript-eslint/typescript-estree@6.0.0(typescript@5.0.2): + /@typescript-eslint/typescript-estree@6.0.0(typescript@5.1.6): resolution: {integrity: sha512-2zq4O7P6YCQADfmJ5OTDQTP3ktajnXIRrYAtHM9ofto/CJZV3QfJ89GEaM2BNGeSr1KgmBuLhEkz5FBkS2RQhQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -9252,13 +9274,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 - ts-api-utils: 1.0.1(typescript@5.0.2) - typescript: 5.0.2 + ts-api-utils: 1.0.1(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@6.0.0(eslint@8.43.0)(typescript@5.0.2): + /@typescript-eslint/utils@6.0.0(eslint@8.43.0)(typescript@5.1.6): resolution: {integrity: sha512-SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -9269,7 +9291,7 @@ packages: '@types/semver': 7.5.0 '@typescript-eslint/scope-manager': 6.0.0 '@typescript-eslint/types': 6.0.0 - '@typescript-eslint/typescript-estree': 6.0.0(typescript@5.0.2) + '@typescript-eslint/typescript-estree': 6.0.0(typescript@5.1.6) eslint: 8.43.0 eslint-scope: 5.1.1 semver: 7.5.4 @@ -11444,14 +11466,14 @@ packages: dev: false optional: true - /esbuild-plugin-copy@2.1.1(esbuild@0.17.19): + /esbuild-plugin-copy@2.1.1(esbuild@0.18.16): resolution: {integrity: sha512-Bk66jpevTcV8KMFzZI1P7MZKZ+uDcrZm2G2egZ2jNIvVnivDpodZI+/KnpL3Jnap0PBdIHU7HwFGB8r+vV5CVw==} peerDependencies: esbuild: '>= 0.14.0' dependencies: chalk: 4.1.2 chokidar: 3.5.3 - esbuild: 0.17.19 + esbuild: 0.18.16 fs-extra: 10.1.0 globby: 11.1.0 dev: true @@ -11614,6 +11636,7 @@ packages: '@esbuild/win32-arm64': 0.17.19 '@esbuild/win32-ia32': 0.17.19 '@esbuild/win32-x64': 0.17.19 + dev: false /esbuild@0.18.16: resolution: {integrity: sha512-1xLsOXrDqwdHxyXb/x/SOyg59jpf/SH7YMvU5RNSU7z3TInaASNJWNFJ6iRvLvLETZMasF3d1DdZLg7sgRimRQ==} @@ -11844,7 +11867,7 @@ packages: dependencies: '@types/estree-jsx': 1.0.0 estree-util-is-identifier-name: 2.1.0 - estree-walker: 3.0.0 + estree-walker: 3.0.3 dev: false /estree-util-is-identifier-name@2.1.0: @@ -11876,8 +11899,10 @@ packages: /estree-walker@2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} - /estree-walker@3.0.0: - resolution: {integrity: sha512-s6ceX0NFiU/vKPiKvFdR83U1Zffu7upwZsGwpoqfg5rbbq1l50WQ5hCeIvM6E6oD4shUHCYMsiFPns4Jk0YfMQ==} + /estree-walker@3.0.3: + resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} + dependencies: + '@types/estree': 1.0.1 dev: false /esutils@2.0.3: @@ -14561,12 +14586,12 @@ packages: typescript: 5.0.2 dev: false - /network-information-types@0.1.1(typescript@5.0.4): + /network-information-types@0.1.1(typescript@5.1.6): resolution: {integrity: sha512-mLXNafJYOkiJB6IlF727YWssTRpXitR+tKSLyA5VAdBi3SOvLf5gtizHgxf241YHPWocnAO/fAhVrB/68tPHDw==} peerDependencies: typescript: '>= 3.0.0' dependencies: - typescript: 5.0.4 + typescript: 5.1.6 dev: false /nice-try@1.0.5: @@ -15109,7 +15134,7 @@ packages: resolution: {integrity: sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==} dependencies: '@types/estree': 1.0.1 - estree-walker: 3.0.0 + estree-walker: 3.0.3 is-reference: 3.0.1 dev: false @@ -16115,7 +16140,7 @@ packages: mdast-util-to-hast: 12.3.0 unified: 10.1.2 - /remark-shiki-twoslash@3.1.3(typescript@5.0.2): + /remark-shiki-twoslash@3.1.3(typescript@5.1.6): resolution: {integrity: sha512-4e8OH3ySOCw5wUbDcPszokOKjKuebOqlP2WlySvC7ITBOq27BiGsFlq+FNWhxppZ+JzhTWah4gQrnMjX3KDbAQ==} peerDependencies: typescript: '>3' @@ -16126,9 +16151,9 @@ packages: fenceparser: 1.1.1 regenerator-runtime: 0.13.11 shiki: 0.10.1 - shiki-twoslash: 3.1.2(typescript@5.0.2) + shiki-twoslash: 3.1.2(typescript@5.1.6) tslib: 2.1.0 - typescript: 5.0.2 + typescript: 5.1.6 unist-util-visit: 2.0.3 transitivePeerDependencies: - supports-color @@ -16533,7 +16558,7 @@ packages: resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==} dev: true - /shiki-twoslash@3.1.2(typescript@5.0.2): + /shiki-twoslash@3.1.2(typescript@5.1.6): resolution: {integrity: sha512-JBcRIIizi+exIA/OUhYkV6jtyeZco0ykCkIRd5sgwIt1Pm4pz+maoaRZpm6SkhPwvif4fCA7xOtJOykhpIV64Q==} peerDependencies: typescript: '>3' @@ -16542,7 +16567,7 @@ packages: '@typescript/vfs': 1.3.4 fenceparser: 1.1.1 shiki: 0.10.1 - typescript: 5.0.2 + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -16997,7 +17022,7 @@ packages: svelte: 3.59.1 dev: false - /svelte2tsx@0.6.15(svelte@3.59.1)(typescript@5.0.2): + /svelte2tsx@0.6.15(svelte@3.59.1)(typescript@5.1.6): resolution: {integrity: sha512-+j6RmA3g5pPs1DHa/rdzJjjhZuCfWx0IbNPaR99A2bvOSPPY6BlVkBGU0urI+DGcWHhYEG28Flo942KqlAkpEQ==} peerDependencies: svelte: ^3.55 || ^4.0 @@ -17009,7 +17034,7 @@ packages: dedent-js: 1.0.1 pascal-case: 3.1.2 svelte: 3.59.1 - typescript: 5.0.2 + typescript: 5.1.6 dev: false /svelte@3.59.1: @@ -17254,13 +17279,13 @@ packages: /trough@2.1.0: resolution: {integrity: sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==} - /ts-api-utils@1.0.1(typescript@5.0.2): + /ts-api-utils@1.0.1(typescript@5.1.6): resolution: {integrity: sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==} engines: {node: '>=16.13.0'} peerDependencies: typescript: '>=4.2.0' dependencies: - typescript: 5.0.2 + typescript: 5.1.6 dev: true /ts-interface-checker@0.1.13: @@ -17459,13 +17484,13 @@ packages: resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==} engines: {node: '>=12.20'} hasBin: true - - /typescript@5.0.4: - resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==} - engines: {node: '>=12.20'} - hasBin: true dev: false + /typescript@5.1.6: + resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} + engines: {node: '>=14.17'} + hasBin: true + /ufo@1.1.2: resolution: {integrity: sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==} dev: false @@ -18653,7 +18678,7 @@ packages: id: file:packages/astro name: astro version: 2.9.2 - engines: {node: '>=16.12.0', npm: '>=6.14.0'} + engines: {node: '>=18.14.1', npm: '>=6.14.0'} hasBin: true peerDependencies: sharp: '>=0.31.0' @@ -18687,8 +18712,8 @@ packages: devalue: 4.3.2 diff: 5.1.0 es-module-lexer: 1.3.0 - esbuild: 0.17.19 - estree-walker: 3.0.0 + esbuild: 0.18.16 + estree-walker: 3.0.3 execa: 6.1.0 fast-glob: 3.2.12 github-slugger: 2.0.0 @@ -18698,7 +18723,7 @@ packages: kleur: 4.1.5 magic-string: 0.27.0 mime: 3.0.0 - network-information-types: 0.1.1(typescript@5.0.4) + network-information-types: 0.1.1(typescript@5.1.6) ora: 6.3.1 p-limit: 4.0.0 path-to-regexp: 6.2.1 @@ -18711,7 +18736,7 @@ packages: string-width: 5.1.2 strip-ansi: 7.1.0 tsconfig-resolver: 3.0.1 - typescript: 5.0.4 + typescript: 5.1.6 unist-util-visit: 4.1.2 vfile: 5.3.7 vite: 4.4.6(@types/node@18.16.18)(sass@1.63.4) @@ -18773,7 +18798,7 @@ packages: '@astrojs/webapi': 2.2.0 '@netlify/functions': 1.6.0 astro: file:packages/astro(@types/node@18.16.18) - esbuild: 0.15.18 + esbuild: 0.18.16 dev: false file:packages/integrations/vercel(astro@2.9.2): @@ -18789,7 +18814,7 @@ packages: '@vercel/analytics': 0.1.11 '@vercel/nft': 0.22.6 astro: file:packages/astro(@types/node@18.16.18) - esbuild: 0.17.19 + esbuild: 0.18.16 fast-glob: 3.2.12 set-cookie-parser: 2.6.0 web-vitals: 3.3.2 diff --git a/scripts/cmd/build.js b/scripts/cmd/build.js index 6d1189b71..b516e6b51 100644 --- a/scripts/cmd/build.js +++ b/scripts/cmd/build.js @@ -12,7 +12,7 @@ const defaultConfig = { minify: false, format: 'esm', platform: 'node', - target: 'node16', + target: 'node18', sourcemap: false, sourcesContent: false, }; diff --git a/scripts/package.json b/scripts/package.json index 1bb517750..8a962b5c7 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -10,7 +10,7 @@ "dependencies": { "@astrojs/webapi": "workspace:*", "arg": "^5.0.2", - "esbuild": "^0.17.19", + "esbuild": "^0.18.16", "globby": "^12.2.0", "kleur": "^4.1.4", "p-limit": "^4.0.0", diff --git a/tsconfig.base.json b/tsconfig.base.json index 0eb3c65c1..337005ad4 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -3,7 +3,8 @@ "declaration": true, "emitDeclarationOnly": true, "strict": true, - "moduleResolution": "node", + // All packages are built with ESBuild, so we can use `moduleResolution: 'bundler'` + "moduleResolution": "Bundler", "esModuleInterop": true, "skipLibCheck": true, "verbatimModuleSyntax": true