Skip to content

Commit 1eb9005

Browse files
committed
cleaner Brocfile
1 parent fcc009c commit 1eb9005

File tree

1 file changed

+32
-41
lines changed

1 file changed

+32
-41
lines changed

Brocfile.js

Lines changed: 32 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,49 @@
1-
var rimraf = require('rimraf');
2-
3-
var mergeTrees = require('broccoli-merge-trees');
4-
var Funnel = require('broccoli-funnel');
5-
6-
var compileSass = require('broccoli-sass');
7-
8-
var esTranspiler = require('broccoli-6to5-transpiler');
9-
10-
var fastBrowserify = require('broccoli-fast-browserify');
11-
12-
var uglifyJavaScript = require('broccoli-uglify-sourcemap');
13-
14-
var gzipFiles = require('broccoli-gzip');
1+
var rimraf = require('rimraf'),
2+
mergeTrees = require('broccoli-merge-trees'),
3+
Funnel = require('broccoli-funnel'),
4+
compileSass = require('broccoli-sass'),
5+
esTranspiler = require('broccoli-6to5-transpiler'),
6+
fastBrowserify = require('broccoli-fast-browserify'),
7+
uglifyJavaScript = require('broccoli-uglify-sourcemap'),
8+
gzipFiles = require('broccoli-gzip'),
9+
env = require('broccoli-env').getEnv();
1510

1611
var staticFiles = new Funnel('src', {
1712
files: ['index.html']
1813
});
1914

15+
// build vendor/*
2016
var jqueryFiles = new Funnel('bower_components/jquery/dist', {
21-
include: [
22-
new RegExp(/\.min\.(js|map)$/),
23-
],
24-
destDir: 'vendor/jquery'
25-
});
26-
var semanticUIFiles = new Funnel('bower_components/semantic-ui/dist', {
27-
include: [
28-
new RegExp(/\.min\.(js|css)$/),
29-
new RegExp(/themes/)
30-
],
31-
destDir: 'vendor/semantic-ui'
32-
});
33-
var fontAwesomeFiles = new Funnel('bower_components/font-awesome', {
34-
include: [
35-
new RegExp(/min\.css$/),
36-
new RegExp(/fonts/)
37-
],
38-
destDir: 'vendor/font-awesome'
39-
});
40-
vendorFiles = mergeTrees([jqueryFiles, semanticUIFiles, fontAwesomeFiles]);
17+
include: [
18+
new RegExp(/\.min\.(js|map)$/),
19+
],
20+
destDir: 'vendor/jquery'
21+
}),
22+
semanticUIFiles = new Funnel('bower_components/semantic-ui/dist', {
23+
include: [
24+
new RegExp(/\.min\.(js|css)$/),
25+
new RegExp(/themes/)
26+
],
27+
destDir: 'vendor/semantic-ui'
28+
}),
29+
fontAwesomeFiles = new Funnel('bower_components/font-awesome', {
30+
include: [
31+
new RegExp(/min\.css$/),
32+
new RegExp(/fonts/)
33+
],
34+
destDir: 'vendor/font-awesome'
35+
});
36+
var vendorFiles = mergeTrees([jqueryFiles, semanticUIFiles, fontAwesomeFiles]);
4137

4238
var cssFiles = compileSass(['src'], 'styles/app.scss', 'styles/app.css');
4339

4440
var jsFiles = new Funnel('src', {
4541
exclude: [new RegExp(/__tests__/)],
4642
include: [new RegExp(/\.js$/)]
4743
});
44+
4845
jsFiles = esTranspiler(jsFiles, {experimental: true});
49-
//jsFiles = browserify(jsFiles, {
50-
// entries: ['./index'],
51-
// outputFile: 'index.js'
52-
//});
46+
5347
jsFiles = fastBrowserify(jsFiles, {
5448
bundles: {
5549
'index.js': {
@@ -58,9 +52,6 @@ jsFiles = fastBrowserify(jsFiles, {
5852
}
5953
});
6054

61-
62-
var env = require('broccoli-env').getEnv();
63-
6455
if (env === 'production') {
6556
jsFiles = uglifyJavaScript(jsFiles);
6657
jsFiles = gzipFiles(jsFiles, {

0 commit comments

Comments
 (0)