fix: locale location (js/ts)

Author: jacekkarczmarczyk

generator/templates/default/src/plugins/vuetify.js

@@ -1,60 +1,60 @@
-import Vue from 'vue'
-<%_ if (useAlaCarte) { _%>
-import {
-  Vuetify,
-  VApp,
-  VNavigationDrawer,
-  VFooter,
-  VList,
-  VBtn,
-  VIcon,
-  VGrid,
-  VToolbar,
-  transitions
-} from 'vuetify'
-import 'vuetify/src/stylus/app.styl'
-<%_ } else { _%>
-import Vuetify from 'vuetify'
-import 'vuetify/dist/vuetify.min.css'
-<%_ } _%>
-<%_ if (locale !== 'en') { _%>
-import <%= locale.replace(/-/g, '') %> from 'vuetify/src/locale/<%= locale %>'
-<%_ } _%>
-
-Vue.use(Vuetify, {
-<%_ if (useAlaCarte) { _%>
-  components: {
-    VApp,
-    VNavigationDrawer,
-    VFooter,
-    VList,
-    VBtn,
-    VIcon,
-    VGrid,
-    VToolbar,
-    transitions
-  },
-<%_ } _%>
-<%_ if (useTheme) { _%>
-  theme: {
-    primary: '#ee44aa',
-    secondary: '#424242',
-    accent: '#82B1FF',
-    error: '#FF5252',
-    info: '#2196F3',
-    success: '#4CAF50',
-    warning: '#FFC107'
-  },
-<%_ } _%>
-<%_ if (useCustomProperties) { _%>
-  customProperties: true,
-<%_ } _%>
-  iconfont: '<%= iconFont %>',
-<%_ if (locale !== 'en') { _%>
-  lang: {
-    locales: { <%= locale.replace(/-/g, '') %> },
-    current: '<%= locale %>'
-  },
-<%_ } _%>
-})
-
+import Vue from 'vue'
+<%_ if (useAlaCarte) { _%>
+import {
+  Vuetify,
+  VApp,
+  VNavigationDrawer,
+  VFooter,
+  VList,
+  VBtn,
+  VIcon,
+  VGrid,
+  VToolbar,
+  transitions
+} from 'vuetify'
+import 'vuetify/src/stylus/app.styl'
+<%_ } else { _%>
+import Vuetify from 'vuetify'
+import 'vuetify/dist/vuetify.min.css'
+<%_ } _%>
+<%_ if (locale !== 'en') { _%>
+import <%= locale.replace(/-/g, '') %> from 'vuetify/<%= typescript ? 'src' : 'es5' %>/locale/<%= locale %>'
+<%_ } _%>
+
+Vue.use(Vuetify, {
+<%_ if (useAlaCarte) { _%>
+  components: {
+    VApp,
+    VNavigationDrawer,
+    VFooter,
+    VList,
+    VBtn,
+    VIcon,
+    VGrid,
+    VToolbar,
+    transitions
+  },
+<%_ } _%>
+<%_ if (useTheme) { _%>
+  theme: {
+    primary: '#ee44aa',
+    secondary: '#424242',
+    accent: '#82B1FF',
+    error: '#FF5252',
+    info: '#2196F3',
+    success: '#4CAF50',
+    warning: '#FFC107'
+  },
+<%_ } _%>
+<%_ if (useCustomProperties) { _%>
+  customProperties: true,
+<%_ } _%>
+  iconfont: '<%= iconFont %>',
+<%_ if (locale !== 'en') { _%>
+  lang: {
+    locales: { <%= locale.replace(/-/g, '') %> },
+    current: '<%= locale %>'
+  },
+<%_ } _%>
+})
+

generator/templates/default/src/plugins/vuetify.ts

@@ -10,9 +10,13 @@ function addDependencies (api) {
 
 function renderFiles (api, opts) {
   const pluginFilename = api.hasPlugin('typescript') ? 'vuetify.ts' : 'vuetify.js'
+  const pluginSourceFilename = 'vuetify.js'
   api.render({
-    [`./src/plugins/${pluginFilename}`]: `../templates/default/src/plugins/${pluginFilename}`
-  }, opts)
+    [`./src/plugins/${pluginFilename}`]: `../templates/default/src/plugins/${pluginSourceFilename}`
+  }, {
+    ...opts,
+    typescript: api.hasPlugin('typescript')
+  })
 
   // Render files if we're replacing
   const fs = require('fs')