Skip to content

Commit

Permalink
fix(deps): update dependencies and drop ember-cli-eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonas Metzener committed Jun 11, 2019
1 parent 1013560 commit bad802b
Show file tree
Hide file tree
Showing 4 changed files with 953 additions and 514 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.js
@@ -1,10 +1,10 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
ecmaVersion: 2018,
sourceType: "module"
},
plugins: ["prettier", "ember"],
plugins: ["ember", "prettier"],
extends: [
"eslint:recommended",
"plugin:ember/recommended",
Expand Down
47 changes: 22 additions & 25 deletions package.json
Expand Up @@ -39,58 +39,55 @@
"broccoli-merge-trees": "^3.0.0",
"broccoli-stew": "^2.0.0",
"chalk": "^2.3.0",
"ember-auto-import": "^1.2.21",
"ember-cli-babel": "^7.5.0",
"ember-auto-import": "^1.4.0",
"ember-cli-babel": "^7.7.3",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-get-config": "^0.2.4",
"ember-toggle": "^5.3.0",
"uikit": "3.1.2"
"uikit": "^3.1.5"
},
"devDependencies": {
"@adfinis-sygroup/semantic-release-config": "2.1.1",
"@commitlint/cli": "7.6.1",
"@commitlint/config-conventional": "7.6.0",
"@commitlint/travis-cli": "7.6.1",
"@adfinis-sygroup/semantic-release-config": "2.1.2",
"@ember/optional-features": "0.7.0",
"broccoli-asset-rev": "3.0.0",
"ember-cli": "3.8.1",
"ember-cli": "3.10.1",
"ember-cli-app-version": "3.2.0",
"ember-cli-code-coverage": "0.4.2",
"ember-cli-dependency-checker": "3.1.0",
"ember-cli-dependency-checker": "3.2.0",
"ember-cli-deploy": "1.0.2",
"ember-cli-deploy-build": "1.1.1",
"ember-cli-deploy-git": "1.3.3",
"ember-cli-deploy-git-ci": "1.0.1",
"ember-cli-eslint": "5.1.0",
"ember-cli-inject-live-reload": "2.0.1",
"ember-cli-sass": "10.0.0",
"ember-cli-sass": "10.0.1",
"ember-cli-sri": "2.1.1",
"ember-cli-template-lint": "1.0.0-beta.3",
"ember-cli-uglify": "2.1.0",
"ember-cli-uglify": "3.0.0",
"ember-code-snippet": "2.4.0",
"ember-composable-helpers": "2.2.0",
"ember-concurrency": "0.10.0",
"ember-composable-helpers": "2.3.1",
"ember-concurrency": "1.0.0",
"ember-disable-prototype-extensions": "1.1.3",
"ember-export-application-global": "2.0.0",
"ember-load-initializers": "2.0.0",
"ember-maybe-import-regenerator": "0.1.6",
"ember-qunit": "4.4.1",
"ember-resolver": "5.1.3",
"ember-source": "3.8.0",
"ember-source-channel-url": "1.1.0",
"ember-source": "3.9.1",
"ember-source-channel-url": "2.0.1",
"ember-truth-helpers": "2.1.0",
"ember-try": "1.1.0",
"eslint-config-prettier": "4.1.0",
"eslint-plugin-ember": "6.3.0",
"eslint-plugin-node": "8.0.1",
"eslint-plugin-prettier": "2.6.0",
"husky": "1.3.1",
"lint-staged": "8.1.5",
"ember-try": "1.2.1",
"eslint": "5.16.0",
"eslint-config-prettier": "4.3.0",
"eslint-plugin-ember": "6.5.1",
"eslint-plugin-node": "9.1.0",
"eslint-plugin-prettier": "3.1.0",
"husky": "2.4.0",
"lint-staged": "8.2.0",
"loader.js": "4.7.0",
"prettier": "1.18.2",
"qunit-dom": "0.8.4",
"sass": "1.19.0"
"qunit-dom": "0.8.5",
"sass": "1.21.0"
},
"engines": {
"node": "6.* || 8.* || >= 10.*"
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/environment.js
Expand Up @@ -15,7 +15,7 @@ module.exports = function(environment) {
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Expand Down

0 comments on commit bad802b

Please sign in to comment.