Skip to content

Commit

Permalink
Move to elixir 6.0 + webpack combo.
Browse files Browse the repository at this point in the history
Signed-off-by: crynobone <crynobone@gmail.com>
  • Loading branch information
crynobone committed Jul 12, 2016
1 parent 97810e8 commit 78217f5
Show file tree
Hide file tree
Showing 11 changed files with 1,562 additions and 2,636 deletions.
8 changes: 3 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
var dir, elixir = require('laravel-elixir');

require('laravel-elixir-vue');

/*
|--------------------------------------------------------------------------
| Elixir Asset Management
Expand All @@ -13,10 +15,6 @@ var dir, elixir = require('laravel-elixir');

dir = require('./paths.js')

elixir.config.js.browserify.transformers.push({
name: 'vueify'
})

elixir.config.sourcemaps = false

elixir(function(mix) {
Expand All @@ -30,7 +28,7 @@ elixir(function(mix) {
paths: [dir.vendor]
})

mix.browserify('orchestra.js', dir.asset.js+'/orchestra.js', dir.js)
mix.webpack('orchestra.js', dir.asset.js+'/orchestra.js', dir.js)

mix.styles([
'vendor.css'
Expand Down
30 changes: 15 additions & 15 deletions gulpfile.vendor.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ elixir(function(mix) {
.copy(dir.vendor+'/html5shiv/dist/html5shiv.min.js', dir.build.js+'/html5shiv.js')

mix.styles([
'select2/select2.css',
'select2/select2-bootstrap.css',
'perfect-scrollbar/css/perfect-scrollbar.css',
dir.vendor+'/select2/select2.css',
dir.vendor+'/select2/select2-bootstrap.css',
dir.vendor+'/perfect-scrollbar/css/perfect-scrollbar.css',
dir.build.vendor+'/delta/theme/jquery-ui.css'
], dir.build.vendor+'/vendor.css', dir.vendor)
], dir.build.vendor+'/vendor.css', './')

mix.scripts([
'jquery/jquery.min.js',
'underscore/underscore-min.js',
'moment/min/moment.min.js',
'javie/dist/javie.min.js',
'bootstrap/dist/js/bootstrap.min.js',
'select2/select2.min.js',
'mousetrap/mousetrap.min.js',
'clipboard/dist/clipboard.min.js',
'Chart.js/dist/Chart.min.js',
dir.vendor+'/jquery/jquery.min.js',
dir.vendor+'/underscore/underscore-min.js',
dir.vendor+'/moment/min/moment.min.js',
dir.vendor+'/javie/dist/javie.min.js',
dir.vendor+'/bootstrap/dist/js/bootstrap.min.js',
dir.vendor+'/select2/select2.min.js',
dir.vendor+'/mousetrap/mousetrap.min.js',
dir.vendor+'/clipboard/dist/clipboard.min.js',
dir.vendor+'/Chart.js/dist/Chart.min.js',
dir.build.vendor+'/jquery.ui/jquery.ui.js',
dir.build.vendor+'/delta/js/jquery-ui.toggleSwitch.js',
'perfect-scrollbar/js/perfect-scrollbar.jquery.min.js'
], dir.build.vendor+'/vendor.js', dir.vendor)
dir.vendor+'/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js'
], dir.build.vendor+'/vendor.js', './')
});
Loading

0 comments on commit 78217f5

Please sign in to comment.