From 85af118f802b5dc3f16bc48ae1d66cd395c9b823 Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Thu, 4 Mar 2021 22:48:49 -0800 Subject: [PATCH 01/16] refactor(templates): clean up templates, enable router for v3. --- .../generator/templates/v3/src/App.js.vue | 2 +- .../v3/src/components/HelloWorld.js.vue | 106 +++++++++--------- .../generator/templates/v3/src/main.js | 19 ++-- .../templates/v3/src/plugins/vuetify.js | 12 +- .../v3/src/router/{router.js => index.js} | 0 .../templates/v3/src/views/Home.js.vue | 16 +-- 6 files changed, 81 insertions(+), 74 deletions(-) rename packages/vue-cli-plugin-vuetify/generator/templates/v3/src/router/{router.js => index.js} (100%) diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/App.js.vue b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/App.js.vue index b2cbd42a..27da5304 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/App.js.vue +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/App.js.vue @@ -12,7 +12,7 @@ diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js index 589a4172..1af4406f 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js @@ -1,9 +1,14 @@ -import { createApp } from "vue"; -import vuetify from "./plugins/vuetify"; -import App from "./App"; +import { createApp } from 'vue' +import vuetify from './plugins/vuetify' +import App from './App' +<_% if (router) { %_> +import router from './router' +<_% } %_> -const app = createApp(App); +const app = createApp(App) +<_% if (router) { %_> +app.use(router) +<_% } %_> +app.use(vuetify) -app.use(vuetify); - -app.mount("#app"); +app.mount('#app') diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/plugins/vuetify.js b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/plugins/vuetify.js index 207d1608..3aca3bf2 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/plugins/vuetify.js +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/plugins/vuetify.js @@ -1,10 +1,10 @@ -import "@mdi/font/css/materialdesignicons.css"; -import "vuetify/lib/styles/main.sass"; -import { createVuetify } from "vuetify"; -import * as components from "vuetify/lib/components"; -import * as directives from "vuetify/lib/directives"; +import '@mdi/font/css/materialdesignicons.css' +import 'vuetify/lib/styles/main.sass' +import { createVuetify } from 'vuetify' +import * as components from 'vuetify/lib/components' +import * as directives from 'vuetify/lib/directives' export default createVuetify({ components, directives, -}); +}) diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/router/router.js b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/router/index.js similarity index 100% rename from packages/vue-cli-plugin-vuetify/generator/templates/v3/src/router/router.js rename to packages/vue-cli-plugin-vuetify/generator/templates/v3/src/router/index.js diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/views/Home.js.vue b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/views/Home.js.vue index 1ff37bd8..44cae989 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/views/Home.js.vue +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/views/Home.js.vue @@ -5,13 +5,13 @@ From cde9d297f19ca7de6ec2ee0a85d677b0d73e53e8 Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Thu, 4 Mar 2021 22:49:19 -0800 Subject: [PATCH 02/16] feat(vite-preview): add vite preview preset. --- .../presets/preview.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 packages/vue-cli-plugin-vuetify/presets/preview.json diff --git a/packages/vue-cli-plugin-vuetify/presets/preview.json b/packages/vue-cli-plugin-vuetify/presets/preview.json new file mode 100644 index 00000000..ee164d69 --- /dev/null +++ b/packages/vue-cli-plugin-vuetify/presets/preview.json @@ -0,0 +1,19 @@ +{ + "useConfigFiles": true, + "cssPreprocessor": "scss", + "plugins": { + "vue-cli-plugin-vuetify": { + "preset": "configure", + "replaceComponents": true, + "iconFont": "mdi", + "installFonts": true, + "locale": "en", + "useAlaCarte": true, + "useCustomProperties": false, + "usePolyfill": false, + "useTheme": false, + "useV3": true, + "useVite": true + } + } +} From 693a483102730392788cb80fa044f13f986fb645 Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Thu, 4 Mar 2021 23:42:30 -0800 Subject: [PATCH 03/16] chore(templates): add vite html and config templates. --- .../v3/src/components/HelloWorld.js.vue | 6 ++++- .../templates/v3/src/index.vite.html | 16 +++++++++++++ .../generator/templates/v3/src/main.js | 10 ++++---- .../generator/templates/v3/src/vite.config.js | 23 +++++++++++++++++++ 4 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 packages/vue-cli-plugin-vuetify/generator/templates/v3/src/index.vite.html create mode 100644 packages/vue-cli-plugin-vuetify/generator/templates/v3/src/vite.config.js diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue index 45626e16..e7b88608 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue @@ -12,7 +12,11 @@

- Welcome to Vuetify V3 Alpha + <%_ if (useVite) { _%> + Welcome to Vuetify 3 + Vite Preview + <%_ } else { _%> + Welcome to Vuetify 3 Alpha + <%_ } _%>

diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/index.vite.html b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/index.vite.html new file mode 100644 index 00000000..ce8366ff --- /dev/null +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/index.vite.html @@ -0,0 +1,16 @@ + + + + + + + + Vite App + + + +

+ + + + \ No newline at end of file diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js index 1af4406f..fed8ce90 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js @@ -1,14 +1,14 @@ import { createApp } from 'vue' import vuetify from './plugins/vuetify' -import App from './App' -<_% if (router) { %_> +import App from './App.vue' +<%_ if (router) { _%> import router from './router' -<_% } %_> +<%_ } _%> const app = createApp(App) -<_% if (router) { %_> +<%_ if (router) { _%> app.use(router) -<_% } %_> +<%_ } _%> app.use(vuetify) app.mount('#app') diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/vite.config.js b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/vite.config.js new file mode 100644 index 00000000..31b29dfc --- /dev/null +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/vite.config.js @@ -0,0 +1,23 @@ +import { defineConfig } from 'vite' +import vue from '@vitejs/plugin-vue' + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [vue()], + define: { + 'process.env': {}, + }, + /* remove the need to specify .vue files https://vitejs.dev/config/#resolve-extensions + resolve: { + extensions: [ + '.js', + '.json', + '.jsx', + '.mjs', + '.ts', + '.tsx', + '.vue', + ] + }, + */ +}) \ No newline at end of file From 4ada88c574249916307682e7aacc8123da1f240b Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Thu, 4 Mar 2021 23:43:50 -0800 Subject: [PATCH 04/16] refactor(generator): install vite dependencies, replace public html file with root level html file. --- .../vue-cli-plugin-vuetify/generator/index.js | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/packages/vue-cli-plugin-vuetify/generator/index.js b/packages/vue-cli-plugin-vuetify/generator/index.js index 33f6cfa7..58adc556 100644 --- a/packages/vue-cli-plugin-vuetify/generator/index.js +++ b/packages/vue-cli-plugin-vuetify/generator/index.js @@ -4,6 +4,8 @@ module.exports = (api, opts) => { const polyfill = require('./tools/polyfill') const vuetify = require('./tools/vuetify') + const fs = require("fs") + if (opts.preset !== 'configure') { opts = require(`../presets/${opts.preset}`).plugins['vue-cli-plugin-vuetify'] } @@ -19,6 +21,28 @@ module.exports = (api, opts) => { if (opts.useAlaCarte) alaCarte.addDependencies(api, opts.useV3) else if (opts.usePolyfill) polyfill.addDependencies(api) + // Vite + if (opts.useVite) { + api.extendPackage({ + devDependencies: { + '@vitejs/plugin-vue': '^1.1.5', + 'vite': '^2.0.5', + }, + scripts: { + 'serve': 'vite preview', + 'build': 'vite build', + 'dev': 'vite', + } + }) + + const viteFiles = { + './vite.config.js': './templates/v3/src/vite.config.js', + './index.html': './templates/v3/src/index.vite.html', + } + + api.render(viteFiles, opts) + } + if (opts.installFonts) fonts.addDependencies(api, opts.iconFont) // Update vue.config.js for transpileDependency if AlaCarte @@ -36,6 +60,10 @@ module.exports = (api, opts) => { if (!opts.installFonts) fonts.addLinks(api, opts.iconFont) vuetify.setHtmlLang(api, opts.locale) + if (fs.existsSync('src/public/index.html')) { + fs.unlinkSync(api.resolve('src/public/index.html')); + } + api.exitLog('Discord community: https://community.vuetifyjs.com') api.exitLog('Github: https://github.com/vuetifyjs/vuetify') api.exitLog('Support Vuetify: https://github.com/sponsors/johnleider') From fb6196b6f5a972e8de3678af7bbf76d2d7f031cf Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Thu, 4 Mar 2021 23:45:05 -0800 Subject: [PATCH 05/16] chore(presets): add vite to preset map. --- packages/vue-cli-plugin-vuetify/util/presets.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vue-cli-plugin-vuetify/util/presets.js b/packages/vue-cli-plugin-vuetify/util/presets.js index 8dce80f0..8b38f22f 100644 --- a/packages/vue-cli-plugin-vuetify/util/presets.js +++ b/packages/vue-cli-plugin-vuetify/util/presets.js @@ -5,7 +5,8 @@ const resolve = file => path.resolve(__dirname, file) const PRESET_MAP = { default: 'Default (recommended)', prototype: 'Prototype (rapid development)', - v3: 'V3 (alpha)' + v3: 'V3 (alpha)', + preview: 'Preview (v3 + vite)', } module.exports = fs.readdirSync(resolve('../presets')).map(preset => { From f66479e0d622bd17618cee7cb002af7ca57dfe77 Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Thu, 4 Mar 2021 23:46:58 -0800 Subject: [PATCH 06/16] chore(tools): remove comments. --- packages/vue-cli-plugin-vuetify/generator/tools/vuetify.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vue-cli-plugin-vuetify/generator/tools/vuetify.js b/packages/vue-cli-plugin-vuetify/generator/tools/vuetify.js index e47332ac..38551dd0 100644 --- a/packages/vue-cli-plugin-vuetify/generator/tools/vuetify.js +++ b/packages/vue-cli-plugin-vuetify/generator/tools/vuetify.js @@ -4,7 +4,6 @@ const helpers = require('./helpers') function addDependencies (api, v3) { api.extendPackage({ dependencies: { - // Will currently prompt to select version for v3 preset, until v3 is released. vuetify: v3 ? '^3.0.0-alpha.0' : '^2.4.0', }, }) From cb462dc3a267d5a7b34d32d61e384bcafced42ca Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Thu, 4 Mar 2021 23:59:06 -0800 Subject: [PATCH 07/16] refactor(preset-map); update vite val. --- packages/vue-cli-plugin-vuetify/util/presets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-cli-plugin-vuetify/util/presets.js b/packages/vue-cli-plugin-vuetify/util/presets.js index 8b38f22f..064ad6d8 100644 --- a/packages/vue-cli-plugin-vuetify/util/presets.js +++ b/packages/vue-cli-plugin-vuetify/util/presets.js @@ -4,9 +4,9 @@ const resolve = file => path.resolve(__dirname, file) const PRESET_MAP = { default: 'Default (recommended)', + preview: 'Preview (vuetify 3 + vite)', prototype: 'Prototype (rapid development)', v3: 'V3 (alpha)', - preview: 'Preview (v3 + vite)', } module.exports = fs.readdirSync(resolve('../presets')).map(preset => { From 6a1bf87d1c7fdc474db2b8095f375532dbc71cdc Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Fri, 5 Mar 2021 00:36:26 -0800 Subject: [PATCH 08/16] fix(templates): correct hello world cmp name. update router conditional. --- .../v3/src/components/HelloWorld.js.vue | 2 +- .../generator/templates/v3/src/main.js | 6 ++++++ .../generator/tools/vite.js | 19 +++++++++++++++++++ .../generator/tools/vuetify.js | 2 ++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/vue-cli-plugin-vuetify/generator/tools/vite.js diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue index e7b88608..1ae043fd 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue @@ -99,7 +99,7 @@ import logo from '../assets/logo.svg'; export default { - name: 'Playground', + name: 'HelloWorld', data: () => ({ ecosystem: [ diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js index fed8ce90..52d72fe1 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/main.js @@ -4,11 +4,17 @@ import App from './App.vue' <%_ if (router) { _%> import router from './router' <%_ } _%> +<%_ if (store) { _%> +import store from './store' +<%_ } _%> const app = createApp(App) <%_ if (router) { _%> app.use(router) <%_ } _%> +<%_ if (store) { _%> +app.use(store) +<%_ } _%> app.use(vuetify) app.mount('#app') diff --git a/packages/vue-cli-plugin-vuetify/generator/tools/vite.js b/packages/vue-cli-plugin-vuetify/generator/tools/vite.js new file mode 100644 index 00000000..1992f6ba --- /dev/null +++ b/packages/vue-cli-plugin-vuetify/generator/tools/vite.js @@ -0,0 +1,19 @@ +const fs = require('fs'); + +function addDependencies(api) { + api.extendPackage({ + devDependencies: { + '@vitejs/plugin-vue': '^1.1.5', + '@vitejs/plugin-vue': '^1.1.5', + }, + scripts: { + 'serve': 'vite preview', + 'build': 'vite build', + 'dev': 'vite', + } + }) +} + +function renderFiles(api, opts) { + fs.unlinkSync('./src/') +} \ No newline at end of file diff --git a/packages/vue-cli-plugin-vuetify/generator/tools/vuetify.js b/packages/vue-cli-plugin-vuetify/generator/tools/vuetify.js index 38551dd0..1d55f60b 100644 --- a/packages/vue-cli-plugin-vuetify/generator/tools/vuetify.js +++ b/packages/vue-cli-plugin-vuetify/generator/tools/vuetify.js @@ -30,7 +30,9 @@ function renderFiles (api, { opts }) { // Render files if we're replacing const fs = require('fs') const routerPath = api.resolve(`./src/router.${ext}`) + const storePath = api.resolve(`./src/store.${ext}`) opts.router = fs.existsSync(routerPath) + opts.store = fs.existsSync(storePath) let files = { "./src/App.vue": `../templates/default/src/App.${ext}.vue`, From 7818569d44c54bbbc0a470c9dc2a441d28234a4d Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Fri, 5 Mar 2021 00:39:13 -0800 Subject: [PATCH 09/16] chore(tools): remove unused file. --- .../generator/tools/vite.js | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 packages/vue-cli-plugin-vuetify/generator/tools/vite.js diff --git a/packages/vue-cli-plugin-vuetify/generator/tools/vite.js b/packages/vue-cli-plugin-vuetify/generator/tools/vite.js deleted file mode 100644 index 1992f6ba..00000000 --- a/packages/vue-cli-plugin-vuetify/generator/tools/vite.js +++ /dev/null @@ -1,19 +0,0 @@ -const fs = require('fs'); - -function addDependencies(api) { - api.extendPackage({ - devDependencies: { - '@vitejs/plugin-vue': '^1.1.5', - '@vitejs/plugin-vue': '^1.1.5', - }, - scripts: { - 'serve': 'vite preview', - 'build': 'vite build', - 'dev': 'vite', - } - }) -} - -function renderFiles(api, opts) { - fs.unlinkSync('./src/') -} \ No newline at end of file From 3d85e7c5667eeb5c554776c8e2a9a00608d66700 Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Sat, 6 Mar 2021 20:51:09 -0800 Subject: [PATCH 10/16] style(generator): spacing. Co-authored-by: John Leider <9064066+johnleider@users.noreply.github.com> --- packages/vue-cli-plugin-vuetify/generator/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vue-cli-plugin-vuetify/generator/index.js b/packages/vue-cli-plugin-vuetify/generator/index.js index 58adc556..682bcf1a 100644 --- a/packages/vue-cli-plugin-vuetify/generator/index.js +++ b/packages/vue-cli-plugin-vuetify/generator/index.js @@ -29,9 +29,9 @@ module.exports = (api, opts) => { 'vite': '^2.0.5', }, scripts: { - 'serve': 'vite preview', - 'build': 'vite build', - 'dev': 'vite', + 'serve': 'vite preview', + 'build': 'vite build', + 'dev': 'vite', } }) From 90c75513d3f2864e544d90cc5d1fc65bd62b3487 Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Sat, 6 Mar 2021 20:52:55 -0800 Subject: [PATCH 11/16] style(templates): remove div title Co-authored-by: John Leider <9064066+johnleider@users.noreply.github.com> --- .../generator/templates/v3/src/components/HelloWorld.js.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue index 1ae043fd..0ad950ce 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue @@ -12,11 +12,7 @@

- <%_ if (useVite) { _%> - Welcome to Vuetify 3 + Vite Preview - <%_ } else { _%> - Welcome to Vuetify 3 Alpha - <%_ } _%> +
Welcome to the Vuetify 3 Alpha

From 61cd42c8d2cdf591882099e137fffdd0d5399d74 Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Sat, 6 Mar 2021 20:53:36 -0800 Subject: [PATCH 12/16] chore(template): add conditional title.. Co-authored-by: John Leider <9064066+johnleider@users.noreply.github.com> --- .../generator/templates/v3/src/components/HelloWorld.js.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue index 0ad950ce..4076fb30 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue @@ -15,6 +15,10 @@

Welcome to the Vuetify 3 Alpha
+<%_ if (useVite) { _%> + Vite Preview +<%_ } _%> +

For help and collaboration with other Vuetify developers,
please join our online From 6255f7beb9bb53b46bc7e25f9bfffe8e3d912bad Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Sat, 6 Mar 2021 20:54:22 -0800 Subject: [PATCH 13/16] style(vite-config): remove spacing Co-authored-by: John Leider <9064066+johnleider@users.noreply.github.com> --- .../generator/templates/v3/src/vite.config.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/vite.config.js b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/vite.config.js index 31b29dfc..2415a28a 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/vite.config.js +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/vite.config.js @@ -4,9 +4,7 @@ import vue from '@vitejs/plugin-vue' // https://vitejs.dev/config/ export default defineConfig({ plugins: [vue()], - define: { - 'process.env': {}, - }, + define: { 'process.env': {} }, /* remove the need to specify .vue files https://vitejs.dev/config/#resolve-extensions resolve: { extensions: [ @@ -20,4 +18,4 @@ export default defineConfig({ ] }, */ -}) \ No newline at end of file +}) From 72dccffc0b64651ea53038f138826971e78871ab Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Sat, 6 Mar 2021 21:26:46 -0800 Subject: [PATCH 14/16] style(presets): fix casing. Co-authored-by: John Leider <9064066+johnleider@users.noreply.github.com> --- packages/vue-cli-plugin-vuetify/util/presets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-cli-plugin-vuetify/util/presets.js b/packages/vue-cli-plugin-vuetify/util/presets.js index 064ad6d8..bf2a2d7c 100644 --- a/packages/vue-cli-plugin-vuetify/util/presets.js +++ b/packages/vue-cli-plugin-vuetify/util/presets.js @@ -4,7 +4,7 @@ const resolve = file => path.resolve(__dirname, file) const PRESET_MAP = { default: 'Default (recommended)', - preview: 'Preview (vuetify 3 + vite)', + preview: 'Preview (Vuetify 3 + Vite)', prototype: 'Prototype (rapid development)', v3: 'V3 (alpha)', } From 8f1cf2df93e94edc0bf4e0025c2b31bce3dc9a07 Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Sat, 6 Mar 2021 21:27:30 -0800 Subject: [PATCH 15/16] chore(preview): Update index.html title. Co-authored-by: John Leider <9064066+johnleider@users.noreply.github.com> --- .../generator/templates/v3/src/index.vite.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/index.vite.html b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/index.vite.html index ce8366ff..fbe8dcbf 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/index.vite.html +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/index.vite.html @@ -5,7 +5,7 @@ - Vite App + Vuetify 3 Vite Preview @@ -13,4 +13,4 @@ - \ No newline at end of file + From 5298d907a273e7a7ee1e8447d619aa9baa688d86 Mon Sep 17 00:00:00 2001 From: Elijah Kotyluk Date: Sat, 6 Mar 2021 21:28:10 -0800 Subject: [PATCH 16/16] chore(v3): fix introduction link, remove specified locale. Co-authored-by: John Leider <9064066+johnleider@users.noreply.github.com> --- .../generator/templates/v3/src/components/HelloWorld.js.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue index 4076fb30..e0ce7ee6 100644 --- a/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue +++ b/packages/vue-cli-plugin-vuetify/generator/templates/v3/src/components/HelloWorld.js.vue @@ -142,7 +142,7 @@ export default { }, { text: 'Roadmap', - href: 'https://vuetifyjs.com/en/introduction/roadmap/', + href: 'https://vuetifyjs.com/introduction/roadmap/', }, { text: 'Frequently Asked Questions',