1
1
diff --git a/.babelrc b/.babelrc
2
- index 164185f69..39029544a 100644
2
+ index 164185f..3902954 100644
3
3
--- a/.babelrc
4
4
+++ b/.babelrc
5
5
@@ -3,5 +3,9 @@
@@ -14,7 +14,7 @@ index 164185f69..39029544a 100644
14
14
+ ]
15
15
}
16
16
diff --git a/app/app.js b/app/app.js
17
- index 90066c7f7..3dd131934 100644
17
+ index 90066c7..3dd1319 100644
18
18
--- a/app/app.js
19
19
+++ b/app/app.js
20
20
@@ -2,6 +2,7 @@ global.$ = window.$ = global.jQuery = window.jQuery = require('jquery');
@@ -26,7 +26,7 @@ index 90066c7f7..3dd131934 100644
26
26
27
27
// require.context('app/schemas', true, /.*\.(coffee|jade)/)
28
28
diff --git a/app/assets/javascripts/run-tests.js b/app/assets/javascripts/run-tests.js
29
- index 953f67e42..d6a69d7bc 100644
29
+ index 953f67e..d6a69d7 100644
30
30
--- a/app/assets/javascripts/run-tests.js
31
31
+++ b/app/assets/javascripts/run-tests.js
32
32
@@ -1,5 +1,6 @@
@@ -37,7 +37,7 @@ index 953f67e42..d6a69d7bc 100644
37
37
38
38
window.userObject = {_id:'1'};
39
39
diff --git a/index.js b/index.js
40
- index 3abc77f62..71f6d4a95 100644
40
+ index 3abc77f..71f6d4a 100644
41
41
--- a/index.js
42
42
+++ b/index.js
43
43
@@ -8,5 +8,7 @@ if (majorVersion === 4) {
@@ -49,7 +49,7 @@ index 3abc77f62..71f6d4a95 100644
49
49
var server = require('./server');
50
50
server.startServer();
51
51
diff --git a/karma.conf.js b/karma.conf.js
52
- index e008887fa..d10ebdf1d 100644
52
+ index e008887..d10ebdf 100644
53
53
--- a/karma.conf.js
54
54
+++ b/karma.conf.js
55
55
@@ -60,7 +60,7 @@ module.exports = function(config) {
@@ -62,19 +62,19 @@ index e008887fa..d10ebdf1d 100644
62
62
transports: ['polling'],
63
63
64
64
diff --git a/package.json b/package.json
65
- index 556640c17..8a16b20fd 100644
65
+ index 1eb97af..67ddfa6 100644
66
66
--- a/package.json
67
67
+++ b/package.json
68
68
@@ -33,7 +33,6 @@
69
69
"test": "./node_modules/.bin/karma start",
70
- "predeploy": "echo Starting deployment--hold onto your butts.; echo Skipping brunch build --production",
70
+ "predeploy": "echo Starting deployment--hold onto your butts.; echo Skipping webpack build --production",
71
71
"postdeploy": "echo Deployed. Unclench.",
72
72
- "postinstall": "bower install && webpack",
73
73
"webpack": "webpack",
74
74
"bower": "bower",
75
75
"dev": "webpack --watch & npm run nodemon",
76
76
diff --git a/spec/helpers/helper.js b/spec/helpers/helper.js
77
- index fb5e78004..194abd6d9 100644
77
+ index fb5e780..194abd6 100644
78
78
--- a/spec/helpers/helper.js
79
79
+++ b/spec/helpers/helper.js
80
80
@@ -2,6 +2,8 @@ var _ = require('lodash');
@@ -96,7 +96,7 @@ index fb5e78004..194abd6d9 100644
96
96
97
97
// Ignore Stripe/Nocking erroring
98
98
diff --git a/webpack.base.config.js b/webpack.base.config.js
99
- index 2e3017c7d..759aae42b 100644
99
+ index 192f8de..c345e98 100644
100
100
--- a/webpack.base.config.js
101
101
+++ b/webpack.base.config.js
102
102
@@ -8,6 +8,8 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
@@ -119,7 +119,7 @@ index 2e3017c7d..759aae42b 100644
119
119
'./vendor/scripts/string_score.js',
120
120
'./bower_components/underscore.string',
121
121
'./vendor/scripts/coffeescript.js',
122
- @@ -53 ,6 +55 ,9 @@ module.exports = (env) => {
122
+ @@ -54 ,6 +56 ,9 @@ module.exports = (env) => {
123
123
{ test: /\.coffee$/, use: [
124
124
{ loader: 'coffee-loader' },
125
125
] },
@@ -129,7 +129,7 @@ index 2e3017c7d..759aae42b 100644
129
129
{ test: /\.jade$/, use: { loader: 'jade-loader', options: { root: path.resolve('./app') } } },
130
130
{ test: /\.pug$/, use: { loader: 'jade-loader', options: { root: path.resolve('./app') } } },
131
131
{
132
- @@ -127 ,7 +132 ,7 @@ module.exports = (env) => {
132
+ @@ -141 ,7 +146 ,7 @@ module.exports = (env) => {
133
133
from: 'bower_components/esper.js/esper.js',
134
134
to: 'javascripts/esper.js'
135
135
},{
0 commit comments