Skip to content

Icu 16546 upgrade ember for admin UI #2793

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.

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

Merged
merged 6 commits into from
Apr 25, 2025
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions ui/admin/.editorconfig
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ insert_final_newline = true
indent_style = space
indent_size = 2

[*.{diff,md}]
trim_trailing_whitespace = false

[*.hbs]
insert_final_newline = false

[*.{diff,md}]
trim_trailing_whitespace = false
8 changes: 0 additions & 8 deletions ui/admin/.ember-cli
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13 changes: 1 addition & 12 deletions ui/admin/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,14 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/declarations/
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
10 changes: 6 additions & 4 deletions ui/admin/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -11,17 +11,19 @@ module.exports = {
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
// This is specific babel-config. If grows consider creating a babel config file
requireConfigFile: false,
babelOptions: {
plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
],
},
// end of babel-config
},
plugins: ['ember'],
extends: ['eslint:recommended', 'plugin:ember/recommended', 'prettier'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true,
},
@@ -57,7 +59,7 @@ module.exports = {
extends: ['plugin:n/recommended'],
},
{
// Test files:
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
rules: {
25 changes: 25 additions & 0 deletions ui/admin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# compiled output
/dist/
/declarations/

# dependencies
/node_modules/

# misc
/.env*
/.pnp*
/.eslintcache
/coverage/
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# broccoli-debug
/DEBUG/
14 changes: 1 addition & 13 deletions ui/admin/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 2 additions & 0 deletions ui/admin/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@
* SPDX-License-Identifier: BUSL-1.1
*/

'use strict';

module.exports = {
singleQuote: true,
printWidth: 80,
2 changes: 1 addition & 1 deletion ui/admin/.watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
16 changes: 8 additions & 8 deletions ui/admin/README.md
Original file line number Diff line number Diff line change
@@ -54,9 +54,9 @@ List of available project commands. `yarn run <command-name>`

## Running / Development

* `ember serve`
* Visit your app at [http://localhost:4200](http://localhost:4200).
* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
- `ember serve`
- Visit your app at [http://localhost:4200](http://localhost:4200).
- Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).

### Building for Production

@@ -102,8 +102,8 @@ Specify what it takes to deploy your app.

## Further Reading / Useful Links

* [ember.js](https://emberjs.com/)
* [ember-cli](https://cli.emberjs.com/release/)
* Development Browser Extensions
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
- [ember.js](https://emberjs.com/)
- [ember-cli](https://cli.emberjs.com/release/)
- Development Browser Extensions
- [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
- [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
17 changes: 7 additions & 10 deletions ui/admin/app/index.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<!doctype html>
<!--
Copyright (c) HashiCorp, Inc.
SPDX-License-Identifier: BUSL-1.1
-->

<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta charset="utf-8">
<title>Admin</title>
<meta
name="description"
content="Simple and secure remote access with HashiCorp Boundary."
/>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#f24c53" />
<meta name="description" content="Simple and secure remote access with HashiCorp Boundary.">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#f24c53">

{{content-for "head"}}

<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css" />
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/admin.css" />
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/admin.css">

<link rel="icon" type="image/svg+xml" href="{{rootURL}}core/logo-app.svg" />

Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ export default class ScopesScopeWorkersWorkerCreateTagsRoute extends Route {
async willTransition(transition) {
// eslint-disable-next-line ember/no-controller-access-in-routes
const controller = this.controllerFor(this.routeName);
if (controller.get('apiTags').length) {
if (controller.apiTags.length) {
transition.abort();
try {
await this.confirm.confirm(this.intl.t('questions.abandon-confirm'), {
8 changes: 6 additions & 2 deletions ui/admin/config/ember-cli-update.json
Original file line number Diff line number Diff line change
@@ -3,13 +3,17 @@
"packages": [
{
"name": "ember-cli",
"version": "4.12.2",
"version": "5.12.0",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true
"isBaseBlueprint": true,
"options": [
"--no-welcome",
"--yarn"
]
}
]
}
3 changes: 2 additions & 1 deletion ui/admin/config/optional-features.json
Original file line number Diff line number Diff line change
@@ -2,5 +2,6 @@
"application-template-wrapper": false,
"default-async-observers": true,
"jquery-integration": false,
"template-only-glimmer-components": true
"template-only-glimmer-components": true,
"no-implicit-route-model": true
}
50 changes: 26 additions & 24 deletions ui/admin/package.json
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@
"build:oss": "EDITION=oss ember build --environment=production",
"build:enterprise": "EDITION=enterprise ember build --environment=production",
"build:hcp": "EDITION=hcp ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint .",
@@ -42,32 +42,33 @@
},
"devDependencies": {
"@babel/core": "^7.26.10",
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@ember/optional-features": "^2.0.0",
"@babel/eslint-parser": "^7.25.1",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@ember/optional-features": "^2.1.0",
"@ember/render-modifiers": "^2.0.4",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^4.0.5",
"@ember/string": "^4.0.0",
"@ember/test-helpers": "^3.3.1",
"@embroider/macros": "^1.16.9",
"@faker-js/faker": "^8.0.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@hashicorp/ember-asciinema-player": "https://github.com/hashicorp/ember-asciinema-player.git#e047a096039cff70234c232efe75dcad74c6358a",
"@warp-drive/build-config": "^0.0.2",
"babel-loader": "^9.2.1",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^9.1.0",
"core": "workspace:*",
"doctoc": "^2.2.0",
"ember-a11y-testing": "^7.0.0",
"ember-auto-import": "^2.10.0",
"ember-cli": "^5.12.0",
"ember-cli": "~5.12.0",
"ember-cli-app-version": "^7.0.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-code-coverage": "^1.0.3",
"ember-cli-content-security-policy": "^2.0.3",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-flash": "^4.0.0",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^11.0.1",
"ember-cli-sri": "^2.1.1",
@@ -76,31 +77,32 @@
"ember-exam": "^8.0.0",
"ember-inline-svg": "^1.0.1",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^4.1.0",
"ember-page-title": "^7.0.0",
"ember-modifier": "^4.2.0",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.1.0",
"ember-resolver": "^10.0.0",
"ember-source": "~4.12.0",
"ember-template-lint": "^5.7.2",
"ember-resolver": "^12.0.1",
"ember-source": "~5.12.0",
"ember-template-lint": "^6.0.0",
"ember-template-lint-plugin-prettier": "^5.0.0",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-n": "^16.3.1",
"eslint-plugin-qunit": "^8.0.1",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^12.2.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-qunit": "^8.1.2",
"js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
"loader.js": "^4.7.0",
"postcss": "^8.4.31",
"prettier": "^3.0.0",
"prettier": "^3.3.3",
"qunit": "^2.22.0",
"qunit-dom": "^3.2.1",
"rose": "workspace:*",
"sinon": "^19.0.2",
"stylelint": "^15.10.1",
"stylelint": "^15.11.0",
"stylelint-config-prettier-scss": "^0.0.1",
"stylelint-config-standard-scss": "^11.0.0",
"tracked-built-ins": "^3.1.1",
"webpack": "^5.94.0"
"tracked-built-ins": "^3.3.0",
"webpack": "^5.95.0"
},
"engines": {
"node": "20.* || 22.*"
2 changes: 1 addition & 1 deletion ui/admin/tests/helpers/index.js
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ import {
authenticateSession,
} from 'ember-simple-auth/test-support';

// This file exists to provide wrappers around ember-qunit's / ember-mocha's
// This file exists to provide wrappers around ember-qunit's
// test setup functions. This way, you can easily extend the setup that is
// needed per test type.

Loading
Loading