From: Haoqun Jiang Date: Fri, 28 Apr 2023 07:56:24 +0000 (+0800) Subject: fix: put css import first in entry files X-Git-Tag: v3.6.2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3d50c06dcd827170e1f53c6246ddddd7d545e27;p=thirdparty%2Fvuejs%2Fcreate-vue.git fix: put css import first in entry files So that styles in Vue components take precendence over it. Fixes #238 Thanks @lovetingyuan for reporting. --- diff --git a/template/entry/default/src/main.js b/template/entry/default/src/main.js index 90e6400b..0ac3a5ff 100644 --- a/template/entry/default/src/main.js +++ b/template/entry/default/src/main.js @@ -1,6 +1,6 @@ +import './assets/main.css' + import { createApp } from 'vue' import App from './App.vue' -import './assets/main.css' - createApp(App).mount('#app') diff --git a/template/entry/pinia/src/main.js b/template/entry/pinia/src/main.js index 8b9d201b..48dad431 100644 --- a/template/entry/pinia/src/main.js +++ b/template/entry/pinia/src/main.js @@ -1,9 +1,9 @@ +import './assets/main.css' + import { createApp } from 'vue' import { createPinia } from 'pinia' import App from './App.vue' -import './assets/main.css' - const app = createApp(App) app.use(createPinia()) diff --git a/template/entry/router-and-pinia/src/main.js b/template/entry/router-and-pinia/src/main.js index 4fb24b7e..5dcad83c 100644 --- a/template/entry/router-and-pinia/src/main.js +++ b/template/entry/router-and-pinia/src/main.js @@ -1,11 +1,11 @@ +import './assets/main.css' + import { createApp } from 'vue' import { createPinia } from 'pinia' import App from './App.vue' import router from './router' -import './assets/main.css' - const app = createApp(App) app.use(createPinia()) diff --git a/template/entry/router/src/main.js b/template/entry/router/src/main.js index eedade80..5a5dbdba 100644 --- a/template/entry/router/src/main.js +++ b/template/entry/router/src/main.js @@ -1,9 +1,9 @@ +import './assets/main.css' + import { createApp } from 'vue' import App from './App.vue' import router from './router' -import './assets/main.css' - const app = createApp(App) app.use(router)