Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b1660f8
[BUGFIX release]: Enter the WatchDetector branch of the build command…
NullVoxPopuli Oct 30, 2025
d6dd318
Add test
NullVoxPopuli Oct 31, 2025
91c6f0a
Merge pull request #10860 from ember-cli/nvp/release/re-add-the-watch…
kategengler Nov 5, 2025
b074221
Prepare Stable Release using 'release-plan'
mansona Nov 29, 2025
0e50870
Merge pull request #10858 from ember-cli/release-preview-stable
mansona Dec 5, 2025
bf53ff9
Merge remote-tracking branch 'origin/beta' into release-plan-6-9
mansona Dec 10, 2025
2300e77
update blueprint dependencies to latest
mansona Dec 10, 2025
91e4650
Merge pull request #10885 from ember-cli/release-plan-6-9
mansona Dec 10, 2025
d8ce4d7
Prepare Stable Release using 'release-plan'
mansona Dec 10, 2025
f6dd3c4
Merge pull request #10881 from ember-cli/release-preview-stable
mansona Dec 10, 2025
de580df
Upgrade broccoli
kategengler Nov 11, 2025
8578ead
Update required Node version to v20.19.0
bertdeblock Dec 10, 2025
2b4142d
Merge pull request #10888 from ember-cli/kg-backport-broccoli
mansona Dec 11, 2025
b9f830a
Prepare Stable Release using 'release-plan'
mansona Dec 11, 2025
a1d1a35
Merge pull request #10889 from ember-cli/release-preview-stable
mansona Dec 11, 2025
b1c4652
Merge remote-tracking branch 'origin/release' into merge-release
mansona Jan 5, 2026
f42b805
Merge remote-tracking branch 'origin/master' into merge-release
mansona Jan 5, 2026
d10c8e3
update versions
mansona Jan 5, 2026
54bd10a
update blueprint dependencies to beta
mansona Jan 6, 2026
9859df7
bump @ember-tooling/blueprint-model
mansona Jan 6, 2026
eb0f037
Merge pull request #10917 from ember-cli/merge-release
mansona Jan 6, 2026
20790d1
Prepare Beta Release using 'release-plan'
mansona Jan 6, 2026
93c2f53
Merge pull request #10883 from ember-cli/release-preview-beta
mansona Jan 7, 2026
aff281e
Merge remote-tracking branch 'origin/beta' into merge-beta
mansona Jan 7, 2026
eba8198
update to the next alpha version
mansona Jan 7, 2026
e915639
update blueprint dependencies to alpha
mansona Jan 7, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/models/command.js
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ let Command = CoreObject.extend({

let options = commandOptions.options;

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

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-cli",
"version": "6.10.0-alpha.1",
"version": "6.11.0-alpha.0",
"description": "Command line tool for developing ambitious ember.js apps",
"keywords": [
"app",
Expand Down Expand Up @@ -55,7 +55,7 @@
"@ember-tooling/blueprint-model": "workspace:*",
"@ember-tooling/classic-build-addon-blueprint": "workspace:*",
"@ember-tooling/classic-build-app-blueprint": "workspace:*",
"@ember/app-blueprint": "~6.10.0-alpha.6",
"@ember/app-blueprint": "~6.11.0-alpha.1",
"@pnpm/find-workspace-dir": "^1000.1.3",
"babel-remove-types": "^1.0.2",
"broccoli": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/addon-blueprint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ember-tooling/classic-build-addon-blueprint",
"version": "6.10.0-alpha.1",
"version": "6.11.0-alpha.0",
"repository": {
"type": "git",
"url": "https://github.com/ember-cli/ember-cli.git",
Expand Down
18 changes: 9 additions & 9 deletions packages/app-blueprint/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
"@ember/test-helpers": "^5.4.1<% if (embroider) { %>",
"@embroider/compat": "^3.9.3",
"@embroider/core": "^3.5.9<% } %>",
"@embroider/macros": "^1.19.5<% if (embroider) { %>",
"@embroider/macros": "^1.19.6<% if (embroider) { %>",
"@embroider/webpack": "^4.1.2<% } %>",
"@eslint/js": "^9.39.1",
"@eslint/js": "^9.39.2",
"@glimmer/component": "^2.0.0",
"@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
"@glint/environment-ember-loose": "^1.5.2",
Expand All @@ -60,7 +60,7 @@
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^9.2.1",
"ember-auto-import": "^2.12.0",
"ember-cli": "~6.10.0-alpha.1",
"ember-cli": "~6.11.0-alpha.0",
"ember-cli-app-version": "^7.0.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-clean-css": "^3.0.0",
Expand All @@ -76,11 +76,11 @@
"ember-page-title": "^9.0.3",
"ember-qunit": "^9.0.4",
"ember-resolver": "^13.1.1",
"ember-source": "~6.10.0-alpha.1",
"ember-template-imports": "^4.3.0",
"ember-source": "~6.11.0-alpha.6",
"ember-template-imports": "^4.4.0",
"ember-template-lint": "^6.1.0<% if (welcome) { %>",
"ember-welcome-page": "^7.0.2<% } %>",
"eslint": "^9.39.1",
"eslint": "^9.39.2",
"eslint-config-prettier": "^9.1.2",
"eslint-plugin-ember": "^12.7.5",
"eslint-plugin-n": "^17.23.1",
Expand All @@ -89,14 +89,14 @@
"loader.js": "^4.7.0",
"prettier": "^3.7.4",
"prettier-plugin-ember-template-tag": "^2.1.2",
"qunit": "^2.24.3",
"qunit": "^2.25.0",
"qunit-dom": "^3.5.0",
"stylelint": "^16.26.1",
"stylelint-config-standard": "^36.0.1",
"tracked-built-ins": "^3.4.0<% if (typescript) { %>",
"typescript": "^5.9.3",
"typescript-eslint": "^8.49.0<% } %>",
"webpack": "^5.103.0"
"typescript-eslint": "^8.52.0<% } %>",
"webpack": "^5.104.1"
},
"engines": {
"node": ">= 20.19"
Expand Down
2 changes: 1 addition & 1 deletion packages/app-blueprint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ember-tooling/classic-build-app-blueprint",
"version": "6.10.0-alpha.1",
"version": "6.11.0-alpha.0",
"repository": {
"type": "git",
"url": "https://github.com/ember-cli/ember-cli.git",
Expand Down
Loading
Loading