chore: Updated fusebox scripts

pull/107/head
NGPixel 8 years ago
parent 9e801548e0
commit 8f974a3ac7

@ -30,17 +30,12 @@ const args = require('yargs')
describe: 'Start in Configure Developer mode', describe: 'Start in Configure Developer mode',
type: 'boolean' type: 'boolean'
}) })
.option('i', {
alias: 'inspect',
describe: 'Enable Inspector for debugging',
type: 'boolean',
implies: 'd'
})
.help('h') .help('h')
.alias('h', 'help') .alias('h', 'help')
.argv .argv
let mode = 'build' let mode = 'build'
const dev = args.d || args.c
if (args.d) { if (args.d) {
console.info(colors.bgWhite.black(' Starting Fuse in DEVELOPER mode... ')) console.info(colors.bgWhite.black(' Starting Fuse in DEVELOPER mode... '))
mode = 'dev' mode = 'dev'
@ -51,31 +46,6 @@ if (args.d) {
console.info(colors.bgWhite.black(' Starting Fuse in BUILD mode... ')) console.info(colors.bgWhite.black(' Starting Fuse in BUILD mode... '))
} }
// ======================================================
// Define aliases / shims
// ======================================================
const ALIASES = {
'brace-ext-modelist': 'brace/ext/modelist.js',
'simplemde': 'simplemde/dist/simplemde.min.js',
'socket.io-client': 'socket.io-client/dist/socket.io.min.js',
'vue': 'vue/dist/vue.min.js'
}
const SHIMS = {
_preinit: {
source: '.build/_preinit.js',
exports: '_preinit'
},
jquery: {
source: 'node_modules/jquery/dist/jquery.js',
exports: '$'
},
mathjax: {
source: 'node_modules/mathjax/MathJax.js',
exports: 'MathJax'
}
}
// ====================================================== // ======================================================
// Global Tasks // Global Tasks
// ====================================================== // ======================================================
@ -169,6 +139,12 @@ let globalTasks = Promise.mapSeries([
}).then(() => { }).then(() => {
return fs.outputFileAsync('./.build/_preinit.js', preInitContent, 'utf8') return fs.outputFileAsync('./.build/_preinit.js', preInitContent, 'utf8')
}) })
},
/**
* Delete Fusebox cache
*/
() => {
return fs.emptyDirAsync('./.fusebox')
} }
], f => { return f() }) ], f => { return f() })
@ -176,129 +152,83 @@ let globalTasks = Promise.mapSeries([
// Fuse Tasks // Fuse Tasks
// ====================================================== // ======================================================
let fuse const ALIASES = {
'brace-ext-modelist': 'brace/ext/modelist.js',
'simplemde': 'simplemde/dist/simplemde.min.js',
'socket.io-client': 'socket.io-client/dist/socket.io.js',
'vue': 'vue/dist/vue.min.js'
}
const SHIMS = {
_preinit: {
source: '.build/_preinit.js',
exports: '_preinit'
},
jquery: {
source: 'node_modules/jquery/dist/jquery.js',
exports: '$'
},
mathjax: {
source: 'node_modules/mathjax/MathJax.js',
exports: 'MathJax'
}
}
globalTasks.then(() => { globalTasks.then(() => {
switch (mode) { let fuse = fsbx.FuseBox.init({
// ============================================= homeDir: './client',
// DEVELOPER MODE output: './assets/js/$name.min.js',
// ============================================= alias: ALIASES,
case 'dev': shim: SHIMS,
// Client plugins: [
fsbx.EnvPlugin({ NODE_ENV: (dev) ? 'development' : 'production' }),
fuse = fsbx.FuseBox.init({ fsbx.VuePlugin(),
homeDir: './client', [ '.scss', fsbx.SassPlugin({ outputStyle: (dev) ? 'nested' : 'compressed' }), fsbx.CSSPlugin() ],
output: './assets/js/$name.min.js', fsbx.BabelPlugin({ comments: false, presets: ['es2015'] }),
alias: ALIASES, fsbx.JSONPlugin(),
shim: SHIMS, !dev && fsbx.UglifyJSPlugin({
plugins: [ compress: { unused: false },
fsbx.VuePlugin(), output: { 'max_line_len': 1000000 }
[ '.scss', fsbx.SassPlugin(), fsbx.CSSPlugin() ],
fsbx.BabelPlugin({ comments: false, presets: ['es2015'] }),
fsbx.JSONPlugin()
],
debug: false,
log: true
})
fuse.dev({
port: 4444,
httpServer: false
}) })
],
debug: false,
log: true
})
fuse.bundle('bundle') if (dev) {
.instructions('> index.js') fuse.dev({
.watch() port: 4444,
httpServer: false
})
}
fuse.run().then(() => { const bundleLibs = fuse.bundle('libs').instructions('~ index.js')
nodemon({ const bundleApp = fuse.bundle('app').instructions('!> index.js')
exec: (args.i) ? 'node --inspect server' : 'node server', const bundleSetup = fuse.bundle('configure').instructions('> configure.js')
ignore: ['assets/', 'client/', 'data/', 'repo/', 'tests/'],
ext: 'js json',
watch: ['server'],
env: { 'NODE_ENV': 'development' }
})
})
switch (mode) {
case 'dev':
bundleLibs.watch()
bundleApp.watch()
break break
// =============================================
// CONFIGURE - DEVELOPER MODE
// =============================================
case 'dev-configure': case 'dev-configure':
// Client bundleSetup.watch()
fuse = fsbx.FuseBox.init({
homeDir: './client',
output: './assets/js/$name.min.js',
alias: ALIASES,
shim: SHIMS,
plugins: [
[ '.scss', fsbx.SassPlugin(), fsbx.CSSPlugin() ],
fsbx.BabelPlugin({ comments: false, presets: ['es2015'] }),
fsbx.JSONPlugin()
],
debug: false,
log: true
})
fuse.dev({
port: 4444,
httpServer: false
})
fuse.bundle('configure')
.instructions('> configure.js')
.watch()
fuse.run().then(() => {
nodemon({
exec: 'node wiki configure',
ignore: ['assets/', 'client/', 'data/', 'repo/', 'tests/'],
ext: 'js json',
watch: ['server/configure.js'],
env: { 'NODE_ENV': 'development' }
})
})
break break
// ============================================= }
// BUILD ONLY MODE
// =============================================
case 'build':
fuse = fsbx.FuseBox.init({
homeDir: './client',
output: './assets/js/$name.min.js',
alias: ALIASES,
shim: SHIMS,
plugins: [
fsbx.EnvPlugin({ NODE_ENV: 'production' }),
fsbx.VuePlugin(),
[ '.scss', fsbx.SassPlugin({ outputStyle: 'compressed' }), fsbx.CSSPlugin() ],
fsbx.BabelPlugin({
config: {
comments: false,
presets: ['es2015']
}
}),
fsbx.JSONPlugin(),
fsbx.UglifyJSPlugin({
compress: { unused: false },
output: { 'max_line_len': 1000000 }
})
],
debug: false,
log: true
})
fuse.bundle('bundle').instructions('> index.js') fuse.run().then(() => {
fuse.bundle('configure').instructions('> configure.js') console.info(colors.green.bold('\nAssets compilation + bundling completed.'))
fuse.run().then(() => { if (dev) {
console.info(colors.green.bold('\nAssets compilation + bundling completed.')) nodemon({
}).catch(err => { exec: (args.d) ? 'node server' : 'node wiki configure',
console.error(colors.red(' X Bundle compilation failed! ' + err.message)) ignore: ['assets/', 'client/', 'data/', 'repo/', 'tests/'],
process.exit(1) ext: 'js json',
watch: (args.d) ? ['server'] : ['server/configure.js'],
env: { 'NODE_ENV': 'development' }
}) })
break }
} }).catch(err => {
console.error(colors.red(' X Bundle compilation failed! ' + err.message))
process.exit(1)
})
}) })

@ -6,6 +6,7 @@
"scripts": { "scripts": {
"start": "node wiki start", "start": "node wiki start",
"stop": "node wiki stop", "stop": "node wiki stop",
"restart": "node wiki restart",
"build": "node fuse", "build": "node fuse",
"dev": "node fuse -d", "dev": "node fuse -d",
"dev-configure": "node fuse -c", "dev-configure": "node fuse -c",

@ -44,8 +44,7 @@ const Promise = require('bluebird')
const fs = Promise.promisifyAll(require('fs-extra')) const fs = Promise.promisifyAll(require('fs-extra'))
const klaw = require('klaw') const klaw = require('klaw')
const Cron = require('cron').CronJob const Cron = require('cron').CronJob
const i18nextBackend = require('i18next-node-fs-backend') const i18nBackend = require('i18next-node-fs-backend')
const i18nextMw = require('i18next-express-middleware')
const entryHelper = require('./helpers/entry') const entryHelper = require('./helpers/entry')
@ -54,15 +53,14 @@ const entryHelper = require('./helpers/entry')
// ---------------------------------------- // ----------------------------------------
global.lang global.lang
.use(i18nextBackend) .use(i18nBackend)
.use(i18nextMw.LanguageDetector)
.init({ .init({
load: 'languageOnly', load: 'languageOnly',
ns: ['common', 'errors', 'git'], ns: ['common', 'admin', 'auth', 'errors', 'git'],
defaultNS: 'common', defaultNS: 'common',
saveMissing: false, saveMissing: false,
supportedLngs: ['en', 'fr'], preload: [appconfig.lang],
preload: ['en', 'fr'], lng: appconfig.lang,
fallbackLng: 'en', fallbackLng: 'en',
backend: { backend: {
loadPath: path.join(SERVERPATH, 'locales/{{lng}}/{{ns}}.json') loadPath: path.join(SERVERPATH, 'locales/{{lng}}/{{ns}}.json')

@ -18,7 +18,8 @@ html(data-logic='login')
link(rel='manifest', href='/manifest.json') link(rel='manifest', href='/manifest.json')
// JS / CSS // JS / CSS
script(type='text/javascript', src='/js/bundle.min.js') script(type='text/javascript', src='/js/libs.min.js')
script(type='text/javascript', src='/js/app.min.js')
body body
#bg #bg

@ -18,7 +18,8 @@ html(data-logic='error')
link(rel='manifest', href='/manifest.json') link(rel='manifest', href='/manifest.json')
// JS / CSS // JS / CSS
script(type='text/javascript', src='/js/bundle.min.js') script(type='text/javascript', src='/js/libs.min.js')
script(type='text/javascript', src='/js/app.min.js')
body(class='is-forbidden') body(class='is-forbidden')
.container .container

@ -18,7 +18,8 @@ html(data-logic='error')
link(rel='manifest', href='/manifest.json') link(rel='manifest', href='/manifest.json')
// JS / CSS // JS / CSS
script(type='text/javascript', src='/js/bundle.min.js') script(type='text/javascript', src='/js/libs.min.js')
script(type='text/javascript', src='/js/app.min.js')
body(class='is-notexist') body(class='is-notexist')
.container .container

@ -18,7 +18,8 @@ html(data-logic='error')
link(rel='manifest', href='/manifest.json') link(rel='manifest', href='/manifest.json')
// JS / CSS // JS / CSS
script(type='text/javascript', src='/js/bundle.min.js') script(type='text/javascript', src='/js/libs.min.js')
script(type='text/javascript', src='/js/app.min.js')
body(class='is-error') body(class='is-error')
.container .container

@ -18,7 +18,8 @@ html
link(rel='manifest', href='/manifest.json') link(rel='manifest', href='/manifest.json')
// JS / CSS // JS / CSS
script(type='text/javascript', src='/js/bundle.min.js') script(type='text/javascript', src='/js/libs.min.js')
script(type='text/javascript', src='/js/app.min.js')
block head block head

Loading…
Cancel
Save