Merge remote-tracking branch 'origin/beta'

ember-cli · Oct 13, 2021 · 2e4f135 · 2e4f135
2 parents 5ed515e + f62562d
commit 2e4f135
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # ember-cli Changelog
 
+## v3.28.2
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.28.1...v3.28.2)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.28.1...v3.28.2)
+
+#### Changelog
+
+- [#9659](https://github.com/ember-cli/ember-cli/pull/9659) Ensure `ember-classic` ember-try scenario uses Ember 3.x [@rwjblue](https://github.com/rwjblue)
+
+Thank you to all who took the time to contribute!
+
+## v3.28.1
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.28.0...v3.28.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.28.0...v3.28.1)
+
+#### Changelog
+
+- [#9618](https://github.com/ember-cli/ember-cli/pull/9618) Ensure discovered addons are refreshed after `ember install` (fix usage of default blueprints) [@brendenpalmer](https://github.com/brendenpalmer)
 
 ## v4.0.0-beta.1
 

diff --git a/blueprints/addon/files/addon-config/ember-try.js b/blueprints/addon/files/addon-config/ember-try.js
@@ -70,6 +70,9 @@ module.exports = async function () {
           }),
         },
         npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0',
+          },
           ember: {
             edition: 'classic',
           },

diff --git a/package.json b/package.json
@@ -1,6 +1,10 @@
 {
   "name": "ember-cli",
+<<<<<<< HEAD
   "version": "4.0.0-beta.1",
+=======
+  "version": "3.28.2",
+>>>>>>> origin/release
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",

diff --git a/tests/fixtures/addon/defaults/config/ember-try.js b/tests/fixtures/addon/defaults/config/ember-try.js
@@ -69,6 +69,9 @@ module.exports = async function () {
           }),
         },
         npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0',
+          },
           ember: {
             edition: 'classic',
           },

diff --git a/tests/fixtures/addon/yarn/config/ember-try.js b/tests/fixtures/addon/yarn/config/ember-try.js
@@ -70,6 +70,9 @@ module.exports = async function () {
           }),
         },
         npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0',
+          },
           ember: {
             edition: 'classic',
           },