Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #133

Merged
merged 1 commit into from
Jul 14, 2017
Merged

Update dependencies #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,9 @@
/coverage/*
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log

# ember-try
.node_modules.ember-try/
package.json.ember-try
30 changes: 15 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"ember-addon"
],
"license": "MIT",
"author": "",
"author": "simplabs GmbH",
"directories": {
"doc": "doc",
"test": "tests"
Expand All @@ -29,28 +29,28 @@
"ember-cli-version-checker": "^2.0.0"
},
"devDependencies": {
"ember-cli": "2.13.3",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.0.0",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.4.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli": "~2.14.0",
"ember-cli-dependency-checker": "^2.0.1",
"ember-cli-eslint": "^4.1.0",
"ember-cli-htmlbars": "^2.0.2",
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
"ember-cli-inject-live-reload": "^1.6.1",
"ember-cli-qunit": "^4.0.0",
"ember-cli-shims": "^1.1.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-resolver": "^4.3.0",
"ember-source": "~2.14.0",
"eslint": "^4.1.0",
"eslint": "^4.2.0",
"eslint-config-simplabs": "^0.4.0",
"eslint-plugin-ember": "^3.0.1",
"eslint-plugin-qunit": "^2.3.0",
"loader.js": "^4.0.10",
"mocha": "^3.2.0",
"eslint-plugin-ember": "^3.6.2",
"eslint-plugin-qunit": "^3.2.0",
"loader.js": "^4.5.1",
"mocha": "^3.4.2",
"multidep": "^2.0.2"
},
"engines": {
"node": ">= 4"
"node": "^4.5 || 6.* || >= 7.*"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand Down
8 changes: 4 additions & 4 deletions testem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* eslint-env node */
module.exports = {
'test_page': 'tests/index.html?hidepassed',
'disable_watching': true,
'launch_in_ci': [
test_page: 'tests/index.html?hidepassed',
disable_watching: true,
launch_in_ci: [
'PhantomJS'
],
'launch_in_dev': [
launch_in_dev: [
'PhantomJS',
'Chrome'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated to this PR, but we should update to headless Chrome here soon

]
Expand Down
9 changes: 9 additions & 0 deletions tests/dummy/config/targets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* eslint-env node */
module.exports = {
browsers: [
'ie 9',
'last 1 Chrome versions',
'last 1 Firefox versions',
'last 1 Safari versions'
]
};