Skip to content

Commit 746f4d9

Browse files
authored
Merge pull request #331 from ember-learn/introduce-static-post-css-addon-tree
Introduce static-post-css-addon-tree
2 parents 516fc94 + aa474e5 commit 746f4d9

File tree

3 files changed

+392
-564
lines changed

3 files changed

+392
-564
lines changed

index.js

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
'use strict';
22
const Funnel = require('broccoli-funnel');
33
const path = require('path');
4-
5-
const CssImport = require('postcss-import');
6-
const PresetEnv = require('postcss-preset-env');
7-
8-
const broccoliPostCSS = require('broccoli-postcss')
9-
const mergeTrees = require('broccoli-merge-trees');
10-
const funnel = require('broccoli-funnel');
11-
const get = require('lodash.get');
12-
const { join } = require('path');
4+
const staticPostcssAddonTree = require('static-postcss-addon-tree');
135

146
module.exports = {
157
name: require('./package').name,
@@ -27,31 +19,11 @@ module.exports = {
2719
treeForAddon() {
2820
var tree = this._super(...arguments);
2921

30-
const addonWithoutStyles = funnel(tree, {
31-
exclude: ['**/*.css'],
32-
});
33-
34-
const addonStyles = funnel(tree, {
35-
include: ['ember-styleguide.css']
22+
return staticPostcssAddonTree(tree, {
23+
addonName: 'ember-styleguide',
24+
addonFolder: __dirname,
25+
project: this.app.project
3626
});
37-
38-
// I don't know exactly why targets is private so I am using `get()` to make
39-
// sure that it isn't missing
40-
let overrideBrowserslist = get(this, 'app.project._targets.browsers');
41-
42-
let processedStyles = broccoliPostCSS(addonStyles, {
43-
plugins: [
44-
CssImport({
45-
path: join(__dirname, 'addon', 'styles'),
46-
}),
47-
PresetEnv({
48-
stage: 3,
49-
features: { 'nesting-rules': true },
50-
overrideBrowserslist,
51-
})
52-
]});
53-
54-
return mergeTrees([addonWithoutStyles, processedStyles]);
5527
},
5628

5729
treeForPublic: function() {

0 commit comments

Comments
 (0)