Skip to content

Commit

Permalink
fix(style manifest): updated to new brocoli-style-mainifest propertie…
Browse files Browse the repository at this point in the history
…s that are more explicit
  • Loading branch information
webark committed Apr 5, 2017
1 parent 7a834c4 commit 5e848ca
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var Funnel = require('broccoli-funnel');
var Merge = require('broccoli-merge-trees');
var ProcessStyles = require('./lib/pod-style.js');
var ExtractNames = require('./lib/pod-names.js');
var IncludeAll = require('broccoli-style-manifest');
var StyleManifest = require('broccoli-style-manifest');

module.exports = {

Expand Down Expand Up @@ -135,9 +135,9 @@ module.exports = {
});
}

var styleManifest = new IncludeAll(podStyles, {
outputFileName: 'pod-styles',
annotation: 'IncludeAll (ember-component-css combining all style files that there are extensions for)'
var styleManifest = new StyleManifest(podStyles, {
outputFileNameWithoutExtension: 'pod-styles',
annotation: 'StyleManifest (ember-component-css combining all style files that there are extensions for)'
});

tree = new Merge([podStyles, styleManifest, tree].filter(Boolean), {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"broccoli-merge-trees": "^2.0.0",
"broccoli-persistent-filter": "1.2.13",
"broccoli-plugin": "^1.2.1",
"broccoli-style-manifest": "^1.1.0",
"broccoli-style-manifest": "^1.2.2",
"ember-cli-babel": "^5.1.7",
"ember-getowner-polyfill": "^1.1.1",
"fs-tree-diff": "^0.5.6",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1270,9 +1270,9 @@ broccoli-stew@^1.2.0, broccoli-stew@^1.3.3:
rsvp "^3.0.16"
walk-sync "^0.3.0"

broccoli-style-manifest@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/broccoli-style-manifest/-/broccoli-style-manifest-1.1.0.tgz#aae89d7773f271ee7740f869c9a074cccf3f57a8"
broccoli-style-manifest@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/broccoli-style-manifest/-/broccoli-style-manifest-1.2.2.tgz#4a91bde0a44d82beb51a55c838270c8dbc2a59d9"
dependencies:
broccoli-plugin "^1.3.0"
fs-tree-diff "^0.5.6"
Expand Down

0 comments on commit 5e848ca

Please sign in to comment.