feat!: support Vite 5 (#598)

* feat!: support Vite 5 * chore: update `dontCacheBustURLsMatching` * docs: v0.17 requires Vite 5 * chore: update `dontCacheBustURLsMatching` logic * chore: . * chore: cleanup `./` prefix from `assetsDir` * chore: . * chore: normalize assetsDir
vite-pwa · Nov 18, 2023 · 54b7ab9 · 54b7ab9
1 parent d4c053b
commit 54b7ab9
Show file tree

Hide file tree

Showing 33 changed files with 1,447 additions and 886 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -8,6 +8,7 @@
       "rules": {
         "@typescript-eslint/no-this-alias": "off",
         "n/handle-callback-err": "off",
+        "no-restricted-globals": "off",
         "no-restricted-syntax": "off",
         "no-labels": "off"
       }

diff --git a/README.md b/README.md
@@ -45,10 +45,12 @@ Zero-config PWA Framework-agnostic Plugin for Vite
 
 ## 📦 Install
 
-> From v0.13, `vite-plugin-pwa` requires **Vite 3.1 or above**.
+> From v0.17, `vite-plugin-pwa` requires **Vite 5**.
 
 > From v0.16 `vite-plugin-pwa` requires **Node 16 or above**: `workbox v7` requires **Node 16 or above**.
 
+> From v0.13, `vite-plugin-pwa` requires **Vite 3.1 or above**.
+
 ```bash
 npm i vite-plugin-pwa -D 
 

diff --git a/docs/frameworks/sveltekit.md b/docs/frameworks/sveltekit.md
@@ -161,7 +161,6 @@ const pwaConfiguration = {
             e.url = `/${url.substring(0, url.lastIndexOf('/'))}`
           else if (url.endsWith('.html'))
             e.url = `/${url.substring(0, url.length - '.html'.length)}`
-
         }
 
         return e

diff --git a/docs/frameworks/vue.md b/docs/frameworks/vue.md
@@ -182,7 +182,6 @@ export default {
     catch {
       console.log('PWA disabled.')
     }
-
   },
   methods: {
     async closePromptUpdateSW() {

diff --git a/docs/scripts/assets.ts b/docs/scripts/assets.ts
@@ -13,7 +13,7 @@ const preconnect = `
     <link rel="preconnect" crossorigin="anonymous" href="${gstatic}">
 `
 
-export const optimizePages = async () => {
+export async function optimizePages() {
   const names = await fg('./.vitepress/dist/**/*.html', { onlyFiles: true })
 
   await Promise.all(names.map(async (i) => {

diff --git a/docs/tsconfig.json b/docs/tsconfig.json
@@ -1,29 +1,29 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
-    "module": "ESNext",
+    "incremental": false,
     "target": "es2016",
     "lib": ["DOM", "ESNext"],
-    "strict": true,
-    "esModuleInterop": true,
-    "incremental": false,
-    "skipLibCheck": true,
+    "module": "ESNext",
     "moduleResolution": "bundler",
-    "resolveJsonModule": true,
-    "noUnusedLocals": true,
-    "strictNullChecks": true,
-    "forceConsistentCasingInFileNames": true,
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["src/*"]
+    },
     "types": [
       "@types/fs-extra",
       "node",
       "vite/client",
       "vite-plugin-pwa/client",
       "vitepress"
     ],
-    "paths": {
-      "~/*": ["src/*"]
-    }
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "strictNullChecks": true,
+    "noUnusedLocals": true,
+    "skipLibCheck": true
   },
   "include": [
     "./*.ts",

diff --git a/examples/preact-router/package.json b/examples/preact-router/package.json
@@ -52,12 +52,12 @@
     "preact-router": "^4.1.2"
   },
   "devDependencies": {
-    "@preact/preset-vite": "^2.6.0",
-    "@rollup/plugin-replace": "^5.0.2",
+    "@preact/preset-vite": "^2.7.0",
+    "@rollup/plugin-replace": "^5.0.5",
     "https-localhost": "^4.7.1",
-    "rimraf": "^5.0.1",
+    "rimraf": "^5.0.5",
     "typescript": "^5.2.2",
-    "vite": "^4.5.0",
+    "vite": "^5.0.0",
     "vite-plugin-pwa": "workspace:*",
     "workbox-core": "^7.0.0",
     "workbox-precaching": "^7.0.0",

diff --git a/examples/preact-router/tsconfig.json b/examples/preact-router/tsconfig.json
@@ -1,26 +1,26 @@
 {
   "compilerOptions": {
     "target": "ES2020",
+    "lib": ["ES2020", "DOM", "DOM.Iterable", "WebWorker"],
+    "jsx": "react-jsx",
+    "jsxImportSource": "preact",
     "useDefineForClassFields": true,
     "module": "ESNext",
-    "lib": ["ES2020", "DOM", "DOM.Iterable", "WebWorker"],
-    "skipLibCheck": true,
 
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
-    "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx",
-    "jsxImportSource": "preact",
+    "isolatedModules": true,
 
     /* Linting */
     "strict": true,
+    "noFallthroughCasesInSwitch": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
+    "skipLibCheck": true
   },
-  "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+  "references": [{ "path": "./tsconfig.node.json" }],
+  "include": ["src"]
 }
diff --git a/examples/preact-router/tsconfig.node.json b/examples/preact-router/tsconfig.node.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
     "composite": true,
-    "skipLibCheck": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true
   },
   "include": ["vite.config.ts"]
 }
diff --git a/examples/react-router/package.json b/examples/react-router/package.json
@@ -1,7 +1,7 @@
 {
   "name": "example-react-router",
-  "version": "0.0.0",
   "type": "module",
+  "version": "0.0.0",
   "private": true,
   "scripts": {
     "dev": "rimraf dev-dist && DEBUG=vite-plugin-pwa SW_DEV=true vite --force",
@@ -50,21 +50,21 @@
   "dependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router": "^6.15.0",
+    "react-router": "^6.19.0",
     "react-router-config": "^5.1.1",
-    "react-router-dom": "^6.15.0"
+    "react-router-dom": "^6.19.0"
   },
   "devDependencies": {
-    "@rollup/plugin-replace": "^5.0.2",
-    "@types/react": "^18.2.21",
-    "@types/react-dom": "^18.2.7",
-    "@types/react-router-config": "^5.0.7",
+    "@rollup/plugin-replace": "^5.0.5",
+    "@types/react": "^18.2.37",
+    "@types/react-dom": "^18.2.15",
+    "@types/react-router-config": "^5.0.10",
     "@types/react-router-dom": "^5.3.3",
-    "@vitejs/plugin-react": "^4.1.0",
+    "@vitejs/plugin-react": "^4.2.0",
     "https-localhost": "^4.7.1",
-    "rimraf": "^5.0.1",
+    "rimraf": "^5.0.5",
     "typescript": "^5.2.2",
-    "vite": "^4.5.0",
+    "vite": "^5.0.0",
     "vite-plugin-pwa": "workspace:*",
     "workbox-core": "^7.0.0",
     "workbox-precaching": "^7.0.0",

diff --git a/examples/react-router/tsconfig.json b/examples/react-router/tsconfig.json
@@ -1,25 +1,25 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "useDefineForClassFields": true,
     "lib": ["ES2020", "DOM", "DOM.Iterable", "WebWorker"],
+    "jsx": "react-jsx",
+    "useDefineForClassFields": true,
     "module": "ESNext",
-    "skipLibCheck": true,
 
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
-    "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx",
+    "isolatedModules": true,
 
     /* Linting */
     "strict": true,
+    "noFallthroughCasesInSwitch": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
+    "skipLibCheck": true
   },
-  "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+  "references": [{ "path": "./tsconfig.node.json" }],
+  "include": ["src"]
 }
diff --git a/examples/react-router/tsconfig.node.json b/examples/react-router/tsconfig.node.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
     "composite": true,
-    "skipLibCheck": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true
   },
   "include": ["vite.config.ts"]
 }
diff --git a/examples/solid-router/package.json b/examples/solid-router/package.json
@@ -48,15 +48,15 @@
     "test": "nr test-build-claims && nr test-build-sw-claims"
   },
   "dependencies": {
-    "@solidjs/router": "^0.8.3",
-    "solid-js": "^1.7.11"
+    "@solidjs/router": "^0.9.1",
+    "solid-js": "^1.8.5"
   },
   "devDependencies": {
-    "@rollup/plugin-replace": "^5.0.2",
+    "@rollup/plugin-replace": "^5.0.5",
     "https-localhost": "^4.7.1",
-    "rimraf": "^5.0.1",
+    "rimraf": "^5.0.5",
     "typescript": "^5.2.2",
-    "vite": "^4.5.0",
+    "vite": "^5.0.0",
     "vite-plugin-pwa": "workspace:*",
     "vite-plugin-solid": "^2.7.2",
     "workbox-core": "^7.0.0",

diff --git a/examples/solid-router/tsconfig.json b/examples/solid-router/tsconfig.json
@@ -1,26 +1,26 @@
 {
   "compilerOptions": {
     "target": "ES2020",
+    "lib": ["ES2020", "DOM", "DOM.Iterable", "WebWorker"],
+    "jsx": "preserve",
+    "jsxImportSource": "solid-js",
     "useDefineForClassFields": true,
     "module": "ESNext",
-    "lib": ["ES2020", "DOM", "DOM.Iterable", "WebWorker"],
-    "skipLibCheck": true,
 
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
-    "isolatedModules": true,
     "noEmit": true,
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "isolatedModules": true,
 
     /* Linting */
     "strict": true,
+    "noFallthroughCasesInSwitch": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
+    "skipLibCheck": true
   },
-  "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+  "references": [{ "path": "./tsconfig.node.json" }],
+  "include": ["src"]
 }
diff --git a/examples/solid-router/tsconfig.node.json b/examples/solid-router/tsconfig.node.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
     "composite": true,
-    "skipLibCheck": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true
   },
   "include": ["vite.config.ts"]
 }
diff --git a/examples/svelte-routify/package.json b/examples/svelte-routify/package.json
@@ -48,19 +48,19 @@
     "test": "nr test-build-claims && nr test-build-sw-claims"
   },
   "devDependencies": {
-    "@rollup/plugin-replace": "^5.0.2",
+    "@rollup/plugin-replace": "^5.0.5",
     "@roxi/routify": "^2.18.12",
-    "@sveltejs/vite-plugin-svelte": "^2.4.6",
+    "@sveltejs/vite-plugin-svelte": "^3.0.0",
     "@tsconfig/svelte": "^5.0.2",
-    "eslint": "^8.48.0",
+    "eslint": "^8.54.0",
     "eslint-plugin-svelte3": "^4.0.0",
     "https-localhost": "^4.7.1",
-    "rimraf": "^5.0.1",
-    "svelte": "^4.2.0",
-    "svelte-check": "^3.5.2",
-    "svelte-preprocess": "^5.0.4",
+    "rimraf": "^5.0.5",
+    "svelte": "^4.2.5",
+    "svelte-check": "^3.6.0",
+    "svelte-preprocess": "^5.1.0",
     "typescript": "^5.2.2",
-    "vite": "^4.5.0",
+    "vite": "^5.0.0",
     "vite-plugin-pwa": "workspace:*",
     "workbox-core": "^7.0.0",
     "workbox-precaching": "^7.0.0",

diff --git a/examples/vanilla-ts-dev-options/package.json b/examples/vanilla-ts-dev-options/package.json
@@ -17,9 +17,9 @@
     "serve": "serve dist"
   },
   "devDependencies": {
-    "rimraf": "^5.0.1",
+    "rimraf": "^5.0.5",
     "typescript": "^5.2.2",
-    "vite": "^4.5.0",
+    "vite": "^5.0.0",
     "vite-plugin-pwa": "workspace:*"
   }
 }
diff --git a/examples/vanilla-ts-dev-options/tsconfig.json b/examples/vanilla-ts-dev-options/tsconfig.json
@@ -1,24 +1,24 @@
 {
   "compilerOptions": {
     "target": "ES2020",
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
     "useDefineForClassFields": true,
     "module": "ESNext",
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
-    "skipLibCheck": true,
-    "types": ["vite/client", "vite-plugin-pwa/vanillajs", "vite-plugin-pwa/info"],
 
     /* Bundler mode */
     "moduleResolution": "bundler",
+    "types": ["vite/client", "vite-plugin-pwa/vanillajs", "vite-plugin-pwa/info"],
     "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
-    "isolatedModules": true,
     "noEmit": true,
+    "isolatedModules": true,
 
     /* Linting */
     "strict": true,
+    "noFallthroughCasesInSwitch": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
+    "skipLibCheck": true
   },
   "include": ["src"]
 }
diff --git a/examples/vanilla-ts-no-ip/package.json b/examples/vanilla-ts-no-ip/package.json
@@ -14,9 +14,9 @@
     "test": "nr test-generate-sw && nr test-custom-sw"
   },
   "devDependencies": {
-    "rimraf": "^5.0.1",
+    "rimraf": "^5.0.5",
     "typescript": "^5.2.2",
-    "vite": "^4.5.0",
+    "vite": "^5.0.0",
     "vite-plugin-pwa": "workspace:*",
     "workbox-cacheable-response": "^7.0.0",
     "workbox-core": "^7.0.0",