Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-server-cli/src/compileClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ const packageCodeForBrowser = (entrypoints, outputDir, outputUrl, hot, minify, l
exclude: /node_modules/,
},
{
test: /\.scss$/,
test: /\.s(a|c)ss$/,
loader: extractTextLoader + "!sass-loader",
exclude: /node_modules/,
},
Expand Down
1 change: 1 addition & 0 deletions packages/react-server-cli/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const parseCliArgs = require("./parseCliArgs").default;
require.extensions['.css'] =
require.extensions['.less'] =
require.extensions['.scss'] =
require.extensions['.sass'] =
function(module, filename) {
return module._compile("", filename);
};
Expand Down
7 changes: 6 additions & 1 deletion packages/react-server-test-pages/pages/styles/sass.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import "./sass.scss"
import "./sass.sass"

const RedThing = () => <div className="red-thing">This should be red</div>
const BlueThing = () => <div className="blue-thing">This should be blue</div>

export default class SassPage {
getElements() {
return <RedThing />
return (<div>
<RedThing />
<BlueThing />
</div>);
}
}
4 changes: 4 additions & 0 deletions packages/react-server-test-pages/pages/styles/sass.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
$blueish: blue

.blue-thing
background-color: $blueish