diff --git a/.eslintignore b/.eslintignore index 04a8b3d2..9cd105a9 100644 --- a/.eslintignore +++ b/.eslintignore @@ -4,3 +4,4 @@ lib/ dist/ !.vuepress/ !.*.js +scripts/ diff --git a/package.json b/package.json index 56328623..ebecc85a 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "prettier": "prettier-config-vuepress", "devDependencies": { "@vuepress/cli": "^2.0.0-beta.37", - "chalk": "^5.0.1", "concurrently": "^7.0.0", "cpx2": "^4.2.0", "cross-env": "^7.0.3", @@ -43,10 +42,13 @@ "webpack-env": "^0.8.0" }, "dependencies": { - "ts-node": "^10.7.0", + "@types/inquirer": "^8.2.1", + "@types/semver": "^7.3.9", + "chalk": "^5.0.1", "execa": "^6.1.0", + "inquirer": "^8.2.2", "ora": "^6.1.0", "semver": "^7.3.5", - "inquirer": "^8.2.2" + "ts-node": "^10.7.0" } } diff --git a/packages/plugin-caniuse/src/client/clientAppEnhance.ts b/packages/plugin-caniuse/src/client/clientAppEnhance.ts index 9e947908..0d740f36 100644 --- a/packages/plugin-caniuse/src/client/clientAppEnhance.ts +++ b/packages/plugin-caniuse/src/client/clientAppEnhance.ts @@ -9,6 +9,7 @@ const mode = __CAN_I_USE_INJECT_MODE__ export default defineClientAppEnhance(({ router }) => { if (__VUEPRESS_SSR__) return + router.afterEach((to) => { if (mode === 'embed') { setTimeout(() => resolveCanIUse(), 1500) diff --git a/packages/theme/src/client/layouts/Layout.vue b/packages/theme/src/client/layouts/Layout.vue index 8a13d771..07bd2617 100644 --- a/packages/theme/src/client/layouts/Layout.vue +++ b/packages/theme/src/client/layouts/Layout.vue @@ -51,7 +51,7 @@ const pageMap = { - + diff --git a/scripts/release/release.ts b/scripts/release/release.ts index d9059172..e113870a 100644 --- a/scripts/release/release.ts +++ b/scripts/release/release.ts @@ -1,4 +1,4 @@ -import { green, red } from 'chalk' +import chalk from 'chalk' import { prompt } from 'inquirer' import type { ReleaseType } from 'semver' import { inc } from 'semver' @@ -9,6 +9,8 @@ import type { Answers } from './version' const execa = require('execa') const ora = require('ora') +const { green, red } = chalk + export const release = async (): Promise => { const buildSpinner = ora('Building project').start() diff --git a/tsconfig.json b/tsconfig.json index 2a47f26c..4639c63a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,9 +15,7 @@ }, "include": [ "packages/**/*", - "docs/.vuepress/**/*", - "scripts/**/*", - "./lerna.json" + "docs/.vuepress/**/*" ], "exclude": [ "node_modules", diff --git a/yarn.lock b/yarn.lock index e55aff87..7086a2d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1214,6 +1214,14 @@ dependencies: "@types/node" "*" +"@types/inquirer@^8.2.1": + version "8.2.1" + resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-8.2.1.tgz#28a139be3105a1175e205537e8ac10830e38dbf4" + integrity sha512-wKW3SKIUMmltbykg4I5JzCVzUhkuD9trD6efAmYgN2MrSntY0SMRQzEnD3mkyJ/rv9NLbTC7g3hKKE86YwEDLw== + dependencies: + "@types/through" "*" + rxjs "^7.2.0" + "@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.11" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" @@ -1323,6 +1331,11 @@ resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== +"@types/semver@^7.3.9": + version "7.3.9" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc" + integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ== + "@types/serve-index@^1.9.1": version "1.9.1" resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" @@ -1345,6 +1358,13 @@ dependencies: "@types/node" "*" +"@types/through@*": + version "0.0.30" + resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.30.tgz#e0e42ce77e897bd6aead6f6ea62aeb135b8a3895" + integrity sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg== + dependencies: + "@types/node" "*" + "@types/webpack-env@^1.16.3": version "1.16.3" resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.3.tgz#b776327a73e561b71e7881d0cd6d34a1424db86a" @@ -8066,7 +8086,7 @@ rxjs@^6.6.0, rxjs@^6.6.3: dependencies: tslib "^1.9.0" -rxjs@^7.5.5: +rxjs@^7.2.0, rxjs@^7.5.5: version "7.5.5" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f" integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==