Skip to content

Commit

Permalink
Ember 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
RobbieTheWagner committed Apr 14, 2018
1 parent 94d0a1c commit 7b103d5
Show file tree
Hide file tree
Showing 6 changed files with 807 additions and 730 deletions.
5 changes: 3 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@ module.exports = {
// node files
{
files: [
'ember-cli-build.js',
'index.js',
'testem.js',
'ember-cli-build.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'app/**',
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
],
parserOptions: {
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "4"
- "6"

sudo: required
sudo: false
dist: trusty

addons:
Expand All @@ -25,6 +25,7 @@ env:
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-lts-2.16
- EMBER_TRY_SCENARIO=ember-lts-2.18
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
Expand Down
8 changes: 8 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ module.exports = function() {
}
}
},
{
name: 'ember-lts-2.18',
npm: {
devDependencies: {
'ember-source': '~2.18.0'
}
}
},
{
name: 'ember-release',
npm: {
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"build": "ember build",
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
"start": "ember serve",
"test": "ember try:each"
"test": "ember test",
"test:all": "ember try:each"
},
"dependencies": {
"broccoli-funnel": "^2.0.1",
Expand All @@ -34,7 +35,7 @@
},
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"ember-cli": "~3.0.0-beta.2",
"ember-cli": "~3.1.2",
"ember-cli-changelog": "^0.3.4",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.2.1",
Expand All @@ -52,12 +53,12 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-native-dom-helpers": "^0.6.2",
"ember-resolver": "^4.0.0",
"ember-source": "~3.0.0-beta.3",
"ember-source": "~3.1.0",
"ember-source-channel-url": "^1.0.1",
"ember-try": "^1.0.0-beta.0",
"eslint-plugin-ember": "^5.0.0",
"eslint-plugin-ember-suave": "^1.0.0",
"eslint-plugin-node": "^6.0.0",
"eslint-plugin-node": "^6.0.1",
"loader.js": "^4.2.3"
},
"engines": {
Expand Down
5 changes: 4 additions & 1 deletion testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ module.exports = {
Chrome: {
mode: 'ci',
args: [
// --no-sandbox is needed when running Chrome inside a container
process.env.TRAVIS ? '--no-sandbox' : null,

'--disable-gpu',
'--headless',
'--remote-debugging-port=0',
'--window-size=1440,900'
]
].filter(Boolean)
}
}
};
Loading

0 comments on commit 7b103d5

Please sign in to comment.