Skip to content

Commit fc2f507

Browse files
authored
Fix codecombat patch file (#123)
1 parent 7f284ae commit fc2f507

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

examples/codecombat/decaffeinate.patch

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/.babelrc b/.babelrc
2-
index 164185f69..39029544a 100644
2+
index 164185f..3902954 100644
33
--- a/.babelrc
44
+++ b/.babelrc
55
@@ -3,5 +3,9 @@
@@ -14,7 +14,7 @@ index 164185f69..39029544a 100644
1414
+ ]
1515
}
1616
diff --git a/app/app.js b/app/app.js
17-
index 90066c7f7..3dd131934 100644
17+
index 90066c7..3dd1319 100644
1818
--- a/app/app.js
1919
+++ b/app/app.js
2020
@@ -2,6 +2,7 @@ global.$ = window.$ = global.jQuery = window.jQuery = require('jquery');
@@ -26,7 +26,7 @@ index 90066c7f7..3dd131934 100644
2626

2727
// require.context('app/schemas', true, /.*\.(coffee|jade)/)
2828
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
3030
--- a/app/assets/javascripts/run-tests.js
3131
+++ b/app/assets/javascripts/run-tests.js
3232
@@ -1,5 +1,6 @@
@@ -37,7 +37,7 @@ index 953f67e42..d6a69d7bc 100644
3737

3838
window.userObject = {_id:'1'};
3939
diff --git a/index.js b/index.js
40-
index 3abc77f62..71f6d4a95 100644
40+
index 3abc77f..71f6d4a 100644
4141
--- a/index.js
4242
+++ b/index.js
4343
@@ -8,5 +8,7 @@ if (majorVersion === 4) {
@@ -49,7 +49,7 @@ index 3abc77f62..71f6d4a95 100644
4949
var server = require('./server');
5050
server.startServer();
5151
diff --git a/karma.conf.js b/karma.conf.js
52-
index e008887fa..d10ebdf1d 100644
52+
index e008887..d10ebdf 100644
5353
--- a/karma.conf.js
5454
+++ b/karma.conf.js
5555
@@ -60,7 +60,7 @@ module.exports = function(config) {
@@ -62,19 +62,19 @@ index e008887fa..d10ebdf1d 100644
6262
transports: ['polling'],
6363

6464
diff --git a/package.json b/package.json
65-
index 556640c17..8a16b20fd 100644
65+
index 1eb97af..67ddfa6 100644
6666
--- a/package.json
6767
+++ b/package.json
6868
@@ -33,7 +33,6 @@
6969
"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",
7171
"postdeploy": "echo Deployed. Unclench.",
7272
- "postinstall": "bower install && webpack",
7373
"webpack": "webpack",
7474
"bower": "bower",
7575
"dev": "webpack --watch & npm run nodemon",
7676
diff --git a/spec/helpers/helper.js b/spec/helpers/helper.js
77-
index fb5e78004..194abd6d9 100644
77+
index fb5e780..194abd6 100644
7878
--- a/spec/helpers/helper.js
7979
+++ b/spec/helpers/helper.js
8080
@@ -2,6 +2,8 @@ var _ = require('lodash');
@@ -96,7 +96,7 @@ index fb5e78004..194abd6d9 100644
9696

9797
// Ignore Stripe/Nocking erroring
9898
diff --git a/webpack.base.config.js b/webpack.base.config.js
99-
index 2e3017c7d..759aae42b 100644
99+
index 192f8de..c345e98 100644
100100
--- a/webpack.base.config.js
101101
+++ b/webpack.base.config.js
102102
@@ -8,6 +8,8 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
@@ -119,7 +119,7 @@ index 2e3017c7d..759aae42b 100644
119119
'./vendor/scripts/string_score.js',
120120
'./bower_components/underscore.string',
121121
'./vendor/scripts/coffeescript.js',
122-
@@ -53,6 +55,9 @@ module.exports = (env) => {
122+
@@ -54,6 +56,9 @@ module.exports = (env) => {
123123
{ test: /\.coffee$/, use: [
124124
{ loader: 'coffee-loader' },
125125
] },
@@ -129,7 +129,7 @@ index 2e3017c7d..759aae42b 100644
129129
{ test: /\.jade$/, use: { loader: 'jade-loader', options: { root: path.resolve('./app') } } },
130130
{ test: /\.pug$/, use: { loader: 'jade-loader', options: { root: path.resolve('./app') } } },
131131
{
132-
@@ -127,7 +132,7 @@ module.exports = (env) => {
132+
@@ -141,7 +146,7 @@ module.exports = (env) => {
133133
from: 'bower_components/esper.js/esper.js',
134134
to: 'javascripts/esper.js'
135135
},{

0 commit comments

Comments
 (0)