Commit 6a45e1ee authored by NGPixel's avatar NGPixel

fix: Safari/iOS const redefinition

parent 44b5a2e0
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
const colors = require('colors/safe') const colors = require('colors/safe')
const fsbx = require('fuse-box') const fsbx = require('fuse-box')
const nodemon = require('nodemon') const nodemon = require('nodemon')
const babel = require('babel-core')
const uglify = require('uglify-es')
const fs = require('fs-extra')
// ====================================================== // ======================================================
// Parse cmd arguments // Parse cmd arguments
...@@ -90,7 +93,7 @@ globalTasks.then(() => { ...@@ -90,7 +93,7 @@ globalTasks.then(() => {
fsbx.VuePlugin(), fsbx.VuePlugin(),
['.scss', fsbx.SassPlugin({ outputStyle: (dev) ? 'nested' : 'compressed' }), fsbx.CSSPlugin()], ['.scss', fsbx.SassPlugin({ outputStyle: (dev) ? 'nested' : 'compressed' }), fsbx.CSSPlugin()],
fsbx.BabelPlugin({ comments: false, presets: ['es2015'] }), fsbx.BabelPlugin({ comments: false, presets: ['es2015'] }),
fsbx.JSONPlugin(), fsbx.JSONPlugin()
/* !dev && fsbx.QuantumPlugin({ /* !dev && fsbx.QuantumPlugin({
target: 'browser', target: 'browser',
uglify: true, uglify: true,
...@@ -109,7 +112,7 @@ globalTasks.then(() => { ...@@ -109,7 +112,7 @@ globalTasks.then(() => {
}) })
} }
}) */ }) */
!dev && fsbx.UglifyESPlugin() // !dev && fsbx.UglifyESPlugin()
], ],
debug: false, debug: false,
log: true log: true
...@@ -140,6 +143,46 @@ globalTasks.then(() => { ...@@ -140,6 +143,46 @@ globalTasks.then(() => {
watch: (args.d) ? ['server'] : ['server/configure.js'], watch: (args.d) ? ['server'] : ['server/configure.js'],
env: { 'NODE_ENV': 'development' } env: { 'NODE_ENV': 'development' }
}) })
} else {
console.info(colors.yellow.bold('\nTranspiling vendor bundle...'))
let appCode = babel.transform(fs.readFileSync('./assets/js/app.js', 'utf8'), {
babelrc: false,
compact: false,
filename: 'app.js',
plugins: ['transform-object-assign']
}).code
let vendorCode = babel.transform(fs.readFileSync('./assets/js/vendor.js', 'utf8'), {
babelrc: false,
comments: false,
compact: false,
filename: 'vendor.js',
plugins: [
'transform-es2015-arrow-functions',
'transform-es2015-block-scoped-functions',
'transform-es2015-block-scoping',
'transform-es2015-classes',
'transform-es2015-computed-properties',
'transform-es2015-destructuring',
'transform-es2015-duplicate-keys',
'transform-es2015-for-of',
'transform-es2015-function-name',
'transform-es2015-literals',
'transform-es2015-object-super',
'transform-es2015-parameters',
'transform-es2015-shorthand-properties',
'transform-es2015-spread',
'transform-es2015-sticky-regex',
'transform-es2015-template-literals',
'transform-es2015-typeof-symbol',
'transform-es2015-unicode-regex'
]
}).code
console.info(colors.yellow.bold('Minifing bundles...'))
fs.writeFileSync('./assets/js/vendor.js', uglify.minify(vendorCode).code, 'utf8')
fs.writeFileSync('./assets/js/app.js', uglify.minify(appCode).code, 'utf8')
fs.writeFileSync('./assets/js/configure.js', uglify.minify(fs.readFileSync('./assets/js/configure.js', 'utf8')).code, 'utf8')
console.info(colors.green.bold('\nBUILD SUCCEEDED.'))
return true
} }
}).catch(err => { }).catch(err => {
console.error(colors.red(' X Bundle compilation failed! ' + err.message)) console.error(colors.red(' X Bundle compilation failed! ' + err.message))
......
{ {
"name": "wiki.js", "name": "wiki.js",
"version": "1.0.0", "version": "1.0.1",
"description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown", "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
"main": "install.js", "main": "install.js",
"scripts": { "scripts": {
......
{ {
"name": "wiki", "name": "wiki",
"version": "1.0.0", "version": "1.0.1",
"description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown", "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
"main": "wiki.js", "main": "wiki.js",
"scripts": { "scripts": {
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
"@panter/vue-i18next": "~0.5.0", "@panter/vue-i18next": "~0.5.0",
"babel-cli": "~6.24.1", "babel-cli": "~6.24.1",
"babel-jest": "~20.0.3", "babel-jest": "~20.0.3",
"babel-plugin-transform-object-assign": "~6.22.0",
"babel-preset-es2015": "~6.24.1", "babel-preset-es2015": "~6.24.1",
"brace": "~0.10.0", "brace": "~0.10.0",
"colors": "~1.1.2", "colors": "~1.1.2",
......
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
"target": "es5" "target": "es5"
}, },
"exclude": [ "exclude": [
"node_modules" ".fusebox",
"data",
"node_modules",
"repo"
] ]
} }
This diff was suppressed by a .gitattributes entry.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment