Skip to content

Commit f2f31e6

Browse files
committed
Updated sass-loader dependency to fix blocker
* New dependency uses proper array iteration * Only affect the hot-reload version
1 parent 1477ba6 commit f2f31e6

File tree

4 files changed

+38
-3
lines changed

4 files changed

+38
-3
lines changed

app/assets/images/twitter_64.png

3.3 KB
Loading

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"node": "0.10.32"
88
},
99
"dependencies": {
10-
"es6-loader": "^0.2.0",
1110
"body-parser": "^1.10.2",
11+
"es6-loader": "^0.2.0",
1212
"imports-loader": "^0.6.3",
1313
"jquery": "^2.1.3",
1414
"jsx-loader": "^0.12.2",
@@ -20,15 +20,15 @@
2020
"webpack": "^1.5.3"
2121
},
2222
"devDependencies": {
23-
"express": "^4.11.1",
2423
"bootstrap-sass": "^3.3.3",
2524
"bootstrap-sass-loader": "0.0.6",
2625
"css-loader": "^0.9.1",
2726
"expose-loader": "^0.6.0",
27+
"express": "^4.11.1",
2828
"extract-text-webpack-plugin": "^0.3.8",
2929
"file-loader": "^0.8.1",
3030
"react-hot-loader": "^1.1.3",
31-
"sass-loader": "^0.2.0",
31+
"sass-loader": "justin808/sass-loader#sass-graph-dependency-to-justin808-patch",
3232
"style-loader": "^0.8.3",
3333
"url-loader": "^0.5.5",
3434
"webpack-dev-server": "^1.7.0"

webpack/assets/javascripts/example.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ var render = () => {
1616
Example of styling using image-url and Open Sans Light custom font
1717
</h3>
1818
</a>
19+
<a href="https://twitter.com/railsonmaui">
20+
<div className="twitter-image"/>
21+
Rails On Maui on Twitter
22+
</a>
1923
</div>
2024
</div>,
2125
document.getElementById('content')

webpack/webpack.test-hot.config.js

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// File helpful for debugging issues with dependencies only used by the hot reload server
2+
// node-debug webpack --config webpack.test-hot.config.js
3+
4+
var path = require("path");
5+
var config = require("./webpack.common.config");
6+
var webpack = require("webpack");
7+
8+
// We're using the bootstrap-sass loader.
9+
// See: https://github.com/justin808/bootstrap-sass-loader
10+
config.entry.push("./scripts/webpack_only",
11+
"bootstrap-sass!./bootstrap-sass.config.js"); // custom bootstrap
12+
config.output = { filename: "express-bundle.js", // this file is served directly by webpack
13+
path: __dirname };
14+
//config.plugins = [ new webpack.HotModuleReplacementPlugin() ];
15+
config.devtool = "eval-source-map";
16+
17+
// All the styling loaders only apply to hot-reload, not rails
18+
config.module.loaders.push(
19+
{ test: /\.jsx$/, loaders: ["react-hot", "es6", "jsx?harmony"] },
20+
{ test: /\.css$/, loader: "style-loader!css-loader" },
21+
{ test: /\.scss$/, loader: "style!css!sass?outputStyle=expanded&imagePath=/assets/images&includePaths[]=" +
22+
path.resolve(__dirname, "./assets/stylesheets")},
23+
24+
// The url-loader uses DataUrls. The file-loader emits files.
25+
{ test: /\.woff$/, loader: "url-loader?limit=10000&minetype=application/font-woff" },
26+
{ test: /\.woff2$/, loader: "url-loader?limit=10000&minetype=application/font-woff" },
27+
{ test: /\.ttf$/, loader: "file-loader" },
28+
{ test: /\.eot$/, loader: "file-loader" },
29+
{ test: /\.svg$/, loader: "file-loader" });
30+
31+
module.exports = config;

0 commit comments

Comments
 (0)