Skip to content

Commit 5490e03

Browse files
committed
chore(deps): update dependencies and add support for newer LTS versions
1 parent 4ca27ee commit 5490e03

17 files changed

+2052
-6072
lines changed

.eslintignore

-14
This file was deleted.

.eslintrc.js

-5
This file was deleted.

.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ jobs:
6161
try-scenario:
6262
- ember-lts-4.12
6363
- ember-lts-5.4
64+
- ember-lts-5.8
65+
- ember-lts-5.12
6466
- ember-data-4.12
6567
- ember-release
6668
- ember-beta

.npmignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
/.ember-cli
88
/.env*
99
/.eslintcache
10-
/.eslintignore
11-
/.eslintrc.js
1210
/.git/
1311
/.github/
1412
/.gitignore
@@ -17,10 +15,10 @@
1715
/.stylelintignore
1816
/.stylelintrc.js
1917
/.template-lintrc.js
20-
/.travis.yml
2118
/.watchmanconfig
2219
/CONTRIBUTING.md
2320
/ember-cli-build.js
21+
/eslint.config.mjs
2422
/testem.js
2523
/tests/
2624
/tsconfig.declarations.json

.prettierignore

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
/coverage/
99
!.*
1010
.*/
11+
/pnpm-lock.yaml
12+
ember-cli-update.json
13+
*.html
14+
CHANGELOG.md
1115

1216
# ember-try
1317
/.node_modules.ember-try/

.prettierrc.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
"use strict";
22

33
module.exports = {
4+
plugins: ["prettier-plugin-ember-template-tag"],
45
overrides: [
56
{
6-
files: "*.{js,ts}",
7+
files: "*.{js,gjs,ts,gts,mjs,mts,cjs,cts}",
78
options: {
89
singleQuote: false,
10+
templateSingleQuote: false,
911
},
1012
},
1113
],

addon/-private/models/localized.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { inject as service } from "@ember/service";
1+
import { service } from "@ember/service";
22
import Model from "@ember-data/model";
33
import { macroCondition, getOwnConfig } from "@embroider/macros";
44
import { tracked } from "@glimmer/tracking";

ember-cli-build.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
44

55
module.exports = function (defaults) {
66
const app = new EmberAddon(defaults, {
7-
// Add options here
7+
emberData: {
8+
deprecations: {
9+
DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false,
10+
},
11+
},
812
});
913

1014
/*

eslint.config.mjs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from "@adfinis/eslint-config/ember-addon";

package.json

+29-23
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,18 @@
1717
},
1818
"scripts": {
1919
"build": "ember build --environment=production",
20-
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
20+
"format": "prettier . --cache --write",
21+
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\" --prefixColors auto",
2122
"lint:css": "stylelint \"**/*.css\"",
2223
"lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
23-
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
24+
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\" --prefixColors auto && pnpm format",
25+
"lint:format": "prettier . --cache --check",
2426
"lint:hbs": "ember-template-lint .",
2527
"lint:hbs:fix": "ember-template-lint . --fix",
2628
"lint:js": "eslint . --cache",
2729
"lint:js:fix": "eslint . --fix",
2830
"start": "ember serve",
29-
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
31+
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\" --prefixColors auto",
3032
"test:ember": "ember test",
3133
"test:ember-compatibility": "ember try:each"
3234
},
@@ -36,51 +38,55 @@
3638
"@glimmer/tracking": "^1.1.2",
3739
"ember-auto-import": "^2.7.4",
3840
"ember-cli-babel": "^8.2.0",
39-
"ember-cli-htmlbars": "^6.3.0"
41+
"ember-cli-htmlbars": "^6.3.0",
42+
"ember-template-imports": "^4.3.0"
4043
},
4144
"devDependencies": {
42-
"@adfinis/eslint-config": "3.0.1",
45+
"@adfinis/eslint-config": "3.0.2",
4346
"@adfinis/semantic-release-config": "5.0.0",
44-
"@babel/eslint-parser": "7.26.5",
47+
"@babel/eslint-parser": "7.27.0",
4548
"@babel/plugin-proposal-decorators": "7.25.9",
4649
"@ember/optional-features": "2.2.0",
47-
"@ember/test-helpers": "5.1.0",
50+
"@ember/test-helpers": "5.2.1",
4851
"@embroider/test-setup": "4.0.0",
52+
"@eslint/js": "9.23.0",
4953
"@glimmer/component": "2.0.0",
5054
"broccoli-asset-rev": "3.0.0",
5155
"concurrently": "9.1.2",
52-
"ember-cli": "6.2.0",
56+
"ember-cli": "6.3.0",
5357
"ember-cli-clean-css": "3.0.0",
5458
"ember-cli-dependency-checker": "3.3.3",
55-
"ember-cli-deprecation-workflow": "3.1.0",
59+
"ember-cli-deprecation-workflow": "3.3.0",
5660
"ember-cli-inject-live-reload": "2.1.0",
5761
"ember-cli-sri": "2.1.1",
5862
"ember-cli-terser": "4.0.2",
59-
"ember-data": "5.3.9",
60-
"ember-intl": "7.1.3",
63+
"ember-data": "5.3.12",
64+
"ember-intl": "7.1.5",
6165
"ember-load-initializers": "3.0.1",
62-
"ember-qunit": "9.0.1",
66+
"ember-qunit": "9.0.2",
6367
"ember-resolver": "13.1.0",
64-
"ember-source": "6.1.0",
68+
"ember-source": "6.3.0",
6569
"ember-source-channel-url": "3.0.0",
66-
"ember-template-lint": "6.1.0",
67-
"ember-try": "3.0.0",
68-
"eslint": "9.19.0",
69-
"eslint-config-prettier": "10.0.1",
70+
"ember-template-lint": "7.0.2",
71+
"ember-try": "4.0.0",
72+
"eslint": "9.23.0",
73+
"eslint-config-prettier": "10.1.1",
7074
"eslint-plugin-ember": "12.5.0",
7175
"eslint-plugin-import": "2.31.0",
72-
"eslint-plugin-n": "17.15.1",
73-
"eslint-plugin-prettier": "5.2.3",
76+
"eslint-plugin-n": "17.17.0",
77+
"eslint-plugin-prettier": "5.2.5",
7478
"eslint-plugin-qunit": "8.1.2",
79+
"globals": "16.0.0",
7580
"loader.js": "4.7.0",
76-
"prettier": "3.4.2",
81+
"prettier": "3.5.3",
82+
"prettier-plugin-ember-template-tag": "2.0.5",
7783
"qunit": "2.24.1",
7884
"qunit-dom": "3.4.0",
79-
"semantic-release": "24.2.1",
80-
"stylelint": "16.14.1",
85+
"semantic-release": "24.2.3",
86+
"stylelint": "16.17.0",
8187
"stylelint-config-standard": "37.0.0",
8288
"stylelint-prettier": "5.0.3",
83-
"webpack": "5.97.1"
89+
"webpack": "5.98.0"
8490
},
8591
"peerDependencies": {
8692
"@ember-data/adapter": "~4.12.0 || >= 5.0.0",

0 commit comments

Comments
 (0)