Icu 16545 upgrade ember addons api (#2791)

* v4.12.1...v5.12.0

* chore: 🤖 yarn.lock changes from ember upgrade

* chore: 🤖 ember init blueprint changes

* chore: 🤖 yarn.lock updates

* chore: 🤖 fix build errors

* chore: 🤖 yarn.lock file changes

* refactor: 💡 undo style path change

* chore: 🤖 fix build errors

* chore: 🤖 yarn.lock file changes

* test: 💍 add @ember/string back in to fix test error

* chore: 🤖 remove eslint prettier plugin

* chore: 🤖 remove prettier eslint plugin in api addon

* docs: ✏️ add comments back in
This commit is contained in:
Lisbet Alvarez authored and GitHub committed 2025-05-06 08:49:29 -07:00
1 parent 8dafc2b9a0
commit 200a7944e6
25 files changed
+132 -990

No files matched your search

+3 -3
View File
@@ -12,8 +12,8 @@ insert_final_newline = true
indent_style = space indent_style = space
indent_size = 2 indent_size = 2
[*.{diff,md}]
trim_trailing_whitespace = false
[*.hbs] [*.hbs]
insert_final_newline = false 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 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. rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+1 -12
View File
@@ -1,25 +1,14 @@
# unconventional js # unconventional js
/blueprints/*/files/ /blueprints/*/files/
/vendor/
# compiled output # compiled output
/declarations/
/dist/ /dist/
/tmp/
# dependencies
/bower_components/
/node_modules/
# misc # misc
/coverage/ /coverage/
!.* !.*
.*/ .*/
.eslintcache
# ember-try # ember-try
/.node_modules.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
@@ -56,7 +56,7 @@ module.exports = {
extends: ['plugin:n/recommended'], extends: ['plugin:n/recommended'],
}, },
{ {
// Test files: // test files
files: ['tests/**/*-test.{js,ts}'], files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'], extends: ['plugin:qunit/recommended'],
rules: { 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/ /dist/
/tmp/ /tmp/
# dependencies
/bower_components/
# misc # misc
/.bowerrc
/.editorconfig /.editorconfig
/.ember-cli /.ember-cli
/.env* /.env*
@@ -21,18 +17,18 @@
/.template-lintrc.js /.template-lintrc.js
/.travis.yml /.travis.yml
/.watchmanconfig /.watchmanconfig
/bower.json
/CONTRIBUTING.md /CONTRIBUTING.md
/ember-cli-build.js /ember-cli-build.js
/testem.js /testem.js
/tests/ /tests/
/tsconfig.declarations.json
/tsconfig.json
/yarn-error.log /yarn-error.log
/yarn.lock /yarn.lock
.gitkeep .gitkeep
# ember-try # ember-try
/.node_modules.ember-try/ /.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try /npm-shrinkwrap.json.ember-try
/package.json.ember-try /package.json.ember-try
/package-lock.json.ember-try /package-lock.json.ember-try
+1 -13
View File
@@ -1,25 +1,13 @@
# unconventional js # unconventional js
/blueprints/*/files/ /blueprints/*/files/
/vendor/
# compiled output # compiled output
/dist/ /dist/
/tmp/
# dependencies
/bower_components/
/node_modules/
# misc # misc
/coverage/ /coverage/
!.* !.*
.eslintcache .*/
.lint-todo/
# ember-try # ember-try
/.node_modules.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
View File
@@ -3,6 +3,8 @@
* SPDX-License-Identifier: BUSL-1.1 * SPDX-License-Identifier: BUSL-1.1
*/ */
'use strict';
module.exports = { module.exports = {
overrides: [ overrides: [
{ {
+1 -1
View File
@@ -1,3 +1,3 @@
{ {
"ignore_dirs": ["tmp", "dist"] "ignore_dirs": ["dist"]
} }
+2 -1
View File
@@ -6,7 +6,6 @@
'use strict'; 'use strict';
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
const { maybeEmbroider } = require('@embroider/test-setup');
module.exports = function (defaults) { module.exports = function (defaults) {
const app = new EmberAddon(defaults, { const app = new EmberAddon(defaults, {
@@ -19,6 +18,8 @@ module.exports = function (defaults) {
This build file does *not* influence how the addon or the app using it This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file behave. You most likely want to be modifying `./index.js` or app's build file
*/ */
const { maybeEmbroider } = require('@embroider/test-setup');
return maybeEmbroider(app, { return maybeEmbroider(app, {
skipBabel: [ skipBabel: [
{ {
+29 -24
View File
@@ -10,8 +10,10 @@
"scripts": { "scripts": {
"build:development": "ember build", "build:development": "ember build",
"build": "ember build --environment=production", "build": "ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint .", "lint:js": "eslint .",
"lint:js:fix": "eslint . --fix", "lint:js:fix": "eslint . --fix",
"format": "concurrently \"npm:format:*\" --names \"format:\"", "format": "concurrently \"npm:format:*\" --names \"format:\"",
@@ -23,59 +25,62 @@
"doc:toc": "doctoc README.md" "doc:toc": "doctoc README.md"
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.26.10",
"@ember/string": "^4.0.0",
"dexie": "^3.2.4", "dexie": "^3.2.4",
"ember-auto-import": "^2.10.0", "ember-auto-import": "^2.10.0",
"ember-can": "^4.2.0", "ember-can": "^4.2.0",
"ember-cli-babel": "^8.2.0", "ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.2.0", "ember-cli-htmlbars": "^6.3.0",
"ember-cli-mirage": "^3.0.3", "ember-cli-mirage": "^3.0.3",
"ember-data": "~5.3.12", "ember-data": "~5.3.12",
"miragejs": "^0.1.48", "miragejs": "^0.1.48",
"tracked-built-ins": "^3.1.1" "tracked-built-ins": "^3.1.1"
}, },
"peerDependencies": {
"sinon": "^19.0.2"
},
"devDependencies": { "devDependencies": {
"@babel/core": "^7.26.10", "@babel/eslint-parser": "^7.25.1",
"@babel/eslint-parser": "^7.21.3", "@babel/plugin-proposal-decorators": "^7.24.7",
"@babel/plugin-proposal-decorators": "^7.21.0", "@ember/optional-features": "^2.1.0",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^4.0.5", "@ember/test-helpers": "^4.0.5",
"@ember/test-waiters": "^4.1.0", "@ember/test-waiters": "^4.1.0",
"@embroider/test-setup": "^2.1.1", "@embroider/test-setup": "^4.0.0",
"@faker-js/faker": "^8.0.2", "@faker-js/faker": "^8.0.2",
"@glimmer/component": "^1.1.2", "@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2", "@glimmer/tracking": "^1.1.2",
"broccoli-asset-rev": "^3.0.0", "broccoli-asset-rev": "^3.0.0",
"concurrently": "^9.1.0", "concurrently": "^9.1.0",
"doctoc": "^2.2.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-dependency-checker": "^3.3.2",
"ember-cli-inject-live-reload": "^2.1.0", "ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1", "ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2", "ember-cli-terser": "^4.0.2",
"ember-exam": "^8.0.0", "ember-exam": "^8.0.0",
"ember-load-initializers": "^2.1.2", "ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0", "ember-page-title": "^8.2.3",
"ember-qunit": "^8.1.0", "ember-qunit": "^8.1.0",
"ember-resolver": "^10.0.0", "ember-resolver": "^12.0.1",
"ember-source": "~4.12.0", "ember-source": "~5.12.0",
"ember-source-channel-url": "^3.0.0", "ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.7.2", "ember-template-lint": "^6.0.0",
"eslint": "^8.54.0", "ember-try": "^3.0.0",
"eslint-config-prettier": "^9.0.0", "eslint": "^8.57.1",
"eslint-plugin-ember": "^11.11.1", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-n": "^16.3.1", "eslint-plugin-ember": "^12.2.1",
"eslint-plugin-qunit": "^8.0.1", "eslint-plugin-n": "^16.6.2",
"eslint-plugin-qunit": "^8.1.2",
"js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1", "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
"loader.js": "^4.7.0", "loader.js": "^4.7.0",
"prettier": "^3.0.0", "prettier": "^3.3.3",
"qunit": "^2.22.0", "qunit": "^2.22.0",
"qunit-dom": "^3.2.1", "qunit-dom": "^3.2.1",
"sinon": "^19.0.2", "sinon": "^19.0.2",
"webpack": "^5.94.0" "webpack": "^5.95.0"
},
"peerDependencies": {
"ember-source": ">= 4.0.0",
"sinon": "^19.0.2"
}, },
"engines": { "engines": {
"node": "20.* || 22.*" "node": "20.* || 22.*"
@@ -2,4 +2,3 @@
* Copyright (c) HashiCorp, Inc. * Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1 * SPDX-License-Identifier: BUSL-1.1
*/ */
@@ -3,7 +3,7 @@
"packages": [ "packages": [
{ {
"name": "ember-cli", "name": "ember-cli",
"version": "4.12.1", "version": "5.12.0",
"blueprints": [ "blueprints": [
{ {
"name": "addon", "name": "addon",
@@ -11,7 +11,8 @@
"codemodsSource": "ember-addon-codemods-manifest@1", "codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true, "isBaseBlueprint": true,
"options": [ "options": [
"--no-welcome" "--no-welcome",
"--yarn"
] ]
} }
] ]
+4 -12
View File
@@ -12,26 +12,18 @@ module.exports = async function () {
return { return {
scenarios: [ scenarios: [
{ {
name: 'ember-lts-4.4', name: 'ember-lts-4.12',
npm: { npm: {
devDependencies: { devDependencies: {
'ember-source': '~4.4.0', 'ember-source': '~4.12.0',
}, },
}, },
}, },
{ {
name: 'ember-lts-4.8', name: 'ember-lts-5.4',
npm: { npm: {
devDependencies: { devDependencies: {
'ember-source': '~4.8.0', 'ember-source': '~5.4.0',
},
},
},
{
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~4.4.0',
}, },
}, },
}, },
+1 -1
View File
@@ -9,7 +9,7 @@ import {
setupTest as upstreamSetupTest, setupTest as upstreamSetupTest,
} from 'ember-qunit'; } from 'ember-qunit';
// 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 // test setup functions. This way, you can easily extend the setup that is
// needed per test type. // needed per test type.
+3 -5
View File
@@ -11,19 +11,17 @@ module.exports = {
parserOptions: { parserOptions: {
ecmaVersion: 'latest', ecmaVersion: 'latest',
sourceType: 'module', sourceType: 'module',
// This is specific babel-config. If grows consider creating a babel config file
requireConfigFile: false, requireConfigFile: false,
babelOptions: { babelOptions: {
plugins: [ plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
], ],
}, },
// end of babel-config
}, },
plugins: ['ember'], plugins: ['ember'],
extends: [ extends: ['eslint:recommended', 'plugin:ember/recommended', 'prettier'],
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: { env: {
browser: true, browser: true,
}, },
-1
View File
@@ -62,7 +62,6 @@
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^12.2.1", "eslint-plugin-ember": "^12.2.1",
"eslint-plugin-n": "^16.6.2", "eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-qunit": "^8.1.2", "eslint-plugin-qunit": "^8.1.2",
"loader.js": "^4.7.0", "loader.js": "^4.7.0",
"pretender": "^3.4.3", "pretender": "^3.4.3",
+1 -1
View File
@@ -53,7 +53,7 @@
"@babel/eslint-parser": "^7.25.1", "@babel/eslint-parser": "^7.25.1",
"@babel/plugin-proposal-decorators": "^7.24.7", "@babel/plugin-proposal-decorators": "^7.24.7",
"@ember/optional-features": "^2.1.0", "@ember/optional-features": "^2.1.0",
"@ember/test-helpers": "^3.3.1", "@ember/test-helpers": "^4.0.5",
"@embroider/test-setup": "^4.0.0", "@embroider/test-setup": "^4.0.0",
"@faker-js/faker": "^8.0.2", "@faker-js/faker": "^8.0.2",
"@glimmer/component": "^1.1.2", "@glimmer/component": "^1.1.2",
+3 -5
View File
@@ -11,19 +11,17 @@ module.exports = {
parserOptions: { parserOptions: {
ecmaVersion: 'latest', ecmaVersion: 'latest',
sourceType: 'module', sourceType: 'module',
// This is specific babel-config. If grows consider creating a babel config file
requireConfigFile: false, requireConfigFile: false,
babelOptions: { babelOptions: {
plugins: [ plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
], ],
}, },
// end of babel-config
}, },
plugins: ['ember'], plugins: ['ember'],
extends: [ extends: ['eslint:recommended', 'plugin:ember/recommended', 'prettier'],
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: { env: {
browser: true, browser: true,
}, },
-1
View File
@@ -79,7 +79,6 @@
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^12.2.1", "eslint-plugin-ember": "^12.2.1",
"eslint-plugin-n": "^16.6.2", "eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-qunit": "^8.1.2", "eslint-plugin-qunit": "^8.1.2",
"loader.js": "^4.7.0", "loader.js": "^4.7.0",
"postcss": "^8.4.31", "postcss": "^8.4.31",
+3 -5
View File
@@ -11,19 +11,17 @@ module.exports = {
parserOptions: { parserOptions: {
ecmaVersion: 'latest', ecmaVersion: 'latest',
sourceType: 'module', sourceType: 'module',
// This is specific babel-config. If grows consider creating a babel config file
requireConfigFile: false, requireConfigFile: false,
babelOptions: { babelOptions: {
plugins: [ plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
], ],
}, },
// end of babel-config
}, },
plugins: ['ember'], plugins: ['ember'],
extends: [ extends: ['eslint:recommended', 'plugin:ember/recommended', 'prettier'],
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: { env: {
browser: true, browser: true,
}, },
+1 -3
View File
@@ -44,11 +44,10 @@
"@babel/core": "^7.26.10", "@babel/core": "^7.26.10",
"@babel/eslint-parser": "^7.25.1", "@babel/eslint-parser": "^7.25.1",
"@babel/plugin-proposal-decorators": "^7.24.7", "@babel/plugin-proposal-decorators": "^7.24.7",
"@ember-data/store": "^5.4.1",
"@ember/optional-features": "^2.1.0", "@ember/optional-features": "^2.1.0",
"@ember/render-modifiers": "^2.0.4", "@ember/render-modifiers": "^2.0.4",
"@ember/string": "^4.0.0", "@ember/string": "^4.0.0",
"@ember/test-helpers": "^3.3.1", "@ember/test-helpers": "^4.0.5",
"@faker-js/faker": "^8.0.2", "@faker-js/faker": "^8.0.2",
"@glimmer/component": "^1.1.2", "@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2", "@glimmer/tracking": "^1.1.2",
@@ -87,7 +86,6 @@
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^12.2.1", "eslint-plugin-ember": "^12.2.1",
"eslint-plugin-n": "^16.6.2", "eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-qunit": "^8.1.2", "eslint-plugin-qunit": "^8.1.2",
"js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1", "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
"loader.js": "^4.7.0", "loader.js": "^4.7.0",
+3 -5
View File
@@ -11,19 +11,17 @@ module.exports = {
parserOptions: { parserOptions: {
ecmaVersion: 'latest', ecmaVersion: 'latest',
sourceType: 'module', sourceType: 'module',
// This is specific babel-config. If grows consider creating a babel config file
requireConfigFile: false, requireConfigFile: false,
babelOptions: { babelOptions: {
plugins: [ plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
], ],
}, },
// end of babel-config
}, },
plugins: ['ember'], plugins: ['ember'],
extends: [ extends: ['eslint:recommended', 'plugin:ember/recommended', 'prettier'],
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: { env: {
browser: true, browser: true,
}, },
+1 -2
View File
@@ -53,7 +53,7 @@
"@ember/optional-features": "^2.1.0", "@ember/optional-features": "^2.1.0",
"@ember/render-modifiers": "^2.0.4", "@ember/render-modifiers": "^2.0.4",
"@ember/string": "^4.0.0", "@ember/string": "^4.0.0",
"@ember/test-helpers": "^3.3.1", "@ember/test-helpers": "^4.0.5",
"@faker-js/faker": "^8.0.2", "@faker-js/faker": "^8.0.2",
"@glimmer/component": "^1.1.2", "@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2", "@glimmer/tracking": "^1.1.2",
@@ -93,7 +93,6 @@
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^12.2.1", "eslint-plugin-ember": "^12.2.1",
"eslint-plugin-n": "^16.6.2", "eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-qunit": "^8.1.2", "eslint-plugin-qunit": "^8.1.2",
"js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1", "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
"loader.js": "^4.7.0", "loader.js": "^4.7.0",
+42 -877
View File
File diff suppressed because it is too large. Load diff