Merge branch 'master' into dev

Author: johnleider

index.js

@@ -1,3 +1,9 @@
+const path = require('path')
+
+function resolve (dir) {
+  return path.join(__dirname, '..', dir)
+}
+
 module.exports = (api) => {
   const hasVuetifyLoader = Boolean(
     api.service.pkg.devDependencies['vuetify-loader'] ||
@@ -7,6 +13,19 @@ module.exports = (api) => {
   if (hasVuetifyLoader) {
     const VuetifyLoaderPlugin = require('vuetify-loader/lib/plugin')
 
+    // As the vuetify-loader automatically imports the necessary Vuetify components they are not found and
+    // transpiled by Babel. Add Vuetify explicitly as a module to be transpiled.
+    if (opts.transpileDependencies.indexOf('vuetify') === -1) {
+      api.chainWebpack(config => {
+        config.module
+          .rule('js')
+            .test(/\.m?jsx?$/)
+            .include
+            .add(resolve('vuetify'))
+            .end()
+      })
+    }
+
     api.chainWebpack(config => {
       config.plugin('VuetifyLoaderPlugin')
         .use(VuetifyLoaderPlugin)

package.json

@@ -28,7 +28,7 @@
   "homepage": "https://github.com/vuetifyjs/vue-cli-plugin-vuetify#readme",
   "devDependencies": {
     "@vue/cli-service": "^3.8.0",
-    "vuetify": "^2.0.0-beta.0",
+    "vuetify": "^2.0.0",
     "vuetify-loader": "^1.2.2"
   },
   "dependencies": {}

ui/index.js

@@ -18,7 +18,7 @@ module.exports = api => {
           message: 'Locale',
           description: 'Default application language',
           default: 'en',
-          link: 'https://vuetifyjs.com/framework/internationalization#getting-started',
+          link: 'https://vuetifyjs.com/customization/internationalization',
           type: 'list',
           choices: locales
         },
@@ -27,7 +27,7 @@ module.exports = api => {
           message: 'Custom Theme',
           description: 'Specify custom theme values',
           default: false,
-          link: 'https://vuetifyjs.com/style/theme',
+          link: 'https://vuetifyjs.com/customization/theme',
           type: 'confirm'
         },
         {
@@ -84,15 +84,15 @@ module.exports = api => {
           message: 'CSS Variables',
           description: 'Create css variables from defined theme',
           default: false,
-          link: 'https://vuetifyjs.com/style/theme#options',
+          link: 'https://vuetifyjs.com/customization/theme#options',
           type: 'confirm'
         },
         {
           name: 'icons',
           message: 'Icon font',
           description: 'Application icon defaults',
           default: 'mdi',
-          link: 'https://vuetifyjs.com/framework/icons#using-custom-icons',
+          link: 'https://vuetifyjs.com/customization/icons#using-custom-icons',
           type: 'list',
           choices: iconfonts
         },
@@ -101,7 +101,7 @@ module.exports = api => {
           message: 'RTL',
           description: 'Enable Right to Left support',
           default: false,
-          link: 'https://vuetifyjs.com/framework/internationalization#rtl',
+          link: 'https://vuetifyjs.com/customization/rtl',
           type: 'confirm'
         }
       ]

yarn.lock

@@ -6875,7 +6875,7 @@ vuetify-loader@^1.2.2:
   dependencies:
     loader-utils "^1.1.0"
 
-vuetify@^2.0.0-beta.0:
+vuetify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.0.0.tgz#58c72247251412b5e804c8c38a0e12bcb736d949"
   integrity sha512-AbtHkWdvxF3QrR/xCpu2XL+KJ59Z7/KQQmbV4gPn6Q3VlQ5tXaGR4AJO1uNrvGCTlLlQxWHGcwMGOiHU7aIlqg==