fix: use module augmentation instead of extending config (vite-pwa#9)

* fix: use module augmentation instead of extending config

* chore: updated pwa plugin and pnpm
chore: add integration to types in pwa-simple

* chore: updated pwa plugin (local copy of PR 378)

Co-authored-by: userquin <userquin@gmail.com>

Author: brc-dd

README.md

@@ -55,31 +55,18 @@ pnpm add @vite-pwa/vitepress -D
 
 ## 🦄 Usage
 
-You will need add or switch `defineConfig` from `VitePress` to `Vite Plugin PWA Integration for Vitepress`:
+You will need wrap your VitePress config with `withPwa`:
 
 ```ts
 // .vitepress/config.ts
-import { defineConfig } from '@vite-pwa/vitepress'
+import { defineConfig } from 'vitepress'
+import { withPwa } from '@vite-pwa/vitepress'
 
-export default defineConfig({
+export default withPwa(defineConfig({
   /* your VitePress options */
   /* Vite PWA Options */
   pwa: {}
-})
-```
-
-or just change the import:
-
-```ts
-// .vitepress/config.ts
-// import { defineConfig } from 'vitepress'  <== comment this line or switch the import
-import { defineConfig } from '@vite-pwa/vitepress' // <== add this line
-
-export default defineConfig({
-  /* your VitePress options */
-  /* Vite PWA Options */
-  pwa: {}
-})
+}))
 ```
 
 Read the [📖 documentation](https://vite-plugin-pwa.netlify.app/guide/) for a complete guide on how to configure and use

examples/pwa-prompt/.vitepress/config.ts

@@ -1,6 +1,7 @@
-import { defineConfig } from '@vite-pwa/vitepress'
+import { defineConfig } from 'vitepress'
+import { withPwa } from '@vite-pwa/vitepress'
 
-export default defineConfig({
+export default withPwa(defineConfig({
   vite: {
     logLevel: 'info',
     define: {
@@ -62,4 +63,4 @@ export default defineConfig({
       globPatterns: ['**/*.{css,js,html,svg,png,ico,txt,woff2}'],
     },
   },
-})
+}))

examples/pwa-simple/.vitepress/config.ts

@@ -1,6 +1,7 @@
-import { defineConfig } from '@vite-pwa/vitepress'
+import { defineConfig } from 'vitepress'
+import { withPwa } from '@vite-pwa/vitepress'
 
-export default defineConfig({
+export default withPwa(defineConfig({
   vite: {
     logLevel: 'info',
     define: {
@@ -64,4 +65,4 @@ export default defineConfig({
       globPatterns: ['**/*.{css,js,html,svg,png,ico,txt,woff2}'],
     },
   },
-})
+}))

examples/pwa-simple/tsconfig.json

@@ -14,7 +14,8 @@
     "forceConsistentCasingInFileNames": true,
     "types": [
       "vite/client",
-      "vitepress"
+      "vitepress",
+      "@vite-pwa/vitepress"
     ]
   },
   "include": [

package.json

@@ -43,18 +43,18 @@
     "release": "npx bumpp --push --tag --commit && npm publish"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.26.3",
+    "@antfu/eslint-config": "^0.27.0",
     "@antfu/ni": "^0.18.0",
     "@types/debug": "^4.1.7",
     "@types/workbox-build": "^5.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.36.2",
-    "eslint": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^5.38.0",
+    "eslint": "^8.23.1",
     "https-localhost": "^4.7.1",
     "typescript": "^4.8.3",
-    "unbuild": "^0.8.10",
-    "vite": "^3.1.0",
-    "vite-plugin-pwa": "file:vite-plugin-pwa-0.12.8.tgz",
-    "vitepress": "1.0.0-alpha.14"
+    "unbuild": "^0.8.11",
+    "vite": "^3.1.3",
+    "vite-plugin-pwa": "file:vite-plugin-pwa-0.13.0.tgz",
+    "vitepress": "1.0.0-alpha.15"
   },
   "pnpm": {
     "peerDependencyRules": {