diff --git a/.commitlintrc.js b/.commitlintrc.cjs similarity index 100% rename from .commitlintrc.js rename to .commitlintrc.cjs diff --git a/.eslintrc.js b/.eslintrc.cjs similarity index 100% rename from .eslintrc.js rename to .eslintrc.cjs diff --git a/docs/.vuepress/config.ts b/docs/.vuepress/config.ts index a4cc36ae..262f6920 100644 --- a/docs/.vuepress/config.ts +++ b/docs/.vuepress/config.ts @@ -3,7 +3,7 @@ import { themePlume } from '@vuepress-plume/vuepress-theme-plume' import { viteBundler } from '@vuepress/bundler-vite' import { webpackBundler } from '@vuepress/bundler-webpack' import { defineUserConfig } from '@vuepress/cli' -import notes from './notes' +import notes from './notes.js' export default defineUserConfig({ base: '/', diff --git a/docs/package.json b/docs/package.json index 486f2a2e..ccc13643 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,7 @@ { "name": "docs", "private": true, + "type": "module", "scripts": { "docs:build": "vuepress-cli build --clean-cache", "docs:clean": "rimraf .vuepress/.temp .vuepress/.cache .vuepress/dist", @@ -9,15 +10,15 @@ }, "dependencies": { "@vuepress-plume/vuepress-theme-plume": "workspace:*", - "@vuepress/bundler-vite": "2.0.0-beta.49", - "@vuepress/bundler-webpack": "2.0.0-beta.49", - "@vuepress/cli": "2.0.0-beta.49", - "@vuepress/client": "2.0.0-beta.49", - "@vuepress/utils": "2.0.0-beta.49", - "anywhere": "^1.5.0", - "leancloud-storage": "^4.12.2", - "sass": "^1.51.0", - "sass-loader": "^13.0.2", - "vue": "^3.2.37" + "@vuepress/bundler-vite": "2.0.0-beta.51", + "@vuepress/bundler-webpack": "2.0.0-beta.51", + "@vuepress/cli": "2.0.0-beta.51", + "@vuepress/client": "2.0.0-beta.51", + "@vuepress/utils": "2.0.0-beta.51", + "anywhere": "^1.6.0", + "leancloud-storage": "^4.13.2", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "vue": "^3.2.41" } } diff --git a/package.json b/package.json index a1736ecf..f6191ceb 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,9 @@ ], "license": "MIT", "author": "pengzhanbo", + "type": "module", "scripts": { - "autoUpdate": "ts-node scripts/autoInstall.ts", + "autoUpdate": "node scripts/autoInstall.js", "build": "pnpm run build:package", "build:package": "pnpm --filter=!vuepress-theme-plume run -r --stream build", "commit": "cz", @@ -26,7 +27,7 @@ "docs:clean": "pnpm --filter=docs docs:clean", "docs:serve": "pnpm --filter=docs docs:serve", "lint": "eslint --ext .js,.ts,.vue .", - "pkg": "ts-node scripts/create/index.ts", + "pkg": "node scripts/create/index.js", "prepare": "husky install", "release": "pnpm release:check && pnpm release:version && pnpm release:publish", "release:changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", @@ -46,36 +47,38 @@ }, "prettier": "prettier-config-vuepress", "devDependencies": { - "@commitlint/cli": "^16.2.3", - "@commitlint/config-conventional": "^16.2.1", + "@commitlint/cli": "^17.1.2", + "@commitlint/config-conventional": "^17.1.0", "@types/minimist": "^1.2.2", - "@types/node": "^17.0.30", - "@types/webpack-env": "^1.16.4", - "bumpp": "^7.2.0", - "chalk": "^4.1.2", - "commitizen": "^4.2.4", - "concurrently": "^7.0.0", + "@types/node": "18.8.0", + "@types/webpack-env": "^1.18.0", + "bumpp": "^8.2.1", + "chalk": "^5.1.2", + "commitizen": "^4.2.5", + "concurrently": "^7.4.0", "conventional-changelog-cli": "^2.2.2", "cpx2": "^4.2.0", "cross-env": "^7.0.3", "cz-conventional-changelog": "^3.3.0", - "eslint": "^8.20.0", - "eslint-config-vuepress": "^3.10.0", - "eslint-config-vuepress-typescript": "^2.9.1", - "execa": "^5.1.1", + "eslint": "^8.25.0", + "eslint-config-vuepress": "^4.0.3", + "eslint-config-vuepress-typescript": "^4.0.3", + "execa": "^6.1.0", "handlebars": "^4.7.7", - "husky": "^7.0.4", - "lint-staged": "^12.4.0", - "minimist": "^1.2.6", - "ora": "^5.4.1", + "husky": "^8.0.1", + "lint-staged": "^13.0.3", + "minimist": "^1.2.7", + "ora": "^6.1.2", "prettier": "^2.7.1", - "prettier-config-vuepress": "^1.4.0", + "prettier-config-vuepress": "^4.0.0", "rimraf": "^3.0.2", - "sort-package-json": "^1.55.0", + "sort-package-json": "^2.0.0", + "taze": "^0.8.2", "ts-node": "^10.9.1", - "typescript": "^4.7.4", - "vite": "^2.9.14" + "typescript": "^4.8.4", + "vite": "^3.1.8" }, + "packageManager": "pnpm@7.13.4", "engines": { "node": ">=14", "pnpm": ">=6" diff --git a/packages/plugin-baidu-tongji/package.json b/packages/plugin-baidu-tongji/package.json index 933a2d9a..21d1a5b4 100644 --- a/packages/plugin-baidu-tongji/package.json +++ b/packages/plugin-baidu-tongji/package.json @@ -11,8 +11,14 @@ "url": "git+https://github.com/pengzhanbo/vuepress-theme-plume.git" }, "license": "MIT", - "author": "pengzhanbo ", + "author": "pengzhanbo (https://github.com/pengzhanbo/)", + "type": "module", + "exports": { + ".": "./lib/node/index.js", + "./package.json": "./package.json" + }, "main": "lib/node/index.js", + "types": "./lib/node/index.d.ts", "files": [ "lib" ], @@ -20,16 +26,13 @@ "build": "pnpm run clean && pnpm run copy && pnpm run ts", "clean": "rimraf lib *.tsbuildinfo", "copy": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png}\" lib", - "copy:watch": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png}\" lib -w", - "dev": "concurrently \"pnpm copy:watch\" \"pnpm ts:watch\"", - "ts": "tsc -b tsconfig.build.json", - "ts:watch": "tsc -b tsconfig.build.json --watch" + "ts": "tsc -b tsconfig.build.json" }, "dependencies": { - "@vuepress/client": "2.0.0-beta.49", - "@vuepress/core": "2.0.0-beta.49", - "@vuepress/shared": "2.0.0-beta.49", - "@vuepress/utils": "2.0.0-beta.49" + "@vuepress/client": "2.0.0-beta.51", + "@vuepress/core": "2.0.0-beta.51", + "@vuepress/shared": "2.0.0-beta.51", + "@vuepress/utils": "2.0.0-beta.51" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-baidu-tongji/src/node/index.ts b/packages/plugin-baidu-tongji/src/node/index.ts index bee13c86..50b31d98 100644 --- a/packages/plugin-baidu-tongji/src/node/index.ts +++ b/packages/plugin-baidu-tongji/src/node/index.ts @@ -1,5 +1,5 @@ -import { baiduTongjiPlugin } from './plugin' +import { baiduTongjiPlugin } from './plugin.js' -export * from './plugin' +export * from './plugin.js' export default baiduTongjiPlugin diff --git a/packages/plugin-baidu-tongji/tsconfig.build.json b/packages/plugin-baidu-tongji/tsconfig.build.json index f45328df..3395ea55 100644 --- a/packages/plugin-baidu-tongji/tsconfig.build.json +++ b/packages/plugin-baidu-tongji/tsconfig.build.json @@ -1,9 +1,9 @@ { "extends": "../../tsconfig.base.json", - "references": [ - { - "path": "./tsconfig.cjs.json" - } - ], + "compilerOptions": { + "rootDir": "./src", + "outDir": "./lib" + }, + "include": ["./src"], "files": [] } diff --git a/packages/plugin-baidu-tongji/tsconfig.cjs.json b/packages/plugin-baidu-tongji/tsconfig.cjs.json deleted file mode 100644 index 81bc167c..00000000 --- a/packages/plugin-baidu-tongji/tsconfig.cjs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "module": "CommonJS", - "rootDir": "./src", - "outDir": "./lib" - }, - "include": ["./src/node"] -} diff --git a/packages/plugin-baidu-tongji/tsconfig.esm.json b/packages/plugin-baidu-tongji/tsconfig.esm.json deleted file mode 100644 index 59b34084..00000000 --- a/packages/plugin-baidu-tongji/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "module": "ES2020", - "rootDir": "./src", - "outDir": "./lib", - "types": ["@vuepress/client/types"] - }, - "include": ["./src/client"] -} diff --git a/packages/plugin-caniuse/package.json b/packages/plugin-caniuse/package.json index 87485f1a..5436e4cb 100644 --- a/packages/plugin-caniuse/package.json +++ b/packages/plugin-caniuse/package.json @@ -19,27 +19,30 @@ }, "license": "MIT", "author": "pengzhanbo ", + "type": "module", + "exports": { + ".": "./lib/node/index.js", + "./client": "./lib/client/index.js", + "./package.json": "./package.json" + }, "main": "lib/node/index.js", + "types": "./lib/node/index.d.ts", "files": [ "lib" ], "scripts": { "build": "pnpm run clean && pnpm run ts", "clean": "rimraf lib *.tsbuildinfo", - "dev": "pnpm run ts:watch", - "ts": "tsc -b tsconfig.build.json", - "ts:watch": "tsc -b tsconfig.build.json --watch" + "ts": "tsc -b tsconfig.build.json" }, "dependencies": { - "@vuepress/cli": "2.0.0-beta.49", - "@vuepress/client": "2.0.0-beta.49", - "@vuepress/core": "2.0.0-beta.49", - "@vuepress/utils": "2.0.0-beta.49", + "@types/markdown-it": "^12.2.3", + "@vuepress/cli": "2.0.0-beta.51", + "@vuepress/client": "2.0.0-beta.51", + "@vuepress/core": "2.0.0-beta.51", + "@vuepress/utils": "2.0.0-beta.51", "markdown-it-container": "^3.0.0" }, - "devDependencies": { - "@types/markdown-it": "^12.2.3" - }, "publishConfig": { "access": "public" } diff --git a/packages/plugin-caniuse/src/client/clientConfig.ts b/packages/plugin-caniuse/src/client/clientConfig.ts index 80f29754..15db4490 100644 --- a/packages/plugin-caniuse/src/client/clientConfig.ts +++ b/packages/plugin-caniuse/src/client/clientConfig.ts @@ -1,6 +1,6 @@ import { defineClientConfig } from '@vuepress/client' -import type { CanIUseMode } from '../shared' -import { resolveCanIUse } from './resolveCanIUse' +import type { CanIUseMode } from '../shared/index.js' +import { resolveCanIUse } from './resolveCanIUse.js' declare const __CAN_I_USE_INJECT_MODE__: CanIUseMode declare const __VUEPRESS_SSR__: boolean diff --git a/packages/plugin-caniuse/src/client/index.ts b/packages/plugin-caniuse/src/client/index.ts new file mode 100644 index 00000000..72593733 --- /dev/null +++ b/packages/plugin-caniuse/src/client/index.ts @@ -0,0 +1 @@ +export * from '../shared/index.js' diff --git a/packages/plugin-caniuse/src/node/index.ts b/packages/plugin-caniuse/src/node/index.ts index bd0e900d..d83b030d 100644 --- a/packages/plugin-caniuse/src/node/index.ts +++ b/packages/plugin-caniuse/src/node/index.ts @@ -1,6 +1,6 @@ -import { caniusePlugin } from './plugin' +import { caniusePlugin } from './plugin.js' -export * from './plugin' -export * from '../shared' +export * from './plugin.js' +export * from '../shared/index.js' export default caniusePlugin diff --git a/packages/plugin-caniuse/src/node/markdown-it-container.d.ts b/packages/plugin-caniuse/src/node/markdown-it-container.d.ts new file mode 100644 index 00000000..84e449f7 --- /dev/null +++ b/packages/plugin-caniuse/src/node/markdown-it-container.d.ts @@ -0,0 +1,5 @@ +declare module 'markdown-it-container' { + import type { PluginWithParams } from 'markdown-it' + const container: PluginWithParams + export = container +} diff --git a/packages/plugin-caniuse/src/node/plugin.ts b/packages/plugin-caniuse/src/node/plugin.ts index 08c2039c..b66effc8 100644 --- a/packages/plugin-caniuse/src/node/plugin.ts +++ b/packages/plugin-caniuse/src/node/plugin.ts @@ -1,10 +1,11 @@ import type { Plugin, PluginObject } from '@vuepress/core' -import { path } from '@vuepress/utils' -import * as container from 'markdown-it-container' -import type * as Token from 'markdown-it/lib/token' -import type { CanIUseMode, CanIUsePluginOptions } from '../shared' -import { resolveCanIUse } from './resolveCanIUse' +import { getDirname, path } from '@vuepress/utils' +import container from 'markdown-it-container' +import type Token from 'markdown-it/lib/token.js' +import type { CanIUseMode, CanIUsePluginOptions } from '../shared/index.js' +import { resolveCanIUse } from './resolveCanIUse.js' +const __dirname = getDirname(import.meta.url) const modeMap: CanIUseMode[] = ['image', 'embed'] const isMode = (mode: CanIUseMode): boolean => modeMap.includes(mode) diff --git a/packages/plugin-caniuse/src/node/resolveCanIUse.ts b/packages/plugin-caniuse/src/node/resolveCanIUse.ts index c4cc8478..49bc1807 100644 --- a/packages/plugin-caniuse/src/node/resolveCanIUse.ts +++ b/packages/plugin-caniuse/src/node/resolveCanIUse.ts @@ -1,4 +1,4 @@ -import type { CanIUseMode } from '../shared' +import type { CanIUseMode } from '../shared/index.js' export const resolveCanIUse = (feature: string, mode: CanIUseMode): string => { const before = mode === 'embed' diff --git a/packages/plugin-caniuse/src/shared/index.ts b/packages/plugin-caniuse/src/shared/index.ts index 09ced7c2..3a1fb664 100644 --- a/packages/plugin-caniuse/src/shared/index.ts +++ b/packages/plugin-caniuse/src/shared/index.ts @@ -1 +1 @@ -export * from './caniuse' +export * from './caniuse.js' diff --git a/packages/plugin-caniuse/tsconfig.build.json b/packages/plugin-caniuse/tsconfig.build.json index b373aff3..6bf67375 100644 --- a/packages/plugin-caniuse/tsconfig.build.json +++ b/packages/plugin-caniuse/tsconfig.build.json @@ -1,12 +1,8 @@ { - "extends": "../../tsconfig.base.json", - "references": [ - { - "path": "./tsconfig.esm.json" - }, - { - "path": "./tsconfig.cjs.json" - } - ], - "files": [] + "extends": "../tsconfig.build.json", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./lib" + }, + "include": ["./src"] } diff --git a/packages/plugin-caniuse/tsconfig.cjs.json b/packages/plugin-caniuse/tsconfig.cjs.json deleted file mode 100644 index a0861fb1..00000000 --- a/packages/plugin-caniuse/tsconfig.cjs.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "module": "CommonJS", - "rootDir": "./src", - "outDir": "./lib" - }, - "include": [ - "./src/node", - "./src/shared" - ] -} diff --git a/packages/plugin-caniuse/tsconfig.esm.json b/packages/plugin-caniuse/tsconfig.esm.json deleted file mode 100644 index eab85e06..00000000 --- a/packages/plugin-caniuse/tsconfig.esm.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "module": "ES2020", - "rootDir": "./src", - "outDir": "./lib", - "types": [ - "@vuepress/client/types" - ] - }, - "include": [ - "./src/client", - "./src/shared" - ] -} diff --git a/packages/plugin-copy-code/package.json b/packages/plugin-copy-code/package.json index 0e023ad8..884d9924 100644 --- a/packages/plugin-copy-code/package.json +++ b/packages/plugin-copy-code/package.json @@ -12,7 +12,14 @@ }, "license": "MIT", "author": "pengzhanbo ", + "type": "module", + "exports": { + ".": "./lib/node/index.js", + "./client": "./lib/client/index.js", + "./package.json": "./package.json" + }, "main": "lib/node/index.js", + "types": "./lib/node/index.d.ts", "files": [ "lib" ], @@ -20,18 +27,15 @@ "build": "pnpm run clean && pnpm run copy && pnpm run ts", "clean": "rimraf lib *.tsbuildinfo", "copy": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png}\" lib", - "copy:watch": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png}\" lib -w", - "dev": "concurrently \"pnpm copy:watch\" \"pnpm ts:watch\"", - "ts": "tsc -b tsconfig.build.json", - "ts:watch": "tsc -b tsconfig.build.json --watch" + "ts": "tsc -b tsconfig.build.json" }, "dependencies": { - "@vuepress/client": "2.0.0-beta.49", - "@vuepress/core": "2.0.0-beta.49", - "@vuepress/shared": "2.0.0-beta.49", - "@vuepress/utils": "2.0.0-beta.49", - "vue": "^3.2.37", - "vue-router": "4.1.2" + "@vuepress/client": "2.0.0-beta.51", + "@vuepress/core": "2.0.0-beta.51", + "@vuepress/shared": "2.0.0-beta.51", + "@vuepress/utils": "2.0.0-beta.51", + "vue": "^3.2.41", + "vue-router": "4.1.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-copy-code/src/client/clientConfig.ts b/packages/plugin-copy-code/src/client/clientConfig.ts index 4fcf104f..78240577 100644 --- a/packages/plugin-copy-code/src/client/clientConfig.ts +++ b/packages/plugin-copy-code/src/client/clientConfig.ts @@ -1,5 +1,5 @@ import { defineClientConfig } from '@vuepress/client' -import { setupCopyCode } from './composables' +import { setupCopyCode } from './composables/index.js' import './styles/button.scss' diff --git a/packages/plugin-copy-code/src/client/composables/index.ts b/packages/plugin-copy-code/src/client/composables/index.ts index 5a774a6b..94060776 100644 --- a/packages/plugin-copy-code/src/client/composables/index.ts +++ b/packages/plugin-copy-code/src/client/composables/index.ts @@ -1 +1 @@ -export * from './setup' +export * from './setup.js' diff --git a/packages/plugin-copy-code/src/client/composables/setup.ts b/packages/plugin-copy-code/src/client/composables/setup.ts index eced998e..97347780 100644 --- a/packages/plugin-copy-code/src/client/composables/setup.ts +++ b/packages/plugin-copy-code/src/client/composables/setup.ts @@ -1,9 +1,9 @@ // import { useRouteLocale } from '@vuepress/client' import { onMounted, watch } from 'vue' import { useRoute } from 'vue-router' -import type { CopyCodeOptions } from '../../shared' -import { copySVG, successSVG } from '../svg' -import { copyToClipboard } from './copyToClipboard' +import type { CopyCodeOptions } from '../../shared/index.js' +import { copySVG, successSVG } from '../svg.js' +import { copyToClipboard } from './copyToClipboard.js' declare const __COPY_CODE_OPTIONS__: CopyCodeOptions // declare const __COPY_CODE_LOCALES_OPTIONS__: CopyCodeLocaleOption diff --git a/packages/plugin-copy-code/src/client/index.ts b/packages/plugin-copy-code/src/client/index.ts new file mode 100644 index 00000000..72593733 --- /dev/null +++ b/packages/plugin-copy-code/src/client/index.ts @@ -0,0 +1 @@ +export * from '../shared/index.js' diff --git a/packages/plugin-copy-code/src/node/index.ts b/packages/plugin-copy-code/src/node/index.ts index 5393e1a6..6b3df8a9 100644 --- a/packages/plugin-copy-code/src/node/index.ts +++ b/packages/plugin-copy-code/src/node/index.ts @@ -1,6 +1,6 @@ -import { copyCodePlugin } from './plugin' +import { copyCodePlugin } from './plugin.js' -export * from './plugin' -export * from '../shared' +export * from './plugin.js' +export * from '../shared/index.js' export default copyCodePlugin diff --git a/packages/plugin-copy-code/src/node/plugin.ts b/packages/plugin-copy-code/src/node/plugin.ts index f15873ca..3f4ff5eb 100644 --- a/packages/plugin-copy-code/src/node/plugin.ts +++ b/packages/plugin-copy-code/src/node/plugin.ts @@ -1,6 +1,8 @@ import type { Plugin } from '@vuepress/core' -import { path } from '@vuepress/utils' -import type { CopyCodeLocaleOption, CopyCodeOptions } from '../shared' +import { getDirname, path } from '@vuepress/utils' +import type { CopyCodeLocaleOption, CopyCodeOptions } from '../shared/index.js' + +const __dirname = getDirname(import.meta.url) const defaultOptions: CopyCodeOptions = { selector: '.theme-default-content div[class*="language-"] pre', diff --git a/packages/plugin-copy-code/tsconfig.build.json b/packages/plugin-copy-code/tsconfig.build.json index b373aff3..6bf67375 100644 --- a/packages/plugin-copy-code/tsconfig.build.json +++ b/packages/plugin-copy-code/tsconfig.build.json @@ -1,12 +1,8 @@ { - "extends": "../../tsconfig.base.json", - "references": [ - { - "path": "./tsconfig.esm.json" - }, - { - "path": "./tsconfig.cjs.json" - } - ], - "files": [] + "extends": "../tsconfig.build.json", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./lib" + }, + "include": ["./src"] } diff --git a/packages/plugin-copy-code/tsconfig.cjs.json b/packages/plugin-copy-code/tsconfig.cjs.json deleted file mode 100644 index 2d998114..00000000 --- a/packages/plugin-copy-code/tsconfig.cjs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "module": "CommonJS", - "rootDir": "./src", - "outDir": "./lib" - }, - "include": ["./src/node", "./src/shared"] -} diff --git a/packages/plugin-copy-code/tsconfig.esm.json b/packages/plugin-copy-code/tsconfig.esm.json deleted file mode 100644 index 6ddae220..00000000 --- a/packages/plugin-copy-code/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "module": "ES2020", - "rootDir": "./src", - "outDir": "./lib", - "types": ["@vuepress/client/types"] - }, - "include": ["./src/client", "./src/shared"] -} diff --git a/packages/plugin-netlify-functions/package.json b/packages/plugin-netlify-functions/package.json index 38fce36e..e298b55c 100644 --- a/packages/plugin-netlify-functions/package.json +++ b/packages/plugin-netlify-functions/package.json @@ -20,7 +20,13 @@ }, "license": "MIT", "author": "pengzhanbo ", + "type": "module", + "exports": { + ".": "./lib/node/index.js", + "./package.json": "./package.json" + }, "main": "lib/node/index.js", + "types": "lib/node/index.d.ts", "files": [ "lib" ], @@ -28,24 +34,25 @@ "build": "pnpm run clean && pnpm run copy && pnpm run ts", "clean": "rimraf lib *.tsbuildinfo", "copy": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png}\" lib", - "copy:watch": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png}\" lib -w", - "dev": "concurrently \"pnpm copy:watch\" \"pnpm ts:watch\"", - "ts": "tsc -b tsconfig.build.json", - "ts:watch": "tsc -b tsconfig.build.json --watch" + "ts": "tsc -b tsconfig.build.json" }, "dependencies": { "@iarna/toml": "^2.2.5", - "@netlify/functions": "^1.0.0", - "@vuepress/core": "2.0.0-beta.49", - "@vuepress/shared": "2.0.0-beta.49", - "@vuepress/utils": "2.0.0-beta.49", + "@netlify/functions": "^1.3.0", + "@vuepress/core": "2.0.0-beta.51", + "@vuepress/shared": "2.0.0-beta.51", + "@vuepress/utils": "2.0.0-beta.51", + "chalk": "^5.1.2", "chokidar": "^3.5.3", "cpx2": "^4.2.0", - "dotenv": "^16.0.1", - "esbuild": "^0.14.39", - "execa": "5.1.1", - "netlify-cli": "^10.10.2", - "portfinder": "^1.0.28" + "dotenv": "^16.0.3", + "esbuild": "^0.15.11", + "execa": "^6.1.0", + "netlify-cli": "^12.0.9", + "portfinder": "^1.0.32" + }, + "devDependencies": { + "@types/node": "^18.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-netlify-functions/src/node/extendsBundlerOptions.ts b/packages/plugin-netlify-functions/src/node/extendsBundlerOptions.ts index a977e889..88a63a56 100644 --- a/packages/plugin-netlify-functions/src/node/extendsBundlerOptions.ts +++ b/packages/plugin-netlify-functions/src/node/extendsBundlerOptions.ts @@ -1,5 +1,5 @@ import type { App } from '@vuepress/core' -import type { NetlifyFunctionsPluginOptions } from '../shared' +import type { NetlifyFunctionsPluginOptions } from '../shared/index.js' export const extendsBundlerOptions = ( bundlerOption: any, app: App, @@ -25,16 +25,18 @@ export const extendsBundlerOptions = ( } if (app.options.bundler.name === '@vuepress/bundler-webpack') { const rewritePath = `^${options.proxyPrefix}` - bundlerOption.configureWebpack((config, isServer, isBuild) => { - if (isBuild) return - config.devServer = config.devServer || {} - config.devServer.proxy = Object.assign(config.devServer.proxy || {}, { - [options.proxyPrefix as string]: { - target: server, - changeOrigin: true, - pathRewrite: { [rewritePath]: targetPath }, - }, - }) - }) + bundlerOption.configureWebpack( + (config: any, isServer: boolean, isBuild: boolean) => { + if (isBuild) return + config.devServer = config.devServer || {} + config.devServer.proxy = Object.assign(config.devServer.proxy || {}, { + [options.proxyPrefix as string]: { + target: server, + changeOrigin: true, + pathRewrite: { [rewritePath]: targetPath }, + }, + }) + } + ) } } diff --git a/packages/plugin-netlify-functions/src/node/index.ts b/packages/plugin-netlify-functions/src/node/index.ts index de68954e..c7e0b031 100644 --- a/packages/plugin-netlify-functions/src/node/index.ts +++ b/packages/plugin-netlify-functions/src/node/index.ts @@ -1,7 +1,7 @@ -import type { NetlifyFunctionsOptions } from '../shared' -import { netlifyFunctionsPlugin } from './plugin' +import type { NetlifyFunctionsOptions } from '../shared/index.js' +import { netlifyFunctionsPlugin } from './plugin.js' -export * from './useNetlifyFunctionsPlugins' +export * from './useNetlifyFunctionsPlugins.js' export { NetlifyFunctionsOptions } diff --git a/packages/plugin-netlify-functions/src/node/netlify/index.ts b/packages/plugin-netlify-functions/src/node/netlify/index.ts index c13f0239..a0be6d16 100644 --- a/packages/plugin-netlify-functions/src/node/netlify/index.ts +++ b/packages/plugin-netlify-functions/src/node/netlify/index.ts @@ -1,3 +1,3 @@ -export * from './initFunctions' -export * from './netlifyConfig' -export * from './netlifyServer' +export * from './initFunctions.js' +export * from './netlifyConfig.js' +export * from './netlifyServer.js' diff --git a/packages/plugin-netlify-functions/src/node/netlify/initFunctions.ts b/packages/plugin-netlify-functions/src/node/netlify/initFunctions.ts index 7a5c4e9c..af927ce6 100644 --- a/packages/plugin-netlify-functions/src/node/netlify/initFunctions.ts +++ b/packages/plugin-netlify-functions/src/node/netlify/initFunctions.ts @@ -2,8 +2,8 @@ import type { App } from '@vuepress/core' import { path } from '@vuepress/utils' import * as chokidar from 'chokidar' import esbuild from 'esbuild' -import type { NetlifyFunctionsPluginOptions } from '../../shared' -import { readFileList } from '../utils' +import type { NetlifyFunctionsPluginOptions } from '../../shared/index.js' +import { readFileList } from '../utils/index.js' export const generateFunctions = async ( app: App, diff --git a/packages/plugin-netlify-functions/src/node/netlify/netlifyConfig.ts b/packages/plugin-netlify-functions/src/node/netlify/netlifyConfig.ts index 6ead3bd7..d1b91d90 100644 --- a/packages/plugin-netlify-functions/src/node/netlify/netlifyConfig.ts +++ b/packages/plugin-netlify-functions/src/node/netlify/netlifyConfig.ts @@ -2,7 +2,7 @@ import type { JsonMap } from '@iarna/toml' import { parse, stringify } from '@iarna/toml' import type { App } from '@vuepress/core' import { fs, path } from '@vuepress/utils' -import type { NetlifyFunctionsPluginOptions } from '../../shared' +import type { NetlifyFunctionsPluginOptions } from '../../shared/index.js' export interface NetlifyConfig { functions: Record diff --git a/packages/plugin-netlify-functions/src/node/netlify/netlifyServer.ts b/packages/plugin-netlify-functions/src/node/netlify/netlifyServer.ts index 0ed3027a..e2a5aafe 100644 --- a/packages/plugin-netlify-functions/src/node/netlify/netlifyServer.ts +++ b/packages/plugin-netlify-functions/src/node/netlify/netlifyServer.ts @@ -1,8 +1,10 @@ -import { fs, path } from '@vuepress/utils' +import { fs, getDirname, path } from '@vuepress/utils' import dotenv from 'dotenv' -import * as execa from 'execa' +import { execa } from 'execa' import * as portFinder from 'portfinder' -import type { NetlifyFunctionsPluginOptions } from '../../shared' +import type { NetlifyFunctionsPluginOptions } from '../../shared/index.js' + +const __dirname = getDirname(import.meta.url) const loadEnvConfig = (): Record => { const configPath = path.resolve(process.cwd(), '.env') diff --git a/packages/plugin-netlify-functions/src/node/plugin.ts b/packages/plugin-netlify-functions/src/node/plugin.ts index 80a88466..81bd424b 100644 --- a/packages/plugin-netlify-functions/src/node/plugin.ts +++ b/packages/plugin-netlify-functions/src/node/plugin.ts @@ -29,15 +29,15 @@ import type { App, Plugin } from '@vuepress/core' import type { NetlifyFunctionsOptions, NetlifyFunctionsPluginOptions, -} from '../shared' -import { extendsBundlerOptions } from './extendsBundlerOptions' -import type { NetlifyServe } from './netlify' +} from '../shared/index.js' +import { extendsBundlerOptions } from './extendsBundlerOptions.js' +import type { NetlifyServe } from './netlify/index.js' import { generateFunctions, generateNetlifyConfig, initialFunctions, netlifyServe, -} from './netlify' +} from './netlify/index.js' const initOptions = ( app: App, diff --git a/packages/plugin-netlify-functions/src/node/useNetlifyFunctionsPlugins.ts b/packages/plugin-netlify-functions/src/node/useNetlifyFunctionsPlugins.ts index 9aa36576..b538a19f 100644 --- a/packages/plugin-netlify-functions/src/node/useNetlifyFunctionsPlugins.ts +++ b/packages/plugin-netlify-functions/src/node/useNetlifyFunctionsPlugins.ts @@ -1,8 +1,8 @@ import type { App, PluginObject } from '@vuepress/core' import { path } from '@vuepress/utils' import * as cpx2 from 'cpx2' -import type { UseNetlifyFunctionPluginsOptions } from '../shared' -import { getOptions, netlifyFunctionsPlugin } from './plugin' +import type { UseNetlifyFunctionPluginsOptions } from '../shared/index.js' +import { getOptions, netlifyFunctionsPlugin } from './plugin.js' interface UseNetlifyFunctionResult { /** diff --git a/packages/plugin-netlify-functions/src/node/utils/index.ts b/packages/plugin-netlify-functions/src/node/utils/index.ts index 763130ed..e311745e 100644 --- a/packages/plugin-netlify-functions/src/node/utils/index.ts +++ b/packages/plugin-netlify-functions/src/node/utils/index.ts @@ -1 +1 @@ -export * from './readFileList' +export * from './readFileList.js' diff --git a/packages/plugin-netlify-functions/tsconfig.build.json b/packages/plugin-netlify-functions/tsconfig.build.json index f45328df..6bf67375 100644 --- a/packages/plugin-netlify-functions/tsconfig.build.json +++ b/packages/plugin-netlify-functions/tsconfig.build.json @@ -1,9 +1,8 @@ { - "extends": "../../tsconfig.base.json", - "references": [ - { - "path": "./tsconfig.cjs.json" - } - ], - "files": [] + "extends": "../tsconfig.build.json", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./lib" + }, + "include": ["./src"] } diff --git a/packages/plugin-netlify-functions/tsconfig.cjs.json b/packages/plugin-netlify-functions/tsconfig.cjs.json deleted file mode 100644 index 2d998114..00000000 --- a/packages/plugin-netlify-functions/tsconfig.cjs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "module": "CommonJS", - "rootDir": "./src", - "outDir": "./lib" - }, - "include": ["./src/node", "./src/shared"] -} diff --git a/packages/plugin-page-collection/package.json b/packages/plugin-page-collection/package.json index e958e2c7..11802496 100644 --- a/packages/plugin-page-collection/package.json +++ b/packages/plugin-page-collection/package.json @@ -13,7 +13,14 @@ }, "license": "MIT", "author": "pengzhanbo ", + "type": "module", + "exports": { + ".": "./lib/node/index.js", + "./client": "./lib/client/index.js", + "./package.json": "./package.json" + }, "main": "lib/node/index.js", + "types": "lib/node/index.d.ts", "files": [ "lib" ], @@ -21,21 +28,18 @@ "build": "pnpm run clean && pnpm run copy && pnpm run ts", "clean": "rimraf lib *.tsbuildinfo", "copy": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png}\" lib", - "copy:watch": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png}\" lib -w", - "dev": "concurrently \"pnpm copy:watch\" \"pnpm ts:watch\"", - "ts": "tsc -b tsconfig.build.json", - "ts:watch": "tsc -b tsconfig.build.json --watch" + "ts": "tsc -b tsconfig.build.json" }, "dependencies": { - "@netlify/functions": "^1.0.0", + "@netlify/functions": "^1.3.0", "@vuepress-plume/vuepress-plugin-netlify-functions": "workspace:*", - "@vuepress/client": "2.0.0-beta.49", - "@vuepress/core": "2.0.0-beta.49", - "@vuepress/shared": "2.0.0-beta.49", - "@vuepress/utils": "2.0.0-beta.49", - "leancloud-storage": "^4.12.2", - "vue": "^3.2.37", - "vue-router": "4.1.2" + "@vuepress/client": "2.0.0-beta.51", + "@vuepress/core": "2.0.0-beta.51", + "@vuepress/shared": "2.0.0-beta.51", + "@vuepress/utils": "2.0.0-beta.51", + "leancloud-storage": "^4.13.2", + "vue": "^3.2.41", + "vue-router": "4.1.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-page-collection/src/client/clientConfig.ts b/packages/plugin-page-collection/src/client/clientConfig.ts index df266112..f5678e5f 100644 --- a/packages/plugin-page-collection/src/client/clientConfig.ts +++ b/packages/plugin-page-collection/src/client/clientConfig.ts @@ -1,5 +1,5 @@ import { defineClientConfig } from '@vuepress/client' -import Collection from './components/PageCollection' +import Collection from './components/PageCollection.js' export default defineClientConfig({ enhance({ app }) { diff --git a/packages/plugin-page-collection/src/client/components/PageCollection.ts b/packages/plugin-page-collection/src/client/components/PageCollection.ts index 405f4333..1e63b0f3 100644 --- a/packages/plugin-page-collection/src/client/components/PageCollection.ts +++ b/packages/plugin-page-collection/src/client/components/PageCollection.ts @@ -1,5 +1,5 @@ import { defineComponent, h } from 'vue' -import { usePageCollection } from '../composables' +import { usePageCollection } from '../composables/index.js' export default defineComponent({ name: 'PageCollection', diff --git a/packages/plugin-page-collection/src/client/composables/index.ts b/packages/plugin-page-collection/src/client/composables/index.ts index 5c49a303..cc44e278 100644 --- a/packages/plugin-page-collection/src/client/composables/index.ts +++ b/packages/plugin-page-collection/src/client/composables/index.ts @@ -1 +1 @@ -export * from './usePageCollection' +export * from './usePageCollection.js' diff --git a/packages/plugin-page-collection/src/client/index.ts b/packages/plugin-page-collection/src/client/index.ts new file mode 100644 index 00000000..8d0483ee --- /dev/null +++ b/packages/plugin-page-collection/src/client/index.ts @@ -0,0 +1,4 @@ +import Collection from './components/PageCollection.js' +export * from '../shared/index.js' + +export { Collection } diff --git a/packages/plugin-page-collection/src/node/index.ts b/packages/plugin-page-collection/src/node/index.ts index a7ddab1a..3a8f2a2e 100644 --- a/packages/plugin-page-collection/src/node/index.ts +++ b/packages/plugin-page-collection/src/node/index.ts @@ -1,6 +1,6 @@ -import { pageCollectionPlugin } from './plugin' +import { pageCollectionPlugin } from './plugin.js' -export * from './plugin' -export * from '../shared' +export * from './plugin.js' +export * from '../shared/index.js' export default pageCollectionPlugin diff --git a/packages/plugin-page-collection/src/node/plugin.ts b/packages/plugin-page-collection/src/node/plugin.ts index efc04f26..f914c431 100644 --- a/packages/plugin-page-collection/src/node/plugin.ts +++ b/packages/plugin-page-collection/src/node/plugin.ts @@ -8,8 +8,10 @@ // netlify functions 开发时支持 import { useNetlifyFunctionsPlugin } from '@vuepress-plume/vuepress-plugin-netlify-functions' import type { App, Plugin } from '@vuepress/core' -import { path } from '@vuepress/utils' -import type { PageCollectionOptions } from '../shared' +import { getDirname, path } from '@vuepress/utils' +import type { PageCollectionOptions } from '../shared/index.js' + +const __dirname = getDirname(import.meta.url) export const pageCollectionPlugin = ( options: PageCollectionOptions = {} diff --git a/packages/plugin-page-collection/tsconfig.build.json b/packages/plugin-page-collection/tsconfig.build.json index b373aff3..6bf67375 100644 --- a/packages/plugin-page-collection/tsconfig.build.json +++ b/packages/plugin-page-collection/tsconfig.build.json @@ -1,12 +1,8 @@ { - "extends": "../../tsconfig.base.json", - "references": [ - { - "path": "./tsconfig.esm.json" - }, - { - "path": "./tsconfig.cjs.json" - } - ], - "files": [] + "extends": "../tsconfig.build.json", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./lib" + }, + "include": ["./src"] } diff --git a/packages/plugin-page-collection/tsconfig.cjs.json b/packages/plugin-page-collection/tsconfig.cjs.json deleted file mode 100644 index 2d998114..00000000 --- a/packages/plugin-page-collection/tsconfig.cjs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "module": "CommonJS", - "rootDir": "./src", - "outDir": "./lib" - }, - "include": ["./src/node", "./src/shared"] -} diff --git a/packages/plugin-page-collection/tsconfig.esm.json b/packages/plugin-page-collection/tsconfig.esm.json deleted file mode 100644 index 6ddae220..00000000 --- a/packages/plugin-page-collection/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "module": "ES2020", - "rootDir": "./src", - "outDir": "./lib", - "types": ["@vuepress/client/types"] - }, - "include": ["./src/client", "./src/shared"] -} diff --git a/packages/plugin-windicss/package.json b/packages/plugin-windicss/package.json index c8eddf7c..4b97199b 100644 --- a/packages/plugin-windicss/package.json +++ b/packages/plugin-windicss/package.json @@ -12,7 +12,13 @@ }, "license": "MIT", "author": "pengzhanbo ", + "type": "module", + "exports": { + ".": "./lib/node/index.js", + "./package.json": "./package.json" + }, "main": "lib/node/index.js", + "types": "lib/node/index.d.ts", "files": [ "lib" ], @@ -20,19 +26,16 @@ "build": "pnpm run clean && pnpm run copy && pnpm run ts", "clean": "rimraf lib *.tsbuildinfo", "copy": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png}\" lib", - "copy:watch": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png}\" lib -w", - "dev": "concurrently \"pnpm copy:watch\" \"pnpm ts:watch\"", - "ts": "tsc -b tsconfig.build.json", - "ts:watch": "tsc -b tsconfig.build.json --watch" + "ts": "tsc -b tsconfig.build.json" }, "dependencies": { - "@vuepress/client": "2.0.0-beta.49", - "@vuepress/core": "2.0.0-beta.49", - "@vuepress/shared": "2.0.0-beta.49", - "@vuepress/utils": "2.0.0-beta.49", - "vite-plugin-windicss": "^1.8.7", + "@vuepress/client": "2.0.0-beta.51", + "@vuepress/core": "2.0.0-beta.51", + "@vuepress/shared": "2.0.0-beta.51", + "@vuepress/utils": "2.0.0-beta.51", + "vite-plugin-windicss": "^1.8.8", "windicss": "^3.5.6", - "windicss-webpack-plugin": "^1.7.5" + "windicss-webpack-plugin": "^1.7.6" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-windicss/src/node/index.ts b/packages/plugin-windicss/src/node/index.ts index e280eadc..1a8a58b8 100644 --- a/packages/plugin-windicss/src/node/index.ts +++ b/packages/plugin-windicss/src/node/index.ts @@ -1,5 +1,5 @@ -import { windiCSSPlugin } from './plugin' +import { windiCSSPlugin } from './plugin.js' -export * from './plugin' +export * from './plugin.js' export default windiCSSPlugin diff --git a/packages/plugin-windicss/src/node/plugin.ts b/packages/plugin-windicss/src/node/plugin.ts index 6d559b32..8d23f8f3 100644 --- a/packages/plugin-windicss/src/node/plugin.ts +++ b/packages/plugin-windicss/src/node/plugin.ts @@ -1,9 +1,10 @@ import type { App, Plugin } from '@vuepress/core' -import { path } from '@vuepress/utils' -import type { UserOptions, WindiPluginUtilsOptions } from 'vite-plugin-windicss' +import { getDirname, path } from '@vuepress/utils' import viteWindiCSS from 'vite-plugin-windicss' +import type { UserOptions, WindiPluginUtilsOptions } from 'vite-plugin-windicss' import WebpackWindiCSSPlugin from 'windicss-webpack-plugin' +const __dirname = getDirname(import.meta.url) export interface WindiCSSOptions { userOptions?: UserOptions utilsOptions?: WindiPluginUtilsOptions diff --git a/packages/plugin-windicss/src/node/windicss.d.ts b/packages/plugin-windicss/src/node/windicss.d.ts new file mode 100644 index 00000000..1e309ec4 --- /dev/null +++ b/packages/plugin-windicss/src/node/windicss.d.ts @@ -0,0 +1,17 @@ +declare module 'windicss-webpack-plugin' { + const result: any + + export default result +} + +declare module 'vite-plugin-windicss' { + const result: any + + type UserOptions = any + + type WindiPluginUtilsOptions = any + + export default result + + export { UserOptions, WindiPluginUtilsOptions } +} diff --git a/packages/plugin-windicss/tsconfig.build.json b/packages/plugin-windicss/tsconfig.build.json index b373aff3..6bf67375 100644 --- a/packages/plugin-windicss/tsconfig.build.json +++ b/packages/plugin-windicss/tsconfig.build.json @@ -1,12 +1,8 @@ { - "extends": "../../tsconfig.base.json", - "references": [ - { - "path": "./tsconfig.esm.json" - }, - { - "path": "./tsconfig.cjs.json" - } - ], - "files": [] + "extends": "../tsconfig.build.json", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./lib" + }, + "include": ["./src"] } diff --git a/packages/plugin-windicss/tsconfig.cjs.json b/packages/plugin-windicss/tsconfig.cjs.json deleted file mode 100644 index 2d998114..00000000 --- a/packages/plugin-windicss/tsconfig.cjs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "module": "CommonJS", - "rootDir": "./src", - "outDir": "./lib" - }, - "include": ["./src/node", "./src/shared"] -} diff --git a/packages/plugin-windicss/tsconfig.esm.json b/packages/plugin-windicss/tsconfig.esm.json deleted file mode 100644 index 6ddae220..00000000 --- a/packages/plugin-windicss/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "module": "ES2020", - "rootDir": "./src", - "outDir": "./lib", - "types": ["@vuepress/client/types"] - }, - "include": ["./src/client", "./src/shared"] -} diff --git a/packages/theme/package.json b/packages/theme/package.json index 8e8442ca..7d4acb93 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -20,6 +20,7 @@ }, "license": "MIT", "author": "pengzhanbo ", + "type": "module", "main": "lib/node/index.js", "files": [ "lib", @@ -35,42 +36,42 @@ "ts:watch": "tsc -b tsconfig.build.json --watch" }, "dependencies": { - "@types/lodash.merge": "^4.6.6", + "@types/lodash.merge": "^4.6.7", "@vuepress-plume/vuepress-plugin-baidu-tongji": "workspace:*", "@vuepress-plume/vuepress-plugin-caniuse": "workspace:*", "@vuepress-plume/vuepress-plugin-copy-code": "workspace:*", - "@vuepress/client": "2.0.0-beta.49", - "@vuepress/core": "2.0.0-beta.49", - "@vuepress/plugin-active-header-links": "2.0.0-beta.49", - "@vuepress/plugin-container": "2.0.0-beta.49", - "@vuepress/plugin-docsearch": "2.0.0-beta.49", - "@vuepress/plugin-external-link-icon": "2.0.0-beta.49", - "@vuepress/plugin-git": "2.0.0-beta.49", - "@vuepress/plugin-medium-zoom": "2.0.0-beta.49", - "@vuepress/plugin-nprogress": "2.0.0-beta.49", - "@vuepress/plugin-palette": "2.0.0-beta.49", - "@vuepress/plugin-prismjs": "2.0.0-beta.49", - "@vuepress/plugin-search": "2.0.0-beta.49", - "@vuepress/plugin-theme-data": "2.0.0-beta.49", - "@vuepress/plugin-toc": "2.0.0-beta.49", - "@vuepress/shared": "2.0.0-beta.49", - "@vuepress/utils": "2.0.0-beta.49", - "@vueuse/core": "^8.2.3", + "@vuepress/client": "2.0.0-beta.51", + "@vuepress/core": "2.0.0-beta.51", + "@vuepress/plugin-active-header-links": "2.0.0-beta.51", + "@vuepress/plugin-container": "2.0.0-beta.51", + "@vuepress/plugin-docsearch": "2.0.0-beta.51", + "@vuepress/plugin-external-link-icon": "2.0.0-beta.51", + "@vuepress/plugin-git": "2.0.0-beta.51", + "@vuepress/plugin-medium-zoom": "2.0.0-beta.51", + "@vuepress/plugin-nprogress": "2.0.0-beta.51", + "@vuepress/plugin-palette": "2.0.0-beta.51", + "@vuepress/plugin-prismjs": "2.0.0-beta.51", + "@vuepress/plugin-search": "2.0.0-beta.51", + "@vuepress/plugin-theme-data": "2.0.0-beta.51", + "@vuepress/plugin-toc": "2.0.0-beta.51", + "@vuepress/shared": "2.0.0-beta.51", + "@vuepress/utils": "2.0.0-beta.51", + "@vueuse/core": "^9.3.0", "chokidar": "^3.5.3", - "date-fns": "^2.28.0", + "date-fns": "^2.29.3", "gray-matter": "^4.0.3", "json2yaml": "^1.1.0", "lodash.merge": "^4.6.2", - "nanoid": "^3.3.4", - "sass": "^1.51.0", - "sass-loader": "^13.0.2", + "nanoid": "^4.0.0", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", "ts-debounce": "^4.0.0", - "vue": "^3.2.37", - "vue-router": "4.1.2", - "vuepress-plugin-comment2": "2.0.0-beta.87", - "vuepress-plugin-md-enhance": "2.0.0-beta.87", - "vuepress-plugin-seo2": "2.0.0-beta.87", - "vuepress-plugin-sitemap2": "2.0.0-beta.87" + "vue": "^3.2.41", + "vue-router": "4.1.5", + "vuepress-plugin-comment2": "2.0.0-beta.110", + "vuepress-plugin-md-enhance": "2.0.0-beta.110", + "vuepress-plugin-seo2": "2.0.0-beta.110", + "vuepress-plugin-sitemap2": "2.0.0-beta.110" }, "peerDependencies": { "sass-loader": "^13.0.2" diff --git a/packages/theme/src/client/components/Archive.vue b/packages/theme/src/client/components/Archive.vue index 77b9dd61..abf9f2b7 100644 --- a/packages/theme/src/client/components/Archive.vue +++ b/packages/theme/src/client/components/Archive.vue @@ -3,8 +3,8 @@ import BlogInfo from '@theme-plume/BlogInfo.vue' import DropdownTransition from '@theme-plume/DropdownTransition.vue' import type { PageHeader } from '@vuepress/client' import { computed } from 'vue' -import { useArchive } from '../composables' -import Toc from './Toc' +import { useArchive } from '../composables/index.js' +import Toc from './Toc.js' const archiveList = useArchive() @@ -14,6 +14,7 @@ const headers = computed(() => { level: 2, slug: year, title: year, + link: '', children: [], } as PageHeader }) diff --git a/packages/theme/src/client/components/AsideNavbar.vue b/packages/theme/src/client/components/AsideNavbar.vue index a66530aa..5861cc2b 100644 --- a/packages/theme/src/client/components/AsideNavbar.vue +++ b/packages/theme/src/client/components/AsideNavbar.vue @@ -1,6 +1,8 @@