Skip to content

Commit 1149f2f

Browse files
Move to ember-cli@6.2.0 (#681)
1 parent eb139e4 commit 1149f2f

File tree

6 files changed

+544
-303
lines changed

6 files changed

+544
-303
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v4
22-
- uses: pnpm/action-setup@v2
22+
- uses: pnpm/action-setup@v4
2323
with:
2424
version: 9
2525
- name: Install Node
@@ -41,7 +41,7 @@ jobs:
4141

4242
steps:
4343
- uses: actions/checkout@v4
44-
- uses: pnpm/action-setup@v2
44+
- uses: pnpm/action-setup@v4
4545
with:
4646
version: 9
4747
- uses: actions/setup-node@v4
@@ -105,21 +105,39 @@ jobs:
105105
- ember-lts-4.8
106106
- ember-lts-4.12
107107
- ember-lts-5.4
108+
- ember-lts-5.8
109+
- ember-lts-5.12
108110
- ember-release
109111
- ember-beta
110112
- ember-canary
111113
- ember-lts-4.4-with-plain-html
112114
- ember-lts-4.8-with-plain-html
113115
- ember-lts-4.12-with-plain-html
116+
- ember-lts-5.4-with-plain-html
117+
- ember-lts-5.8-with-plain-html
118+
- ember-lts-5.12-with-plain-html
114119
- ember-beta-with-plain-html
115120
- ember-lts-4.4-with-ember-bootstrap-v4
116121
- ember-lts-4.8-with-ember-bootstrap-v4
117122
- ember-lts-4.12-with-ember-bootstrap-v4
123+
- ember-lts-5.4-with-ember-bootstrap-v4
124+
- ember-lts-5.8-with-ember-bootstrap-v4
125+
- ember-lts-5.12-with-ember-bootstrap-v4
118126
- ember-beta-with-ember-bootstrap-v4
119127
- ember-lts-4.4-with-ember-bootstrap-v5
120128
- ember-lts-4.8-with-ember-bootstrap-v5
121129
- ember-lts-4.12-with-ember-bootstrap-v5
130+
- ember-lts-5.4-with-ember-bootstrap-v5
131+
- ember-lts-5.8-with-ember-bootstrap-v5
132+
- ember-lts-5.12-with-ember-bootstrap-v5
122133
- ember-beta-with-ember-bootstrap-v5
134+
- ember-lts-4.4-with-ember-bootstrap-v6
135+
- ember-lts-4.8-with-ember-bootstrap-v6
136+
- ember-lts-4.12-with-ember-bootstrap-v6
137+
- ember-lts-5.4-with-ember-bootstrap-v6
138+
- ember-lts-5.8-with-ember-bootstrap-v6
139+
- ember-lts-5.12-with-ember-bootstrap-v6
140+
- ember-beta-with-ember-bootstrap-v6
123141
- embroider-safe
124142
- embroider-optimized
125143
browser:
@@ -131,12 +149,14 @@ jobs:
131149
browser: Firefox
132150
- try-scenario: ember-default-with-ember-bootstrap-v5
133151
browser: Firefox
152+
- try-scenario: ember-default-with-ember-bootstrap-v6
153+
browser: Firefox
134154
- try-scenario: ember-default-with-plain-html
135155
browser: Firefox
136156

137157
steps:
138158
- uses: actions/checkout@v4
139-
- uses: pnpm/action-setup@v2
159+
- uses: pnpm/action-setup@v4
140160
with:
141161
version: 9
142162
- name: Install Node
@@ -162,6 +182,7 @@ jobs:
162182
- plain-html
163183
- bs4
164184
- bs5
185+
- bs6
165186
browser:
166187
- Chrome
167188

package.json

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"build:gh-pages:docs": "typedoc --out dist",
1919
"build:gh-pages:bs4": "ember try:one ember-default-with-ember-bootstrap-v4 --- ember build --prod",
2020
"build:gh-pages:bs5": "ember try:one ember-default-with-ember-bootstrap-v5 --- ember build --prod",
21+
"build:gh-pages:bs6": "ember try:one ember-default-with-ember-bootstrap-v6 --- ember build --prod",
2122
"build:gh-pages:plain-html": "ember try:one ember-default-with-plain-html --- ember build --prod",
2223
"build": "ember build --environment=production",
2324
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\" --prefixColors auto",
@@ -37,14 +38,15 @@
3738
"test:cov:default": "COVERAGE=true ember test",
3839
"test:cov:bs4": "COVERAGE=true ember try:one ember-default-with-ember-bootstrap-v4 --skip-cleanup=true --- ember test",
3940
"test:cov:bs5": "COVERAGE=true ember try:one ember-default-with-ember-bootstrap-v5 --skip-cleanup=true --- ember test",
41+
"test:cov:bs6": "COVERAGE=true ember try:one ember-default-with-ember-bootstrap-v6 --skip-cleanup=true --- ember test",
4042
"test:cov:plain-html": "COVERAGE=true ember try:one ember-default-with-plain-html --skip-cleanup=true --- ember test",
4143
"docs": "typedoc",
4244
"prepack": "ember ts:precompile",
4345
"postpack": "ember ts:clean",
4446
"nodetest": "mocha node-tests --recursive"
4547
},
4648
"dependencies": {
47-
"@babel/core": "^7.26.0",
49+
"@babel/core": "^7.26.7",
4850
"@embroider/macros": "^1.8.0",
4951
"@embroider/util": "^1.12.0",
5052
"chalk": "^4.1.1",
@@ -57,20 +59,20 @@
5759
"ember-cli-typescript": "^5.2.1",
5860
"ember-composable-helpers": "~5.0.0",
5961
"ember-lifeline": "^7.0.0",
60-
"ember-template-imports": "^4.2.0",
62+
"ember-template-imports": "^4.3.0",
6163
"ember-truth-helpers": "^4.0.0",
6264
"fs-extra": "^11.0.0",
6365
"tracked-built-ins": "^3.1.0"
6466
},
6567
"devDependencies": {
66-
"@babel/eslint-parser": "^7.25.9",
68+
"@babel/eslint-parser": "^7.26.5",
6769
"@babel/plugin-proposal-decorators": "^7.25.9",
6870
"@ember/optional-features": "^2.2.0",
6971
"@ember/render-modifiers": "^2.0.4",
7072
"@ember/string": "^3.1.1",
71-
"@ember/test-helpers": "^4.0.4",
73+
"@ember/test-helpers": "^4.0.5",
7274
"@embroider/test-setup": "^4.0.0",
73-
"@eslint/js": "^9.17.0",
75+
"@eslint/js": "^9.19.0",
7476
"@faker-js/faker": "^8.4.1",
7577
"@fortawesome/ember-fontawesome": "^2.0.0",
7678
"@fortawesome/fontawesome-svg-core": "^6.6.0",
@@ -115,10 +117,10 @@
115117
"@warp-drive/build-config": "^0.0.0-alpha.45",
116118
"babel-eslint": "^10.1.0",
117119
"broccoli-asset-rev": "^3.0.0",
118-
"concurrently": "^9.1.0",
120+
"concurrently": "^9.1.2",
119121
"coveralls": "^3.0.9",
120122
"ember-a11y-testing": "^7.1.0",
121-
"ember-cli": "~6.1.0",
123+
"ember-cli": "~6.2.3",
122124
"ember-cli-blueprint-test-helpers": "^0.19.2",
123125
"ember-cli-clean-css": "^3.0.0",
124126
"ember-cli-code-coverage": "^1.0.3",
@@ -138,18 +140,18 @@
138140
"ember-page-title": "^8.2.3",
139141
"ember-power-select": "^7.1.1",
140142
"ember-prism": "^0.13.0",
141-
"ember-qunit": "^8.1.1",
143+
"ember-qunit": "^9.0.1",
142144
"ember-resolver": "^13.1.0",
143-
"ember-source": "~6.1.0",
145+
"ember-source": "~6.2.0",
144146
"ember-source-channel-url": "^3.0.0",
145-
"ember-template-lint": "^6.0.0",
147+
"ember-template-lint": "^6.1.0",
146148
"ember-try": "^3.0.0",
147149
"ember-welcome-page": "^7.0.2",
148-
"eslint": "^9.17.0",
150+
"eslint": "^9.19.0",
149151
"eslint-config-prettier": "^9.1.0",
150-
"eslint-plugin-ember": "^12.3.3",
152+
"eslint-plugin-ember": "^12.5.0",
151153
"eslint-plugin-n": "^17.15.1",
152-
"eslint-plugin-prettier": "^5.2.1",
154+
"eslint-plugin-prettier": "^5.2.3",
153155
"eslint-plugin-qunit": "^8.1.2",
154156
"eslint-plugin-simple-import-sort": "^12.1.0",
155157
"globals": "^15.14.0",
@@ -159,12 +161,12 @@
159161
"mocha": "^10.0.0",
160162
"prettier": "^3.4.2",
161163
"prettier-plugin-ember-template-tag": "^2.0.4",
162-
"qunit": "^2.23.1",
164+
"qunit": "^2.24.1",
163165
"qunit-dom": "^3.4.0",
164166
"sass": "^1.85.0",
165-
"stylelint": "^16.12.0",
167+
"stylelint": "^16.14.1",
166168
"stylelint-config-standard": "^36.0.1",
167-
"stylelint-prettier": "^5.0.2",
169+
"stylelint-prettier": "^5.0.3",
168170
"typedoc": "0.26.9",
169171
"typedoc-plugin-rename-defaults": "0.7.1",
170172
"typescript": "^5.5.4",

0 commit comments

Comments
 (0)