@@ -22,7 +22,7 @@ module.exports = {
2222 filename : railsBundleFile ,
2323 path : railsJsAssetsDir
2424 } ,
25- // Let's load jQuery from the CDN or rails asset pipeline
25+ // Load jQuery from the CDN or rails asset pipeline
2626 externals : {
2727 jquery : "var jQuery"
2828 } ,
@@ -34,20 +34,28 @@ module.exports = {
3434 loaders : [
3535 // **IMPORTANT** This is needed so that each bootstrap js file required by
3636 // bootstrap-sass-loader has access to the jQuery object
37- { test : / b o o t s t r a p - s a s s \/ a s s e t s \/ j a v a s c r i p t s \/ / , loader : 'imports?jQuery=jquery' } ,
38- { test : / \. s c s s $ / , loader : "style!css!sass?outputStyle=expanded&imagePath=/assets/images" } ,
37+ { test : / b o o t s t r a p - s a s s \/ a s s e t s \/ j a v a s c r i p t s \/ / ,
38+ loader : 'imports?jQuery=jquery' } ,
39+ { test : / \. s c s s $ / ,
40+ loader : "style!css!sass?outputStyle=expanded&imagePath=/assets/images" } ,
41+
3942 // Load Bootstrap's CSS
4043 // Needed for the css-loader when [bootstrap-sass-loader]
41- { test : / \. w o f f ( \? v = \d + \. \d + \. \d + ) ? $ / , loader : "url?limit=10000&minetype=application/font-woff" } ,
42- { test : / \. t t f ( \? v = \d + \. \d + \. \d + ) ? $ / , loader : "url?limit=10000&minetype=application/octet-stream" } ,
43- { test : / \. e o t ( \? v = \d + \. \d + \. \d + ) ? $ / , loader : "file" } ,
44- { test : / \. s v g ( \? v = \d + \. \d + \. \d + ) ? $ / , loader : "url?limit=10000&minetype=image/svg+xml" } ,
44+ { test : / \. w o f f ( \? v = \d + \. \d + \. \d + ) ? $ / ,
45+ loader : "url?limit=10000&minetype=application/font-woff" } ,
46+ { test : / \. t t f ( \? v = \d + \. \d + \. \d + ) ? $ / ,
47+ loader : "url?limit=10000&minetype=application/octet-stream" } ,
48+ { test : / \. e o t ( \? v = \d + \. \d + \. \d + ) ? $ / ,
49+ loader : "file" } ,
50+ { test : / \. s v g ( \? v = \d + \. \d + \. \d + ) ? $ / ,
51+ loader : "url?limit=10000&minetype=image/svg+xml" } ,
4552 //{ test: /\.woff$/, loader: "url-loader?limit=10000&minetype=application/font-woff" },
4653 //{ test: /\.ttf$/, loader: "file-loader" },
4754 //{ test: /\.eot$/, loader: "file-loader" },
4855 //{ test: /\.svg$/, loader: "file-loader" },
4956
5057 { test : / \. j s x $ / , loaders : [ 'es6' , 'jsx?harmony' ] } ,
58+
5159 // Next 2 lines expose jQuery and $ to any JavaScript files loaded after rails-bundle.js
5260 // in the Rails Asset Pipeline. Thus, load this one prior.
5361 { test : require . resolve ( "jquery" ) , loader : "expose?jQuery" } ,
0 commit comments