Merge branch 'master' into v3

# Conflicts:
#	.gitignore
#	package.json
#	vite.config.ts

.gitignore

@@ -1,30 +1,23 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-types
-
-docs/.vitepress/dist
-docs/.vitepress/cache
+.DS_Store
+node_modules
 stat
 lib
-node_modules
-.DS_Store
-dist-ssr
-coverage
-*.local
+package-lock.json
+types
+docs/.vitepress/cache
 
-/cypress/videos/
-/cypress/screenshots/
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
 # Editor directories and files
-.vscode/*
-!.vscode/extensions.json
 .idea
+.vscode
 *.suo
 *.ntvs*
 *.njsproj