Skip to content

Commit 469cd50

Browse files
authored
Merge pull request #10919 from ember-cli/merge-beta
Prepare 6.11-alpha
2 parents 8ea5b2e + e915639 commit 469cd50

26 files changed

Lines changed: 701 additions & 775 deletions

File tree

lib/models/command.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ let Command = CoreObject.extend({
312312

313313
let options = commandOptions.options;
314314

315-
if (this.hasOption('watcher')) {
315+
if (this.hasOption('watcher') || process.env.EMBROIDER_PREBUILD) {
316316
// Do stuff to try and provide a good experience when it comes to file watching:
317317
let watchPreference = detector.findBestWatcherOption(options);
318318

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-cli",
3-
"version": "6.10.0-alpha.1",
3+
"version": "6.11.0-alpha.0",
44
"description": "Command line tool for developing ambitious ember.js apps",
55
"keywords": [
66
"app",
@@ -55,7 +55,7 @@
5555
"@ember-tooling/blueprint-model": "workspace:*",
5656
"@ember-tooling/classic-build-addon-blueprint": "workspace:*",
5757
"@ember-tooling/classic-build-app-blueprint": "workspace:*",
58-
"@ember/app-blueprint": "~6.10.0-alpha.6",
58+
"@ember/app-blueprint": "~6.11.0-alpha.1",
5959
"@pnpm/find-workspace-dir": "^1000.1.3",
6060
"babel-remove-types": "^1.0.2",
6161
"broccoli": "^4.0.0",

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.10.0-alpha.1",
3+
"version": "6.11.0-alpha.0",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/ember-cli/ember-cli.git",

packages/app-blueprint/files/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
"@ember/test-helpers": "^5.4.1<% if (embroider) { %>",
4646
"@embroider/compat": "^3.9.3",
4747
"@embroider/core": "^3.5.9<% } %>",
48-
"@embroider/macros": "^1.19.5<% if (embroider) { %>",
48+
"@embroider/macros": "^1.19.6<% if (embroider) { %>",
4949
"@embroider/webpack": "^4.1.2<% } %>",
50-
"@eslint/js": "^9.39.1",
50+
"@eslint/js": "^9.39.2",
5151
"@glimmer/component": "^2.0.0",
5252
"@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
5353
"@glint/environment-ember-loose": "^1.5.2",
@@ -60,7 +60,7 @@
6060
"broccoli-asset-rev": "^3.0.0",
6161
"concurrently": "^9.2.1",
6262
"ember-auto-import": "^2.12.0",
63-
"ember-cli": "~6.10.0-alpha.1",
63+
"ember-cli": "~6.11.0-alpha.0",
6464
"ember-cli-app-version": "^7.0.0",
6565
"ember-cli-babel": "^8.2.0",
6666
"ember-cli-clean-css": "^3.0.0",
@@ -76,11 +76,11 @@
7676
"ember-page-title": "^9.0.3",
7777
"ember-qunit": "^9.0.4",
7878
"ember-resolver": "^13.1.1",
79-
"ember-source": "~6.10.0-alpha.1",
80-
"ember-template-imports": "^4.3.0",
79+
"ember-source": "~6.11.0-alpha.6",
80+
"ember-template-imports": "^4.4.0",
8181
"ember-template-lint": "^6.1.0<% if (welcome) { %>",
8282
"ember-welcome-page": "^7.0.2<% } %>",
83-
"eslint": "^9.39.1",
83+
"eslint": "^9.39.2",
8484
"eslint-config-prettier": "^9.1.2",
8585
"eslint-plugin-ember": "^12.7.5",
8686
"eslint-plugin-n": "^17.23.1",
@@ -89,14 +89,14 @@
8989
"loader.js": "^4.7.0",
9090
"prettier": "^3.7.4",
9191
"prettier-plugin-ember-template-tag": "^2.1.2",
92-
"qunit": "^2.24.3",
92+
"qunit": "^2.25.0",
9393
"qunit-dom": "^3.5.0",
9494
"stylelint": "^16.26.1",
9595
"stylelint-config-standard": "^36.0.1",
9696
"tracked-built-ins": "^3.4.0<% if (typescript) { %>",
9797
"typescript": "^5.9.3",
98-
"typescript-eslint": "^8.49.0<% } %>",
99-
"webpack": "^5.103.0"
98+
"typescript-eslint": "^8.52.0<% } %>",
99+
"webpack": "^5.104.1"
100100
},
101101
"engines": {
102102
"node": ">= 20.19"

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.10.0-alpha.1",
3+
"version": "6.11.0-alpha.0",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/ember-cli/ember-cli.git",

0 commit comments

Comments
 (0)