Skip to content

Commit b538e71

Browse files
DhaulagiriDhaulagiri
authored
Merge pull request #265 from hashicorp/br-ember-tidy
npx ember-cli-update across all the ember packages
2 parents d26280c + 03cf9a0 commit b538e71

37 files changed

+951
-1534
lines changed

‎.changeset/shiny-laws-relate.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hashicorp/design-system-components": patch
3+
---
4+
5+
npx ember-cli-update@4.3.0 dependency updates

‎packages/components/.ember-cli

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": true
8+
"disableAnalytics": true,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": false
915
}

‎packages/components/.eslintignore

+3
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

‎packages/components/.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module.exports = {
4545
extends: ['plugin:node/recommended'],
4646
},
4747
{
48-
// Test files:
48+
// test files
4949
files: ['tests/**/*-test.{js,ts}'],
5050
extends: ['plugin:qunit/recommended'],
5151
},

‎packages/components/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ node_modules/
2626
/.node_modules.ember-try/
2727
/bower.json.ember-try
2828
/package.json.ember-try
29+
30+
# broccoli-debug
31+
/DEBUG/

‎packages/components/.npmignore

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/.eslintignore
1515
/.eslintrc.js
1616
/.git/
17+
/.github/
1718
/.gitignore
1819
/.prettierignore
1920
/.prettierrc.js
@@ -33,4 +34,7 @@
3334
# ember-try
3435
/.node_modules.ember-try/
3536
/bower.json.ember-try
37+
/npm-shrinkwrap.json.ember-try
3638
/package.json.ember-try
39+
/package-lock.json.ember-try
40+
/yarn.lock.ember-try

‎packages/components/.prettierignore

+4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

‎packages/components/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
* `ember s`
2323
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

25-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
25+
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

‎packages/components/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ A package containing the components for the HashiCorp Design System.
99
Compatibility
1010
------------------------------------------------------------------------------
1111

12-
* Ember.js v3.20 or above
13-
* Ember CLI v3.20 or above
12+
* Ember.js v3.24 or above
13+
* Ember CLI v3.24 or above
1414
* Node.js v12 or above
1515

1616

‎packages/components/config/ember-try.js

-13
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,6 @@ module.exports = async function () {
4646
},
4747
},
4848
},
49-
{
50-
name: 'ember-default-with-jquery',
51-
env: {
52-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
53-
'jquery-integration': true,
54-
}),
55-
},
56-
npm: {
57-
devDependencies: {
58-
'@ember/jquery': '^1.1.0',
59-
},
60-
},
61-
},
6249
{
6350
name: 'ember-classic',
6451
env: {

‎packages/components/package.json

+21-22
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
"dependencies": {
3737
"@hashicorp/design-system-tokens": "^0.8.0",
3838
"@hashicorp/ember-flight-icons": "^2.0.5",
39-
"ember-auto-import": "^2.2.3",
40-
"ember-cli-babel": "^7.26.6",
41-
"ember-cli-htmlbars": "^5.7.1",
39+
"ember-auto-import": "^2.4.1",
40+
"ember-cli-babel": "^7.26.11",
41+
"ember-cli-htmlbars": "^6.0.1",
4242
"ember-cli-sass": "^10.0.1",
4343
"ember-focus-trap": "^1.0.1",
4444
"ember-keyboard": "^8.1.0",
@@ -47,16 +47,16 @@
4747
},
4848
"devDependencies": {
4949
"@ember/optional-features": "^2.0.0",
50-
"@ember/test-helpers": "^2.4.2",
51-
"@embroider/test-setup": "^0.43.5",
50+
"@ember/test-helpers": "^2.6.0",
51+
"@embroider/test-setup": "^1.5.0",
5252
"@glimmer/component": "^1.0.4",
5353
"@glimmer/tracking": "^1.0.4",
5454
"@percy/cli": "^1.0.1",
5555
"@percy/ember": "^3.0.0",
5656
"babel-eslint": "^10.1.0",
5757
"broccoli-asset-rev": "^3.0.0",
5858
"ember-a11y-refocus": "^2.1.0",
59-
"ember-cli": "~3.28.4",
59+
"ember-cli": "~4.3.0",
6060
"ember-cli-clipboard": "^0.15.0",
6161
"ember-cli-dependency-checker": "^3.2.0",
6262
"ember-cli-deprecation-workflow": "^2.1.0",
@@ -69,31 +69,30 @@
6969
"ember-disable-prototype-extensions": "^1.1.3",
7070
"ember-export-application-global": "^2.0.1",
7171
"ember-load-initializers": "^2.1.2",
72-
"ember-maybe-import-regenerator": "^0.1.6",
73-
"ember-page-title": "^6.2.2",
72+
"ember-page-title": "^7.0.0",
7473
"ember-prism": "^0.12.0",
75-
"ember-qunit": "^5.1.4",
76-
"ember-resolver": "^8.0.2",
77-
"ember-source": "~3.28.0",
74+
"ember-qunit": "^5.1.5",
75+
"ember-resolver": "^8.0.3",
76+
"ember-source": "~4.3.0",
7877
"ember-source-channel-url": "^3.0.0",
7978
"ember-style-modifier": "^0.8.0",
80-
"ember-template-lint": "^3.6.0",
81-
"ember-template-lint-plugin-prettier": "^3.0.1",
79+
"ember-template-lint": "^4.3.0",
80+
"ember-template-lint-plugin-prettier": "^4.0.0",
8281
"ember-truth-helpers": "^3.0.0",
83-
"ember-try": "^1.4.0",
82+
"ember-try": "^2.0.0",
8483
"eslint": "^7.32.0",
85-
"eslint-config-prettier": "^8.3.0",
86-
"eslint-plugin-ember": "^10.5.4",
84+
"eslint-config-prettier": "^8.5.0",
85+
"eslint-plugin-ember": "^10.5.9",
8786
"eslint-plugin-node": "^11.1.0",
88-
"eslint-plugin-prettier": "^3.4.1",
89-
"eslint-plugin-qunit": "^6.2.0",
87+
"eslint-plugin-prettier": "^4.0.0",
88+
"eslint-plugin-qunit": "^7.2.0",
9089
"loader.js": "^4.7.0",
9190
"npm-run-all": "^4.1.5",
92-
"prettier": "^2.3.2",
93-
"qunit": "^2.16.0",
94-
"qunit-dom": "^1.6.0",
91+
"prettier": "^2.6.1",
92+
"qunit": "^2.18.0",
93+
"qunit-dom": "^2.0.0",
9594
"version-bump-prompt": "^6.1.0",
96-
"webpack": "^5.61.0"
95+
"webpack": "^5.70.0"
9796
},
9897
"engines": {
9998
"node": "12.* || 14.* || >= 16"

‎packages/components/tests/dummy/app/templates/components/dropdown.hbs

+1
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,7 @@
471471
</p>
472472
{{! prettier-ignore-start }}
473473
{{! template-lint-disable no-unbalanced-curlies }}
474+
{{! template-lint-disable no-whitespace-for-layout }}
474475
<CodeBlock
475476
@language="markup"
476477
@code='

‎packages/components/tests/dummy/config/ember-cli-update.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.28.4",
6+
"version": "4.3.0",
77
"blueprints": [
88
{
99
"name": "addon",

‎packages/components/tests/dummy/config/environment.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = function (environment) {
55
modulePrefix: 'dummy',
66
environment,
77
rootURL: '/',
8-
locationType: 'auto',
8+
locationType: 'history',
99
EmberENV: {
1010
FEATURES: {
1111
// Here you can enable experimental features on an ember canary build

‎packages/components/tests/dummy/config/targets.js

-15
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,6 @@ const browsers = [
66
'last 1 Safari versions',
77
];
88

9-
// Ember's browser support policy is changing, and IE11 support will end in
10-
// v4.0 onwards.
11-
//
12-
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
13-
//
14-
// If you need IE11 support on a version of Ember that still offers support
15-
// for it, uncomment the code block below.
16-
//
17-
// const isCI = Boolean(process.env.CI);
18-
// const isProduction = process.env.EMBER_ENV === 'production';
19-
//
20-
// if (isCI || isProduction) {
21-
// browsers.push('ie 11');
22-
// }
23-
249
module.exports = {
2510
browsers,
2611
};

‎packages/components/tests/helpers/.gitkeep

Whitespace-only changes.

‎packages/components/tests/helpers/index.js

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import {
2+
setupApplicationTest as upstreamSetupApplicationTest,
3+
setupRenderingTest as upstreamSetupRenderingTest,
4+
setupTest as upstreamSetupTest,
5+
} from 'ember-qunit';
6+
7+
// This file exists to provide wrappers around ember-qunit's / ember-mocha's
8+
// test setup functions. This way, you can easily extend the setup that is
9+
// needed per test type.
10+
11+
function setupApplicationTest(hooks, options) {
12+
upstreamSetupApplicationTest(hooks, options);
13+
14+
// Additional setup for application tests can be done here.
15+
//
16+
// For example, if you need an authenticated session for each
17+
// application test, you could do:
18+
//
19+
// hooks.beforeEach(async function () {
20+
// await authenticateSession(); // ember-simple-auth
21+
// });
22+
//
23+
// This is also a good place to call test setup functions coming
24+
// from other addons:
25+
//
26+
// setupIntl(hooks); // ember-intl
27+
// setupMirage(hooks); // ember-cli-mirage
28+
}
29+
30+
function setupRenderingTest(hooks, options) {
31+
upstreamSetupRenderingTest(hooks, options);
32+
33+
// Additional setup for rendering tests can be done here.
34+
}
35+
36+
function setupTest(hooks, options) {
37+
upstreamSetupTest(hooks, options);
38+
39+
// Additional setup for unit tests can be done here.
40+
}
41+
42+
export { setupApplicationTest, setupRenderingTest, setupTest };

‎packages/components/tests/index.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
65
<title>Dummy Tests</title>
76
<meta name="description" content="">
87
<meta name="viewport" content="width=device-width, initial-scale=1">

‎packages/components/tests/integration/components/hds/badge/index-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ module('Integration | Component | hds/badge/index', function (hooks) {
6868
await render(
6969
hbs`<Hds::Badge @text="meaningful text for icon only badge" @isIconOnly={{true}} id="test-badge" @icon="activity" />`
7070
);
71-
assert.equal(
71+
assert.deepEqual(
7272
this.element.querySelector('.sr-only').textContent.trim(),
7373
'meaningful text for icon only badge'
7474
);

‎packages/components/tests/unit/helpers/hds-link-to-query-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { hdsLinkToQuery } from '@hashicorp/design-system-components/helpers/hds-
33

44
module('Unit | Helper | hds-link-to-query', function () {
55
test('returns the same object that is passed as argument', async function (assert) {
6-
assert.equal(hdsLinkToQuery(['test']), 'test');
6+
assert.deepEqual(hdsLinkToQuery(['test']), 'test');
77
});
88
test('returns an empty object if no argument is passed', async function (assert) {
99
assert.deepEqual(hdsLinkToQuery([]), {});

‎packages/ember-flight-icons/.ember-cli

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": false
915
}

‎packages/ember-flight-icons/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@ jsconfig.json
2929
/package.json.ember-try
3030
/package-lock.json.ember-try
3131
/yarn.lock.ember-try
32+
33+
# broccoli-debug
34+
/DEBUG/

‎packages/ember-flight-icons/CONTRIBUTING.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
* `ember serve`
1717
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
1818

19-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
19+
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
20+
2021

2122
## Releasing a new npm version of the package
2223

‎packages/ember-flight-icons/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
"devDependencies": {
4343
"@ember/optional-features": "^2.0.0",
4444
"@ember/test-helpers": "^2.6.0",
45-
"@embroider/test-setup": "^1.0.0",
45+
"@embroider/test-setup": "^1.5.0",
4646
"@glimmer/component": "^1.0.4",
4747
"@glimmer/tracking": "^1.0.4",
4848
"@percy/cli": "^1.0.1",
4949
"@percy/ember": "^3.0.0",
5050
"babel-eslint": "^10.1.0",
5151
"broccoli-asset-rev": "^3.0.0",
52-
"ember-auto-import": "^2.2.4",
53-
"ember-cli": "~4.1.1",
52+
"ember-auto-import": "^2.4.1",
53+
"ember-cli": "~4.3.0",
5454
"ember-cli-dependency-checker": "^3.2.0",
5555
"ember-cli-inject-live-reload": "^2.1.0",
5656
"ember-cli-sri": "^2.1.1",
@@ -61,23 +61,23 @@
6161
"ember-page-title": "^7.0.0",
6262
"ember-qunit": "^5.1.5",
6363
"ember-resolver": "^8.0.3",
64-
"ember-source": "~4.1.0",
64+
"ember-source": "~4.3.0",
6565
"ember-source-channel-url": "^3.0.0",
66-
"ember-template-lint": "^3.15.0",
67-
"ember-template-lint-plugin-prettier": "^2.0.1",
66+
"ember-template-lint": "^4.3.0",
67+
"ember-template-lint-plugin-prettier": "^4.0.0",
6868
"ember-try": "^2.0.0",
6969
"eslint": "^7.32.0",
70-
"eslint-config-prettier": "^8.3.0",
71-
"eslint-plugin-ember": "^10.5.8",
70+
"eslint-config-prettier": "^8.5.0",
71+
"eslint-plugin-ember": "^10.5.9",
7272
"eslint-plugin-node": "^11.1.0",
7373
"eslint-plugin-prettier": "^4.0.0",
7474
"eslint-plugin-qunit": "^7.2.0",
7575
"loader.js": "^4.7.0",
7676
"npm-run-all": "^4.1.5",
77-
"prettier": "^2.5.1",
78-
"qunit": "^2.17.2",
77+
"prettier": "^2.6.1",
78+
"qunit": "^2.18.0",
7979
"qunit-dom": "^2.0.0",
80-
"webpack": "^5.65.0"
80+
"webpack": "^5.70.0"
8181
},
8282
"peerDependencies": {
8383
"ember-test-selectors": "^6.0.0"

‎packages/ember-flight-icons/tests/dummy/config/ember-cli-update.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "4.1.1",
6+
"version": "4.3.0",
77
"blueprints": [
88
{
99
"name": "addon",

‎packages/ember-flight-icons/tests/helpers/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)