@vite-pwa/vitepress 0.1.0 → 0.2.0

package/dist/index.cjs

@@ -1,6 +1,5 @@
 'use strict';
 
-const vitepress = require('vitepress');
 const vitePluginPwa = require('vite-plugin-pwa');
 
 function configurePWAOptions(options) {
@@ -17,7 +16,7 @@ function configurePWAOptions(options) {
   }
 }
 
-function withPwa(config) {
+function withUserConfig(config) {
   let viteConf = config.vite;
   if (!viteConf) {
     viteConf = {};
@@ -33,7 +32,7 @@ function withPwa(config) {
     if (pwaPlugin)
       throw new Error("Remove vite-plugin-pwa plugin from Vite Plugins entry in VitePress config file");
   }
-  const { pwa = {}, ...vitePressOptions } = config;
+  const { pwa = {} } = config;
   configurePWAOptions(pwa);
   let api;
   vitePlugins.push(
@@ -48,7 +47,7 @@ function withPwa(config) {
       }
     }
   );
-  const vitePressConfig = vitepress.defineConfigWithTheme(vitePressOptions);
+  const vitePressConfig = config;
   const userTransformHead = vitePressConfig.transformHead;
   const userBuildEnd = vitePressConfig.buildEnd;
   vitePressConfig.transformHead = async (ctx) => {
@@ -88,4 +87,14 @@ function withPwa(config) {
   return vitePressConfig;
 }
 
+async function withPwa(config) {
+  if (typeof config === "function") {
+    return async (ctx) => {
+      const userConfig = await config(ctx);
+      return withUserConfig(userConfig);
+    };
+  }
+  return withUserConfig(await config);
+}
+
 exports.withPwa = withPwa;

package/dist/index.d.ts

@@ -1,4 +1,6 @@
-import { UserConfig } from 'vitepress';
+import * as vite from 'vite';
+import * as vitepress_dist_node from 'vitepress/dist/node';
+import { DefaultTheme, UserConfigExport } from 'vitepress';
 import { VitePWAOptions } from 'vite-plugin-pwa';
 
 interface PwaOptions extends Partial<VitePWAOptions> {
@@ -9,6 +11,6 @@ declare module 'vitepress' {
     }
 }
 
-declare function withPwa(config: UserConfig): UserConfig<any>;
+declare function withPwa<T = DefaultTheme.Config>(config: UserConfigExport<T>): Promise<vitepress_dist_node.UserConfig<T> | ((ctx: vite.ConfigEnv) => Promise<vitepress_dist_node.UserConfig<T>>)>;
 
 export { PwaOptions, withPwa };

package/dist/index.mjs

@@ -1,4 +1,3 @@
-import { defineConfigWithTheme } from 'vitepress';
 import { VitePWA } from 'vite-plugin-pwa';
 
 function configurePWAOptions(options) {
@@ -15,7 +14,7 @@ function configurePWAOptions(options) {
   }
 }
 
-function withPwa(config) {
+function withUserConfig(config) {
   let viteConf = config.vite;
   if (!viteConf) {
     viteConf = {};
@@ -31,7 +30,7 @@ function withPwa(config) {
     if (pwaPlugin)
       throw new Error("Remove vite-plugin-pwa plugin from Vite Plugins entry in VitePress config file");
   }
-  const { pwa = {}, ...vitePressOptions } = config;
+  const { pwa = {} } = config;
   configurePWAOptions(pwa);
   let api;
   vitePlugins.push(
@@ -46,7 +45,7 @@ function withPwa(config) {
       }
     }
   );
-  const vitePressConfig = defineConfigWithTheme(vitePressOptions);
+  const vitePressConfig = config;
   const userTransformHead = vitePressConfig.transformHead;
   const userBuildEnd = vitePressConfig.buildEnd;
   vitePressConfig.transformHead = async (ctx) => {
@@ -86,4 +85,14 @@ function withPwa(config) {
   return vitePressConfig;
 }
 
+async function withPwa(config) {
+  if (typeof config === "function") {
+    return async (ctx) => {
+      const userConfig = await config(ctx);
+      return withUserConfig(userConfig);
+    };
+  }
+  return withUserConfig(await config);
+}
+
 export { withPwa };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vite-pwa/vitepress",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "packageManager": "pnpm@8.6.1",
   "description": "Zero-config PWA for VitePress",
   "author": "antfu <anthonyfu117@hotmail.com>",
@@ -57,7 +57,7 @@
     "unbuild": "^1.2.1",
     "vite": "^4.3.9",
     "vite-plugin-pwa": ">=0.16.3 <1",
-    "vitepress": "1.0.0-beta.1"
+    "vitepress": "1.0.0-beta.2"
   },
   "pnpm": {
     "peerDependencyRules": {
@@ -66,4 +66,4 @@
       ]
     }
   }
-}
+}