chore: updates

packages/core/src/types/page.ts

@@ -5,11 +5,14 @@ import type { PageBase, PageData, PageFrontmatter } from '@vuepress/shared'
  * Vuepress Page
  */
 export type Page<
-  ExtraPageData extends Record<any, any> = Record<never, never>,
-  ExtraPageFrontmatter extends Record<any, any> = Record<string, unknown>,
-  ExtraPageFields extends Record<any, any> = Record<never, never>,
-> = PageBase<ExtraPageFrontmatter> &
-  ExtraPageFields & {
+  ExtraPageData extends Record<string, unknown> = Record<string, unknown>,
+  ExtraPageFrontmatter extends Record<string, unknown> = Record<
+    string,
+    unknown
+  >,
+  ExtraPageFields extends Record<string, unknown> = Record<string, unknown>,
+> = ExtraPageFields &
+  PageBase<ExtraPageFrontmatter> & {
     /**
      * Data of the page, which will be available in client code
      */

packages/core/src/types/plugin.ts

@@ -11,8 +11,8 @@ import type { HooksExposed } from './pluginApi/index.js'
  * A plugin package should have a `Plugin` as the default export
  */
 export type Plugin<T extends PluginObject = PluginObject> =
-  | T
   | PluginFunction<T>
+  | T
 
 /**
  * Vuepress plugin function

packages/core/src/types/pluginApi/hooks.ts

@@ -12,11 +12,11 @@ interface Closable {
 export interface Hook<
   Exposed,
   Normalized = Exposed,
-  Result = Normalized extends (...args: any) => infer U
+  Result = Normalized extends (...args: unknown[]) => infer U
     ? U extends Promise<infer V>
       ? V
       : U
-    : void,
+    : never,
 > {
   exposed: Exposed
   normalized: Normalized
@@ -41,9 +41,9 @@ export type ClientConfigFileHook = Hook<
 
 // alias and define hook
 export type AliasDefineHook = Hook<
-  | Record<string, any>
-  | ((app: App, isServer: boolean) => PromiseOrNot<Record<string, any>>),
-  (app: App, isServer: boolean) => Promise<Record<string, any>>
+  | Record<string, unknown>
+  | ((app: App, isServer: boolean) => PromiseOrNot<Record<string, unknown>>),
+  (app: App, isServer: boolean) => Promise<Record<string, unknown>>
 >
 
 /**
@@ -58,7 +58,7 @@ export interface Hooks {
   extendsMarkdown: ExtendsHook<Markdown>
   extendsPageOptions: ExtendsHook<PageOptions>
   extendsPage: ExtendsHook<Page>
-  extendsBundlerOptions: ExtendsHook<any>
+  extendsBundlerOptions: ExtendsHook<Record<string, unknown>>
   clientConfigFile: ClientConfigFileHook
   alias: AliasDefineHook
   define: AliasDefineHook

packages/core/tests/app/resolvePluginObject.spec.ts

@@ -1,12 +1,12 @@
 import { path } from '@vuepress/utils'
 import { describe, expect, it, vi } from 'vitest'
+import type { Bundler, PluginFunction, PluginObject } from '../../src/index.js'
 import { createBaseApp, resolvePluginObject } from '../../src/index.js'
-import type { PluginFunction, PluginObject } from '../../src/index.js'
 
 const app = createBaseApp({
   source: path.resolve(__dirname, 'fake-source'),
   theme: { name: 'test' },
-  bundler: {} as any,
+  bundler: {} as Bundler,
 })
 
 describe('core > app > resolvePluginObject', () => {
@@ -20,7 +20,7 @@ describe('core > app > resolvePluginObject', () => {
   })
 
   it('should work with plugin function', () => {
-    const pluginFunction: PluginFunction = vi.fn((app) => ({
+    const pluginFunction: PluginFunction = vi.fn(() => ({
       name: 'plugin-function',
     }))
 

packages/core/tests/page/createPage.spec.ts

@@ -1,18 +1,19 @@
 import { path } from '@vuepress/utils'
 import { beforeAll, describe, expect, it, vi } from 'vitest'
+import type { Bundler } from '../../src/index.js'
 import { createBaseApp, createPage } from '../../src/index.js'
 
-const app = createBaseApp({
-  source: path.resolve(__dirname, 'fake-source'),
-  theme: { name: 'test' },
-  bundler: {} as any,
-})
+describe('should work without plugins', () => {
+  const app = createBaseApp({
+    source: path.resolve(__dirname, 'fake-source'),
+    theme: { name: 'test' },
+    bundler: {} as Bundler,
+  })
 
-beforeAll(async () => {
-  await app.init()
-})
+  beforeAll(async () => {
+    await app.init()
+  })
 
-describe('core > page > createPage', () => {
   it('should throw an error', async () => {
     const consoleError = console.error
     console.error = vi.fn()
@@ -86,12 +87,14 @@ describe('core > page > createPage', () => {
     )
     expect(page.chunkName).toBeTruthy()
   })
+})
 
+describe('should work with plugins', () => {
   it('should be extended by plugin correctly', async () => {
     const app = createBaseApp({
       source: path.resolve(__dirname, 'fake-source'),
       theme: { name: 'test' },
-      bundler: {} as any,
+      bundler: {} as Bundler,
     })
     app.use({
       name: 'foo',

packages/core/tests/page/inferPagePath.spec.ts

@@ -51,41 +51,39 @@ const TEST_CASES: [string, ReturnType<typeof inferPagePath>][] = [
   ],
 ]
 
-describe('core > page > inferPagePath', () => {
-  describe('should infer page path according to relative path of page file', () => {
-    TEST_CASES.forEach(([source, expected]) => {
-      it(JSON.stringify(source), () => {
-        expect(
-          inferPagePath({
-            app,
-            filePathRelative: source,
-          }),
-        ).toEqual(expected)
-      })
+describe('should infer page path according to relative path of page file', () => {
+  TEST_CASES.forEach(([source, expected]) => {
+    it(JSON.stringify(source), () => {
+      expect(
+        inferPagePath({
+          app,
+          filePathRelative: source,
+        }),
+      ).toEqual(expected)
     })
   })
+})
 
-  it('should use `/` as the default locale path', () => {
-    expect(
-      inferPagePath({
-        app: appWithoutLocales,
-        filePathRelative: 'en/foo/bar.md',
-      }),
-    ).toEqual({
-      pathInferred: '/en/foo/bar.html',
-      pathLocale: '/',
-    })
+it('should use `/` as the default locale path', () => {
+  expect(
+    inferPagePath({
+      app: appWithoutLocales,
+      filePathRelative: 'en/foo/bar.md',
+    }),
+  ).toEqual({
+    pathInferred: '/en/foo/bar.html',
+    pathLocale: '/',
   })
+})
 
-  it('should handle empty file relative path', () => {
-    expect(
-      inferPagePath({
-        app,
-        filePathRelative: null,
-      }),
-    ).toEqual({
-      pathInferred: null,
-      pathLocale: '/',
-    })
+it('should handle empty file relative path', () => {
+  expect(
+    inferPagePath({
+      app,
+      filePathRelative: null,
+    }),
+  ).toEqual({
+    pathInferred: null,
+    pathLocale: '/',
   })
 })