Skip to content

Commit

Permalink
Merge pull request #69 from bem/yeti-or.natural-deps
Browse files Browse the repository at this point in the history
Fix natural dependencies order
  • Loading branch information
Yeti-or authored Mar 12, 2018
2 parents 590ea06 + b7a9346 commit 83efa42
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@bem/cell": "^0.2.6",
"@bem/entity-name": "^1.5.0",
"@bem/fs-scheme": "^2.1.0",
"@bem/import-notation": "^1.1.2",
"@bem/import-notation": "^1.1.3",
"@bem/naming": "^2.0.0-6",
"bem-config": "^3.2.3",
"falafel": "^2.1.0",
Expand Down
3 changes: 1 addition & 2 deletions test/order/order.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ describe('order', () => {
expect(getOrder(cssFile)).toEqual([0, 1, 2, 3]);
});

// TODO: https://github.com/bem/webpack-bem-loader/issues/64
test.skip('order of modifiers required inside block', async () => {
test('order of modifiers required inside block', async () => {
const mock = {
'index.js' : `require('b:button m:theme=action m:size=m')`,
'common.blocks/button' : {
Expand Down

0 comments on commit 83efa42

Please sign in to comment.