diff options
| -rw-r--r-- | docs/package.json | 2 | ||||
| -rw-r--r-- | examples/docs/package.json | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | packages/markdown/remark/src/rehype-islands.ts | 6 | ||||
| -rw-r--r-- | packages/markdown/remark/src/remark-unwrap.ts | 6 | ||||
| -rw-r--r-- | yarn.lock | 14 |
6 files changed, 20 insertions, 12 deletions
diff --git a/docs/package.json b/docs/package.json index fe1cf55a2..a0a868f19 100644 --- a/docs/package.json +++ b/docs/package.json @@ -16,7 +16,7 @@ "lint:linkcheck:remote": "blc -ro --user-agent 'broken-link-checker/0.7.8' 'https://docs.astro.build/'" }, "devDependencies": { - "astro": "^0.21.0-next.2", + "astro": "^0.21.12", "broken-link-checker": "^0.7.8", "npm-run-all": "^4.1.5", "prettier": "^2.4.1", diff --git a/examples/docs/package.json b/examples/docs/package.json index a4770f93d..076ae0cfe 100644 --- a/examples/docs/package.json +++ b/examples/docs/package.json @@ -12,6 +12,6 @@ "@docsearch/react": "^1.0.0-alpha.28" }, "devDependencies": { - "astro": "^0.21.5" + "astro": "^0.21.12" } } diff --git a/package.json b/package.json index 28cb1fb75..3ad6760a1 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "prettier": "^2.4.1", "tiny-glob": "^0.2.8", "turbo": "^1.0.0", - "typescript": "4.4.4" + "typescript": "4.5.2" }, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" diff --git a/packages/markdown/remark/src/rehype-islands.ts b/packages/markdown/remark/src/rehype-islands.ts index b98419cd4..e3fa09860 100644 --- a/packages/markdown/remark/src/rehype-islands.ts +++ b/packages/markdown/remark/src/rehype-islands.ts @@ -1,4 +1,8 @@ -import { SKIP, visit } from 'unist-util-visit'; +import { SKIP, visit as _visit } from 'unist-util-visit'; + +// This is a workaround. +// It fixes a compatibility issue between different, incompatible ASTs given by plugins to Unist +const visit = _visit as (node: any, type: string, callback?: (node: any, index: number, parent: any) => any) => any; // This fixes some confusing bugs coming from somewhere inside of our Markdown pipeline. // `unist`/`remark`/`rehype` (not sure) often generate malformed HTML inside of <astro-root> diff --git a/packages/markdown/remark/src/remark-unwrap.ts b/packages/markdown/remark/src/remark-unwrap.ts index d6f3275ab..15ddb7779 100644 --- a/packages/markdown/remark/src/remark-unwrap.ts +++ b/packages/markdown/remark/src/remark-unwrap.ts @@ -1,4 +1,8 @@ -import { visit, SKIP } from 'unist-util-visit'; +import { visit as _visit, SKIP } from 'unist-util-visit'; + +// This is a workaround. +// It fixes a compatibility issue between different, incompatible ASTs given by plugins to Unist +const visit = _visit as (node: any, type: string, callback?: (node: any, index: number, parent: any) => any) => any; // Remove the wrapping paragraph for <astro-root> islands export default function remarkUnwrap() { @@ -8697,9 +8697,9 @@ tty-table@^2.8.10: yargs "^15.1.0" turbo@^1.0.0: - version "1.0.8" - resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.0.8.tgz#d8da5fcce277060c3504394e09be69ad343f44cb" - integrity sha512-qGmZDLVkjMMcgDZLtzMfeKqk8kfg6QIIy/Nl74uWb2yujXhSzGVw2URjbRplH0BzqRkdus/m6IJWlvDRLSZ8PQ== + version "1.0.9" + resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.0.9.tgz#a955d1db1ec0080e542be427bd0eeb9ebb38a357" + integrity sha512-th0vdSpiO0gWQfehhTsG6vDXnq2fRXwvWSy1/LW2PBosv7VGgD2RENRVpjvPCNo7xEnkF6hZXnBfz0Tlvwu32A== dependencies: zlib "^1.0.5" @@ -8760,10 +8760,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@4.4.4: - version "4.4.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c" - integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA== +typescript@4.5.2: + version "4.5.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.2.tgz#8ac1fba9f52256fdb06fb89e4122fa6a346c2998" + integrity sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw== typescript@^4.3.5, typescript@^4.5.2: version "4.5.3" |