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

rebase (#2087)

Browse source
This commit is contained in:
Jonathan Neal 2021-12-13 16:18:21 -05:00 committed by GitHub
parent 5f5dc60976
commit 6570a20442
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/package.json
View file

@ -16,7 +16,7 @@
"lint:linkcheck:remote": "blc -ro --user-agent 'broken-link-checker/0.7.8' 'https://docs.astro.build/'" "lint:linkcheck:remote": "blc -ro --user-agent 'broken-link-checker/0.7.8' 'https://docs.astro.build/'"
}, },
"devDependencies": { "devDependencies": {
"astro": "^0.21.0-next.2", "astro": "^0.21.12",
"broken-link-checker": "^0.7.8", "broken-link-checker": "^0.7.8",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"prettier": "^2.4.1", "prettier": "^2.4.1",

2
examples/docs/package.json
View file

@ -12,6 +12,6 @@
"@docsearch/react": "^1.0.0-alpha.28" "@docsearch/react": "^1.0.0-alpha.28"
}, },
"devDependencies": { "devDependencies": {
"astro": "^0.21.5" "astro": "^0.21.12"
} }
} }

2
package.json
View file

@ -82,7 +82,7 @@
"prettier": "^2.4.1", "prettier": "^2.4.1",
"tiny-glob": "^0.2.8", "tiny-glob": "^0.2.8",
"turbo": "^1.0.0", "turbo": "^1.0.0",
"typescript": "4.4.4" "typescript": "4.5.2"
}, },
"engines": { "engines": {
"node": "^12.20.0 || ^14.13.1 || >=16.0.0" "node": "^12.20.0 || ^14.13.1 || >=16.0.0"

6
packages/markdown/remark/src/rehype-islands.ts
View file

@ -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. // 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> // `unist`/`remark`/`rehype` (not sure) often generate malformed HTML inside of <astro-root>

6
packages/markdown/remark/src/remark-unwrap.ts
View file

@ -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 // Remove the wrapping paragraph for <astro-root> islands
export default function remarkUnwrap() { export default function remarkUnwrap() {

14
yarn.lock
View file

@ -8697,9 +8697,9 @@ tty-table@^2.8.10:
yargs "^15.1.0" yargs "^15.1.0"
turbo@^1.0.0: turbo@^1.0.0:
version "1.0.8" version "1.0.9"
resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.0.8.tgz#d8da5fcce277060c3504394e09be69ad343f44cb" resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.0.9.tgz#a955d1db1ec0080e542be427bd0eeb9ebb38a357"
integrity sha512-qGmZDLVkjMMcgDZLtzMfeKqk8kfg6QIIy/Nl74uWb2yujXhSzGVw2URjbRplH0BzqRkdus/m6IJWlvDRLSZ8PQ== integrity sha512-th0vdSpiO0gWQfehhTsG6vDXnq2fRXwvWSy1/LW2PBosv7VGgD2RENRVpjvPCNo7xEnkF6hZXnBfz0Tlvwu32A==
dependencies: dependencies:
zlib "^1.0.5" zlib "^1.0.5"
@ -8760,10 +8760,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
typescript@4.4.4: typescript@4.5.2:
version "4.4.4" version "4.5.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.2.tgz#8ac1fba9f52256fdb06fb89e4122fa6a346c2998"
integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA== integrity sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==
typescript@^4.3.5, typescript@^4.5.2: typescript@^4.3.5, typescript@^4.5.2:
version "4.5.3" version "4.5.3"