Skip to content

Commit 1014ee0

Browse files
RobbieTheWagnerrunspired
authored andcommitted
Update ember (#35)
1 parent 555c65d commit 1014ee0

24 files changed

+5772
-114
lines changed

.editorconfig

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,8 @@ insert_final_newline = true
1313
indent_style = space
1414
indent_size = 2
1515

16-
[*.js]
17-
indent_style = space
18-
indent_size = 2
19-
2016
[*.hbs]
2117
insert_final_newline = false
22-
indent_style = space
23-
indent_size = 2
24-
25-
[*.css]
26-
indent_style = space
27-
indent_size = 2
28-
29-
[*.html]
30-
indent_style = space
31-
indent_size = 2
3218

3319
[*.{diff,md}]
3420
trim_trailing_whitespace = false

.eslintrc.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 2017,
5+
sourceType: 'module'
6+
},
7+
extends: [
8+
'eslint:recommended',
9+
'plugin:ember-suave/recommended'
10+
],
11+
env: {
12+
browser: true
13+
},
14+
rules: {
15+
}
16+
};

.gitignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
44
/dist
@@ -13,5 +13,11 @@
1313
/connect.lock
1414
/coverage/*
1515
/libpeerconnection.log
16-
npm-debug.log
16+
npm-debug.log*
17+
yarn-error.log
1718
testem.log
19+
20+
# ember-try
21+
.node_modules.ember-try/
22+
bower.json.ember-try
23+
package.json.ember-try

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.editorconfig
99
.ember-cli
1010
.gitignore
11-
.jshintrc
11+
.eslintrc.js
1212
.watchmanconfig
1313
.travis.yml
1414
bower.json

.travis.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
language: node_js
33
node_js:
4-
- "4"
4+
- "6"
55

66
sudo: required
77
dist: trusty
@@ -16,45 +16,42 @@ addons:
1616
- google-chrome-stable
1717

1818
cache:
19-
directories:
20-
- node_modules
19+
yarn: true
2120

2221
env:
23-
- EMBER_TRY_SCENARIO=ember-1.13.13
22+
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
23+
- EMBER_TRY_SCENARIO=ember-lts-2.4
24+
- EMBER_TRY_SCENARIO=ember-lts-2.8
2425
- EMBER_TRY_SCENARIO=ember-release
2526
- EMBER_TRY_SCENARIO=ember-beta
2627
- EMBER_TRY_SCENARIO=ember-canary
28+
- EMBER_TRY_SCENARIO=ember-default
2729

2830
matrix:
2931
fast_finish: true
3032
allow_failures:
3133
- env: EMBER_TRY_SCENARIO=ember-canary
3234

3335
before_install:
34-
- "export DISPLAY=:99.0"
35-
- "sh -e /etc/init.d/xvfb start"
36-
- "npm install -g npm@^2"
37-
- "npm config set spin false"
38-
- "npm config set progress false"
39-
- "npm install phantomjs-prebuilt"
36+
- export DISPLAY=:99.0
37+
- sh -e /etc/init.d/xvfb start
4038
- export CHROME_BIN=/usr/bin/google-chrome
4139
- sudo apt-get update
4240
- sudo apt-get install -y libappindicator1 fonts-liberation
4341
- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
4442
- sudo dpkg -i google-chrome*.deb
45-
- npm install -g bower
46-
- bower --version
47-
- node_modules/phantomjs-prebuilt/bin/phantomjs --version
43+
- curl -o- -L https://yarnpkg.com/install.sh | bash
44+
- export PATH=$HOME/.yarn/bin:$PATH
45+
- yarn global add phantomjs-prebuilt
46+
- phantomjs --version
4847

4948
install:
50-
- npm install -g bower
51-
- npm install
52-
- bower install
49+
- yarn install --no-lockfile
5350

5451
script:
5552
# Usually, it's ok to finish the test scenario without reverting
5653
# to the addon's original dependency state, skipping "cleanup".
57-
- ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
54+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
5855

5956
branches:
6057
only:

bower.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"name": "ember-hammertime",
33
"dependencies": {
4-
"ember": "~2.8.0",
5-
"ember-cli-shims": "0.1.1"
64
}
75
}

config/ember-try.js

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,35 @@
1-
/*jshint node:true*/
1+
/* eslint-env node */
22
module.exports = {
33
scenarios: [
44
{
5-
name: 'default',
5+
name: 'ember-lts-2.4',
66
bower: {
7-
dependencies: { }
7+
dependencies: {
8+
'ember': 'components/ember#lts-2-4'
9+
},
10+
resolutions: {
11+
'ember': 'lts-2-4'
12+
}
13+
},
14+
npm: {
15+
devDependencies: {
16+
'ember-source': null
17+
}
818
}
919
},
1020
{
11-
name: 'ember-1.13',
21+
name: 'ember-lts-2.8',
1222
bower: {
1323
dependencies: {
14-
'ember': '~1.13.0'
24+
'ember': 'components/ember#lts-2-8'
1525
},
1626
resolutions: {
17-
'ember': '~1.13.0'
27+
'ember': 'lts-2-8'
28+
}
29+
},
30+
npm: {
31+
devDependencies: {
32+
'ember-source': null
1833
}
1934
}
2035
},
@@ -27,6 +42,11 @@ module.exports = {
2742
resolutions: {
2843
'ember': 'release'
2944
}
45+
},
46+
npm: {
47+
devDependencies: {
48+
'ember-source': null
49+
}
3050
}
3151
},
3252
{
@@ -38,6 +58,11 @@ module.exports = {
3858
resolutions: {
3959
'ember': 'beta'
4060
}
61+
},
62+
npm: {
63+
devDependencies: {
64+
'ember-source': null
65+
}
4166
}
4267
},
4368
{
@@ -49,6 +74,17 @@ module.exports = {
4974
resolutions: {
5075
'ember': 'canary'
5176
}
77+
},
78+
npm: {
79+
devDependencies: {
80+
'ember-source': null
81+
}
82+
}
83+
},
84+
{
85+
name: 'ember-default',
86+
npm: {
87+
devDependencies: {}
5288
}
5389
}
5490
]

config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*jshint node:true*/
1+
/* eslint-env node */
22
'use strict';
33

44
module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
/*jshint node:true*/
2-
/* global require, module */
3-
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
1+
/* eslint-env node */
2+
'use strict';
3+
4+
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
45

56
module.exports = function(defaults) {
6-
var app = new EmberAddon(defaults, {
7+
let app = new EmberAddon(defaults, {
78
// Add options here
89
});
910

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* jshint node: true */
1+
/* eslint-env node */
22
'use strict';
33

44
var path = require('path');

0 commit comments

Comments
 (0)