michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: fix rebase problems

Browse source
This commit is contained in:
Emanuele Stoppa 2023-07-25 14:53:52 +01:00
parent 5a31724d60
commit e635660a87
2 changed files with 106 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/integrations/markdoc/src/content-entry-type.ts
View file

@ -9,7 +9,6 @@ import type * as rollup from 'rollup';
import type { ErrorPayload as ViteErrorPayload } from 'vite'; import type { ErrorPayload as ViteErrorPayload } from 'vite';
import type { ComponentConfig } from './config.js'; import type { ComponentConfig } from './config.js';
import { MarkdocError, isComponentConfig, isValidUrl, prependForwardSlash } from './utils.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 { emitESMImage } from 'astro/assets/utils';
import { htmlTokenTransform } from './html/transform/html-token-transform.js'; import { htmlTokenTransform } from './html/transform/html-token-transform.js';
import type { MarkdocConfigResult } from './load-config.js'; import type { MarkdocConfigResult } from './load-config.js';

183
pnpm-lock.yaml
View file

@ -32,13 +32,13 @@ importers:
version: 18.16.18 version: 18.16.18
'@typescript-eslint/eslint-plugin': '@typescript-eslint/eslint-plugin':
specifier: 6.0.0 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': '@typescript-eslint/parser':
specifier: 6.0.0 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: esbuild:
specifier: ^0.17.19 specifier: ^0.18.16
version: 0.17.19 version: 0.18.16
eslint: eslint:
specifier: ^8.43.0 specifier: ^8.43.0
version: 8.43.0 version: 8.43.0
@ -70,8 +70,8 @@ importers:
specifier: ^1.10.3 specifier: ^1.10.3
version: 1.10.3 version: 1.10.3
typescript: typescript:
specifier: ~5.0.2 specifier: ~5.1.6
version: 5.0.2 version: 5.1.6
benchmark: benchmark:
dependencies: dependencies:
@ -564,11 +564,11 @@ importers:
specifier: ^1.3.0 specifier: ^1.3.0
version: 1.3.0 version: 1.3.0
esbuild: esbuild:
specifier: ^0.17.19 specifier: ^0.18.16
version: 0.17.19 version: 0.18.16
estree-walker: estree-walker:
specifier: 3.0.0 specifier: ^3.0.3
version: 3.0.0 version: 3.0.3
execa: execa:
specifier: ^6.1.0 specifier: ^6.1.0
version: 6.1.0 version: 6.1.0
@ -3645,8 +3645,8 @@ importers:
specifier: ^4.20230518.0 specifier: ^4.20230518.0
version: 4.20230518.0 version: 4.20230518.0
esbuild: esbuild:
specifier: ^0.17.19 specifier: ^0.18.16
version: 0.17.19 version: 0.18.16
tiny-glob: tiny-glob:
specifier: ^0.2.9 specifier: ^0.2.9
version: 0.2.9 version: 0.2.9
@ -4021,8 +4021,8 @@ importers:
specifier: ^0.3.0 specifier: ^0.3.0
version: 0.3.0 version: 0.3.0
esbuild: esbuild:
specifier: ^0.17.19 specifier: ^0.18.16
version: 0.17.19 version: 0.18.16
github-slugger: github-slugger:
specifier: ^2.0.0 specifier: ^2.0.0
version: 2.0.0 version: 2.0.0
@ -4301,7 +4301,7 @@ importers:
version: 10.1.0 version: 10.1.0
remark-shiki-twoslash: remark-shiki-twoslash:
specifier: ^3.1.3 specifier: ^3.1.3
version: 3.1.3(typescript@5.0.2) version: 3.1.3(typescript@5.1.6)
remark-toc: remark-toc:
specifier: ^8.0.1 specifier: ^8.0.1
version: 8.0.1 version: 8.0.1
@ -4450,8 +4450,8 @@ importers:
specifier: ^1.6.0 specifier: ^1.6.0
version: 1.6.0 version: 1.6.0
esbuild: esbuild:
specifier: ^0.15.18 specifier: ^0.18.16
version: 0.15.18 version: 0.18.16
devDependencies: devDependencies:
'@netlify/edge-functions': '@netlify/edge-functions':
specifier: ^2.0.0 specifier: ^2.0.0
@ -4864,7 +4864,7 @@ importers:
version: 2.4.2(svelte@3.59.1)(vite@4.4.6) version: 2.4.2(svelte@3.59.1)(vite@4.4.6)
svelte2tsx: svelte2tsx:
specifier: ^0.6.15 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: devDependencies:
astro: astro:
specifier: workspace:* specifier: workspace:*
@ -4932,8 +4932,8 @@ importers:
specifier: ^0.22.6 specifier: ^0.22.6
version: 0.22.6 version: 0.22.6
esbuild: esbuild:
specifier: ^0.17.19 specifier: ^0.18.16
version: 0.17.19 version: 0.18.16
fast-glob: fast-glob:
specifier: ^3.2.12 specifier: ^3.2.12
version: 3.2.12 version: 3.2.12
@ -5409,7 +5409,7 @@ importers:
version: 13.3.0(rollup@2.79.1) version: 13.3.0(rollup@2.79.1)
'@rollup/plugin-typescript': '@rollup/plugin-typescript':
specifier: ^8.5.0 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': '@types/chai':
specifier: ^4.3.5 specifier: ^4.3.5
version: 4.3.5 version: 4.3.5
@ -5441,8 +5441,8 @@ importers:
specifier: ^2.5.3 specifier: ^2.5.3
version: 2.5.3 version: 2.5.3
typescript: typescript:
specifier: ~5.0.2 specifier: ~5.1.6
version: 5.0.2 version: 5.1.6
urlpattern-polyfill: urlpattern-polyfill:
specifier: ^1.0.0-rc5 specifier: ^1.0.0-rc5
version: 1.0.0-rc5 version: 1.0.0-rc5
@ -5456,8 +5456,8 @@ importers:
specifier: ^5.0.2 specifier: ^5.0.2
version: 5.0.2 version: 5.0.2
esbuild: esbuild:
specifier: ^0.17.19 specifier: ^0.18.16
version: 0.17.19 version: 0.18.16
globby: globby:
specifier: ^12.2.0 specifier: ^12.2.0
version: 12.2.0 version: 12.2.0
@ -5482,7 +5482,7 @@ importers:
version: 7.0.0 version: 7.0.0
esbuild-plugin-copy: esbuild-plugin-copy:
specifier: ^2.1.1 specifier: ^2.1.1
version: 2.1.1(esbuild@0.17.19) version: 2.1.1(esbuild@0.18.16)
execa: execa:
specifier: ^6.1.0 specifier: ^6.1.0
version: 6.1.0 version: 6.1.0
@ -7553,6 +7553,7 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [android] os: [android]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/android-arm64@0.18.16: /@esbuild/android-arm64@0.18.16:
@ -7578,6 +7579,7 @@ packages:
cpu: [arm] cpu: [arm]
os: [android] os: [android]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/android-arm@0.18.16: /@esbuild/android-arm@0.18.16:
@ -7594,6 +7596,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [android] os: [android]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/android-x64@0.18.16: /@esbuild/android-x64@0.18.16:
@ -7610,6 +7613,7 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/darwin-arm64@0.18.16: /@esbuild/darwin-arm64@0.18.16:
@ -7626,6 +7630,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/darwin-x64@0.18.16: /@esbuild/darwin-x64@0.18.16:
@ -7642,6 +7647,7 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [freebsd] os: [freebsd]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/freebsd-arm64@0.18.16: /@esbuild/freebsd-arm64@0.18.16:
@ -7658,6 +7664,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [freebsd] os: [freebsd]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/freebsd-x64@0.18.16: /@esbuild/freebsd-x64@0.18.16:
@ -7674,6 +7681,7 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/linux-arm64@0.18.16: /@esbuild/linux-arm64@0.18.16:
@ -7690,6 +7698,7 @@ packages:
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/linux-arm@0.18.16: /@esbuild/linux-arm@0.18.16:
@ -7706,6 +7715,7 @@ packages:
cpu: [ia32] cpu: [ia32]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/linux-ia32@0.18.16: /@esbuild/linux-ia32@0.18.16:
@ -7731,6 +7741,7 @@ packages:
cpu: [loong64] cpu: [loong64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/linux-loong64@0.18.16: /@esbuild/linux-loong64@0.18.16:
@ -7747,6 +7758,7 @@ packages:
cpu: [mips64el] cpu: [mips64el]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/linux-mips64el@0.18.16: /@esbuild/linux-mips64el@0.18.16:
@ -7763,6 +7775,7 @@ packages:
cpu: [ppc64] cpu: [ppc64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/linux-ppc64@0.18.16: /@esbuild/linux-ppc64@0.18.16:
@ -7779,6 +7792,7 @@ packages:
cpu: [riscv64] cpu: [riscv64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/linux-riscv64@0.18.16: /@esbuild/linux-riscv64@0.18.16:
@ -7795,6 +7809,7 @@ packages:
cpu: [s390x] cpu: [s390x]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/linux-s390x@0.18.16: /@esbuild/linux-s390x@0.18.16:
@ -7811,6 +7826,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/linux-x64@0.18.16: /@esbuild/linux-x64@0.18.16:
@ -7827,6 +7843,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [netbsd] os: [netbsd]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/netbsd-x64@0.18.16: /@esbuild/netbsd-x64@0.18.16:
@ -7843,6 +7860,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [openbsd] os: [openbsd]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/openbsd-x64@0.18.16: /@esbuild/openbsd-x64@0.18.16:
@ -7859,6 +7877,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [sunos] os: [sunos]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/sunos-x64@0.18.16: /@esbuild/sunos-x64@0.18.16:
@ -7875,6 +7894,7 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/win32-arm64@0.18.16: /@esbuild/win32-arm64@0.18.16:
@ -7891,6 +7911,7 @@ packages:
cpu: [ia32] cpu: [ia32]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/win32-ia32@0.18.16: /@esbuild/win32-ia32@0.18.16:
@ -7907,6 +7928,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: false
optional: true optional: true
/@esbuild/win32-x64@0.18.16: /@esbuild/win32-x64@0.18.16:
@ -8119,7 +8141,7 @@ packages:
estree-util-build-jsx: 2.2.2 estree-util-build-jsx: 2.2.2
estree-util-is-identifier-name: 2.1.0 estree-util-is-identifier-name: 2.1.0
estree-util-to-js: 1.2.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 hast-util-to-estree: 2.3.2
markdown-extensions: 1.1.1 markdown-extensions: 1.1.1
periscopic: 3.1.0 periscopic: 3.1.0
@ -8642,7 +8664,7 @@ packages:
rollup: 3.20.1 rollup: 3.20.1
dev: false 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==} resolution: {integrity: sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ==}
engines: {node: '>=8.0.0'} engines: {node: '>=8.0.0'}
peerDependencies: peerDependencies:
@ -8659,7 +8681,7 @@ packages:
resolve: 1.22.2 resolve: 1.22.2
rollup: 2.79.1 rollup: 2.79.1
tslib: 2.5.3 tslib: 2.5.3
typescript: 5.0.2 typescript: 5.1.6
dev: true dev: true
/@rollup/pluginutils@3.1.0(rollup@2.79.1): /@rollup/pluginutils@3.1.0(rollup@2.79.1):
@ -9161,7 +9183,7 @@ packages:
/@types/yargs-parser@21.0.0: /@types/yargs-parser@21.0.0:
resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} 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==} resolution: {integrity: sha512-xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A==}
engines: {node: ^16.0.0 || >=18.0.0} engines: {node: ^16.0.0 || >=18.0.0}
peerDependencies: peerDependencies:
@ -9173,10 +9195,10 @@ packages:
optional: true optional: true
dependencies: dependencies:
'@eslint-community/regexpp': 4.5.1 '@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/scope-manager': 6.0.0
'@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)
'@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)
'@typescript-eslint/visitor-keys': 6.0.0 '@typescript-eslint/visitor-keys': 6.0.0
debug: 4.3.4 debug: 4.3.4
eslint: 8.43.0 eslint: 8.43.0
@ -9186,13 +9208,13 @@ packages:
natural-compare: 1.4.0 natural-compare: 1.4.0
natural-compare-lite: 1.4.0 natural-compare-lite: 1.4.0
semver: 7.5.3 semver: 7.5.3
ts-api-utils: 1.0.1(typescript@5.0.2) ts-api-utils: 1.0.1(typescript@5.1.6)
typescript: 5.0.2 typescript: 5.1.6
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
dev: true 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==} resolution: {integrity: sha512-TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg==}
engines: {node: ^16.0.0 || >=18.0.0} engines: {node: ^16.0.0 || >=18.0.0}
peerDependencies: peerDependencies:
@ -9204,11 +9226,11 @@ packages:
dependencies: dependencies:
'@typescript-eslint/scope-manager': 6.0.0 '@typescript-eslint/scope-manager': 6.0.0
'@typescript-eslint/types': 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 '@typescript-eslint/visitor-keys': 6.0.0
debug: 4.3.4 debug: 4.3.4
eslint: 8.43.0 eslint: 8.43.0
typescript: 5.0.2 typescript: 5.1.6
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
dev: true dev: true
@ -9221,7 +9243,7 @@ packages:
'@typescript-eslint/visitor-keys': 6.0.0 '@typescript-eslint/visitor-keys': 6.0.0
dev: true 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==} resolution: {integrity: sha512-ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ==}
engines: {node: ^16.0.0 || >=18.0.0} engines: {node: ^16.0.0 || >=18.0.0}
peerDependencies: peerDependencies:
@ -9231,12 +9253,12 @@ packages:
typescript: typescript:
optional: true optional: true
dependencies: dependencies:
'@typescript-eslint/typescript-estree': 6.0.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.0.2) '@typescript-eslint/utils': 6.0.0(eslint@8.43.0)(typescript@5.1.6)
debug: 4.3.4 debug: 4.3.4
eslint: 8.43.0 eslint: 8.43.0
ts-api-utils: 1.0.1(typescript@5.0.2) ts-api-utils: 1.0.1(typescript@5.1.6)
typescript: 5.0.2 typescript: 5.1.6
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
dev: true dev: true
@ -9246,7 +9268,7 @@ packages:
engines: {node: ^16.0.0 || >=18.0.0} engines: {node: ^16.0.0 || >=18.0.0}
dev: true 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==} resolution: {integrity: sha512-2zq4O7P6YCQADfmJ5OTDQTP3ktajnXIRrYAtHM9ofto/CJZV3QfJ89GEaM2BNGeSr1KgmBuLhEkz5FBkS2RQhQ==}
engines: {node: ^16.0.0 || >=18.0.0} engines: {node: ^16.0.0 || >=18.0.0}
peerDependencies: peerDependencies:
@ -9261,13 +9283,13 @@ packages:
globby: 11.1.0 globby: 11.1.0
is-glob: 4.0.3 is-glob: 4.0.3
semver: 7.5.4 semver: 7.5.4
ts-api-utils: 1.0.1(typescript@5.0.2) ts-api-utils: 1.0.1(typescript@5.1.6)
typescript: 5.0.2 typescript: 5.1.6
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
dev: true 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==} resolution: {integrity: sha512-SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ==}
engines: {node: ^16.0.0 || >=18.0.0} engines: {node: ^16.0.0 || >=18.0.0}
peerDependencies: peerDependencies:
@ -9278,7 +9300,7 @@ packages:
'@types/semver': 7.5.0 '@types/semver': 7.5.0
'@typescript-eslint/scope-manager': 6.0.0 '@typescript-eslint/scope-manager': 6.0.0
'@typescript-eslint/types': 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: 8.43.0
eslint-scope: 5.1.1 eslint-scope: 5.1.1
semver: 7.5.4 semver: 7.5.4
@ -11449,14 +11471,14 @@ packages:
dev: false dev: false
optional: true 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==} resolution: {integrity: sha512-Bk66jpevTcV8KMFzZI1P7MZKZ+uDcrZm2G2egZ2jNIvVnivDpodZI+/KnpL3Jnap0PBdIHU7HwFGB8r+vV5CVw==}
peerDependencies: peerDependencies:
esbuild: '>= 0.14.0' esbuild: '>= 0.14.0'
dependencies: dependencies:
chalk: 4.1.2 chalk: 4.1.2
chokidar: 3.5.3 chokidar: 3.5.3
esbuild: 0.17.19 esbuild: 0.18.16
fs-extra: 10.1.0 fs-extra: 10.1.0
globby: 11.1.0 globby: 11.1.0
dev: true dev: true
@ -11619,6 +11641,7 @@ packages:
'@esbuild/win32-arm64': 0.17.19 '@esbuild/win32-arm64': 0.17.19
'@esbuild/win32-ia32': 0.17.19 '@esbuild/win32-ia32': 0.17.19
'@esbuild/win32-x64': 0.17.19 '@esbuild/win32-x64': 0.17.19
dev: false
/esbuild@0.18.16: /esbuild@0.18.16:
resolution: {integrity: sha512-1xLsOXrDqwdHxyXb/x/SOyg59jpf/SH7YMvU5RNSU7z3TInaASNJWNFJ6iRvLvLETZMasF3d1DdZLg7sgRimRQ==} resolution: {integrity: sha512-1xLsOXrDqwdHxyXb/x/SOyg59jpf/SH7YMvU5RNSU7z3TInaASNJWNFJ6iRvLvLETZMasF3d1DdZLg7sgRimRQ==}
@ -11849,7 +11872,7 @@ packages:
dependencies: dependencies:
'@types/estree-jsx': 1.0.0 '@types/estree-jsx': 1.0.0
estree-util-is-identifier-name: 2.1.0 estree-util-is-identifier-name: 2.1.0
estree-walker: 3.0.0 estree-walker: 3.0.3
dev: false dev: false
/estree-util-is-identifier-name@2.1.0: /estree-util-is-identifier-name@2.1.0:
@ -11881,8 +11904,10 @@ packages:
/estree-walker@2.0.2: /estree-walker@2.0.2:
resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
/estree-walker@3.0.0: /estree-walker@3.0.3:
resolution: {integrity: sha512-s6ceX0NFiU/vKPiKvFdR83U1Zffu7upwZsGwpoqfg5rbbq1l50WQ5hCeIvM6E6oD4shUHCYMsiFPns4Jk0YfMQ==} resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
dependencies:
'@types/estree': 1.0.1
dev: false dev: false
/esutils@2.0.3: /esutils@2.0.3:
@ -14575,12 +14600,12 @@ packages:
typescript: 5.0.2 typescript: 5.0.2
dev: false 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==} resolution: {integrity: sha512-mLXNafJYOkiJB6IlF727YWssTRpXitR+tKSLyA5VAdBi3SOvLf5gtizHgxf241YHPWocnAO/fAhVrB/68tPHDw==}
peerDependencies: peerDependencies:
typescript: '>= 3.0.0' typescript: '>= 3.0.0'
dependencies: dependencies:
typescript: 5.0.4 typescript: 5.1.6
dev: false dev: false
/nice-try@1.0.5: /nice-try@1.0.5:
@ -15123,7 +15148,7 @@ packages:
resolution: {integrity: sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==} resolution: {integrity: sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==}
dependencies: dependencies:
'@types/estree': 1.0.1 '@types/estree': 1.0.1
estree-walker: 3.0.0 estree-walker: 3.0.3
is-reference: 3.0.1 is-reference: 3.0.1
dev: false dev: false
@ -16129,7 +16154,7 @@ packages:
mdast-util-to-hast: 12.3.0 mdast-util-to-hast: 12.3.0
unified: 10.1.2 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==} resolution: {integrity: sha512-4e8OH3ySOCw5wUbDcPszokOKjKuebOqlP2WlySvC7ITBOq27BiGsFlq+FNWhxppZ+JzhTWah4gQrnMjX3KDbAQ==}
peerDependencies: peerDependencies:
typescript: '>3' typescript: '>3'
@ -16140,9 +16165,9 @@ packages:
fenceparser: 1.1.1 fenceparser: 1.1.1
regenerator-runtime: 0.13.11 regenerator-runtime: 0.13.11
shiki: 0.10.1 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 tslib: 2.1.0
typescript: 5.0.2 typescript: 5.1.6
unist-util-visit: 2.0.3 unist-util-visit: 2.0.3
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -16547,7 +16572,7 @@ packages:
resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==} resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
dev: true 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==} resolution: {integrity: sha512-JBcRIIizi+exIA/OUhYkV6jtyeZco0ykCkIRd5sgwIt1Pm4pz+maoaRZpm6SkhPwvif4fCA7xOtJOykhpIV64Q==}
peerDependencies: peerDependencies:
typescript: '>3' typescript: '>3'
@ -16556,7 +16581,7 @@ packages:
'@typescript/vfs': 1.3.4 '@typescript/vfs': 1.3.4
fenceparser: 1.1.1 fenceparser: 1.1.1
shiki: 0.10.1 shiki: 0.10.1
typescript: 5.0.2 typescript: 5.1.6
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
dev: true dev: true
@ -17011,7 +17036,7 @@ packages:
svelte: 3.59.1 svelte: 3.59.1
dev: false 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==} resolution: {integrity: sha512-+j6RmA3g5pPs1DHa/rdzJjjhZuCfWx0IbNPaR99A2bvOSPPY6BlVkBGU0urI+DGcWHhYEG28Flo942KqlAkpEQ==}
peerDependencies: peerDependencies:
svelte: ^3.55 || ^4.0 svelte: ^3.55 || ^4.0
@ -17023,7 +17048,7 @@ packages:
dedent-js: 1.0.1 dedent-js: 1.0.1
pascal-case: 3.1.2 pascal-case: 3.1.2
svelte: 3.59.1 svelte: 3.59.1
typescript: 5.0.2 typescript: 5.1.6
dev: false dev: false
/svelte@3.59.1: /svelte@3.59.1:
@ -17268,13 +17293,13 @@ packages:
/trough@2.1.0: /trough@2.1.0:
resolution: {integrity: sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==} 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==} resolution: {integrity: sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==}
engines: {node: '>=16.13.0'} engines: {node: '>=16.13.0'}
peerDependencies: peerDependencies:
typescript: '>=4.2.0' typescript: '>=4.2.0'
dependencies: dependencies:
typescript: 5.0.2 typescript: 5.1.6
dev: true dev: true
/ts-interface-checker@0.1.13: /ts-interface-checker@0.1.13:
@ -17473,13 +17498,13 @@ packages:
resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==} resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==}
engines: {node: '>=12.20'} engines: {node: '>=12.20'}
hasBin: true hasBin: true
/typescript@5.0.4:
resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
engines: {node: '>=12.20'}
hasBin: true
dev: false dev: false
/typescript@5.1.6:
resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==}
engines: {node: '>=14.17'}
hasBin: true
/ufo@1.1.2: /ufo@1.1.2:
resolution: {integrity: sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==} resolution: {integrity: sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==}
dev: false dev: false
@ -18667,7 +18692,7 @@ packages:
id: file:packages/astro id: file:packages/astro
name: astro name: astro
version: 2.9.2 version: 2.9.2
engines: {node: '>=16.12.0', npm: '>=6.14.0'} engines: {node: '>=18.14.1', npm: '>=6.14.0'}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
sharp: '>=0.31.0' sharp: '>=0.31.0'
@ -18701,8 +18726,8 @@ packages:
devalue: 4.3.2 devalue: 4.3.2
diff: 5.1.0 diff: 5.1.0
es-module-lexer: 1.3.0 es-module-lexer: 1.3.0
esbuild: 0.17.19 esbuild: 0.18.16
estree-walker: 3.0.0 estree-walker: 3.0.3
execa: 6.1.0 execa: 6.1.0
fast-glob: 3.2.12 fast-glob: 3.2.12
github-slugger: 2.0.0 github-slugger: 2.0.0
@ -18712,7 +18737,7 @@ packages:
kleur: 4.1.5 kleur: 4.1.5
magic-string: 0.27.0 magic-string: 0.27.0
mime: 3.0.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 ora: 6.3.1
p-limit: 4.0.0 p-limit: 4.0.0
path-to-regexp: 6.2.1 path-to-regexp: 6.2.1
@ -18725,7 +18750,7 @@ packages:
string-width: 5.1.2 string-width: 5.1.2
strip-ansi: 7.1.0 strip-ansi: 7.1.0
tsconfig-resolver: 3.0.1 tsconfig-resolver: 3.0.1
typescript: 5.0.4 typescript: 5.1.6
unist-util-visit: 4.1.2 unist-util-visit: 4.1.2
vfile: 5.3.7 vfile: 5.3.7
vite: 4.4.6(@types/node@18.16.18)(sass@1.63.4) vite: 4.4.6(@types/node@18.16.18)(sass@1.63.4)
@ -18752,21 +18777,25 @@ packages:
file:packages/astro/test/fixtures/css-assets/packages/font-awesome: file:packages/astro/test/fixtures/css-assets/packages/font-awesome:
resolution: {directory: packages/astro/test/fixtures/css-assets/packages/font-awesome, type: directory} resolution: {directory: packages/astro/test/fixtures/css-assets/packages/font-awesome, type: directory}
name: '@test/astro-font-awesome-package' name: '@test/astro-font-awesome-package'
version: 0.0.1
dev: false dev: false
file:packages/astro/test/fixtures/multiple-renderers/renderers/one: file:packages/astro/test/fixtures/multiple-renderers/renderers/one:
resolution: {directory: packages/astro/test/fixtures/multiple-renderers/renderers/one, type: directory} resolution: {directory: packages/astro/test/fixtures/multiple-renderers/renderers/one, type: directory}
name: '@test/astro-renderer-one' name: '@test/astro-renderer-one'
version: 1.0.0
dev: false dev: false
file:packages/astro/test/fixtures/multiple-renderers/renderers/two: file:packages/astro/test/fixtures/multiple-renderers/renderers/two:
resolution: {directory: packages/astro/test/fixtures/multiple-renderers/renderers/two, type: directory} resolution: {directory: packages/astro/test/fixtures/multiple-renderers/renderers/two, type: directory}
name: '@test/astro-renderer-two' name: '@test/astro-renderer-two'
version: 1.0.0
dev: false dev: false
file:packages/astro/test/fixtures/solid-component/deps/solid-jsx-component: file:packages/astro/test/fixtures/solid-component/deps/solid-jsx-component:
resolution: {directory: packages/astro/test/fixtures/solid-component/deps/solid-jsx-component, type: directory} resolution: {directory: packages/astro/test/fixtures/solid-component/deps/solid-jsx-component, type: directory}
name: '@test/solid-jsx-component' name: '@test/solid-jsx-component'
version: 0.0.0
dependencies: dependencies:
solid-js: 1.7.6 solid-js: 1.7.6
dev: false dev: false
@ -18783,7 +18812,7 @@ packages:
'@astrojs/webapi': 2.2.0 '@astrojs/webapi': 2.2.0
'@netlify/functions': 1.6.0 '@netlify/functions': 1.6.0
astro: file:packages/astro(@types/node@18.16.18) astro: file:packages/astro(@types/node@18.16.18)
esbuild: 0.15.18 esbuild: 0.18.16
dev: false dev: false
file:packages/integrations/vercel(astro@2.9.2): file:packages/integrations/vercel(astro@2.9.2):
@ -18799,7 +18828,7 @@ packages:
'@vercel/analytics': 0.1.11 '@vercel/analytics': 0.1.11
'@vercel/nft': 0.22.6 '@vercel/nft': 0.22.6
astro: file:packages/astro(@types/node@18.16.18) astro: file:packages/astro(@types/node@18.16.18)
esbuild: 0.17.19 esbuild: 0.18.16
fast-glob: 3.2.12 fast-glob: 3.2.12
set-cookie-parser: 2.6.0 set-cookie-parser: 2.6.0
web-vitals: 3.3.2 web-vitals: 3.3.2