Skip to content
This repository was archived by the owner on May 8, 2025. It is now read-only.

fix/enh: restructured code, fixed bugs #8

Merged
merged 2 commits into from
May 8, 2018
Merged

fix/enh: restructured code, fixed bugs #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a427ff
fix/enh: restructured code, fixed bugs
nekosaur May 8, 2018
4c7783c
refactor(index): updated font addition
johnleider May 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions generator/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
const fs = require('fs')

module.exports = function (api) {
return {
updateBabelConfig (callback) {
let config, configPath

const rcPath = api.resolve('./.babelrc')
const pkgPath = api.resolve('./package.json')
if (fs.existsSync(rcPath)) {
configPath = rcPath
config = JSON.parse(fs.readFileSync(rcPath, { encoding: 'utf8' }))
config = callback(config)
} else if (fs.existsSync(pkgPath)) {
configPath = pkgPath
config = JSON.parse(fs.readFileSync(pkgPath, { encoding: 'utf8' }))

if (config.babel) {
config.babel = callback(config.babel)
} else {
// TODO: error handling here?
}
}

if (configPath) {
fs.writeFileSync(
configPath,
JSON.stringify(config, null, 2),
{ encoding: 'utf8' }
)
} else {
// TODO: handle if babel config doesn't exist
}
},

updateMain (callback) {
const tsPath = api.resolve('./src/main.ts')
const jsPath = api.resolve('./src/main.js')

const mainPath = fs.existsSync(tsPath) ? tsPath : jsPath
let content = fs.readFileSync(mainPath, { encoding: 'utf8' })

let lines = content.split(/\r?\n/g)

lines = callback(lines)

content = lines.join('\n')
fs.writeFileSync(mainPath, content, { encoding: 'utf8' })
}
}
}
168 changes: 58 additions & 110 deletions generator/index.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
module.exports = (api, opts, rootOpts) => {
const helpers = require('./helpers')(api)

api.extendPackage({
dependencies: {
vuetify: "^1.0.16"
Expand All @@ -15,99 +17,78 @@ module.exports = (api, opts, rootOpts) => {
})
}

// Handle if router exists
{
const fs = require('fs')
const routerPath = api.resolve('./src/router.js')
opts.router = fs.existsSync(routerPath)
// Render vuetify plugin file
api.render({
'./src/plugins/vuetify.js': './templates/default/src/plugins/vuetify.js'
}, opts)

// Render files if we're replacing
const fs = require('fs')
const routerPath = api.resolve('./src/router.js')
opts.router = fs.existsSync(routerPath)

if (opts.replaceComponents) {
api.render('./templates/default', { ...opts })
if (opts.replaceComponents) {
const files = {
'./src/App.vue': './templates/default/src/App.vue',
'./src/assets/logo.png': './templates/default/src/assets/logo.png'
}

if (opts.router) {
files['./src/views/Home.vue'] = './templates/default/src/views/Home.vue'
} else {
files['./src/components/HelloWorld.vue'] = './templates/default/src/components/HelloWorld.vue'
}

api.render(files, opts)
}

// adapted from https://github.com/Akryum/vue-cli-plugin-apollo/blob/master/generator/index.js#L68-L91
api.onCreateComplete(() => {
const fs = require('fs')
// Modify main.js
helpers.updateMain(src => {
const vueImportIndex = src.findIndex(line => line.match(/^import Vue/))

// Setup Vuetify import for main.js
let vuetifyLines = ''
if (opts.useAlaCarte) {
vuetifyLines += "\nimport {"
vuetifyLines += "\n Vuetify,"
vuetifyLines += "\n VApp,"
vuetifyLines += "\n VNavigationDrawer,"
vuetifyLines += "\n VFooter,"
vuetifyLines += "\n VList,"
vuetifyLines += "\n VBtn,"
vuetifyLines += "\n VIcon,"
vuetifyLines += "\n VGrid,"
vuetifyLines += "\n VToolbar,"
vuetifyLines += "\n transitions"
vuetifyLines += "\n} from 'vuetify'"
vuetifyLines += "\nimport '../node_modules/vuetify/src/stylus/app.styl'\n"
} else {
vuetifyLines += "\nimport Vuetify from 'vuetify'"
vuetifyLines += "\nimport 'vuetify/dist/vuetify.min.css'\n"
}
src.splice(vueImportIndex + 1, 0, 'import \'./plugins/vuetify\'')

if (opts.useAlaCarte || opts.useTheme) {
vuetifyLines += "\nVue.use(Vuetify, {"

if (opts.useAlaCarte) {
vuetifyLines += "\n components: {"
vuetifyLines += "\n VApp,"
vuetifyLines += "\n VNavigationDrawer,"
vuetifyLines += "\n VFooter,"
vuetifyLines += "\n VList,"
vuetifyLines += "\n VBtn,"
vuetifyLines += "\n VIcon,"
vuetifyLines += "\n VGrid,"
vuetifyLines += "\n VToolbar,"
vuetifyLines += "\n transitions"
vuetifyLines += "\n },"
}
return src
})

if (opts.useTheme) {
vuetifyLines += "\n theme: {"
vuetifyLines += "\n primary: '#ee44aa',"
vuetifyLines += "\n secondary: '#424242',"
vuetifyLines += "\n accent: '#82B1FF',"
vuetifyLines += "\n error: '#FF5252',"
vuetifyLines += "\n info: '#2196F3',"
vuetifyLines += "\n success: '#4CAF50',"
vuetifyLines += "\n warning: '#FFC107'"
vuetifyLines += "\n },"
}
// Add polyfill
if (opts.usePolyfill) {
helpers.updateBabelConfig(cfg => {
if (!cfg.presets) return

vuetifyLines += "\n})"
} else {
vuetifyLines += "\nVue.use(Vuetify)"
}
const vuePresetIndex = cfg.presets.findIndex(p => Array.isArray(p) ? p[0] === '@vue/app' : p === '@vue/app')
const isArray = Array.isArray(cfg.presets[vuePresetIndex])

// Modify main.js
{
const tsPath = api.resolve('./src/main.ts')
const jsPath = api.resolve('./src/main.js')
if (vuePresetIndex < 0) return

const mainPath = fs.existsSync(tsPath) ? tsPath : jsPath
let content = fs.readFileSync(mainPath, { encoding: 'utf8' })
if (isArray) {
cfg.presets[vuePresetIndex][1]['useBuiltIns'] = 'entry'
} else {
cfg.presets[vuePresetIndex] = [
'@vue/app',
{
useBuiltIns: 'entry'
}
]
}

const lines = content.split(/\r?\n/g).reverse()
return cfg
})

// Inject import
const lastImportIndex = lines.findIndex(line => line.match(/^import/))
lines[lastImportIndex] += vuetifyLines
// Modify app
content = lines.reverse().join('\n')
fs.writeFileSync(mainPath, content, { encoding: 'utf8' })
helpers.updateMain(src => {
if (!src.find(l => l.match(/^(import|require).*@babel\/polyfill.*$/))) {
src.unshift('import \'@babel/polyfill\'')
}

return src
})
}

// If a-la-carte, update babel
if (opts.useAlaCarte) {
let config
let configPath
function addBabelPlugin(cfg) {
helpers.updateBabelConfig(cfg => {
if (cfg.plugins === undefined) {
cfg.plugins = []
}
Expand All @@ -123,32 +104,7 @@ module.exports = (api, opts, rootOpts) => {
])

return cfg
}

const rcPath = api.resolve('./.babelrc')
if (fs.existsSync(rcPath)) {
configPath = rcPath
config = JSON.parse( fs.readFileSync(rcPath, { encoding: 'utf8' }) )
config = addBabelPlugin(config)
} else {
const pkgPath = api.resolve('./package.json')
config = JSON.parse( fs.readFileSync(pkgPath, { encoding: 'utf8' }) )

if (config.babel) {
configPath = pkgPath
config.babel = addBabelPlugin(config.babel)
}
}

if (configPath) {
fs.writeFileSync(
configPath,
JSON.stringify(config, null, 2),
{ encoding: 'utf8' }
)
} else {
// TODO handle if babel config doesn't exist
}
})
}

// Add Material Icons
Expand All @@ -160,18 +116,10 @@ module.exports = (api, opts, rootOpts) => {
const lines = content.split(/\r?\n/g).reverse()

const lastLink = lines.findIndex(line => line.match(/^\s*<link/))
lines[lastLink] += '\n<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel="stylesheet">'
lines[lastLink] += '\n\t\t<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' })
}

// Based on router option, remove unneccessary vue components
const rimraf = require('rimraf')
if (opts.router) {
rimraf( api.resolve('./src/components'), () => {})
} else {
rimraf( api.resolve('./src/views'), () => {})
}
})
}
46 changes: 46 additions & 0 deletions generator/templates/default/src/plugins/vuetify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import Vue from 'vue'
<%_ if (options.useAlaCarte) { _%>
import {
Vuetify,
VApp,
VNavigationDrawer,
VFooter,
VList,
VBtn,
VIcon,
VGrid,
VToolbar,
transitions
} from 'vuetify'
import '../node_modules/vuetify/src/stylus/app.styl'
<%_ } else { _%>
import Vuetify from 'vuetify'
import 'vuetify/dist/vuetify.min.css'
<%_ } _%>

Vue.use(Vuetify, {
<%_ if (options.useAlaCarte) { _%>
components: {
VApp,
VNavigationDrawer,
VFooter,
VList,
VBtn,
VIcon,
VGrid,
VToolbar,
transitions
},
<%_ } _%>
<%_ if (options.useTheme) { _%>
theme: {
primary: '#ee44aa',
secondary: '#424242',
accent: '#82B1FF',
error: '#FF5252',
info: '#2196F3',
success: '#4CAF50',
warning: '#FFC107'
},
<%_ } _%>
})
42 changes: 26 additions & 16 deletions prompts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
module.exports = [{
type: 'confirm',
name: 'replaceComponents',
message: 'Allow Vuetify to replace App.vue and HelloWorld.vue?',
default: true,
}, {
type: 'confirm',
name: 'useTheme',
message: 'Use custom theme?',
default: false,
}, {
type: 'confirm',
name: 'useAlaCarte',
message: 'Use a-la-carte components?',
default: false,
}]
module.exports = [
{
type: 'confirm',
name: 'replaceComponents',
message: 'Allow Vuetify to replace App.vue and HelloWorld.vue?',
default: true,
},
{
type: 'confirm',
name: 'useTheme',
message: 'Use custom theme?',
default: false,
},
{
type: 'confirm',
name: 'useAlaCarte',
message: 'Use a-la-carte components?',
default: false,
},
{
type: 'confirm',
name: 'usePolyfill',
message: 'Use babel/polyfill?',
default: true
}
]