diff --git a/app/index.html b/app/index.html index 2a96e095..3d216c66 100644 --- a/app/index.html +++ b/app/index.html @@ -4,7 +4,7 @@ - - <%- title %> + Nginx UI
diff --git a/app/package.json b/app/package.json index 67b92ec7..ddea0e45 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,7 @@ { "name": "nginx-ui-app-next", "version": "2.0.0-beta.4", + "type": "module", "scripts": { "dev": "vite", "typecheck": "vue-tsc --noEmit", @@ -28,7 +29,7 @@ "pinia-plugin-persistedstate": "^3.0.2", "reconnecting-websocket": "^4.4.0", "sortablejs": "^1.15.0", - "vite-plugin-build-id": "^0.2.5", + "vite-plugin-build-id": "^0.2.6", "vue": "^3.3.9", "vue-github-button": "https://github.com/0xJacky/vue-github-button", "vue-router": "^4.2.5", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 75540126..36f27698 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -57,8 +57,8 @@ dependencies: specifier: ^1.15.0 version: 1.15.0 vite-plugin-build-id: - specifier: ^0.2.5 - version: 0.2.5(less@4.2.0) + specifier: ^0.2.6 + version: 0.2.6(less@4.2.0) vue: specifier: ^3.3.9 version: 3.3.9(typescript@5.3.2) @@ -1105,8 +1105,8 @@ packages: undici-types: 5.26.5 dev: false - /@types/node@20.10.1: - resolution: {integrity: sha512-T2qwhjWwGH81vUEx4EXmBKsTJRXFXNZTL4v0gi01+zyBmCwzE6TyHszqX01m+QHTEq+EZNo13NeJIdEqf+Myrg==} + /@types/node@20.10.2: + resolution: {integrity: sha512-37MXfxkb0vuIlRKHNxwCkb60PNBpR94u4efQuN4JgIAm66zfCDXGSAFCef9XUWFovX2R1ok6Z7MHhtdVXXkkIw==} dependencies: undici-types: 5.26.5 dev: false @@ -5196,13 +5196,13 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-plugin-build-id@0.2.5(less@4.2.0): - resolution: {integrity: sha512-qnCqiaMjXwDABlQjM7+x6j6vmkcpK5MFgtCyPdBzNL9XOxRl6DNw1/9KPqbuEI7+rlz102jr9XSILxbab4kU3w==} + /vite-plugin-build-id@0.2.6(less@4.2.0): + resolution: {integrity: sha512-P9Xa4FPou8LuRhEaq+vCWadHnfgOdzEjhqcm1u39zp4grZke2RRCZFPI6V/loiZBStMY40Zj8EQ35Rmnj6i9xQ==} dependencies: - '@types/node': 20.10.1 + '@types/node': 20.10.2 rimraf: 5.0.5 typescript: 5.3.2 - vite: 5.0.4(@types/node@20.10.1)(less@4.2.0) + vite: 5.0.4(@types/node@20.10.2)(less@4.2.0) transitivePeerDependencies: - less - lightningcss @@ -5277,7 +5277,7 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.0.4(@types/node@20.10.1)(less@4.2.0): + /vite@5.0.4(@types/node@20.10.2)(less@4.2.0): resolution: {integrity: sha512-RzAr8LSvM8lmhB4tQ5OPcBhpjOZRZjuxv9zO5UcxeoY2bd3kP3Ticd40Qma9/BqZ8JS96Ll/jeBX9u+LJZrhVg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -5305,7 +5305,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.10.1 + '@types/node': 20.10.2 esbuild: 0.19.7 less: 4.2.0 postcss: 8.4.31 diff --git a/app/postcss.config.js b/app/postcss.config.cjs similarity index 100% rename from app/postcss.config.js rename to app/postcss.config.cjs diff --git a/app/src/version.json b/app/src/version.json index 960207c7..f16e5ff5 100644 --- a/app/src/version.json +++ b/app/src/version.json @@ -1 +1 @@ -{"version":"2.0.0-beta.4","build_id":64,"total_build":268} \ No newline at end of file +{"version":"2.0.0-beta.4","build_id":67,"total_build":271} \ No newline at end of file diff --git a/app/tsconfig.json b/app/tsconfig.json index e74c5015..ff124ca7 100644 --- a/app/tsconfig.json +++ b/app/tsconfig.json @@ -1,20 +1,29 @@ { - "extends": "@vue/tsconfig/tsconfig.json", "compilerOptions": { "target": "ESNext", "useDefineForClassFields": true, "module": "ESNext", - "moduleResolution": "Node", - "strict": true, - "jsx": "preserve", - "sourceMap": true, - "resolveJsonModule": true, - "isolatedModules": true, - "esModuleInterop": true, "lib": [ "ESNext", - "DOM" + "DOM", + "DOM.Iterable" ], + + /* Bundler mode */ + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "preserve", + + /* Linting */ + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true, + + "esModuleInterop": true, "skipLibCheck": true, "baseUrl": ".", "paths": { diff --git a/app/tsconfig.node.json b/app/tsconfig.node.json index b8afcc8f..efe86421 100644 --- a/app/tsconfig.node.json +++ b/app/tsconfig.node.json @@ -2,7 +2,7 @@ "compilerOptions": { "composite": true, "module": "ESNext", - "moduleResolution": "Node", + "moduleResolution": "bundler", "allowSyntheticDefaultImports": true }, "include": [ diff --git a/app/version.json b/app/version.json index 960207c7..f16e5ff5 100644 --- a/app/version.json +++ b/app/version.json @@ -1 +1 @@ -{"version":"2.0.0-beta.4","build_id":64,"total_build":268} \ No newline at end of file +{"version":"2.0.0-beta.4","build_id":67,"total_build":271} \ No newline at end of file diff --git a/app/vite.config.ts b/app/vite.config.ts index d7538698..6d6d3557 100644 --- a/app/vite.config.ts +++ b/app/vite.config.ts @@ -1,10 +1,10 @@ import { URL, fileURLToPath } from 'node:url' import { defineConfig } from 'vite' import vue from '@vitejs/plugin-vue' -import { createHtmlPlugin } from 'vite-plugin-html' import Components from 'unplugin-vue-components/vite' import { AntDesignVueResolver } from 'unplugin-vue-components/resolvers' import vueJsx from '@vitejs/plugin-vue-jsx' + import vitePluginBuildId from 'vite-plugin-build-id' import svgLoader from 'vite-svg-loader' import AutoImport from 'unplugin-auto-import/vite' @@ -43,30 +43,6 @@ export default defineConfig({ vueTemplate: true, }), DefineOptions(), - createHtmlPlugin({ - minify: true, - - /** - * After writing entry here, you will not need to add script tags in `index.html`, the original tags need to be deleted - * @default src/main.ts - */ - entry: '/src/main.ts', - - /** - * If you want to store `index.html` in the specified folder, you can modify it, otherwise no configuration is required - * @default index.html - */ - template: 'index.html', - - /** - * Data that needs to be injected into the index.html ejs template - */ - inject: { - data: { - title: 'Nginx UI', - }, - }, - }), ], css: { preprocessorOptions: {