Skip to content

Commit 3ed3d5f

Browse files
thoovlukemelia
authored andcommitted
Upgrades for cli, source, and deps to 2.15 (#34)
* Upgrade to cli, source, and deps to 2.15 * Removing bower specific files * Use yarn within ember-try
1 parent 43e5a7b commit 3ed3d5f

File tree

22 files changed

+1864
-2543
lines changed

22 files changed

+1864
-2543
lines changed

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 6,
4+
ecmaVersion: 2017,
55
sourceType: 'module'
66
},
77
extends: 'eslint:recommended',

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,10 @@
1414
/coverage/*
1515
/libpeerconnection.log
1616
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

.travis.yml

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,42 @@
11
---
22
language: node_js
33
node_js:
4+
# we recommend testing addons with the same minimum supported node version as Ember CLI
5+
# so that your addon works for all apps
46
- "4"
57

8+
sudo: false
69
dist: trusty
7-
sudo: required
810

911
addons:
10-
apt:
11-
sources:
12-
- google-chrome
13-
packages:
14-
- google-chrome-stable
12+
chrome: stable
1513

1614
cache:
1715
yarn: true
1816

17+
env:
18+
# we recommend new addons test the current and previous LTS
19+
# as well as latest stable release (bonus points to beta/canary)
20+
- EMBER_TRY_SCENARIO=ember-lts-2.8
21+
- EMBER_TRY_SCENARIO=ember-lts-2.12
22+
- EMBER_TRY_SCENARIO=ember-release
23+
- EMBER_TRY_SCENARIO=ember-beta
24+
- EMBER_TRY_SCENARIO=ember-canary
25+
- EMBER_TRY_SCENARIO=ember-default
26+
27+
matrix:
28+
fast_finish: true
29+
allow_failures:
30+
- env: EMBER_TRY_SCENARIO=ember-canary
31+
1932
before_install:
20-
- "export DISPLAY=:99.0"
21-
- "sh -e /etc/init.d/xvfb start"
22-
- sleep 3
2333
- curl -o- -L https://yarnpkg.com/install.sh | bash
2434
- export PATH=$HOME/.yarn/bin:$PATH
25-
- yarn global add bower
2635

2736
install:
28-
- yarn install --no-lockfile
29-
- bower install
37+
- yarn install --no-lockfile --non-interactive
3038

3139
script:
3240
# Usually, it's ok to finish the test scenario without reverting
3341
# to the addon's original dependency state, skipping "cleanup".
34-
- ember try:each --skip-cleanup
42+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

bower.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

config/ember-try.js

Lines changed: 83 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,85 @@
1-
/*jshint node:true*/
1+
/* eslint-env node */
22
module.exports = {
3-
// see package.json
4-
// TLDR: 1.13.x ++
5-
useVersionCompatibility: true
3+
useYarn: true,
4+
5+
scenarios: [
6+
{
7+
name: 'ember-lts-2.8',
8+
bower: {
9+
dependencies: {
10+
'ember': 'components/ember#lts-2-8'
11+
},
12+
resolutions: {
13+
'ember': 'lts-2-8'
14+
}
15+
},
16+
npm: {
17+
devDependencies: {
18+
'ember-source': null
19+
}
20+
}
21+
},
22+
{
23+
name: 'ember-lts-2.12',
24+
npm: {
25+
devDependencies: {
26+
'ember-source': '~2.12.0'
27+
}
28+
}
29+
},
30+
{
31+
name: 'ember-release',
32+
bower: {
33+
dependencies: {
34+
'ember': 'components/ember#release'
35+
},
36+
resolutions: {
37+
'ember': 'release'
38+
}
39+
},
40+
npm: {
41+
devDependencies: {
42+
'ember-source': null
43+
}
44+
}
45+
},
46+
{
47+
name: 'ember-beta',
48+
bower: {
49+
dependencies: {
50+
'ember': 'components/ember#beta'
51+
},
52+
resolutions: {
53+
'ember': 'beta'
54+
}
55+
},
56+
npm: {
57+
devDependencies: {
58+
'ember-source': null
59+
}
60+
}
61+
},
62+
{
63+
name: 'ember-canary',
64+
bower: {
65+
dependencies: {
66+
'ember': 'components/ember#canary'
67+
},
68+
resolutions: {
69+
'ember': 'canary'
70+
}
71+
},
72+
npm: {
73+
devDependencies: {
74+
'ember-source': null
75+
}
76+
}
77+
},
78+
{
79+
name: 'ember-default',
80+
npm: {
81+
devDependencies: {}
82+
}
83+
}
84+
]
685
};

ember-cli-build.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
/* eslint-env node */
2+
'use strict';
3+
24
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
35

46
module.exports = function(defaults) {
5-
var app = new EmberAddon(defaults, {
7+
let app = new EmberAddon(defaults, {
68
// Add options here
79
});
810

package.json

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,33 @@
2424
"test": "ember try:each"
2525
},
2626
"dependencies": {
27+
"bower": "^1.8.2",
2728
"ember-cli-babel": "^6.6.0"
2829
},
2930
"devDependencies": {
30-
"ember-cli": "^2.12.1",
31-
"ember-cli-dependency-checker": "^1.3.0",
32-
"ember-cli-eslint": "^3.0.0",
33-
"ember-cli-htmlbars": "^1.1.1",
34-
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
31+
"broccoli-asset-rev": "^2.4.5",
32+
"ember-ajax": "^3.0.0",
33+
"ember-cli": "~2.15.1",
34+
"ember-cli-dependency-checker": "^2.0.0",
35+
"ember-cli-eslint": "^4.0.0",
36+
"ember-cli-htmlbars": "^2.0.1",
37+
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
3538
"ember-cli-inject-live-reload": "^1.4.1",
36-
"ember-cli-qunit": "^3.1.0",
37-
"ember-cli-release": "^1.0.0-beta.2",
38-
"ember-cli-shims": "^1.0.2",
39-
"ember-disable-prototype-extensions": "^1.1.0",
40-
"ember-export-application-global": "^1.0.5",
41-
"ember-load-initializers": "^0.6.0",
42-
"ember-resolver": "^2.0.3",
39+
"ember-cli-qunit": "^4.0.0",
40+
"ember-cli-shims": "^1.1.0",
41+
"ember-cli-sri": "^2.1.0",
42+
"ember-cli-uglify": "^1.2.0",
43+
"ember-disable-prototype-extensions": "^1.1.2",
44+
"ember-export-application-global": "^2.0.0",
45+
"ember-load-initializers": "^1.0.0",
46+
"ember-resolver": "^4.0.0",
4347
"ember-source": "~2.12.0",
4448
"loader.js": "^4.2.3"
4549
},
4650
"engines": {
47-
"node": ">= 4"
51+
"node": "^4.5 || 6.* || >= 7.*"
4852
},
4953
"ember-addon": {
50-
"versionCompatibility": {
51-
"ember": ">=1.13"
52-
},
5354
"configPath": "tests/dummy/config"
5455
}
5556
}

testem.js

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
/* eslint-env node */
22
module.exports = {
3-
"test_page": "tests/index.html?hidepassed",
4-
"disable_watching": true,
5-
"launch_in_ci": [
6-
"PhantomJS"
3+
test_page: 'tests/index.html?hidepassed',
4+
disable_watching: true,
5+
launch_in_ci: [
6+
'Chrome'
77
],
8-
"launch_in_dev": [
9-
"PhantomJS",
10-
"Chrome"
11-
]
8+
launch_in_dev: [
9+
'Chrome'
10+
],
11+
browser_args: {
12+
Chrome: [
13+
'--disable-gpu',
14+
'--headless',
15+
'--remote-debugging-port=9222',
16+
'--window-size=1440,900'
17+
]
18+
}
1219
};

testem.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)