Skip to content

Commit

Permalink
UI: Dependency bumps 1.15.x (#26371)
Browse files Browse the repository at this point in the history
* reform yarn.lock without minimatch or qs in resolutions

* pin async and nth-check

* fix TS errors after bump

* bump ember-template-lint and disable broken rules

* pin ansi-html

* add extra lint rule to skip

* remove ember-d3 in favor of specific d3 libraries we import except d3-selection which was failing in compareAttributes

* add changelog from PR to main
  • Loading branch information
hashishaw authored and akshya96 committed Apr 11, 2024
1 parent cbe073f commit f00d749
Show file tree
Hide file tree
Showing 5 changed files with 3,405 additions and 8,856 deletions.
3 changes: 3 additions & 0 deletions changelog/26346.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:change
ui: Update dependencies including D3 libraries
```
6 changes: 6 additions & 0 deletions ui/.template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ module.exports = {
},
'require-input-label': 'off',
'no-array-prototype-extensions': 'off',
// from bump to ember-template-lint@6.0.0
'no-builtin-form-components': 'off',
'no-at-ember-render-modifiers': 'off',
'no-unnecessary-curly-strings': 'off',
'no-unnecessary-curly-parens': 'off',
'no-action-on-submit-button': 'off',
},
overrides: [
{
Expand Down
2 changes: 1 addition & 1 deletion ui/lib/ldap/addon/routes/libraries/library/check-out.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default class LdapLibraryCheckOutRoute extends Route {
}
}
model(_params: object, transition: Transition) {
const { ttl } = transition.to.queryParams;
const ttl = transition.to?.queryParams['ttl'];
const library = this.modelFor('libraries.library') as LdapLibraryModel;
return library.checkOutAccount(ttl);
}
Expand Down
19 changes: 9 additions & 10 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,12 @@
"broccoli-sri-hash": "meirish/broccoli-sri-hash#rooturl",
"codemirror": "^5.58.2",
"columnify": "^1.5.4",
"d3-axis": "^1.0.8",
"d3-ease": "^1.0.5",
"d3-scale": "^1.0.7",
"d3-array": "^3.2.4",
"d3-axis": "^3.0.0",
"d3-format": "^3.1.0",
"d3-scale": "^4.0.2",
"d3-selection": "^1.3.0",
"d3-time-format": "^2.1.1",
"d3-tip": "^0.9.1",
"d3-transition": "^1.2.0",
"d3-shape": "^3.2.0",
"date-fns": "^2.16.1",
"date-fns-tz": "^1.2.2",
"deepmerge": "^4.0.0",
Expand Down Expand Up @@ -143,7 +142,6 @@
"ember-composable-helpers": "5.0.0",
"ember-concurrency": "2.3.4",
"ember-copy": "2.0.1",
"ember-d3": "^0.5.1",
"ember-data": "~4.11.3",
"ember-engines": "0.8.23",
"ember-fetch": "^8.1.2",
Expand All @@ -163,7 +161,7 @@
"ember-sinon": "^4.0.0",
"ember-source": "~4.12.0",
"ember-svg-jar": "2.4.0",
"ember-template-lint": "5.7.2",
"ember-template-lint": "^6.0.0",
"ember-template-lint-plugin-prettier": "4.0.0",
"ember-test-selectors": "6.0.0",
"ember-tether": "^2.0.1",
Expand Down Expand Up @@ -209,6 +207,8 @@
"xstate": "^3.3.3"
},
"resolutions": {
"ansi-html": "^0.0.8",
"async": "^2.6.4",
"cryptiles": "^4.1.2",
"eslint-utils": "^1.4.1",
"ember-basic-dropdown": "6.0.1",
Expand All @@ -217,10 +217,9 @@
"https-proxy-agent": "^2.2.3",
"ini": "^1.3.6",
"kind-of": "^6.0.3",
"minimatch": "^3.0.2",
"node-notifier": "^8.0.1",
"nth-check": "^2.1.1",
"prismjs": "^1.21.0",
"qs": "^6.3.0",
"serialize-javascript": "^3.1.0",
"underscore": "^1.12.1",
"trim": "^0.0.3",
Expand Down
Loading

0 comments on commit f00d749

Please sign in to comment.