Merge branch 'dev'

Author: johnleider

.gitignore

@@ -1,4 +1,5 @@
 /node_modules/
+/dev/
 
 *.swp
 

generator/index.js

@@ -1,38 +1,36 @@
-const defaults = {
-  preset: 'configure',
-  replaceComponents: true,
-  useTheme: false,
-  useCustomProperties: false,
-  iconFont: 'md',
-  installFonts: false,
-  useAlaCarte: true,
-  usePolyfill: true,
-  locale: 'en'
-}
-
-module.exports = (api, opts, rootOpts) => {
+module.exports = (api, opts) => {
   const alaCarte = require('./tools/alaCarte')
   const fonts = require('./tools/fonts')
   const polyfill = require('./tools/polyfill')
   const vuetify = require('./tools/vuetify')
 
-  opts = opts.preset === 'default'
-    ? defaults
-    : opts
+  if (opts.preset !== 'configure') {
+    opts = require(`../presets/${opts.preset}`).plugins['vue-cli-plugin-vuetify']
+  }
 
   vuetify.addDependencies(api)
-  opts.useAlaCarte && alaCarte.addDependencies(api)
-  opts.usePolyfill && polyfill.addDependencies(api)
-  opts.installFonts && fonts.addDependencies(api, opts.iconFont)
-  opts.installFonts && fonts.addImports(api, opts.iconFont)
+
+  if (opts.useAlaCarte) {
+    alaCarte.addDependencies(api)
+  } else if (opts.usePolyfill) {
+    polyfill.addDependencies(api)
+  }
+
+  if (opts.installFonts) {
+    fonts.addDependencies(api, opts.iconFont)
+    fonts.addImports(api, opts.iconFont)
+  }
+
   vuetify.renderFiles(api, opts)
 
   // adapted from https://github.com/Akryum/vue-cli-plugin-apollo/blob/master/generator/index.js#L68-L91
   api.onCreateComplete(() => {
     vuetify.addImports(api)
-    opts.usePolyfill && polyfill.updateBabelConfig(api)
-    opts.usePolyfill && polyfill.updateBrowsersList(api)
-    opts.usePolyfill && polyfill.addImports(api)
+    if (!opts.useAlaCarte && opts.usePolyfill) {
+      polyfill.updateBabelConfig(api)
+      polyfill.updateBrowsersList(api)
+      polyfill.addImports(api)
+    }
     !opts.installFonts && fonts.addLinks(api, opts.iconFont)
     vuetify.setHtmlLang(api, opts.locale)
   })

index.js

@@ -1,12 +1,19 @@
-const VuetifyLoaderPlugin = require('vuetify-loader/lib/plugin')
-
-module.exports = (api, opts) => {
+module.exports = (api) => {
   const hasVuetifyLoader = Boolean(
     api.service.pkg.devDependencies['vuetify-loader'] ||
     api.service.pkg.dependencies['vuetify-loader']
   )
 
   if (hasVuetifyLoader) {
+    const VuetifyLoaderPlugin = require('vuetify-loader/lib/plugin')
+
+    api.chainWebpack(config => {
+      config.module
+        .rule('js')
+        .include
+          .add(api.resolve('node_modules/vuetify'))
+    })
+
     api.configureWebpack(webpackConfig => {
       webpackConfig.plugins.push(new VuetifyLoaderPlugin())
     })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-plugin-vuetify",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Plugin for Vue CLI 3",
   "main": "index.js",
   "scripts": {
@@ -25,6 +25,7 @@
   "homepage": "https://github.com/vuetifyjs/vue-cli-plugin-vuetify#readme",
   "devDependencies": {
     "@vue/cli-service": "^3.0.1",
+    "vuetify": "^1.3.1",
     "vuetify-loader": "^1.0.5"
   },
   "dependencies": {}

presets/default.json

@@ -0,0 +1,17 @@
+{
+  "useConfigFiles": true,
+  "cssPreprocessor": "scss",
+  "plugins": {
+    "vue-cli-plugin-vuetify": {
+      "preset": "configure",
+      "replaceComponents": true,
+      "iconFont": "md",
+      "installFonts": false,
+      "locale": "en",
+      "useAlaCarte": true,
+      "useCustomProperties": false,
+      "usePolyfill": false,
+      "useTheme": false
+    }
+  }
+}

presets/prototype.json

@@ -0,0 +1,17 @@
+{
+  "useConfigFiles": true,
+  "cssPreprocessor": "scss",
+  "plugins": {
+    "vue-cli-plugin-vuetify": {
+      "preset": "configure",
+      "replaceComponents": true,
+      "iconFont": "md",
+      "installFonts": true,
+      "locale": "en",
+      "useAlaCarte": false,
+      "useCustomProperties": false,
+      "usePolyfill": false,
+      "useTheme": true
+    }
+  }
+}

prompts.js

@@ -1,14 +1,22 @@
+const path = require('path')
+const resolve = file => path.resolve(__dirname, file)
+
+const iconfonts = require(resolve('./util/iconfonts.js'))
+const presets = require(resolve('./util/presets.js'))
+const locales = require(resolve('./util/locales.js'))
+
 function isCustom (answers) {
   return answers.preset === 'configure'
 }
 
 module.exports = [
   {
     name: 'preset',
+    message: 'Choose a preset:',
     type: 'list',
     choices: [
-      { name: 'default (recommended)', value: 'default' },
-      { name: 'configure', value: 'configure' }
+      ...presets,
+      { name: 'Configure (advanced)', value: 'configure' }
     ],
     default: 'default'
   },
@@ -35,23 +43,10 @@ module.exports = [
   },
   {
     name: 'iconFont',
-    type: 'rawlist',
+    type: 'list',
     message: 'Select icon font',
-    choices: [
-      'Material Icons (default)',
-      'Material Design Icons',
-      'Font Awesome 5',
-      'Font Awesome 4',
-    ],
-    default: 0,
-    filter: function (val) {
-      return {
-        'Material Icons (default)': 'md',
-        'Material Design Icons': 'mdi',
-        'Font Awesome 5': 'fa',
-        'Font Awesome 4': 'fa4',
-      }[val]
-    },
+    choices: iconfonts,
+    default: 'md',
     when: isCustom
   },
   {
@@ -73,47 +68,16 @@ module.exports = [
     type: 'confirm',
     message: 'Use babel/polyfill?',
     default: true,
-    when: isCustom
+    when: answers => {
+      return isCustom(answers) && !answers.useAlaCarte
+    }
   },
   {
     name: 'locale',
-    type: 'rawlist',
+    type: 'list',
     message: 'Select locale',
-    choices: [
-      'English (default)',
-      'Catalan',
-      'Chinese (simplified)',
-      'Chinese (traditional)',
-      'Dutch',
-      'Farsi',
-      'French',
-      'German',
-      'Greek',
-      'Polish',
-      'Portuguese',
-      'Russian',
-      'Ukrainian',
-      'Serbian (cyrillic)',
-    ],
-    default: 0,
-    filter: function (val) {
-      return {
-        'English (default)': 'en',
-        'Catalan': 'ca',
-        'Chinese (simplified)': 'zh-Hans',
-        'Chinese (traditional)': 'zh-Hant',
-        'Dutch': 'nl',
-        'Farsi': 'fa',
-        'French': 'fr',
-        'German': 'de',
-        'Greek': 'gr',
-        'Polish': 'pl',
-        'Portuguese': 'pt',
-        'Russian': 'ru',
-        'Ukrainian': 'uk',
-        'Serbian (cyrillic)': 'sr-Cyrl',
-      }[val]
-    },
+    choices: locales,
+    default: 'en',
     when: isCustom
   }
 ]

util/iconfonts.js

@@ -0,0 +1,6 @@
+module.exports = [
+  { name: 'Material Icons (default)', value: 'md' },
+  { name: 'Material Design Icons', value: 'mdi' },
+  { name: 'Font Awesome 5', value: 'fa' },
+  { name: 'Font Awesome 4', value: 'fa4' }
+]

util/locales.js

@@ -0,0 +1,28 @@
+const fs = require('fs')
+const path = require('path')
+const resolve = file => path.resolve(__dirname, file)
+
+const LOCALE_MAP = {
+  ca: 'Catalan',
+  de: 'German',
+  en: 'English (default)',
+  fa: 'Farsi',
+  gr: 'Greek',
+  fr: 'French',
+  hu: 'Hungary',
+  it: 'Italy',
+  nl: 'Dutch',
+  pl: 'Polish',
+  pt: 'Portuguese',
+  ru: 'Russian',
+  'sr-Cyrl': 'Serbian (cyrillic)',
+  uk: 'Ukrainian',
+  'zh-Hans': 'Chinese (simplified)',
+  'zh-Hant': 'Chinese (traditional)'
+}
+
+module.exports = fs.readdirSync('node_modules/vuetify/src/locale').map(locale => {
+  const value = locale.split('.').shift()
+
+  return { name: LOCALE_MAP[value], value }
+}).sort()

util/presets.js

@@ -0,0 +1,14 @@
+const fs = require('fs')
+const path = require('path')
+const resolve = file => path.resolve(__dirname, file)
+
+const PRESET_MAP = {
+  default: 'Default (recommended)',
+  prototype: 'Prototype (rapid development)'
+}
+
+module.exports = fs.readdirSync(resolve('../presets')).map(preset => {
+  const value = preset.split('.').shift()
+
+  return { name: PRESET_MAP[value], value }
+})