Skip to content

Commit 948ff8f

Browse files
mansonamansona
committed
Merge remote-tracking branch 'origin/beta' into merge-beta
2 parents 538ae32 + 5e6c316 commit 948ff8f

27 files changed

Lines changed: 449 additions & 439 deletions

File tree

.github/workflows/plan-release.yml renamed to .github/workflows/plan-alpha-release.yml

File renamed without changes.

.github/workflows/publish.yml renamed to .github/workflows/publish-alpha.yml

File renamed without changes.

‎dev/update-blueprint-dependencies.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,13 @@ async function updateDependencies(dependencies) {
145145

146146
if (hasVersion && isValidPrefix) {
147147
const semverRange = OPTIONS.latest ? 'latest' : removeTemplateExpression(previousValue);
148-
const newVersion = await latestVersion(dependencyName, semverRange);
148+
try {
149+
const newVersion = await latestVersion(dependencyName, semverRange);
149150

150-
dependencies[dependencyKey] = `${prefix}${newVersion}${templateSuffix}`;
151+
dependencies[dependencyKey] = `${prefix}${newVersion}${templateSuffix}`;
152+
} catch (err) {
153+
console.warn(`Error checking new version of ${dependencyName}: ${err.message}`);
154+
}
151155
}
152156
}
153157
}

‎docs/node-support.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
| 13.x | 3.15.0 - 3.20.0 |
1919
| 14.x | 3.19.0 - 5.0.0 |
2020
| 16.x | 3.28.0 - 5.3.0 |
21-
| 18.x | 4.6.0 - 6.6.0 |
21+
| 18.x | 4.6.0 - 6.5.0 |
2222
| 20.x | 5.4.0 - Current |
2323
| 22.x | 6.2.0 - Current |
2424
| 24.x | 6.7.0 - Current |

‎package.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
"nock": "^13.5.5",
157157
"nyc": "^15.1.0",
158158
"prettier": "2.8.7",
159-
"release-plan": "^0.17.0",
159+
"release-plan": "^0.17.2",
160160
"strip-ansi": "^6.0.0",
161161
"supertest": "^7.1.0",
162162
"testdouble": "^3.18.0",
@@ -168,11 +168,6 @@
168168
"yuidocjs": "0.10.2"
169169
},
170170
"packageManager": "pnpm@10.12.1",
171-
"pnpm": {
172-
"overrides": {
173-
"github-changelog": "github:embroider-build/github-changelog#ignore-pre-release"
174-
}
175-
},
176171
"engines": {
177172
"node": ">= 20.11"
178173
},

‎packages/addon-blueprint/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ember-tooling/classic-build-addon-blueprint",
3-
"version": "6.7.0-alpha.4",
3+
"version": "6.7.0-beta.1",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/ember-cli/ember-cli.git",

‎packages/app-blueprint/files/package.json‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -28,75 +28,75 @@
2828
"test:ember": "ember test"
2929
},
3030
"devDependencies": {
31-
"@babel/core": "^7.27.4",
32-
"@babel/eslint-parser": "^7.27.5",
33-
"@babel/plugin-proposal-decorators": "^7.27.1<% if (typescript && emberData) { %>",
34-
"@ember-data/adapter": "~5.6.0-alpha.12",
35-
"@ember-data/graph": "~5.6.0-alpha.12",
36-
"@ember-data/json-api": "~5.6.0-alpha.12",
37-
"@ember-data/legacy-compat": "~5.6.0-alpha.12",
38-
"@ember-data/model": "~5.6.0-alpha.12",
39-
"@ember-data/request": "~5.6.0-alpha.12",
40-
"@ember-data/request-utils": "~5.6.0-alpha.12",
41-
"@ember-data/serializer": "~5.6.0-alpha.12",
42-
"@ember-data/store": "~5.6.0-alpha.12",
43-
"@warp-drive/ember": "~5.6.0-alpha.12<% } %>",
31+
"@babel/core": "^7.28.0",
32+
"@babel/eslint-parser": "^7.28.0",
33+
"@babel/plugin-proposal-decorators": "^7.28.0<% if (typescript && emberData) { %>",
34+
"@ember-data/adapter": "~5.6.0-beta.2",
35+
"@ember-data/graph": "~5.6.0-beta.2",
36+
"@ember-data/json-api": "~5.6.0-beta.2",
37+
"@ember-data/legacy-compat": "~5.6.0-beta.2",
38+
"@ember-data/model": "~5.6.0-beta.2",
39+
"@ember-data/request": "~5.6.0-beta.2",
40+
"@ember-data/request-utils": "~5.6.0-beta.2",
41+
"@ember-data/serializer": "~5.6.0-beta.2",
42+
"@ember-data/store": "~5.6.0-beta.2",
43+
"@warp-drive/ember": "~5.6.0-beta.2<% } %>",
4444
"@ember/optional-features": "^2.2.0",
4545
"@ember/test-helpers": "^5.2.2<% if (embroider) { %>",
46-
"@embroider/compat": "^3.9.0",
47-
"@embroider/core": "^3.5.6<% } %>",
48-
"@embroider/macros": "^1.18.0<% if (embroider) { %>",
49-
"@embroider/webpack": "^4.1.0<% } %>",
50-
"@eslint/js": "^9.29.0",
46+
"@embroider/compat": "^3.9.1",
47+
"@embroider/core": "^3.5.7<% } %>",
48+
"@embroider/macros": "^1.18.1<% if (embroider) { %>",
49+
"@embroider/webpack": "^4.1.1<% } %>",
50+
"@eslint/js": "^9.32.0",
5151
"@glimmer/component": "^2.0.0",
5252
"@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
5353
"@glint/environment-ember-loose": "^1.5.2",
5454
"@glint/environment-ember-template-imports": "^1.5.2",
5555
"@glint/template": "^1.5.2",
56-
"@tsconfig/ember": "^3.0.10",
56+
"@tsconfig/ember": "^3.0.11",
5757
"@types/qunit": "^2.19.12",
5858
"@types/rsvp": "^4.0.9<% if (emberData) {%>",
59-
"@warp-drive/core-types": "~5.6.0-alpha.12<% }} %>",
59+
"@warp-drive/core-types": "~5.6.0-beta.2<% }} %>",
6060
"broccoli-asset-rev": "^3.0.0",
61-
"concurrently": "^9.1.2",
61+
"concurrently": "^9.2.0",
6262
"ember-auto-import": "^2.10.0",
63-
"ember-cli": "~6.7.0-alpha.4",
63+
"ember-cli": "~6.7.0-beta.1",
6464
"ember-cli-app-version": "^7.0.0",
6565
"ember-cli-babel": "^8.2.0",
6666
"ember-cli-clean-css": "^3.0.0",
6767
"ember-cli-dependency-checker": "^3.3.3",
68-
"ember-cli-deprecation-workflow": "^3.3.0",
68+
"ember-cli-deprecation-workflow": "^3.4.0",
6969
"ember-cli-htmlbars": "^6.3.0",
7070
"ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>",
7171
"ember-cli-sri": "^2.1.1",
7272
"ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>",
73-
"ember-data": "~5.6.0-alpha.12<% } %>",
73+
"ember-data": "~5.6.0-beta.2<% } %>",
7474
"ember-load-initializers": "^3.0.1",
7575
"ember-modifier": "^4.2.2",
7676
"ember-page-title": "^9.0.2",
7777
"ember-qunit": "^9.0.3",
7878
"ember-resolver": "^13.1.1",
79-
"ember-source": "~6.7.0-alpha.1",
79+
"ember-source": "~6.7.0-beta.1",
8080
"ember-template-imports": "^4.3.0",
8181
"ember-template-lint": "^6.1.0<% if (welcome) { %>",
8282
"ember-welcome-page": "^7.0.2<% } %>",
83-
"eslint": "^9.29.0",
84-
"eslint-config-prettier": "^9.1.0",
85-
"eslint-plugin-ember": "^12.5.0",
86-
"eslint-plugin-n": "^17.20.0",
87-
"eslint-plugin-qunit": "^8.1.2",
83+
"eslint": "^9.32.0",
84+
"eslint-config-prettier": "^9.1.2",
85+
"eslint-plugin-ember": "^12.7.0",
86+
"eslint-plugin-n": "^17.21.3",
87+
"eslint-plugin-qunit": "^8.2.5",
8888
"globals": "^15.15.0",
8989
"loader.js": "^4.7.0",
90-
"prettier": "^3.5.3",
91-
"prettier-plugin-ember-template-tag": "^2.0.6",
90+
"prettier": "^3.6.2",
91+
"prettier-plugin-ember-template-tag": "^2.1.0",
9292
"qunit": "^2.24.1",
9393
"qunit-dom": "^3.4.0",
94-
"stylelint": "^16.20.0",
94+
"stylelint": "^16.23.0",
9595
"stylelint-config-standard": "^36.0.1",
9696
"tracked-built-ins": "^3.4.0<% if (typescript) { %>",
9797
"typescript": "^5.8.3",
98-
"typescript-eslint": "^8.34.1<% } %>",
99-
"webpack": "^5.99.9"
98+
"typescript-eslint": "^8.38.0<% } %>",
99+
"webpack": "^5.101.0"
100100
},
101101
"engines": {
102102
"node": ">= 20.11"

‎packages/app-blueprint/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ember-tooling/classic-build-app-blueprint",
3-
"version": "6.7.0-alpha.4",
3+
"version": "6.7.0-beta.1",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/ember-cli/ember-cli.git",

‎pnpm-lock.yaml‎

Lines changed: 35 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)