Skip to content

Commit

Permalink
Update to latest ember-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
cibernox committed Dec 9, 2017
1 parent ea0f4b0 commit 68078ca
Show file tree
Hide file tree
Showing 9 changed files with 1,028 additions and 1,036 deletions.
5 changes: 5 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@
bower.json
ember-cli-build.js
testem.js

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
37 changes: 22 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,33 @@ node_js:
- "6"

sudo: false
dist: trusty

addons:
chrome: stable

cache:
yarn: true

env:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-1.13
- EMBER_TRY_SCENARIO=ember-lts-2.4
- EMBER_TRY_SCENARIO=2.6
- EMBER_TRY_SCENARIO=2.7
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default
- EMBER_TRY_SCENARIO=fastboot-tests
global:
# See https://git.io/vdao3 for details.
- JOBS=1
matrix:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-1.13
- EMBER_TRY_SCENARIO=ember-lts-2.4
- EMBER_TRY_SCENARIO=2.6
- EMBER_TRY_SCENARIO=2.7
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-lts-2.16
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default
- EMBER_TRY_SCENARIO=fastboot-tests

matrix:
fast_finish: true
Expand All @@ -31,8 +40,6 @@ matrix:
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
- yarn global add phantomjs-prebuilt bower
- phantomjs --version

install:
- yarn install --no-lockfile --non-interactive
Expand Down
9 changes: 9 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-env node */
module.exports = {
useYarn: true,
scenarios: [
{
name: 'ember-1.13',
Expand Down Expand Up @@ -59,6 +60,14 @@ module.exports = {
}
}
},
{
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.16.0'
}
}
},
{
name: 'ember-release',
bower: {
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@
},
"repository": "https://github.com/yapplabs/ember-wormhole.git",
"scripts": {
"start": "ember server",
"build": "ember build",
"test": "ember test"
"start": "ember serve",
"test": "ember try:each"
},
"dependencies": {
"ember-cli-babel": "^6.8.2",
"ember-cli-babel": "^6.10.0",
"ember-cli-htmlbars": "^2.0.1"
},
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"chai": "^4.1.2",
"ember-cli": "~2.16.2",
"ember-cli": "^2.17.0",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.0.0",
"ember-cli-eslint": "^4.2.1",
"ember-cli-github-pages": "0.1.2",
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-qunit": "^4.0.0",
"ember-cli-qunit": "^4.1.1",
"ember-cli-release": "^1.0.0-beta.2",
"ember-cli-shims": "^1.1.0",
"ember-cli-shims": "^1.2.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^2.0.0",
"ember-code-snippet": "^1.3.0",
Expand All @@ -41,7 +41,7 @@
"ember-fastboot-addon-tests": "^0.4.0",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-source": "~2.16.0",
"ember-source": "~2.17.0",
"loader.js": "^4.2.3"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ module.exports = {
args: [
'--disable-gpu',
'--headless',
'--remote-debugging-port=9222',
'--remote-debugging-port=0',
'--window-size=1440,900'
]
},
}
}
};
6 changes: 5 additions & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ module.exports = function(environment) {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false
}
},

Expand Down Expand Up @@ -44,7 +48,7 @@ module.exports = function(environment) {
}

if (environment === 'production') {

// here you can enable a production-specific feature
}

return ENV;
Expand Down
1 change: 0 additions & 1 deletion tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* eslint-env node */

module.exports = {
browsers: [
'ie 9',
Expand Down
11 changes: 5 additions & 6 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import resolver from './helpers/resolver';
import {
setResolver
} from 'ember-qunit';
import { start } from 'ember-cli-qunit';
import Application from '../app';
import { setApplication } from '@ember/test-helpers';
import { start } from 'ember-qunit';

setApplication(Application.create({ autoboot: false }));

setResolver(resolver);
start();
Loading

0 comments on commit 68078ca

Please sign in to comment.