Skip to content

Commit

Permalink
Load module router automatically
Browse files Browse the repository at this point in the history
  • Loading branch information
José Luis Pereira committed Jul 20, 2022
1 parent 9cc1ee0 commit cb20546
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ module.exports = {
globals: {
defineEmits: true,
defineProps: true,
__APP_ENV__: true
__APP_ENV__: true,
__basedir: true
},
rules: {
'vue/no-v-html': 'off'
Expand Down
2 changes: 1 addition & 1 deletion config/vendor/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
presets: [
require('../../tailwind.config.js')
require(__basedir + '/tailwind.config.js')
]
}
1 change: 0 additions & 1 deletion src/assets/css/main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import '@/assets/css/tailwind.css';
@import 'leaflet/dist/leaflet.css';
@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,400;0,500;0,900;1,100;1,400&display=swap');
@import '@/assets/css/leaflet.scss';
@import '@/assets/css/webkit.scss';

Expand Down
5 changes: 3 additions & 2 deletions src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import {
createWebHashHistory
} from 'vue-router'

import otusRoutes from '@/modules/otus/router'
import dynamicRoutes from '~pages'

const moduleRoutes = import.meta.globEager('@/modules/**/router/*.js')
const routerObjects = [].concat(...Object.values(moduleRoutes).map(route => route.default))
const { base_url, hash_mode } = __APP_ENV__

const router = createRouter({
Expand All @@ -16,7 +17,7 @@ const router = createRouter({

routes: [
...dynamicRoutes,
...otusRoutes,
...routerObjects,
]
})

Expand Down
7 changes: 4 additions & 3 deletions vite.config.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import { defineConfig, loadEnv } from 'vite'
import { defineConfig } from 'vite'
import { loadConfiguration } from './src/utils/loadConfiguration.js'
import path from 'path'
import htmlPlugin from './src/plugins/htmlPlugin.js'
import Vue from '@vitejs/plugin-vue'
import Markdown from 'vite-plugin-md'
import Pages from 'vite-plugin-pages'

global.__basedir = process.env.PWD

export default () => {
const configuration = loadConfiguration(__dirname)

return defineConfig({
base: configuration.base_url,
define: {
__APP_ENV__: configuration,
__APP_PATH__: () => __dirname
__APP_ENV__: configuration
},
resolve: {
alias: {
Expand Down

0 comments on commit cb20546

Please sign in to comment.