@@ -62,7 +62,7 @@ index e008887fa..d10ebdf1d 100644
62
62
transports: ['polling'],
63
63
64
64
diff --git a/package.json b/package.json
65
- index 2d78ee9a9..b42d8feaa 100644
65
+ index c2410e7b0..0100228d7 100644
66
66
--- a/package.json
67
67
+++ b/package.json
68
68
@@ -33,7 +33,6 @@
@@ -87,7 +87,7 @@ index fb5e78004..a94be4631 100644
87
87
var oldIt = global.it;
88
88
global.it = function(description, testFn) {
89
89
diff --git a/webpack.base.config.js b/webpack.base.config.js
90
- index b0959b487..65d859731 100644
90
+ index 2e3017c7d..759aae42b 100644
91
91
--- a/webpack.base.config.js
92
92
+++ b/webpack.base.config.js
93
93
@@ -8,6 +8,8 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
@@ -107,10 +107,10 @@ index b0959b487..65d859731 100644
107
107
- './app/core/utils.coffee',
108
108
+ './app/core/CocoClass.js',
109
109
+ './app/core/utils.js',
110
- './vendor/scripts/Box2dWeb-2.1.a.3',
111
110
'./vendor/scripts/string_score.js',
112
111
'./bower_components/underscore.string',
113
- @@ -54,6 +56,9 @@ module.exports = (env) => {
112
+ './vendor/scripts/coffeescript.js',
113
+ @@ -53,6 +55,9 @@ module.exports = (env) => {
114
114
{ test: /\.coffee$/, use: [
115
115
{ loader: 'coffee-loader' },
116
116
] },
@@ -120,7 +120,7 @@ index b0959b487..65d859731 100644
120
120
{ test: /\.jade$/, use: { loader: 'jade-loader', options: { root: path.resolve('./app') } } },
121
121
{ test: /\.pug$/, use: { loader: 'jade-loader', options: { root: path.resolve('./app') } } },
122
122
{
123
- @@ -128 ,7 +133 ,7 @@ module.exports = (env) => {
123
+ @@ -127 ,7 +132 ,7 @@ module.exports = (env) => {
124
124
from: 'bower_components/esper.js/esper.js',
125
125
to: 'javascripts/esper.js'
126
126
},{
0 commit comments