Skip to content

Commit

Permalink
Update packages (#27)
Browse files Browse the repository at this point in the history
* Upgrade packages

* Fix eslint

* Update packages

* Remove yarn
  • Loading branch information
Exelord authored Apr 8, 2017
1 parent a54b6b5 commit 7dc4901
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 6,096 deletions.
18 changes: 18 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6,
sourceType: 'module'
},
extends: 'eslint:recommended',
env: {
browser: true
},
rules: {
},
globals: {
md5: true,
define: true,
FastBoot: true
}
};
33 changes: 0 additions & 33 deletions .jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.editorconfig
.ember-cli
.gitignore
.jshintrc
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
Expand Down
11 changes: 1 addition & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
---
language: node_js
node_js:
- "4"
- "6"

sudo: false

cache:
directories:
- $HOME/.npm
- $HOME/.cache # includes bowers cache
- travis_phantomjs

env:
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
Expand All @@ -31,14 +30,6 @@ before_install:
- npm install phantomjs-prebuilt
- node_modules/phantomjs-prebuilt/bin/phantomjs --version

# Upgrade PhantomJS to v2.1.1.
- "export PHANTOMJS_VERSION=2.1.1"
- "export PATH=$PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH"
- "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
- "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; fi"
- "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
- "phantomjs --version"

install:
- npm install
- bower install
Expand Down
4 changes: 1 addition & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{
"name": "ember-initials",
"dependencies": {
}
"name": "ember-initials"
}
2 changes: 1 addition & 1 deletion config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */
module.exports = {
scenarios: [
{
Expand Down
2 changes: 1 addition & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */
'use strict';

module.exports = function (/* environment, appConfig */) {
Expand Down
5 changes: 2 additions & 3 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*jshint node:true*/
/* global require, module */
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
/* eslint-env node */
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function (defaults) {
var config = defaults.project.config(EmberAddon.env());
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* jshint node: true */
/* eslint-env node */
'use strict';

const path = require('path');
Expand Down
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,44 +29,44 @@
"deploy_page": "ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\" && git push origin gh-pages:gh-pages"
},
"engines": {
"node": ">= 0.12.0"
"node": ">= 4"
},
"devDependencies": {
"bootstrap-sass": "^3.3.7",
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^2.4.1",
"ember-bootstrap": "1.0.0-alpha.5",
"ember-cli": "2.11.1",
"ember-cli-app-version": "^2.0.0",
"broccoli-asset-rev": "2.5.0",
"ember-ajax": "2.5.6",
"ember-bootstrap": "1.0.0-alpha.9",
"ember-cli": "2.12.1",
"ember-cli-app-version": "3.0.0",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-fastboot": "1.0.0-beta.15",
"ember-cli-eslint": "^3.0.0",
"ember-cli-fastboot": "1.0.0-beta.16",
"ember-cli-favicon": "1.0.0-beta.4",
"ember-cli-github-pages": "0.1.2",
"ember-cli-htmlbars": "^1.1.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-jshint": "^2.0.1",
"ember-cli-qunit": "^3.0.1",
"ember-cli-release": "^0.2.9",
"ember-cli-sass": "6.1.1",
"ember-cli-qunit": "^3.1.0",
"ember-cli-release": "^1.0.0-beta.2",
"ember-cli-sass": "6.1.2",
"ember-cli-shims": "^1.0.2",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-test-loader": "^2.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-data": "^2.11.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
"ember-font-awesome": "3.0.4",
"ember-load-initializers": "^0.6.0",
"ember-resolver": "^2.0.3",
"ember-export-application-global": "^2.0.0",
"ember-font-awesome": "3.0.5",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.1.0",
"ember-scroll-to": "0.6.4",
"ember-source": "~2.11.0",
"loader.js": "^4.0.10"
"ember-source": "~2.12.0",
"loader.js": "4.2.3"
},
"dependencies": {
"ember-cli-babel": "^5.2.1",
"ember-cli-babel": "^5.2.4",
"broccoli-funnel": "1.1.0",
"broccoli-merge-trees": "1.2.4",
"broccoli-merge-trees": "2.0.0",
"blueimp-md5": "^2.7.0"
},
"fastbootDependencies": [
Expand Down
5 changes: 5 additions & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
env: {
embertest: true
}
};
52 changes: 0 additions & 52 deletions tests/.jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* jshint node: true */
/* eslint-env node */

module.exports = function(environment) {
var ENV = {
Expand Down
9 changes: 3 additions & 6 deletions tests/helpers/start-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@ import Application from '../../app';
import config from '../../config/environment';

export default function startApp(attrs) {
let application;

// use defaults, but you can override
let attributes = Ember.assign({}, config.APP, attrs);

Ember.run(() => {
application = Application.create(attributes);
return Ember.run(() => {
let application = Application.create(attributes);
application.setupForTesting();
application.injectTestHelpers();
return application;
});

return application;
}
Loading

0 comments on commit 7dc4901

Please sign in to comment.