switched imagesloaded from bower to npm dependency via browserify

.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -13,5 +13,5 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
 testem.log

.jshintrc

@@ -27,6 +27,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "unused": true
 }

.npmignore

@@ -1,14 +1,16 @@
-bower_components/
-tests/
-tmp/
-dist/
-
+/bower_components
+/config/ember-try.js
+/dist
+/tests
+/tmp
+**/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
+.gitignore
+.jshintrc
+.watchmanconfig
 .travis.yml
-.npmignore
-**/.gitkeep
 bower.json
-Brocfile.js
-testem.json
+ember-cli-build.js
+testem.js

.travis.yml

@@ -1,17 +1,19 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "4"
 
 sudo: false
 
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache # includes bowers cache
 
 env:
-  - EMBER_TRY_SCENARIO=default
-  - EMBER_TRY_SCENARIO=ember-1.13
+  # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
+  - EMBER_TRY_SCENARIO=ember-lts-2.4
+  - EMBER_TRY_SCENARIO=ember-lts-2.8
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
@@ -22,14 +24,17 @@ matrix:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - bower --version
+  - npm install phantomjs-prebuilt
+  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
 
 install:
-  - npm install -g bower
   - npm install
   - bower install
 
 script:
-  - ember try $EMBER_TRY_SCENARIO test
+  # Usually, it's ok to finish the test scenario without reverting
+  #  to the addon's original dependency state, skipping "cleanup".
+  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015
+Copyright (c) 2016
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

addon/components/masonry-grid/component.js

@@ -1,5 +1,6 @@
-/* global imagesLoaded, Masonry */
+/* global Masonry */
 import Ember from 'ember';
+import imagesLoaded from 'npm:imagesloaded';
 import layout from './template';
 
 const {
@@ -8,14 +9,13 @@ const {
   defineProperty,
   getProperties,
   get,
-  set
+  set,
+  String: { htmlSafe },
+  run: { scheduleOnce },
+  A
 } = Ember;
 
-const {
-  htmlSafe
-} = Ember.String;
-
-const MASONRY_OPTION_KEYS = Ember.A([
+const MASONRY_OPTION_KEYS = A([
   'containerStyle',
   'columnWidth',
   'gutter',
@@ -59,7 +59,7 @@ export default Component.extend({
   didUpdateAttrs(attrsObj) {
     this._super(...arguments);
 
-    const shouldRebuild = MASONRY_OPTION_KEYS.any((option) => {
+    let shouldRebuild = MASONRY_OPTION_KEYS.any((option) => {
       return (attrsObj.newAttrs[option] !== attrsObj.oldAttrs[option]);
     });
 
@@ -73,12 +73,12 @@ export default Component.extend({
 
     let masonry = get(this, 'masonry');
 
-    Ember.run.scheduleOnce('afterRender', this, () => {
+    scheduleOnce('afterRender', this, () => {
       imagesLoaded(get(this, 'element'), () => {
         if (masonry) {
           masonry.reloadItems();
         } else {
-          const options = get(this, 'options');
+          let options = get(this, 'options');
           masonry = set(this, 'masonry', new Masonry(get(this, 'element'), options));
 
           masonry.on('layoutComplete', (layout) => {
@@ -113,7 +113,7 @@ export default Component.extend({
   },
 
   _destroyMasonry() {
-    const masonry = get(this, 'masonry');
+    let masonry = get(this, 'masonry');
 
     if (masonry) {
       masonry.destroy();

addon/components/masonry-item/component.js

@@ -4,13 +4,10 @@ import layout from './template';
 const {
   Component,
   computed,
-  get
+  get,
+  String: { htmlSafe }
 } = Ember;
 
-const {
-  htmlSafe
-} = Ember.String;
-
 export default Component.extend({
   layout,
   classNameBindings: ['itemClass'],
@@ -21,8 +18,8 @@ export default Component.extend({
   itemClass: computed.oneWay('grid.itemClass'),
 
   click(ev) {
-    const onItemClick = get(this, 'onItemClick');
-    const item = get(this, 'item');
+    let onItemClick = get(this, 'onItemClick');
+    let item = get(this, 'item');
 
     if (onItemClick && typeof onItemClick === 'function') {
       onItemClick(ev, item);

addon/instance-initializers/images-loaded.js

@@ -0,0 +1,8 @@
+export function initialize(/* appInstance */) {
+  // appInstance.inject('route', 'foo', 'service:foo');
+}
+
+export default {
+  name: 'images-loaded',
+  initialize
+};

app/instance-initializers/images-loaded.js

@@ -0,0 +1,2 @@
+import 'npm:imagesloaded';
+export { default, initialize } from 'ember-masonry-grid/instance-initializers/images-loaded';

blueprints/ember-masonry-grid/index.js

@@ -1,3 +1,4 @@
+var RSVP = require('rsvp');
 module.exports = {
   name: 'ember-masonry-grid',
   description: 'Add ember-masonry-grid bower dependencies to app.',
@@ -6,9 +7,13 @@ module.exports = {
   },
 
   afterInstall: function () {
-    return this.addBowerPackagesToProject([
-      { name: 'masonry' },
-      { name: 'imagesloaded' }
+    return RSVP.all([
+        this.addBowerPackageToProject('masonry'),
+        this.addPackagesToProject([
+            { name: 'imagesloaded' },
+            { name: 'ember-browserify' },
+            { name: 'rsvp' }
+        ])
     ]);
   }
 };

bower.json

@@ -1,16 +1,8 @@
 {
   "name": "ember-masonry-grid",
   "dependencies": {
-    "ember": "^2.2.0",
-    "ember-cli-shims": "0.1.0",
-    "ember-cli-test-loader": "0.2.1",
-    "ember-load-initializers": "0.1.7",
-    "ember-qunit-notifications": "0.1.0",
-    "jquery": "^1.11.3",
-    "loader.js": "^3.5.0",
-    "qunit": "~1.20.0",
-    "imagesloaded": "~3.2.0",
-    "masonry": "~3.3.2",
-    "sinonjs": "~1.17.1"
+    "ember": "~2.10.0",
+    "ember-cli-shims": "0.1.3",
+    "masonry": "~3.3.2"
   }
 }

config/ember-try.js

@@ -1,44 +1,59 @@
 /*jshint node:true*/
 module.exports = {
-    scenarios: [
+  scenarios: [
     {
-      name: 'default',
-      dependencies: { }
+      name: 'ember-lts-2.4',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#lts-2-4'
+        },
+        resolutions: {
+          'ember': 'lts-2-4'
+        }
+      }
     },
     {
-      name: 'ember-1.13',
-      dependencies: {
-        'ember': '~1.13.0'
-      },
-      resolutions: {
-        'ember': '~1.13.0'
+      name: 'ember-lts-2.8',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#lts-2-8'
+        },
+        resolutions: {
+          'ember': 'lts-2-8'
+        }
       }
     },
     {
       name: 'ember-release',
-      dependencies: {
-        'ember': 'components/ember#release'
-      },
-      resolutions: {
-        'ember': 'release'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#release'
+        },
+        resolutions: {
+          'ember': 'release'
+        }
       }
     },
     {
       name: 'ember-beta',
-      dependencies: {
-        'ember': 'components/ember#beta'
-      },
-      resolutions: {
-        'ember': 'beta'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#beta'
+        },
+        resolutions: {
+          'ember': 'beta'
+        }
       }
     },
     {
       name: 'ember-canary',
-      dependencies: {
-        'ember': 'components/ember#canary'
-      },
-      resolutions: {
-        'ember': 'canary'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#canary'
+        },
+        resolutions: {
+          'ember': 'canary'
+        }
       }
     }
   ]

ember-cli-build.js

@@ -8,7 +8,7 @@ module.exports = function(defaults) {
   });
 
   /*
-    This build file specifes the options for the dummy test app of this
+    This build file specifies the options for the dummy test app of this
     addon, located in `/tests/dummy`
     This build file does *not* influence how the addon or the app using it
     behave. You most likely want to be modifying `./index.js` or app's build file

index.js

@@ -12,11 +12,6 @@ module.exports = {
         development: app.bowerDirectory + '/masonry/dist/masonry.pkgd.js',
         production: app.bowerDirectory + '/masonry/dist/masonry.pkgd.min.js'
       });
-
-      app.import({
-        development: app.bowerDirectory + '/imagesloaded/imagesloaded.pkgd.js',
-        production: app.bowerDirectory + '/imagesloaded/imagesloaded.pkgd.min.js'
-      });
     }
   }
 };