Skip to content

Commit

Permalink
ui: Dependency Upgrade (post ember 2.18 > 3.12 upgrade) (#6452)
Browse files Browse the repository at this point in the history
* yarn upgrade

* Manually upgrade all dependencies to latest versions

* ui: Switch lint errors to warnings so we can look at them later

* ui: Upgrade our custom href-to helper for new href-to upgrade
  • Loading branch information
johncowen authored and John Cowen committed Sep 25, 2019
1 parent 90ff45d commit 359ce29
Show file tree
Hide file tree
Showing 5 changed files with 643 additions and 538 deletions.
3 changes: 2 additions & 1 deletion ui-v2/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ module.exports = {
browser: true,
},
rules: {
'no-unused-vars': ['error', { args: 'none' }]
'no-unused-vars': ['error', { args: 'none' }],
'ember/no-new-mixins': ['warn']
},
overrides: [
// node files
Expand Down
3 changes: 3 additions & 0 deletions ui-v2/app/components/templated-anchor.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*eslint ember/require-return-from-computed: "warn"*/
// TODO: Remove ^

import Component from '@ember/component';
import { get, set, computed } from '@ember/object';

Expand Down
22 changes: 10 additions & 12 deletions ui-v2/app/helpers/href-to.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,18 @@ const isWildcard = wildcard(routes);

export default Helper.extend({
compute([targetRouteName, ...rest], namedArgs) {
if (isWildcard(targetRouteName)) {
rest = rest.map(function(item, i) {
return item
.split('/')
.map(encodeURIComponent)
.join('/');
});
}
if (namedArgs.params) {
return hrefTo(this, ...namedArgs.params);
return hrefTo(this, namedArgs.params);
} else {
if (isWildcard(targetRouteName)) {
const split = rest.map(function(item, i) {
return item
.split('/')
.map(encodeURIComponent)
.join('/');
});
return hrefTo(this, targetRouteName, ...split);
} else {
return hrefTo(this, targetRouteName, ...rest);
}
return hrefTo(this, [targetRouteName, ...rest]);
}
},
});
32 changes: 16 additions & 16 deletions ui-v2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,46 +64,46 @@
"ember-cli-eslint": "^5.1.0",
"ember-cli-flash": "^1.6.3",
"ember-cli-htmlbars": "^3.0.1",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-htmlbars-inline-precompile": "^3.0.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-page-object": "^1.15.0-beta.2",
"ember-cli-sass": "^8.0.1",
"ember-cli-sass": "^10.0.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-string-helpers": "^1.9.0",
"ember-cli-string-helpers": "^4.0.3",
"ember-cli-template-lint": "^1.0.0-beta.1",
"ember-cli-uglify": "^2.1.0",
"ember-cli-uglify": "^3.0.0",
"ember-cli-yadda": "^0.5.0",
"ember-collection": "^1.0.0-alpha.9",
"ember-composable-helpers": "^2.1.0",
"ember-computed-style": "^0.3.0",
"ember-data": "~3.12.0",
"ember-exam": "^2.0.1",
"ember-exam": "^4.0.0",
"ember-export-application-global": "^2.0.0",
"ember-href-to": "^1.15.1",
"ember-href-to": "^3.1.0",
"ember-inflector": "^3.0.0",
"ember-load-initializers": "^2.0.0",
"ember-math-helpers": "^2.4.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-power-select": "^2.0.2",
"ember-power-select": "^3.0.3",
"ember-power-select-with-create": "^0.6.0",
"ember-qunit": "^4.4.1",
"ember-resolver": "^5.0.1",
"ember-sinon-qunit": "^2.1.0",
"ember-sinon-qunit": "^3.4.0",
"ember-source": "~3.12.0",
"ember-test-selectors": "^1.0.0",
"ember-test-selectors": "^2.1.0",
"ember-truth-helpers": "^2.0.0",
"eslint-plugin-ember": "^6.2.0",
"eslint-plugin-node": "^9.0.1",
"husky": "^1.1.0",
"eslint-plugin-ember": "^7.0.0",
"eslint-plugin-node": "^10.0.0",
"husky": "^3.0.5",
"ivy-codemirror": "^2.1.0",
"js-yaml": "^3.13.1",
"jsonlint": "^1.6.3",
"lint-staged": "^7.0.0",
"lint-staged": "^9.2.5",
"loader.js": "^4.7.0",
"node-sass": "^4.9.3",
"prettier": "^1.10.2",
"qunit-dom": "^0.8.4",
"text-encoding": "^0.6.4"
"qunit-dom": "^0.9.0",
"text-encoding": "^0.7.0"
},
"engines": {
"node": "8.* || >= 10.*"
Expand Down
Loading

0 comments on commit 359ce29

Please sign in to comment.