+
{{ post.title }}
diff --git a/src/views/Category.vue b/src/pages/category.vue
similarity index 100%
rename from src/views/Category.vue
rename to src/pages/category.vue
diff --git a/src/views/Home.vue b/src/pages/index.vue
similarity index 100%
rename from src/views/Home.vue
rename to src/pages/index.vue
diff --git a/src/views/Links.vue b/src/pages/links.vue
similarity index 100%
rename from src/views/Links.vue
rename to src/pages/links.vue
diff --git a/src/views/Page.vue b/src/pages/page/[slug].vue
similarity index 100%
rename from src/views/Page.vue
rename to src/pages/page/[slug].vue
diff --git a/src/views/Post.vue b/src/pages/post/[slug].vue
similarity index 100%
rename from src/views/Post.vue
rename to src/pages/post/[slug].vue
diff --git a/src/views/Result.vue b/src/pages/post/search/index.vue
similarity index 100%
rename from src/views/Result.vue
rename to src/pages/post/search/index.vue
diff --git a/src/views/Tag.vue b/src/pages/tags.vue
similarity index 100%
rename from src/views/Tag.vue
rename to src/pages/tags.vue
diff --git a/src/router/index.ts b/src/router/index.ts
index a0c5bcbd..afe0bb0d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,70 +1,6 @@
/* eslint-disable */
import { createRouter, createWebHistory } from 'vue-router'
-import Home from '../views/Home.vue'
-
-const routes = [
- {
- path: '/',
- name: 'home',
- component: Home
- },
- {
- path: '/404',
- name: 'not-found',
- component: () => import('../views/404.vue'),
- hidden: true
- },
- {
- path: '/about',
- name: 'about',
- component: () => import('../views/About.vue')
- },
- {
- path: '/links',
- name: 'links',
- component: () => import('../views/Links.vue')
- },
- {
- path: '/categories',
- name: 'categories',
- component: () => import('../views/Category.vue')
- },
- {
- path: '/archives',
- name: 'archives',
- component: () => import('../views/Archives.vue')
- },
- {
- path: '/tags',
- name: 'tags',
- component: () => import('../views/Tag.vue')
- },
- {
- path: '/post/search',
- name: 'post-search',
- component: () => import('../views/Result.vue')
- },
- {
- path: '/post/:slug*',
- name: 'post',
- component: () => import('../views/Post.vue'),
- props: true
- },
- {
- path: '/page/:slug*',
- name: 'page',
- component: () => import('../views/Page.vue'),
- props: true
- },
- {
- path: '/result',
- name: 'result',
- component: () => import('../views/Result.vue'),
- props: true
- },
- // 404 page must be placed at the end !!!
- { path: '/:catchAll(.*)', redirect: '/404', hidden: true }
-]
+import routes from '~pages'
const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL),
diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts
index e3b39ca6..4c853ee0 100644
--- a/src/shims-vue.d.ts
+++ b/src/shims-vue.d.ts
@@ -1,3 +1,6 @@
+// vite-env.d.ts
+///
+
/* eslint-disable */
declare module '*.vue' {
import type { DefineComponent } from 'vue'
diff --git a/src/utils/comments/waline-api.ts b/src/utils/comments/waline-api.ts
index bdf0cf64..ec6fda02 100644
--- a/src/utils/comments/waline-api.ts
+++ b/src/utils/comments/waline-api.ts
@@ -8,11 +8,11 @@ import {
// @ts-expect-error
} from 'https://unpkg.com/@waline/client@v2/dist/waline.mjs'
import { cleanPath, filterHTMLContent, formatTime } from '..'
-import { PluginsData } from '@/models/ThemeConfig.class'
+import { Locales, PluginsData } from '@/models/ThemeConfig.class'
type WalinePlugin = PluginsData['waline']
interface WalineConfig extends WalinePlugin {
- lang: string
+ lang: Locales
}
interface WalineComment {
@@ -92,7 +92,7 @@ export const walineCommentViewInit = (serverURL: string, path: string) => {
export class WalineComments {
configs: Partial = {
serverURL: '',
- lang: ''
+ lang: 'en'
}
constructor({ serverURL, lang }: Partial) {
diff --git a/tsconfig.json b/tsconfig.json
index 40c562df..35f53dd4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,7 +13,13 @@
"resolveJsonModule": true,
"sourceMap": true,
"baseUrl": ".",
- "types": ["vite/client", "jest", "node", "vite-plugin-svg-icons/client"],
+ "types": [
+ "vite/client",
+ "jest",
+ "node",
+ "vite-plugin-svg-icons/client",
+ "vite-plugin-pages/client"
+ ],
"paths": {
"@/*": ["src/*"]
},
diff --git a/vite-env.d.ts b/vite-env.d.ts
new file mode 100644
index 00000000..cff98b07
--- /dev/null
+++ b/vite-env.d.ts
@@ -0,0 +1,2 @@
+// vite-env.d.ts
+///
diff --git a/vite.config.js b/vite.config.js
index 8affcaf6..3b94f4b3 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,15 +1,21 @@
-import { defineConfig, loadEnv } from 'vite';
+import { defineConfig, loadEnv } from 'vite'
import vue from '@vitejs/plugin-vue'
import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
import { createHtmlPlugin } from 'vite-plugin-html-transformer'
-
+import Pages from 'vite-plugin-pages'
import path from 'path'
// https://vitejs.dev/config/
-export default (({mode}) => {
- process.env = {...process.env, ...loadEnv(mode, process.cwd())};
- const filenamePath = process.env.VITE_MODE === 'production' ? '../layout/index.ejs' : 'index.html';
- const templatePath = process.env.VITE_MODE === 'production' ? 'templates/index_prod.html' : 'templates/index.html';
+export default ({ mode }) => {
+ process.env = { ...process.env, ...loadEnv(mode, process.cwd()) }
+ const filenamePath =
+ process.env.VITE_MODE === 'production'
+ ? '../layout/index.ejs'
+ : 'index.html'
+ const templatePath =
+ process.env.VITE_MODE === 'production'
+ ? 'templates/index_prod.html'
+ : 'templates/index.html'
return defineConfig({
build: {
@@ -17,18 +23,18 @@ export default (({mode}) => {
assetsDir: 'static',
rollupOptions: {
output: {
- assetFileNames: (assetInfo) => {
- let extType = assetInfo.name.split('.').at(1);
+ assetFileNames: assetInfo => {
+ let extType = assetInfo.name.split('.').at(1)
if (/png|jpe?g|svg|gif|tiff|bmp|ico/i.test(extType)) {
- extType = 'img';
+ extType = 'img'
}
- return `static/${extType}/[name]-[hash][extname]`;
+ return `static/${extType}/[hash][extname]`
},
- chunkFileNames: 'static/js/[name]-[hash].js',
- entryFileNames: 'static/js/[name]-[hash].js',
+ chunkFileNames: 'static/js/[hash].js',
+ entryFileNames: 'static/js/[hash].js'
},
plugins: []
- },
+ }
},
plugins: [
createSvgIconsPlugin({
@@ -47,15 +53,16 @@ export default (({mode}) => {
* custom dom id
* @default: __svg__icons__dom__
*/
- customDomId: '__svg__icons__dom__',
+ customDomId: '__svg__icons__dom__'
}),
createHtmlPlugin({
minify: true,
entry: '/src/main.ts',
filename: filenamePath,
- template: templatePath,
+ template: templatePath
}),
vue(),
+ Pages({})
],
resolve: {
alias: {
@@ -68,14 +75,14 @@ export default (({mode}) => {
'/api': {
target: 'http://localhost:4000/api',
changeOrigin: true,
- rewrite: (path) => path.replace(/^\/api/, ''),
+ rewrite: path => path.replace(/^\/api/, '')
},
'/assets': {
target: 'http://localhost:4000/assets',
changeOrigin: true,
- rewrite: (path) => path.replace(/^\/assets/, ''),
+ rewrite: path => path.replace(/^\/assets/, '')
}
}
}
})
-})
+}
diff --git a/vue.config.js b/vue.config.js
index d78bdcb6..d714a538 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -80,14 +80,14 @@ module.exports = {
config
// https://webpack.js.org/configuration/devtool/#development
- .when(process.env.NODE_ENV === 'development', (config) =>
+ .when(process.env.NODE_ENV === 'development', config =>
config.devtool('cheap-source-map')
)
- config.when(process.env.NODE_ENV !== 'development', (config) => {
+ config.when(process.env.NODE_ENV !== 'development', config => {
// htmlWebpackPlugin
// https://github.com/jantimon/html-webpack-plugin
- config.plugin('html').tap((args) => {
+ config.plugin('html').tap(args => {
args[0].filename = path.resolve(__dirname, './layout/index.ejs')
args[0].template = path.resolve(__dirname, './public/index_prod.html')
return args
@@ -127,7 +127,7 @@ module.exports = {
// CopyWebpackPlugin Configs
// https://github.com/webpack-contrib/copy-webpack-plugin
- config.plugin('copy').tap((args) => {
+ config.plugin('copy').tap(args => {
args[0][0].to = path.resolve(__dirname, './source')
args[0][0].ignore = ['.*', '*.html']
return args