Merge pull request #73 from davewasmer/feature-updates

Updates

.eslintignore

@@ -0,0 +1,16 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+
+# misc
+/coverage/
+
+# ember-try
+/.node_modules.ember-try/

.eslintrc.js

@@ -20,15 +20,17 @@ module.exports = {
     // node files
     {
       files: [
+        'ember-cli-build.js',
         'index.js',
         'testem.js',
-        'ember-cli-build.js',
+        'blueprints/*/index.js',
         'config/**/*.js',
         'tests/dummy/config/**/*.js'
       ],
       excludedFiles: [
-        'app/**',
         'addon/**',
+        'addon-test-support/**',
+        'app/**',
         'tests/dummy/app/**'
       ],
       parserOptions: {

.gitignore

@@ -1,23 +1,23 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist
-/tmp
+/dist/
+/tmp/
 
 # dependencies
-/node_modules
-/bower_components
+/bower_components/
+/node_modules/
 
 # misc
 /.sass-cache
 /connect.lock
-/coverage/*
+/coverage/
 /libpeerconnection.log
-npm-debug.log*
-yarn-error.log
-testem.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
 
 # ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.npmignore

@@ -14,6 +14,7 @@
 bower.json
 ember-cli-build.js
 testem.js
+yarn.lock
 
 # ember-try
 .node_modules.ember-try/

.travis.yml

@@ -44,4 +44,5 @@ script:
   - npm run lint:js
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
+  # - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
+  - npm test

README.md

@@ -5,13 +5,15 @@
 
 Take a single favicon source file at `public/favicon.png`, and convert to the various formats and sizes required for popular devices and platforms. Also injects the appropriate HTML into your index.html file during the build process.
 
-## Installation
+Installation
+------------------------------------------------------------------------------
 
-```sh
-$ ember install ember-cli-favicon
+```
+ember install ember-cli-favicon
 ```
 
-## Usage
+Usage
+------------------------------------------------------------------------------
 
 Just save an image to `public/favicon.png` (try to make sure it's at least 256x256). Additional configuration options are supplied in your `ember-cli-build.js` file:
 
@@ -28,3 +30,35 @@ var app = new EmberApp({
 
 See the [favicons](https://github.com/haydenbleasel/favicons) module for details on the available configuration options.
 
+
+Contributing
+------------------------------------------------------------------------------
+
+### Installation
+
+* `git clone https://github.com/davewasmer/broccoli-favicon`
+* `cd ember-cli-favicon`
+* `npm install`
+
+### Linting
+
+* `npm run lint:js`
+* `npm run lint:js -- --fix`
+
+### Running tests
+
+* `ember test` – Runs the test suite on the current Ember version
+* `ember test --server` – Runs the test suite in "watch mode"
+* `ember try:each` – Runs the test suite against multiple Ember versions
+
+### Running the dummy application
+
+* `ember serve`
+* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+
+License
+------------------------------------------------------------------------------
+
+This project is licensed under the [MIT License](LICENSE.md).

config/ember-try.js

@@ -6,7 +6,7 @@ module.exports = function() {
   return Promise.all([
     getChannelURL('release'),
     getChannelURL('beta'),
-    getChannelURL('canary'),
+    getChannelURL('canary')
   ]).then((urls) => {
     return {
       scenarios: [

index.js

@@ -7,26 +7,36 @@ const mergeTrees = require('broccoli-merge-trees');
 let htmlCache = null;
 
 module.exports = {
-
   name: 'ember-cli-favicon',
 
-  included(app) {
-    let options = app.options;
+  included(parent) {
+    // Support for fingerprint
+    parent.options.fingerprint = parent.options.fingerprint || {};
+    parent.options.fingerprint.exclude = parent.options.fingerprint.exclude || [];
+    parent.options.fingerprint.exclude.push('apple-touch-icon', 'favicon', 'mstile');
+
+    // Set success callback
+    parent.options.favicons = parent.options.favicons || {};
 
-    let fingerprint = options.fingerprint = options.fingerprint || {};
-    fingerprint.exclude = fingerprint.exclude || [];
-    fingerprint.exclude.push('apple-touch-icon', 'favicon', 'mstile');
+    let currentCallback = parent.options.favicons.htmlCallback || function() {};
 
-    this.options = options.favicons || {};
-    this.options.htmlCallback = function(html) {
+    parent.options.favicons.htmlCallback = function(html) {
       htmlCache = html;
+      return currentCallback(...arguments);
     };
+
+    this.parentOptions = parent.options;
+
+    return this._super.included(parent);
+  },
+
+  treeForPublic(tree) {
+    let faviconTree = new Favicons(this.parentOptions.trees.public, this.parentOptions.favicons);
+    return mergeTrees([ faviconTree, tree ].filter(Boolean), { overwrite: true });
   },
 
   postprocessTree(type, tree) {
     if (type === 'all') {
-      const favicons = new Favicons(tree, this.options);
-      tree = mergeTrees([ favicons, tree ], { overwrite: true });
       return replace(tree, {
         files: [ 'index.html' ],
         patterns: [{
@@ -37,7 +47,7 @@ module.exports = {
         }]
       });
     }
+
     return tree;
   }
-
 };