Migrate to GA4

package-lock.json

@@ -31,7 +31,6 @@
 			"devDependencies": {
 				"@vuepress/plugin-active-header-links": "1.9.9",
 				"@vuepress/plugin-back-to-top": "1.9.9",
-				"@vuepress/plugin-google-analytics": "1.9.9",
 				"@vuepress/plugin-pwa": "1.9.9",
 				"babel-eslint": "10.1.0",
 				"eslint": "7.32.0",
@@ -46,6 +45,7 @@
 				"vuepress-plugin-clean-urls": "1.1.2",
 				"vuepress-plugin-container": "2.1.5",
 				"vuepress-plugin-element-ui": "1.1.0",
+				"vuepress-plugin-google-analytics-4": "0.1.1",
 				"vuepress-plugin-zooming": "1.1.8",
 				"webpack": "4.46.0"
 			}
@@ -2640,26 +2640,6 @@
 				"webpack-chain": "^6.0.0"
 			}
 		},
-		"node_modules/@vuepress/plugin-google-analytics": {
-			"version": "1.9.9",
-			"resolved": "https://registry.npmjs.org/@vuepress/plugin-google-analytics/-/plugin-google-analytics-1.9.9.tgz",
-			"integrity": "sha512-GxrM4BopPqTiGAq2ku5HqInha6uQZePxdGpU8etTbM6hhaxZAev4HehrtHISAJm5dVptbFFJl3sNGQBnw2deFQ==",
-			"dev": true,
-			"dependencies": {
-				"@vuepress/types": "1.9.9"
-			}
-		},
-		"node_modules/@vuepress/plugin-google-analytics/node_modules/@vuepress/types": {
-			"version": "1.9.9",
-			"resolved": "https://registry.npmjs.org/@vuepress/types/-/types-1.9.9.tgz",
-			"integrity": "sha512-ukGW49ILzLhIc7CltHMr+BeIjWKloJNN1mrvbDz3beycp9b9kgH+DXNdRIK9QCKr4fJsy7x08vNMwZr9Nq/PTQ==",
-			"dev": true,
-			"dependencies": {
-				"@types/markdown-it": "^10.0.0",
-				"@types/webpack-dev-server": "^3",
-				"webpack-chain": "^6.0.0"
-			}
-		},
 		"node_modules/@vuepress/plugin-last-updated": {
 			"version": "1.9.8",
 			"resolved": "https://registry.npmjs.org/@vuepress/plugin-last-updated/-/plugin-last-updated-1.9.8.tgz",
@@ -17811,6 +17791,26 @@
 				"markdown-it-container": "^2.0.0"
 			}
 		},
+		"node_modules/vuepress-plugin-google-analytics-4": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/vuepress-plugin-google-analytics-4/-/vuepress-plugin-google-analytics-4-0.1.1.tgz",
+			"integrity": "sha512-7zcLXFVDiDN3MW9ASf/RrPq67QWGnYmfMl7+vVBhlr6ocBvV6jPWhVvyU0Iu0bzT9rv2HdEkDkwwsj45310skA==",
+			"dev": true,
+			"dependencies": {
+				"@vuepress/types": "1.9.9"
+			}
+		},
+		"node_modules/vuepress-plugin-google-analytics-4/node_modules/@vuepress/types": {
+			"version": "1.9.9",
+			"resolved": "https://registry.npmjs.org/@vuepress/types/-/types-1.9.9.tgz",
+			"integrity": "sha512-ukGW49ILzLhIc7CltHMr+BeIjWKloJNN1mrvbDz3beycp9b9kgH+DXNdRIK9QCKr4fJsy7x08vNMwZr9Nq/PTQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/markdown-it": "^10.0.0",
+				"@types/webpack-dev-server": "^3",
+				"webpack-chain": "^6.0.0"
+			}
+		},
 		"node_modules/vuepress-plugin-robots": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/vuepress-plugin-robots/-/vuepress-plugin-robots-1.0.1.tgz",
@@ -20879,28 +20879,6 @@
 				}
 			}
 		},
-		"@vuepress/plugin-google-analytics": {
-			"version": "1.9.9",
-			"resolved": "https://registry.npmjs.org/@vuepress/plugin-google-analytics/-/plugin-google-analytics-1.9.9.tgz",
-			"integrity": "sha512-GxrM4BopPqTiGAq2ku5HqInha6uQZePxdGpU8etTbM6hhaxZAev4HehrtHISAJm5dVptbFFJl3sNGQBnw2deFQ==",
-			"dev": true,
-			"requires": {
-				"@vuepress/types": "1.9.9"
-			},
-			"dependencies": {
-				"@vuepress/types": {
-					"version": "1.9.9",
-					"resolved": "https://registry.npmjs.org/@vuepress/types/-/types-1.9.9.tgz",
-					"integrity": "sha512-ukGW49ILzLhIc7CltHMr+BeIjWKloJNN1mrvbDz3beycp9b9kgH+DXNdRIK9QCKr4fJsy7x08vNMwZr9Nq/PTQ==",
-					"dev": true,
-					"requires": {
-						"@types/markdown-it": "^10.0.0",
-						"@types/webpack-dev-server": "^3",
-						"webpack-chain": "^6.0.0"
-					}
-				}
-			}
-		},
 		"@vuepress/plugin-last-updated": {
 			"version": "1.9.8",
 			"resolved": "https://registry.npmjs.org/@vuepress/plugin-last-updated/-/plugin-last-updated-1.9.8.tgz",
@@ -32755,6 +32733,28 @@
 				"markdown-it-container": "^2.0.0"
 			}
 		},
+		"vuepress-plugin-google-analytics-4": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/vuepress-plugin-google-analytics-4/-/vuepress-plugin-google-analytics-4-0.1.1.tgz",
+			"integrity": "sha512-7zcLXFVDiDN3MW9ASf/RrPq67QWGnYmfMl7+vVBhlr6ocBvV6jPWhVvyU0Iu0bzT9rv2HdEkDkwwsj45310skA==",
+			"dev": true,
+			"requires": {
+				"@vuepress/types": "1.9.9"
+			},
+			"dependencies": {
+				"@vuepress/types": {
+					"version": "1.9.9",
+					"resolved": "https://registry.npmjs.org/@vuepress/types/-/types-1.9.9.tgz",
+					"integrity": "sha512-ukGW49ILzLhIc7CltHMr+BeIjWKloJNN1mrvbDz3beycp9b9kgH+DXNdRIK9QCKr4fJsy7x08vNMwZr9Nq/PTQ==",
+					"dev": true,
+					"requires": {
+						"@types/markdown-it": "^10.0.0",
+						"@types/webpack-dev-server": "^3",
+						"webpack-chain": "^6.0.0"
+					}
+				}
+			}
+		},
 		"vuepress-plugin-robots": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/vuepress-plugin-robots/-/vuepress-plugin-robots-1.0.1.tgz",

package.json

@@ -40,7 +40,6 @@
 	"devDependencies": {
 		"@vuepress/plugin-active-header-links": "1.9.9",
 		"@vuepress/plugin-back-to-top": "1.9.9",
-		"@vuepress/plugin-google-analytics": "1.9.9",
 		"@vuepress/plugin-pwa": "1.9.9",
 		"babel-eslint": "10.1.0",
 		"eslint": "7.32.0",
@@ -55,6 +54,7 @@
 		"vuepress-plugin-clean-urls": "1.1.2",
 		"vuepress-plugin-container": "2.1.5",
 		"vuepress-plugin-element-ui": "1.1.0",
+		"vuepress-plugin-google-analytics-4": "0.1.1",
 		"vuepress-plugin-zooming": "1.1.8",
 		"webpack": "4.46.0"
 	}

src/.vuepress/config/plugins.js

@@ -25,9 +25,9 @@ module.exports = [
 	],
 	["@vuepress/back-to-top"],
 	[
-		"@vuepress/google-analytics",
+		"google-analytics-4",
 		{
-			ga: "UA-148212082-1",
+			gtag: "G-2CBXXM1Y86",
 		},
 	],
 	["vuepress-plugin-dehydrate"],

src/help/faq/README.md

@@ -53,7 +53,7 @@ By default, the app does not check for updates if an entry:
 
 This avoids unnecessary heavy traffic to sources. If you have entries that get infrequent or no updates, you should consider using categories and excluding them from updates.
 
-We recommend to **keep the defaults as they are** to help ensure that they continue to work. To get updates:
+We recommend to **keep the defaults as they are** to help ensure that sources continue to work. To get updates:
 
 * Mark unread chapters as read
 * Ensure that at least 1 chapter is marked read