Merge branch 'dev'

Author: maurop123

generator/helpers.js

@@ -2,6 +2,12 @@ const fs = require('fs')
 
 module.exports = function (api) {
   return {
+    getMain() {
+      const tsPath = api.resolve('src/main.ts')
+
+      return fs.existsSync(tsPath) ? 'src/main.ts' : 'src/main.js'
+    },
+
     updateBabelConfig (callback) {
       let config, configPath
 

generator/index.js

@@ -25,6 +25,24 @@ module.exports = (api, opts, rootOpts) => {
     })
   }
 
+  if (api.hasPlugin('electron-builder') === true) {
+    // material icons pkg for electron
+    api.extendPackage({
+      devDependencies: {
+        "material-design-icons-iconfont": "^3.0.3",
+      }
+    })
+
+    try {
+      api.injectImports(helpers.getMain(),
+        `import 'material-design-icons-iconfont/dist/material-design-icons.css'`
+      )
+    } catch(e) {
+      console.error(e)
+    }
+  }
+
+
   // Render vuetify plugin file
   api.render({
     './src/plugins/vuetify.js': './templates/default/src/plugins/vuetify.js'
@@ -115,16 +133,16 @@ module.exports = (api, opts, rootOpts) => {
       })
     }
 
-    // Add Material Icons
-    {
+    // Add Material Icons (unless electron)
+    if(api.hasPlugin('electron-builder') === false) {
       const indexPath = api.resolve('./public/index.html')
 
       let content = fs.readFileSync(indexPath, { encoding: 'utf8' })
 
       const lines = content.split(/\r?\n/g).reverse()
 
       const lastLink = lines.findIndex(line => line.match(/^\s*<link/))
-      lines[lastLink] += '\n\t\t<link href="https://fonts.googleapis.com/css?family=Roboto:100:300,400,500,700,900|Material+Icons" rel="stylesheet">'
+      lines[lastLink] += '\n    <link href="https://fonts.googleapis.com/css?family=Roboto:100:300,400,500,700,900|Material+Icons" rel="stylesheet">'
 
       content = lines.reverse().join('\n')
       fs.writeFileSync(indexPath, content, { encoding: 'utf8' })

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-plugin-vuetify",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Plugin for vue cli 3",
   "main": "index.js",
   "scripts": {