Skip to content

Commit cc969bd

Browse files
fix: Update template imports and don't install vuetify-loader (#243)
1 parent 46e6322 commit cc969bd

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

packages/vue-cli-plugin-vuetify/generator/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ module.exports = (api, opts) => {
1616

1717
// Add dependencies
1818
vuetify.addDependencies(api, opts.useV3)
19-
if (opts.useAlaCarte) alaCarte.addDependencies(api)
19+
if (opts.useAlaCarte) alaCarte.addDependencies(api, opts.useV3)
2020
else if (opts.usePolyfill) polyfill.addDependencies(api)
2121

22-
if (opts.installFonts) fonts.addDependencies(api, opts.iconFont, opts.useV3)
22+
if (opts.installFonts) fonts.addDependencies(api, opts.iconFont)
2323

2424
// Update vue.config.js for transpileDependency if AlaCarte
2525
if (opts.useAlaCarte) alaCarte.addVueConfigTranspileDependency(api)

packages/vue-cli-plugin-vuetify/generator/templates/v3/src/App.js.vue

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<template>
22
<v-app>
3-
<%_ if (router) { _%>
4-
<router-view/>
5-
<%_ } else { _%>
6-
<HelloWorld/>
7-
<%_ } _%>
3+
<v-main>
4+
<%_ if (router) { _%>
5+
<router-view/>
6+
<%_ } else { _%>
7+
<HelloWorld/>
8+
<%_ } _%>
9+
</v-main>
810
</v-app>
911
</template>
1012

packages/vue-cli-plugin-vuetify/generator/templates/v3/src/App.ts.vue

-11
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
import "@mdi/font/css/materialdesignicons.css";
2+
import "vuetify/lib/styles/main.sass";
23
import { createVuetify } from "vuetify";
4+
import * as components from "vuetify/lib/components";
5+
import * as directives from "vuetify/lib/directives";
36

4-
export default createVuetify();
7+
export default createVuetify({
8+
components,
9+
directives,
10+
});

packages/vue-cli-plugin-vuetify/generator/tools/alaCarte.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
function addDependencies (api) {
2-
api.extendPackage({
1+
function addDependencies (api, useV3) {
2+
let deps = {
33
devDependencies: {
4-
'vuetify-loader': '^1.7.0',
54
sass: '^1.32.0',
65
'sass-loader': '^10.0.0',
76
},
8-
})
7+
}
8+
9+
if (!useV3) deps['vuetify-loader'] = '^1.7.0'
10+
11+
api.extendPackage(deps);
912
}
1013

1114
function addVueConfigTranspileDependency (api) {

0 commit comments

Comments
 (0)