diff --git a/.eslintrc.js b/.eslintrc.js index a15b65c..f36ff8c 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -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' diff --git a/config/vendor/tailwind.config.js b/config/vendor/tailwind.config.js index 4bb6b81..e56c9cb 100644 --- a/config/vendor/tailwind.config.js +++ b/config/vendor/tailwind.config.js @@ -1,5 +1,5 @@ module.exports = { presets: [ - require('../../tailwind.config.js') + require(__basedir + '/tailwind.config.js') ] } diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index de44874..795771f 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -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'; diff --git a/src/router/index.js b/src/router/index.js index 053367c..9cd6d0b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -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({ @@ -16,7 +17,7 @@ const router = createRouter({ routes: [ ...dynamicRoutes, - ...otusRoutes, + ...routerObjects, ] }) diff --git a/vite.config.js b/vite.config.js index 0217acd..51b4999 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,4 +1,4 @@ -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' @@ -6,14 +6,15 @@ 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: {