Skip to content
This repository was archived by the owner on May 8, 2025. It is now read-only.

Commit 8ca4885

Browse files
chore(nightly): setup optional v3 nightly install.
1 parent cacde39 commit 8ca4885

File tree

4 files changed

+21
-10
lines changed

4 files changed

+21
-10
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ module.exports = (api, opts) => {
99
const fs = require('fs')
1010

1111
if (opts.preset !== 'configure') {
12-
opts = require(`../presets/${opts.preset}`).plugins['vue-cli-plugin-vuetify']
12+
opts = {
13+
...opts,
14+
...require(`../presets/${opts.preset}`).plugins['vue-cli-plugin-vuetify']
15+
}
1316
}
1417

1518
// Add imports
@@ -19,7 +22,7 @@ module.exports = (api, opts) => {
1922
if (opts.installFonts) opts.useV3 ? fonts.addPlugin(api, opts) : fonts.addImports(api, opts.iconFont)
2023

2124
// Add dependencies
22-
vuetify.addDependencies(api, opts.useV3)
25+
vuetify.addDependencies(api, opts)
2326
if (opts.useAlaCarte) alaCarte.addDependencies(api, opts.useV3)
2427
else if (opts.usePolyfill) polyfill.addDependencies(api)
2528

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ function addDependencies (api, useV3) {
77
},
88
}
99

10-
// @TODO temporary fix for Vuetify 3 only
11-
if (useV3) {
12-
deps.devDependencies['@vue/cli-service'] = '5.0.0-beta.7'
13-
deps.devDependencies['@vue/cli-plugin-babel'] = '5.0.0-beta.7'
14-
}
15-
1610
api.extendPackage(deps)
1711
}
1812

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
const fs = require('fs')
33
const helpers = require('./helpers')
44

5-
function addDependencies (api, v3) {
5+
function addDependencies (api, opts) {
6+
const { useV3, useNightly } = opts
67
api.extendPackage({
78
dependencies: {
8-
vuetify: v3 ? '^3.0.0-alpha.0' : '^2.4.0',
9+
vuetify: useV3 ? (useNightly ? 'npm:@vuetify/nightly@next' : '^3.0.0-alpha.0') : '^2.6.0',
910
},
1011
})
1112
}

packages/vue-cli-plugin-vuetify/prompts.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ function isCustom (answers) {
99
return answers.preset === 'configure'
1010
}
1111

12+
function isVuetify3 (answers) {
13+
return answers.preset === 'v3'
14+
}
15+
1216
module.exports = [
1317
{
1418
name: 'preset',
@@ -20,6 +24,15 @@ module.exports = [
2024
],
2125
default: 'default',
2226
},
27+
{
28+
name: 'useNightly',
29+
type: 'confirm',
30+
message: 'Would you like to install Vuetify 3 nightly build?',
31+
default: false,
32+
when: answers => {
33+
return isVuetify3(answers)
34+
}
35+
},
2336
{
2437
name: 'replaceComponents',
2538
type: 'confirm',

0 commit comments

Comments
 (0)