Skip to content
This repository was archived by the owner on Sep 30, 2019. It is now read-only.

Commit

Permalink
Apply namespacing also to scss, set file-loader as default for some e…
Browse files Browse the repository at this point in the history
…xtensions
  • Loading branch information
juhoojala committed Jan 14, 2016
1 parent 7f0f055 commit 31fc985
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 11 deletions.
2 changes: 1 addition & 1 deletion node_modules/sub-project/Index.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions node_modules/sub-project/Index.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions node_modules/sub-project/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/components/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
}

.turtle {
background: url('file-loader!./turtle.jpg');
background: url('./turtle.jpg');
}
8 changes: 5 additions & 3 deletions src/components/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import ClassCompositionDemo from './3-ClassComposition/ClassCompositionDemo';
import CompositionOverridesDemo from './4-CompositionOverrides/CompositionOverridesDemo';
import ScopedAnimationsDemo from './5-ScopedAnimations/ScopedAnimationsDemo';

var url = require("file-loader!./camel.jpg");
var url = require("./camel.jpg");
//var url = require("camel.jpg");

var Testi = require('sub-project');
var jsonUrl = require('file-loader!./data-example.json');

Expand All @@ -21,8 +23,8 @@ export default class App extends Component {
<div className={styles.app}>
<Logo />

<div className="test">
Moi
<div className={styles2.test}>
Red text via mixin from subproject
</div>

<div>
Expand Down
9 changes: 7 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,13 @@ module.exports = {
},
{
test: /\.scss$/,
loaders: ["style", "css", "sass"]
}
loaders: ["style", "css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]", "sass"]
},
{
test: /\.(jpeg|jpg|gif|png|json)$/,
loaders: ["file-loader?name=[name]-[hash:12].[ext]"]
},

]
}
}

0 comments on commit 31fc985

Please sign in to comment.