Skip to content

Commit 44dfefe

Browse files
committed
v6.1.0...v6.4.0
1 parent f5194e0 commit 44dfefe

File tree

15 files changed

+534
-631
lines changed

15 files changed

+534
-631
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ jobs:
5757
fail-fast: false
5858
matrix:
5959
try-scenario:
60-
- ember-lts-4.12
61-
- ember-lts-5.4
60+
- ember-lts-5.8
61+
- ember-lts-5.12
6262
- ember-release
6363
- ember-beta
6464
- ember-canary

.gitignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,5 @@
1414
/testem.log
1515
/yarn-error.log
1616

17-
# ember-try
18-
/.node_modules.ember-try/
19-
/npm-shrinkwrap.json.ember-try
20-
/package.json.ember-try
21-
/package-lock.json.ember-try
22-
/yarn.lock.ember-try
23-
2417
# broccoli-debug
2518
/DEBUG/

.npmignore

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
/.stylelintignore
1616
/.stylelintrc.js
1717
/.template-lintrc.js
18-
/.travis.yml
1918
/.watchmanconfig
2019
/CONTRIBUTING.md
2120
/ember-cli-build.js
@@ -27,10 +26,3 @@
2726
/yarn-error.log
2827
/yarn.lock
2928
.gitkeep
30-
31-
# ember-try
32-
/.node_modules.ember-try/
33-
/npm-shrinkwrap.json.ember-try
34-
/package.json.ember-try
35-
/package-lock.json.ember-try
36-
/yarn.lock.ember-try

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
/coverage/
99
!.*
1010
.*/
11+
/pnpm-lock.yaml
12+
ember-cli-update.json
13+
*.html
1114

1215
# ember-try
1316
/.node_modules.ember-try/

.prettierrc.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ module.exports = {
55
overrides: [
66
{
77
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
8-
options: {
9-
singleQuote: true,
10-
},
11-
},
12-
{
13-
files: '*.{gjs,gts}',
148
options: {
159
singleQuote: true,
1610
templateSingleQuote: false,

.stylelintignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,3 @@
33

44
# compiled output
55
/dist/
6-
7-
# addons
8-
/.node_modules.ember-try/

.stylelintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
4+
extends: ['stylelint-config-standard'],
55
};

eslint.config.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import globals from 'globals';
1616
import js from '@eslint/js';
1717

1818
import ember from 'eslint-plugin-ember/recommended';
19-
import prettier from 'eslint-plugin-prettier/recommended';
19+
import eslintConfigPrettier from 'eslint-config-prettier';
2020
import qunit from 'eslint-plugin-qunit';
2121
import n from 'eslint-plugin-n';
2222

@@ -35,7 +35,7 @@ const esmParserOptions = {
3535

3636
export default [
3737
js.configs.recommended,
38-
prettier,
38+
eslintConfigPrettier,
3939
ember.configs.base,
4040
ember.configs.gjs,
4141
/**

package.json

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
},
1616
"scripts": {
1717
"build": "ember build --environment=production",
18+
"format": "prettier . --cache --write",
1819
"lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\" --prefixColors auto",
1920
"lint:css": "stylelint \"**/*.css\"",
2021
"lint:css:fix": "concurrently \"yarn:lint:css -- --fix\"",
21-
"lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\" --prefixColors auto",
22+
"lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\" --prefixColors auto && yarn format",
23+
"lint:format": "prettier . --cache --check",
2224
"lint:hbs": "ember-template-lint .",
2325
"lint:hbs:fix": "ember-template-lint . --fix",
2426
"lint:js": "eslint . --cache",
@@ -29,55 +31,55 @@
2931
"test:ember-compatibility": "ember try:each"
3032
},
3133
"dependencies": {
32-
"@babel/core": "^7.26.0",
34+
"@babel/core": "^7.27.1",
3335
"core-object": "^3.1.5",
3436
"ember-cli-babel": "^8.2.0",
3537
"ember-cli-htmlbars": "^6.3.0",
36-
"ember-template-imports": "^4.2.0",
38+
"ember-template-imports": "^4.3.0",
3739
"node-fetch": "^2"
3840
},
3941
"devDependencies": {
40-
"@babel/eslint-parser": "^7.25.9",
41-
"@babel/plugin-proposal-decorators": "^7.25.9",
42+
"@babel/eslint-parser": "^7.27.1",
43+
"@babel/plugin-proposal-decorators": "^7.27.1",
4244
"@ember/optional-features": "^2.2.0",
43-
"@ember/test-helpers": "^4.0.4",
45+
"@ember/test-helpers": "^5.2.1",
46+
"@embroider/macros": "^1.17.2",
4447
"@embroider/test-setup": "^4.0.0",
45-
"@eslint/js": "^9.17.0",
46-
"@glimmer/component": "^1.1.2",
48+
"@eslint/js": "^9.25.1",
49+
"@glimmer/component": "^2.0.0",
4750
"@glimmer/tracking": "^1.1.2",
4851
"broccoli-asset-rev": "^3.0.0",
49-
"concurrently": "^9.1.0",
52+
"concurrently": "^9.1.2",
5053
"ember-auto-import": "^2.10.0",
51-
"ember-cli": "~6.1.0",
54+
"ember-cli": "~6.4.0",
5255
"ember-cli-clean-css": "^3.0.0",
5356
"ember-cli-dependency-checker": "^3.3.3",
5457
"ember-cli-deploy-plugin": "^0.2.9",
58+
"ember-cli-deprecation-workflow": "^3.3.0",
5559
"ember-cli-inject-live-reload": "^2.1.0",
5660
"ember-cli-sri": "^2.1.1",
5761
"ember-cli-terser": "^4.0.2",
5862
"ember-load-initializers": "^3.0.1",
59-
"ember-qunit": "^8.1.1",
63+
"ember-qunit": "^9.0.2",
6064
"ember-resolver": "^13.1.0",
61-
"ember-source": "~6.1.0",
65+
"ember-source": "~6.4.0",
6266
"ember-source-channel-url": "^3.0.0",
63-
"ember-template-lint": "^6.0.0",
64-
"ember-try": "^3.0.0",
65-
"eslint": "^9.17.0",
67+
"ember-template-lint": "^6.1.0",
68+
"ember-try": "^4.0.0",
69+
"eslint": "^9.25.1",
6670
"eslint-config-prettier": "^9.1.0",
67-
"eslint-plugin-ember": "^12.3.3",
68-
"eslint-plugin-n": "^17.15.1",
69-
"eslint-plugin-prettier": "^5.2.1",
71+
"eslint-plugin-ember": "^12.5.0",
72+
"eslint-plugin-n": "^17.17.0",
7073
"eslint-plugin-qunit": "^8.1.2",
71-
"globals": "^15.14.0",
74+
"globals": "^15.15.0",
7275
"loader.js": "^4.7.0",
73-
"prettier": "^3.4.2",
74-
"prettier-plugin-ember-template-tag": "^2.0.4",
75-
"qunit": "^2.23.1",
76+
"prettier": "^3.5.3",
77+
"prettier-plugin-ember-template-tag": "^2.0.5",
78+
"qunit": "^2.24.1",
7679
"qunit-dom": "^3.4.0",
77-
"stylelint": "^16.12.0",
80+
"stylelint": "^16.19.1",
7881
"stylelint-config-standard": "^36.0.1",
79-
"stylelint-prettier": "^5.0.2",
80-
"webpack": "^5.97.1"
82+
"webpack": "^5.99.7"
8183
},
8284
"peerDependencies": {
8385
"ember-source": ">= 4.0.0"

tests/dummy/app/app.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ import Application from '@ember/application';
22
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from 'dummy/config/environment';
5+
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
6+
7+
if (macroCondition(isDevelopingApp())) {
8+
importSync('./deprecation-workflow');
9+
}
510

611
export default class App extends Application {
712
modulePrefix = config.modulePrefix;

0 commit comments

Comments
 (0)