Merge pull request #112 from eugene-serb/dev

Release 1.29.0
eugene-serb · Apr 20, 2024 · 203cc6e · 203cc6e
2 parents c318162 + 9213179
commit 203cc6e
Show file tree

Hide file tree

Showing 18 changed files with 416 additions and 435 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,7 +1,6 @@
 {
   "recommendations": [
     "Vue.volar",
-    "Vue.vscode-typescript-vue-plugin",
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode"
   ]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wavelovers",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "description": "Wavelovers is a vibration test tool for gamepads and mobile devices that can also turn them into vibration massagers. It has free vibration templates, template editor and manual control mode.",
   "keywords": [
     "wavelovers",
@@ -35,7 +35,7 @@
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
-    "type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
+    "type-check": "vue-tsc --build --force",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --ignore-path .gitignore",
     "lint:fix": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "format": "npx prettier --check src && npx prettier --check public",
@@ -51,24 +51,24 @@
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.10.1",
-    "@tsconfig/node18": "^18.2.4",
+    "@tsconfig/node20": "^20.1.4",
     "@types/jsdom": "^21.1.6",
-    "@types/node": "^18.19.30",
-    "@vitejs/plugin-vue": "^4.6.2",
+    "@types/node": "^20.12.7",
+    "@vitejs/plugin-vue": "^5.0.4",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
-    "@vue/eslint-config-prettier": "^8.0.0",
-    "@vue/eslint-config-typescript": "^12.0.0",
+    "@vue/eslint-config-prettier": "^9.0.0",
+    "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/test-utils": "^2.4.5",
     "@vue/tsconfig": "^0.5.1",
     "eslint": "^8.57.0",
     "eslint-plugin-vue": "^9.24.0",
-    "jsdom": "^23.2.0",
+    "jsdom": "^24.0.0",
     "npm-run-all2": "^6.1.2",
     "prettier": "^3.2.5",
     "sass": "^1.74.1",
-    "typescript": "~5.3.0",
+    "typescript": "^5.4.5",
     "vite": "^5.2.8",
     "vitest": "^1.4.0",
-    "vue-tsc": "^1.8.27"
+    "vue-tsc": "^2.0.13"
   }
 }
diff --git a/public/sitemap-internal.xml b/public/sitemap-internal.xml
@@ -2,55 +2,55 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>
     <loc>https://wavelovers.ru/</loc>
-    <lastmod>2024-04-07</lastmod>
+    <lastmod>2024-04-20</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>https://wavelovers.ru/custom</loc>
-    <lastmod>2024-04-07</lastmod>
+    <lastmod>2024-04-20</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>https://wavelovers.ru/manual</loc>
-    <lastmod>2024-04-07</lastmod>
+    <lastmod>2024-04-20</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>https://wavelovers.ru/diagnostic</loc>
-    <lastmod>2024-04-07</lastmod>
+    <lastmod>2024-04-20</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>https://wavelovers.ru/mobile</loc>
-    <lastmod>2024-04-07</lastmod>
+    <lastmod>2024-04-20</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>https://wavelovers.ru/mobile-custom</loc>
-    <lastmod>2024-04-07</lastmod>
+    <lastmod>2024-04-20</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>https://wavelovers.ru/faq</loc>
-    <lastmod>2024-04-07</lastmod>
+    <lastmod>2024-04-20</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>https://wavelovers.ru/about</loc>
-    <lastmod>2024-04-07</lastmod>
+    <lastmod>2024-04-20</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>https://wavelovers.ru/donate</loc>
-    <lastmod>2024-04-07</lastmod>
+    <lastmod>2024-04-20</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>

diff --git a/public/sitemap.xml b/public/sitemap.xml
@@ -2,6 +2,6 @@
 <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <sitemap>
     <loc>https://wavelovers.ru/sitemap-internal.xml</loc>
-    <lastmod>2024-04-07</lastmod>
+    <lastmod>2024-04-20</lastmod>
   </sitemap>
 </sitemapindex>
diff --git a/about.html → src/pages/about.html b/about.html → src/pages/about.html
@@ -88,6 +88,6 @@
         />
       </div>
     </noscript>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="../main.ts"></script>
   </body>
 </html>
diff --git a/custom.html → src/pages/custom.html b/custom.html → src/pages/custom.html
@@ -88,6 +88,6 @@
         />
       </div>
     </noscript>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="../main.ts"></script>
   </body>
 </html>
diff --git a/diagnostic.html → src/pages/diagnostic.html b/diagnostic.html → src/pages/diagnostic.html
@@ -88,6 +88,6 @@
         />
       </div>
     </noscript>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="../main.ts"></script>
   </body>
 </html>
diff --git a/donate.html → src/pages/donate.html b/donate.html → src/pages/donate.html
@@ -88,6 +88,6 @@
         />
       </div>
     </noscript>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="../main.ts"></script>
   </body>
 </html>
diff --git a/faq.html → src/pages/faq.html b/faq.html → src/pages/faq.html
@@ -88,6 +88,6 @@
         />
       </div>
     </noscript>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="../main.ts"></script>
   </body>
 </html>
diff --git a/index.html → src/pages/index.html b/index.html → src/pages/index.html
@@ -88,6 +88,6 @@
         />
       </div>
     </noscript>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="../main.ts"></script>
   </body>
 </html>
diff --git a/manual.html → src/pages/manual.html b/manual.html → src/pages/manual.html
@@ -88,6 +88,6 @@
         />
       </div>
     </noscript>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="../main.ts"></script>
   </body>
 </html>
diff --git a/mobile-custom.html → src/pages/mobile-custom.html b/mobile-custom.html → src/pages/mobile-custom.html
@@ -88,6 +88,6 @@
         />
       </div>
     </noscript>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="../main.ts"></script>
   </body>
 </html>
diff --git a/mobile.html → src/pages/mobile.html b/mobile.html → src/pages/mobile.html
@@ -88,6 +88,6 @@
         />
       </div>
     </noscript>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="../main.ts"></script>
   </body>
 </html>
diff --git a/tsconfig.app.json b/tsconfig.app.json
@@ -5,6 +5,8 @@
   "compilerOptions": {
     "composite": true,
     "noEmit": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]

diff --git a/tsconfig.node.json b/tsconfig.node.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@tsconfig/node18/tsconfig.json",
+  "extends": "@tsconfig/node20/tsconfig.json",
   "include": [
     "vite.config.*",
     "vitest.config.*",
@@ -10,6 +10,8 @@
   "compilerOptions": {
     "composite": true,
     "noEmit": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+
     "module": "ESNext",
     "moduleResolution": "Bundler",
     "types": ["node"]

diff --git a/tsconfig.vitest.json b/tsconfig.vitest.json
@@ -3,6 +3,8 @@
   "exclude": [],
   "compilerOptions": {
     "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.vitest.tsbuildinfo",
+
     "lib": [],
     "types": ["node", "jsdom"]
   }

diff --git a/vite.config.ts b/vite.config.ts
@@ -5,6 +5,10 @@ import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import vueJsx from '@vitejs/plugin-vue-jsx';
 
+const ROOT = resolve(__dirname, 'src/pages');
+const PUBLIC_DIR = resolve(__dirname, 'public');
+const OUTPUT_DIR = resolve(__dirname, 'dist');
+
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue(), vueJsx()],
@@ -13,22 +17,27 @@ export default defineConfig({
       '@': fileURLToPath(new URL('./src', import.meta.url)),
     },
   },
+  root: ROOT,
+  publicDir: PUBLIC_DIR,
   build: {
+    outDir: OUTPUT_DIR,
+    emptyOutDir: true,
+    copyPublicDir: true,
     rollupOptions: {
       input: {
-        index: resolve(__dirname, 'index.html'),
-        manual: resolve(__dirname, 'manual.html'),
-        custom: resolve(__dirname, 'custom.html'),
-        diagnostic: resolve(__dirname, 'diagnostic.html'),
-        faq: resolve(__dirname, 'faq.html'),
-        about: resolve(__dirname, 'about.html'),
-        donate: resolve(__dirname, 'donate.html'),
-        mobile: resolve(__dirname, 'mobile.html'),
-        'mobile-custom': resolve(__dirname, 'mobile-custom.html'),
+        index: resolve(ROOT, 'index.html'),
+        manual: resolve(ROOT, 'manual.html'),
+        custom: resolve(ROOT, 'custom.html'),
+        diagnostic: resolve(ROOT, 'diagnostic.html'),
+        faq: resolve(ROOT, 'faq.html'),
+        about: resolve(ROOT, 'about.html'),
+        donate: resolve(ROOT, 'donate.html'),
+        mobile: resolve(ROOT, 'mobile.html'),
+        'mobile-custom': resolve(ROOT, 'mobile-custom.html'),
       },
       output: {
         format: 'es',
-        dir: 'dist',
+        dir: OUTPUT_DIR,
         entryFileNames: '[name].js',
         assetFileNames: 'assets/[name]-[hash][extname]',
         chunkFileNames: 'chunks/[name]-[hash].js',