Skip to content

Commit 6840c5e

Browse files
committed
fix(scss @ rules): now allowing namespaceing of rules deinfed inside of a scss @ for rule. Fixes #216
1 parent 24d03ef commit 6840c5e

7 files changed

Lines changed: 35 additions & 3 deletions

File tree

ember-cli-build.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/* eslint-env node */
22
'use strict';
33

4-
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
4+
let EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
55

66
module.exports = function(defaults) {
7-
var app = new EmberAddon(defaults, {
8-
// Add options here
7+
let app = new EmberAddon(defaults, {
8+
"ember-cli-babel": {
9+
includePolyfill: true
10+
},
911
});
1012

1113
/*

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
"eslint-plugin-ember-suave": "^1.0.0",
6565
"loader.js": "^4.0.10",
6666
"no-style-files-yet": "file:./tests/dummy/lib/no-style-files-yet",
67+
"postcss-selector-namespace": "^1.3.0",
6768
"second-test-addon": "file:./tests/dummy/lib/second-test-addon",
6869
"test-addon": "file:./tests/dummy/lib/test-addon"
6970
},

tests/acceptance/scss-test.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,14 @@ test('mixin psudo elements do not get scoped', function(assert) {
5454
assert.equal(item.css('color'), 'rgb(0, 0, 6)');
5555
});
5656
});
57+
58+
test('children of root @for rules are namspaced', function(assert) {
59+
visit(`/${TYPE}`);
60+
61+
andThen(function() {
62+
for (let index of Array(10).keys()) {
63+
let item = find(`[class$=__element--${index}]`);
64+
assert.equal(item.css('color'), `rgb(0, 0, ${index})`);
65+
}
66+
});
67+
});
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import Ember from 'ember';
2+
3+
const {
4+
Component,
5+
} = Ember;
6+
7+
export default Component.extend({
8+
items: [...Array(10).keys()],
9+
});
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@for $index from 0 through 9 {
2+
&__element--#{$index} {
3+
color: rgb(0, 0, $index);
4+
}
5+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{{#each items as |item|}}
2+
<span class="{{componentCssClassName}}__element--{{item}}"></span>
3+
{{/each}}

tests/dummy/app/scss/template.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
{{scss/base-rules}}
2+
{{scss/for-loop}}

0 commit comments

Comments
 (0)