From 73605d3de53ea792aeb3ee1c02fcd0fc9da11ece Mon Sep 17 00:00:00 2001 From: Marco Otte-Witte Date: Thu, 13 Jul 2017 21:41:59 +0200 Subject: [PATCH] update ember-cil et al --- .gitignore | 5 +++++ package.json | 33 ++++++++++++++++++--------------- testem.js | 8 ++++---- tests/dummy/app/styles/.gitkeep | 0 tests/dummy/config/targets.js | 9 +++++++++ 5 files changed, 36 insertions(+), 19 deletions(-) delete mode 100644 tests/dummy/app/styles/.gitkeep create mode 100644 tests/dummy/config/targets.js diff --git a/.gitignore b/.gitignore index 558809d8..b08d9e63 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/package.json b/package.json index c0eb2559..491a6e54 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "ember-addon" ], "license": "MIT", - "author": "", + "author": "simplabs GmbH", "directories": { "doc": "doc", "test": "tests" @@ -29,28 +29,31 @@ "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-cli-sri": "^2.1.1", + "ember-cli-uglify": "^1.2.0", + "ember-disable-prototype-extensions": "^1.1.2", + "ember-export-application-global": "^2.0.0", "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", diff --git a/testem.js b/testem.js index 6348b405..f4135163 100644 --- a/testem.js +++ b/testem.js @@ -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' ] diff --git a/tests/dummy/app/styles/.gitkeep b/tests/dummy/app/styles/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js new file mode 100644 index 00000000..df7664c2 --- /dev/null +++ b/tests/dummy/config/targets.js @@ -0,0 +1,9 @@ +/* eslint-env node */ +module.exports = { + browsers: [ + 'ie 9', + 'last 1 Chrome versions', + 'last 1 Firefox versions', + 'last 1 Safari versions' + ] +};