From a574023c05bff3bd4f826708490d86528b03f379 Mon Sep 17 00:00:00 2001 From: Devon Anderson Date: Wed, 1 Nov 2023 15:52:00 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Upgrade=20addons/rose?= =?UTF-8?q?=20dependencies=20(#1973)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 🤖 Upgrade addons/rose dependencies Upgraded `addons/rose` dependencies to match other addons. Lint fixes, and fixed scripts for concurrently ✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11587 * v4.4.1...v4.12.2 * Update ember-try.js change scenarios to match 4.12.2 * Update addons/rose/tests/integration/components/rose/button-test.js Co-authored-by: Lisbet Alvarez <107949262+lisbet-alvarez@users.noreply.github.com> * Update ember-try.js originally had the right scenarios for 4. 12.2 * chore: 🤖 upgrade ember-cli-babel Upgrade ember-cli-babel to match other addons ✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11587 * Update button-test.js fix test declaration statement --------- Co-authored-by: Lisbet Alvarez <107949262+lisbet-alvarez@users.noreply.github.com> --- addons/api/package.json | 2 +- addons/core/package.json | 2 +- addons/rose/.ember-cli | 4 +- addons/rose/.eslintrc.js | 9 +-- addons/rose/.npmignore | 2 + addons/rose/.stylelintignore | 8 +++ addons/rose/.template-lintrc.js | 6 ++ .../addon/components/rose/button/index.hbs | 2 +- .../components/rose/dropdown/button/index.hbs | 2 +- addons/rose/ember-cli-build.js | 2 +- addons/rose/package.json | 31 +++++----- .../tests/dummy/config/ember-cli-update.json | 2 +- addons/rose/tests/dummy/config/ember-try.js | 58 +++++++++++++++++++ addons/rose/tests/dummy/config/environment.js | 7 +-- .../components/rose/anonymous-test.js | 4 +- .../components/rose/button-test.js | 10 ++-- .../components/rose/card/link-test.js | 10 ++-- .../components/rose/dropdown/button-test.js | 6 +- .../components/rose/form/actions-test.js | 30 ++++++++-- .../rose/form/actions/edit-toggle-test.js | 16 ++++- .../rose/layout/body-content-test.js | 2 +- .../components/rose/layout/page-test.js | 2 +- .../components/rose/table/row-test.js | 2 +- .../components/rose/table/row/cell-test.js | 8 +-- .../helpers/set-from-event-test.js | 2 +- .../app/components/form/role/grants/index.hbs | 2 +- .../form/worker/create-worker-led/index.hbs | 2 +- yarn.lock | 16 +++++ 28 files changed, 187 insertions(+), 62 deletions(-) create mode 100644 addons/rose/.stylelintignore create mode 100644 addons/rose/tests/dummy/config/ember-try.js diff --git a/addons/api/package.json b/addons/api/package.json index 49b9a6ac8..bccc733a6 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -14,7 +14,7 @@ "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", "lint:js": "eslint .", "lint:js:fix": "eslint . --fix", - "format": "yarn run format:js", + "format": "concurrently \"npm:format:*\" --names \"format:\"", "format:js": "prettier --write '{addon,app,config,stories,tests,mirage}/**/*.js' *.js", "start": "ember serve", "test": "ember exam --test-port 0 --split=4 --parallel=1 --random", diff --git a/addons/core/package.json b/addons/core/package.json index 896ab53be..a2cbe5129 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -21,7 +21,7 @@ "lint:hbs:fix": "ember-template-lint . --fix", "lint:js": "eslint .", "lint:js:fix": "eslint . --fix", - "format": "npm-run-all format:*", + "format": "concurrently \"npm:format:*\" --names \"format:\"", "format:js": "prettier --write '{addon,app,config,stories,tests}/**/*.js' *.js", "format:hbs": "prettier --write '{addon,app,tests}/**/*.hbs'", "start": "ember serve", diff --git a/addons/rose/.ember-cli b/addons/rose/.ember-cli index 4ccb4bf43..8c1812cff 100644 --- a/addons/rose/.ember-cli +++ b/addons/rose/.ember-cli @@ -8,8 +8,8 @@ "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. + 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. */ "isTypeScriptProject": false } diff --git a/addons/rose/.eslintrc.js b/addons/rose/.eslintrc.js index 476b8408b..fb36fa0b9 100644 --- a/addons/rose/.eslintrc.js +++ b/addons/rose/.eslintrc.js @@ -9,12 +9,14 @@ module.exports = { root: true, parser: '@babel/eslint-parser', parserOptions: { - ecmaVersion: 2018, + 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', { legacy: true }]], + plugins: [ + ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], + ], }, // end of babel-config }, @@ -60,8 +62,7 @@ module.exports = { browser: false, node: true, }, - plugins: ['node'], - extends: ['plugin:node/recommended'], + extends: ['plugin:n/recommended'], }, { // Test files: diff --git a/addons/rose/.npmignore b/addons/rose/.npmignore index 38a2b0863..27849b170 100644 --- a/addons/rose/.npmignore +++ b/addons/rose/.npmignore @@ -18,6 +18,8 @@ /.gitignore /.prettierignore /.prettierrc.js +/.stylelintignore +/.stylelintrc.js /.template-lintrc.js /.travis.yml /.watchmanconfig diff --git a/addons/rose/.stylelintignore b/addons/rose/.stylelintignore new file mode 100644 index 000000000..a0cf71cbd --- /dev/null +++ b/addons/rose/.stylelintignore @@ -0,0 +1,8 @@ +# unconventional files +/blueprints/*/files/ + +# compiled output +/dist/ + +# addons +/.node_modules.ember-try/ diff --git a/addons/rose/.template-lintrc.js b/addons/rose/.template-lintrc.js index 0dfeeb665..c40cbddbc 100644 --- a/addons/rose/.template-lintrc.js +++ b/addons/rose/.template-lintrc.js @@ -31,5 +31,11 @@ module.exports = { 'no-passed-in-event-handlers': false, }, }, + { + files: '**/tests/**/*.{js,gts,gjs}', + rules: { + prettier: false, + }, + }, ], }; diff --git a/addons/rose/addon/components/rose/button/index.hbs b/addons/rose/addon/components/rose/button/index.hbs index 9d2a9ff9a..4980d2994 100644 --- a/addons/rose/addon/components/rose/button/index.hbs +++ b/addons/rose/addon/components/rose/button/index.hbs @@ -5,7 +5,7 @@