diff --git a/gulpfile.js b/gulpfile.js index cefb5fc2..2c3cbae9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,49 +5,49 @@ var elixir = require('laravel-elixir'); var gutils = require('gulp-util'); elixir.config.js.browserify.transformers.push({ - name: 'vueify', + name: 'vueify', - options: { - postcss: [cssnext()] - } + options: { + postcss: [cssnext()] + } }); if (gutils.env._.indexOf('watch') > -1) { - elixir.config.js.browserify.plugins.push({ - name: "browserify-hmr", - options : {} - }); + elixir.config.js.browserify.plugins.push({ + name: "browserify-hmr", + options : {} + }); } elixir(function (mix) { - mix.browserify('main.js'); - mix.sass('app.scss'); + mix.browserify('main.js'); + mix.sass('app.scss'); - mix.copy('resources/assets/img', 'public/img') - .copy('node_modules/font-awesome/fonts', 'public/build/fonts') - .copy('resources/assets/fonts', 'public/build/fonts'); + mix.copy('resources/assets/img', 'public/img') + .copy('node_modules/font-awesome/fonts', 'public/build/fonts') + .copy('resources/assets/fonts', 'public/build/fonts'); - mix.scripts([ - 'node_modules/babel-polyfill/dist/polyfill.min.js', - 'node_modules/plyr/dist/plyr.js', - 'node_modules/rangetouch/dist/rangetouch.js', - 'resources/assets/js/libs/modernizr-custom.js' - ], 'public/js/vendors.js', './') - .styles([ - 'resources/assets/css/**/*.css', - 'node_modules/font-awesome/css/font-awesome.min.css', - 'node_modules/rangeslider.js/dist/rangeslider.css' - ], 'public/css/vendors.css', './'); + mix.scripts([ + 'node_modules/babel-polyfill/dist/polyfill.min.js', + 'node_modules/plyr/dist/plyr.js', + 'node_modules/rangetouch/dist/rangetouch.js', + 'resources/assets/js/libs/modernizr-custom.js' + ], 'public/js/vendors.js', './') + .styles([ + 'resources/assets/css/**/*.css', + 'node_modules/font-awesome/css/font-awesome.min.css', + 'node_modules/rangeslider.js/dist/rangeslider.css' + ], 'public/css/vendors.css', './'); - mix.version(['css/vendors.css', 'css/app.css', 'js/vendors.js', 'js/main.js']); + mix.version(['css/vendors.css', 'css/app.css', 'js/vendors.js', 'js/main.js']); - if (process.env.NODE_ENV !== 'production') { - mix.browserSync({ - proxy: 'koel.dev', - files: [ - elixir.config.get('public.css.outputFolder') + '/**/*.css', - elixir.config.get('public.versioning.buildFolder') + '/rev-manifest.json', - ] - }); - } + if (process.env.NODE_ENV !== 'production') { + mix.browserSync({ + proxy: 'koel.dev', + files: [ + elixir.config.get('public.css.outputFolder') + '/**/*.css', + elixir.config.get('public.versioning.buildFolder') + '/rev-manifest.json', + ] + }); + } }); diff --git a/package.json b/package.json index 922a37ff..3bf7ad9a 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "rangetouch": "0.0.9", "select": "^1.0.6", "sinon": "^1.17.2", - "vue": "^2.0.0-alpha.8", + "vue": "^2.0.0-beta.1", "vue-hot-reload-api": "^1.3.2", "vue-resource": "^0.7.0", "vueify": "^9.1.0",