Merge pull request #68 from kpfefferle/bower-to-npm

Load Octicons from NPM instead of Bower

.bowerrc

@@ -1,4 +0,0 @@
-{
-  "directory": "bower_components",
-  "analytics": false
-}

.gitignore

@@ -6,7 +6,6 @@
 
 # dependencies
 /node_modules
-/bower_components
 
 # misc
 /.sass-cache
@@ -19,5 +18,4 @@ testem.log
 
 # ember-try
 .node_modules.ember-try/
-bower.json.ember-try
 package.json.ember-try

.npmignore

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

.vscodeignore

@@ -3,8 +3,7 @@ tmp/**
 build/**
 cache/**
 node_modules/**
-bower_components/**
 .sass-cache/**
 connect.lock/**
 coverage/*/**
-libpeerconnection.log
+libpeerconnection.log

circle.yml

@@ -5,11 +5,9 @@ machine:
     version: "4"
 dependencies:
   pre:
-    - npm install -g bower
     - sudo apt-get update; sudo apt-get install -y --only-upgrade google-chrome-stable
   override:
     - yarn install --no-lockfile --non-interactive
-    - bower install
   cache_directories:
     - ~/.cache/yarn
 test:

config/ember-try.js

@@ -1,4 +1,5 @@
 module.exports = {
+  useYarn: true,
   scenarios: [
     {
       name: 'ember-lts-2.12',

index.js

@@ -6,11 +6,11 @@ module.exports = {
   included: function(app) {
     this._super.included(app);
 
-    app.import(app.bowerDirectory + '/octicons/build/font/octicons.css');
-    app.import(app.bowerDirectory + '/octicons/build/font/octicons.eot', { destDir: 'assets' });
-    app.import(app.bowerDirectory + '/octicons/build/font/octicons.woff2', { destDir: 'assets' });
-    app.import(app.bowerDirectory + '/octicons/build/font/octicons.woff', { destDir: 'assets' });
-    app.import(app.bowerDirectory + '/octicons/build/font/octicons.ttf', { destDir: 'assets' });
-    app.import(app.bowerDirectory + '/octicons/build/font/octicons.svg', { destDir: 'assets' });
+    app.import('node_modules/octicons/build/font/octicons.css');
+    app.import('node_modules/octicons/build/font/octicons.eot', { destDir: 'assets' });
+    app.import('node_modules/octicons/build/font/octicons.woff2', { destDir: 'assets' });
+    app.import('node_modules/octicons/build/font/octicons.woff', { destDir: 'assets' });
+    app.import('node_modules/octicons/build/font/octicons.ttf', { destDir: 'assets' });
+    app.import('node_modules/octicons/build/font/octicons.svg', { destDir: 'assets' });
   }
 };

package.json

@@ -24,7 +24,8 @@
     "test": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^6.11.0"
+    "ember-cli-babel": "^6.11.0",
+    "octicons": "4.3.0"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.6.0",

yarn.lock

@@ -5241,6 +5241,10 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
+[email protected]:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/octicons/-/octicons-4.3.0.tgz#fcbb72850c138fb4e0049aac18c4952951cac14d"
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"