Skip to content

Commit f5e4663

Browse files
locksKelly Selden
authored andcommitted
Upgrade to 2.18 (#91)
Upgrade to 2.18
1 parent 92fe4a5 commit f5e4663

28 files changed

+3597
-947
lines changed

.eslintrc.js

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,45 @@ module.exports = {
44
ecmaVersion: 2017,
55
sourceType: 'module'
66
},
7-
extends: 'eslint:recommended',
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
814
env: {
915
browser: true
1016
},
1117
rules: {
12-
}
13-
};
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'fastboot-server.js',
24+
'testem.js',
25+
'ember-cli-build.js',
26+
'config/**/*.js',
27+
'lib/*/index.js'
28+
],
29+
parserOptions: {
30+
sourceType: 'script',
31+
ecmaVersion: 2015
32+
},
33+
env: {
34+
browser: false,
35+
node: true
36+
}
37+
},
38+
39+
// test files
40+
{
41+
files: ['tests/**/*.js'],
42+
excludedFiles: ['tests/dummy/**/*.js'],
43+
env: {
44+
embertest: true
45+
}
46+
}
47+
]
48+
};

.gitignore

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
/connect.lock
1515
/coverage/*
1616
/libpeerconnection.log
17-
npm-debug.log
17+
npm-debug.log*
18+
yarn-error.log
1819
testem.log
19-
.DS_Store
20+
21+
# ember-try
22+
.node_modules.ember-try/
23+
bower.json.ember-try
24+
package.json.ember-try

.travis.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,32 @@ language: node_js
22
node_js:
33
- '6'
44
sudo: false
5+
dist: trusty
6+
7+
addons:
8+
chrome: stable
9+
510
cache:
611
yarn: true
712
directories:
8-
- $HOME/.cache # includes bowers cache
13+
- $HOME/.cache
14+
15+
env:
16+
global:
17+
# See https://git.io/vdao3 for details.
18+
- JOBS=1
19+
920
before_install:
1021
- curl -o- -L https://yarnpkg.com/install.sh | bash
1122
- export PATH=$HOME/.yarn/bin:$PATH
12-
- yarn global add bower phantomjs-prebuilt
13-
- phantomjs --version
23+
1424
install:
1525
- yarn
26+
1627
script:
28+
- yarn run lint:js
1729
- yarn test
30+
1831
deploy:
1932
provider: heroku
2033
api_key:

app/app.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import Ember from 'ember';
1+
import Application from '@ember/application';
22
import Resolver from './resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

6-
let App;
7-
8-
App = Ember.Application.extend({
6+
const App = Application.extend({
97
modulePrefix: config.modulePrefix,
108
podModulePrefix: config.podModulePrefix,
119
Resolver
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22

3-
export default Ember.Component.extend({
3+
export default Component.extend({
44
classNames: ['command-prompt']
55
});
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22

3-
export default Ember.Component.extend({
3+
export default Component.extend({
44
classNames: ['fastboot-logo']
55
});
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22

3-
export default Ember.Component.extend({
3+
export default Component.extend({
44
classNames: ['main-hero-terminal']
55
});
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22

3-
export default Ember.Component.extend({
3+
export default Component.extend({
44
classNames: ['main-hero']
55
});

app/components/main-nav.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22

3-
export default Ember.Component.extend({
3+
export default Component.extend({
44
tagName: 'nav',
55
classNames: [
66
'main-nav',

app/components/nav-bar.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import Ember from "ember";
2-
import Component from "ember-component";
1+
import $ from 'jquery';
2+
import Component from "@ember/component";
33

44
export default Component.extend({
55
classNames: 'nav-bar',
66
classNameBindings: 'isOffTop',
77

88
didInsertElement() {
9-
let $window = Ember.$(window);
9+
let $window = $(window);
1010

1111
$window.on('scroll', () => {
1212
requestAnimationFrame(() => {
13-
let $section = Ember.$('section').first();
13+
let $section = $('section').first();
1414
let sectionTop = $section[0].getBoundingClientRect().top;
1515
this.set('isOffTop', sectionTop < 0);
1616
});

0 commit comments

Comments
 (0)