Icu 16542 upgrade ember addons rose (#2784)

* v4.12.2...v5.12.0

* fix: 🐛 update path name for hds styles

* chore: 🤖 ember init changes

* style: 💄 clear lint errors

* chore: 🤖 run yarn format in rose addon

* chore: 🤖 fix build failures

* chore: 🤖 yarn.lock file changes

* chore: 🤖 yarn.lock file updates

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-16542
This commit is contained in:
Lisbet Alvarez authored and GitHub committed 2025-05-02 15:13:45 -07:00
1 parent dd8e1864db
commit b7559c1f4e
28 files changed
+321 -1813

No files matched your search

+9 -3
View File
@@ -16,8 +16,10 @@
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint .",
"lint:js:fix": "eslint . --fix",
"format": "yarn run format:js",
"format:js": "prettier --write '{addon,app,config,stories,tests}/**/*.js' *.js",
"start": "ember serve",
"test": "ember test",
"test": "ember test --test-port 0",
"test:ember-compatibility": "ember try:each",
"precommit": "yarn lint && yarn format && yarn test",
"doc:toc": "doctoc README.md"
@@ -85,7 +87,11 @@
"configPath": "tests/dummy/config"
},
"lint-staged": {
"*.{js,scss,yaml}": "eslint --fix",
"*.hbs": "ember-template-lint --fix"
"*.js": [
"eslint --fix",
"prettier --write"
],
"*.hbs": "ember-template-lint --fix",
"*.{scss,yaml}": "prettier --write"
}
}
+3 -3
View File
@@ -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
View File
@@ -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.
+2 -14
View File
@@ -1,26 +1,14 @@
# unconventional js
/blueprints/*/files/
/vendor/
# compiled output
/declarations/
/dist/
/tmp/
# dependencies
/bower_components/
/node_modules/
# misc
main.js
/coverage/
!.*
.eslintcache
.*/
index.js
# 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
+16 -20
View File
@@ -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,
},
@@ -38,22 +40,16 @@ module.exports = {
// node files
{
files: [
'.eslintrc.js',
'.stylelintrc.js',
'.prettierrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js',
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**',
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./index.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./tests/dummy/config/**/*.js',
],
parserOptions: {
sourceType: 'script',
@@ -65,7 +61,7 @@ module.exports = {
extends: ['plugin:n/recommended'],
},
{
// Test files:
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
rules: {
+25
View File
@@ -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/
+2 -6
View File
@@ -2,11 +2,7 @@
/dist/
/tmp/
# dependencies
/bower_components/
# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
@@ -23,18 +19,18 @@
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
/tsconfig.declarations.json
/tsconfig.json
/yarn-error.log
/yarn.lock
.gitkeep
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
+1 -13
View File
@@ -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
+1 -1
View File
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
@@ -1,10 +0,0 @@
/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
*/
import Component from '@glimmer/component';
export default class RoseButtonComponent extends Component {
// =attributes
}
@@ -24,7 +24,7 @@ export default class RoseCodeEditorToolbarComponent extends Component {
if (onCopy) {
onCopy();
}
// eslint-disable-next-line ember/no-runloop
later(() => (this.copyIconType = originalIconType), 1000);
}
}
@@ -5,7 +5,6 @@
import Component from '@glimmer/component';
import { generateComponentID } from '../../../../utilities/component-auto-id';
import { action } from '@ember/object';
export default class RoseDialogComponent extends Component {
// =attributes
@@ -4,7 +4,7 @@
}}
<div class='rose-form-checkbox{{if @error " error"}} {{if @inline " inline"}}'>
{{! template-lint-disable no-builtin-form-components }}
<Input
...attributes
class='rose-form-checkbox-field'
@@ -5,7 +5,7 @@
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { computed, action } from '@ember/object';
import { action } from '@ember/object';
export default class RoseFormComponent extends Component {
// =attributes
@@ -24,7 +24,6 @@ export default class RoseFormComponent extends Component {
* in which case the value is dependent on `@disabled` and `this.isEditable`.
* @type {boolean}
*/
@computed('args.disabled', 'args.showEditToggle', 'isEditable')
get disabled() {
if (this.args.showEditToggle) return this.args.disabled || !this.isEditable;
return this.args.disabled;
@@ -34,7 +33,6 @@ export default class RoseFormComponent extends Component {
* True if showEditToggle is true and edit mode is enabled.
* @type {boolean}
*/
@computed('args.showEditToggle', 'isEditable')
get showEditToggleButton() {
return this.args.showEditToggle && !this.isEditable;
}
@@ -3,6 +3,7 @@
SPDX-License-Identifier: BUSL-1.1
}}
{{! template-lint-disable no-builtin-form-components }}
<Input
...attributes
class='rose-form-input-field{{if @error " error"}}'
@@ -148,51 +148,51 @@
--token-elevation-inset-box-shadow: inset 0 1px 2px 1px
var(--token-color-palette-alpha-100);
--token-elevation-low-box-shadow: 0 1px 1px 0
var(--token-color-palette-neutral-500-alpha-50),
--token-elevation-low-box-shadow:
0 1px 1px 0 var(--token-color-palette-neutral-500-alpha-50),
0 2px 2px 0 var(--token-color-palette-neutral-500-alpha-50);
--token-elevation-mid-box-shadow: 0 2px 3px 0
var(--token-color-palette-alpha-100),
--token-elevation-mid-box-shadow:
0 2px 3px 0 var(--token-color-palette-alpha-100),
0 8px 16px -10px var(--token-color-palette-alpha-200);
--token-elevation-high-box-shadow: 0 2px 3px 0
var(--token-color-palette-neutral-500-alpha-100),
--token-elevation-high-box-shadow:
0 2px 3px 0 var(--token-color-palette-neutral-500-alpha-100),
0 16px 16px -10px var(--token-color-palette-alpha-200);
--token-elevation-higher-box-shadow: 0 2px 3px 0
var(--token-color-palette-alpha-100),
--token-elevation-higher-box-shadow:
0 2px 3px 0 var(--token-color-palette-alpha-100),
0 12px 28px 0 var(--token-color-palette-neutral-500-alpha-200);
--token-elevation-overlay-box-shadow: 0 2px 3px 0
var(--token-color-palette-neutral-600-alpha-100),
--token-elevation-overlay-box-shadow:
0 2px 3px 0 var(--token-color-palette-neutral-600-alpha-100),
0 12px 24px 0 var(--token-color-palette-neutral-600-alpha-200);
--token-surface-inset-box-shadow: inset 0 0 0 1px
var(--token-color-palette-neutral-500-alpha-200),
--token-surface-inset-box-shadow:
inset 0 0 0 1px var(--token-color-palette-neutral-500-alpha-200),
inset 0 1px 2px 1px var(--token-color-palette-alpha-100);
--token-surface-base-box-shadow: 0 0 0 1px
var(--token-color-palette-alpha-200);
--token-surface-low-box-shadow: 0 0 0 1px
var(--token-color-palette-neutral-500-alpha-100),
--token-surface-low-box-shadow:
0 0 0 1px var(--token-color-palette-neutral-500-alpha-100),
0 1px 1px 0 var(--token-color-palette-neutral-500-alpha-50),
0 2px 2px 0 var(--token-color-palette-neutral-500-alpha-50);
--token-surface-mid-box-shadow: 0 0 0 1px
var(--token-color-palette-neutral-500-alpha-100),
--token-surface-mid-box-shadow:
0 0 0 1px var(--token-color-palette-neutral-500-alpha-100),
0 2px 3px 0 var(--token-color-palette-alpha-100),
0 8px 16px -10px var(--token-color-palette-alpha-200);
--token-surface-high-box-shadow: 0 0 0 1px
var(--token-color-palette-neutral-500-alpha-200),
--token-surface-high-box-shadow:
0 0 0 1px var(--token-color-palette-neutral-500-alpha-200),
0 2px 3px 0 var(--token-color-palette-neutral-500-alpha-100),
0 16px 16px -10px var(--token-color-palette-alpha-200);
--token-surface-higher-box-shadow: 0 0 0 1px
var(--token-color-palette-alpha-200),
--token-surface-higher-box-shadow:
0 0 0 1px var(--token-color-palette-alpha-200),
0 2px 3px 0 var(--token-color-palette-alpha-100),
0 12px 28px 0 var(--token-color-palette-neutral-500-alpha-200);
--token-surface-overlay-box-shadow: 0 0 0 1px
var(--token-color-palette-neutral-600-alpha-100),
--token-surface-overlay-box-shadow:
0 0 0 1px var(--token-color-palette-neutral-600-alpha-100),
0 2px 3px 0 var(--token-color-palette-neutral-600-alpha-100),
0 12px 24px 0 var(--token-color-palette-neutral-600-alpha-200);
--token-focus-ring-action-box-shadow: inset 0 0 0 1px
var(--token-color-palette-blue-300),
--token-focus-ring-action-box-shadow:
inset 0 0 0 1px var(--token-color-palette-blue-300),
0 0 0 3px var(--token-color-focus-action-external);
--token-focus-ring-critical-box-shadow: inset 0 0 0 1px
var(--token-color-palette-red-300),
--token-focus-ring-critical-box-shadow:
inset 0 0 0 1px var(--token-color-palette-red-300),
0 0 0 3px var(--token-color-focus-critical-external);
--token-form-label-color: var(--token-color-palette-neutral-700);
--token-form-legend-color: var(--token-color-palette-neutral-700);
@@ -28,8 +28,7 @@ $size-coefficients: (
// 4
xxxs: 0.125,
// 2
xxxxs: 0.0625,
// 1
xxxxs: 0.0625, // 1
);
/**
@@ -24,8 +24,8 @@ $family-primary:
'Droid Sans',
'Helvetica Neue',
sans-serif;
$family-monospace: 'SFMono-Regular', consolas, 'Liberation Mono', menlo, courier,
monospace;
$family-monospace:
'SFMono-Regular', consolas, 'Liberation Mono', menlo, courier, monospace;
// Available font weights by name
$font-weights: (
@@ -55,8 +55,7 @@ $font-sizes: (
// 20
h3: sizing.size(m),
// 16
button: sizing.size(m) * 0.8125,
// 13
button: sizing.size(m) * 0.8125, // 13
);
// Line height expressed as ratio.
+1 -1
View File
@@ -6,7 +6,6 @@
'use strict';
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
const { maybeEmbroider } = require('@embroider/test-setup');
module.exports = function (defaults) {
const app = new EmberAddon(defaults, {
@@ -20,6 +19,7 @@ module.exports = function (defaults) {
behave. You most likely want to be modifying `./index.js` or app's build file
*/
const { maybeEmbroider } = require('@embroider/test-setup');
return maybeEmbroider(app, {
skipBabel: [
{
+1 -3
View File
@@ -6,8 +6,6 @@
'use strict';
var path = require('path');
var Funnel = require('broccoli-funnel');
var mergeTrees = require('broccoli-merge-trees');
module.exports = {
name: require('./package').name,
@@ -27,7 +25,7 @@ module.exports = {
/**
* Due to a limitation in how ember treats nested addons (see https://github.com/ember-cli/ember-cli/issues/4475)
* this is neeeded to reach down into @hashicorp/design-system-components' contentFor hook to run the logic
* this is needed to reach down into @hashicorp/design-system-components' contentFor hook to run the logic
* that injects the sprite into the DOM
*/
contentFor(type, config) {
+27 -31
View File
@@ -10,8 +10,8 @@
"scripts": {
"build:development": "ember build",
"build": "ember build --environment=production && cp metadata.json dist/metadata.json",
"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 .",
@@ -29,13 +29,13 @@
"doc:toc": "doctoc README.md"
},
"dependencies": {
"@embroider/test-setup": "^2.1.1",
"@babel/core": "^7.26.10",
"@hashicorp/design-system-components": "^4.18.1",
"codemirror": "5.65.7",
"ember-auto-import": "^2.10.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-clipboard": "^1.2.1",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-sass": "^11.0.1",
"ember-composable-helpers": "^5.0.0",
"ember-focus-trap": "^1.0.1",
@@ -45,58 +45,54 @@
"uuid": "^11.0.3"
},
"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",
"@ember/string": "^3.0.1",
"@babel/eslint-parser": "^7.25.1",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@ember/optional-features": "^2.1.0",
"@ember/test-helpers": "^4.0.5",
"@embroider/test-setup": "^4.0.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"babel-loader": "^9.2.1",
"babel-plugin-ember-modules-api-polyfill": "^2.12.0",
"babel-plugin-htmlbars-inline-precompile": "3",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^9.1.0",
"doctoc": "^2.2.0",
"ember-cli": "^5.12.0",
"ember-cli": "~5.12.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-element-helper": "^0.8.7",
"ember-exam": "^8.0.0",
"ember-export-application-global": "^2.0.1",
"ember-inline-svg": "^1.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-modifier": "^3.2.7",
"ember-page-title": "^7.0.0",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.1.0",
"ember-resolver": "^10.0.0",
"ember-source": "~4.12.0",
"ember-resolver": "^12.0.1",
"ember-source": "~5.12.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.7.2",
"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",
"jest": "^29.7.0",
"ember-try": "^3.0.0",
"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",
"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",
"react": "^16",
"react-dom": "^16",
"react-syntax-highlighter": "^15.6.1",
"stylelint": "^15.10.1",
"stylelint": "^15.11.0",
"stylelint-config-prettier-scss": "^0.0.1",
"stylelint-config-standard-scss": "^11.0.0",
"webpack": "^5.94.0"
"webpack": "^5.95.0"
},
"peerDependencies": {
"ember-source": ">= 4.0.0"
},
"engines": {
"node": "20.* || 22.*"
@@ -3,4 +3,8 @@
SPDX-License-Identifier: BUSL-1.1
}}
{{page-title 'Dummy'}}
<Hds::Text::Display @tag='h2' id='title'>Welcome to Ember</Hds::Text::Display>
{{outlet}}
@@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "4.12.2",
"version": "5.12.0",
"blueprints": [
{
"name": "addon",
@@ -11,7 +11,8 @@
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--no-welcome"
"--no-welcome",
"--yarn"
]
}
]
+4 -4
View File
@@ -12,18 +12,18 @@ module.exports = async function () {
return {
scenarios: [
{
name: 'ember-lts-4.4',
name: 'ember-lts-4.12',
npm: {
devDependencies: {
'ember-source': '~4.4.0',
'ember-source': '~4.12.0',
},
},
},
{
name: 'ember-lts-4.8',
name: 'ember-lts-5.4',
npm: {
devDependencies: {
'ember-source': '~4.8.0',
'ember-source': '~5.4.0',
},
},
},
+47
View File
@@ -0,0 +1,47 @@
/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
*/
import {
setupApplicationTest as upstreamSetupApplicationTest,
setupRenderingTest as upstreamSetupRenderingTest,
setupTest as upstreamSetupTest,
} from 'ember-qunit';
// 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.
function setupApplicationTest(hooks, options) {
upstreamSetupApplicationTest(hooks, options);
// Additional setup for application tests can be done here.
//
// For example, if you need an authenticated session for each
// application test, you could do:
//
// hooks.beforeEach(async function () {
// await authenticateSession(); // ember-simple-auth
// });
//
// This is also a good place to call test setup functions coming
// from other addons:
//
// setupIntl(hooks, 'en-us'); // ember-intl
// setupMirage(hooks); // ember-cli-mirage
}
function setupRenderingTest(hooks, options) {
upstreamSetupRenderingTest(hooks, options);
// Additional setup for rendering tests can be done here.
}
function setupTest(hooks, options) {
upstreamSetupTest(hooks, options);
// Additional setup for unit tests can be done here.
}
export { setupApplicationTest, setupRenderingTest, setupTest };
-1
View File
@@ -7,7 +7,6 @@
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Dummy Tests</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
+1
View File
@@ -44,6 +44,7 @@
"@babel/core": "^7.26.10",
"@babel/eslint-parser": "^7.25.1",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@ember-data/store": "^5.4.1",
"@ember/optional-features": "^2.1.0",
"@ember/render-modifiers": "^2.0.4",
"@ember/string": "^4.0.0",
+140 -1655
View File
File diff suppressed because it is too large. Load diff