Repository: ember-cli/ember-cli
Pull request #7774 (2018-04-19 01:28:40)

remove ember-cli-shims in blueprint
Remove [ember-cli-shims](https://github.com/ember-cli/ember-cli-shims) when addons have upgraded to ember-cli-babel >= 6.6.0


thoov: @xg-wang I believe there are some fixtures that have `ember-cli-shims` in it that will need to be removed
xg-wang: @thoov I'll look into the mu failure test

Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddcdca8b8..2995ddf29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,67 +1,5 @@
 # ember-cli Changelog
 
-## v3.2.0-beta.1
-
-The following changes are required if you are upgrading from the previous
-version:
-
-- Users
-  + [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.1.2...v3.2.0-beta.1)
-  + Upgrade your project's ember-cli version - [docs](https://ember-cli.com/user-guide/#upgrading)
-- Addon Developers
-  + [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.1.2...v3.2.0-beta.1)
-- Core Contributors
-  + No changes required
-
-#### Community Contributions
-
-- [#7490](https://github.com/ember-cli/ember-cli/pull/7490) Module Unification Addons [@rwjblue](https://github.com/rwjblue)
-- [#7605](https://github.com/ember-cli/ember-cli/pull/7605) blueprints/app: Add `qunit-dom` dependency by default [@Turbo87](https://github.com/Turbo87)
-- [#7501](https://github.com/ember-cli/ember-cli/pull/7501) add delayed transpilation [@kellyselden](https://github.com/kellyselden)
-- [#7634](https://github.com/ember-cli/ember-cli/pull/7634) Addon._treeFor optimization [@kellyselden](https://github.com/kellyselden)
-- [#7635](https://github.com/ember-cli/ember-cli/pull/7635) Packaged Bower [@twokul](https://github.com/twokul)
-- [#7637](https://github.com/ember-cli/ember-cli/pull/7637) More comprehensive detect if ember-cli is being run within CI or not. [@ember-cli](https://github.com/ember-cli)
-- [#7641](https://github.com/ember-cli/ember-cli/pull/7641) update console-ui [@kellyselden](https://github.com/kellyselden)
-- [#7665](https://github.com/ember-cli/ember-cli/pull/7665) Package config [@twokul](https://github.com/twokul)
-- [#7661](https://github.com/ember-cli/ember-cli/pull/7661) Double linting test timeout [@ro0gr](https://github.com/ro0gr)
-- [#7659](https://github.com/ember-cli/ember-cli/pull/7659) Exclude addon-test-support from eslint node files [@kolybasov](https://github.com/kolybasov)
-- [#7660](https://github.com/ember-cli/ember-cli/pull/7660) improve logic for if addon is module-unification [@iezer](https://github.com/iezer)
-- [#7658](https://github.com/ember-cli/ember-cli/pull/7658) Module Unification Addon blueprint [@cibernox](https://github.com/cibernox)
-- [#7654](https://github.com/ember-cli/ember-cli/pull/7654) Package Vendor [@twokul](https://github.com/twokul)
-- [#7650](https://github.com/ember-cli/ember-cli/pull/7650) compile all addons at once optimization [@kellyselden](https://github.com/kellyselden)
-- [#7655](https://github.com/ember-cli/ember-cli/pull/7655) Package tests [@twokul](https://github.com/twokul)
-- [#7649](https://github.com/ember-cli/ember-cli/pull/7649) only use the standard compilers to compile addon code [@kellyselden](https://github.com/kellyselden)
-- [#7731](https://github.com/ember-cli/ember-cli/pull/7731) restore `addon-import` logic [@GavinJoyce](https://github.com/GavinJoyce)
-- [#7671](https://github.com/ember-cli/ember-cli/pull/7671) Include _super call in example of Addon.included [@jacobq](https://github.com/jacobq)
-- [#7667](https://github.com/ember-cli/ember-cli/pull/7667) MU addons must generate a MU dummy app [@cibernox](https://github.com/cibernox)
-- [#7662](https://github.com/ember-cli/ember-cli/pull/7662) Remove redundant checks [@twokul](https://github.com/twokul)
-- [#7664](https://github.com/ember-cli/ember-cli/pull/7664) Support serving wasm with application/wasm [@ember-cli](https://github.com/ember-cli)
-- [#7668](https://github.com/ember-cli/ember-cli/pull/7668) Only watch test/dummy/app on addons if it exist [@cibernox](https://github.com/cibernox)
-- [#7739](https://github.com/ember-cli/ember-cli/pull/7739) remove config caching [@GavinJoyce](https://github.com/GavinJoyce)
-- [#7708](https://github.com/ember-cli/ember-cli/pull/7708) Update default broccoli-asset-rev [@ef4](https://github.com/ef4)
-- [#7676](https://github.com/ember-cli/ember-cli/pull/7676) Deprecate ember-cli-babel 5.x [@raytiley](https://github.com/raytiley)
-- [#7679](https://github.com/ember-cli/ember-cli/pull/7679) Update init to be src/ friendly [@mixonic](https://github.com/mixonic)
-- [#7674](https://github.com/ember-cli/ember-cli/pull/7674) Package Public [@twokul](https://github.com/twokul)
-- [#7678](https://github.com/ember-cli/ember-cli/pull/7678) Use a recent release of Ember canary for MU [@ember-cli](https://github.com/ember-cli)
-- [#7742](https://github.com/ember-cli/ember-cli/pull/7742) Package Javascript [@twokul](https://github.com/twokul)
-- [#7702](https://github.com/ember-cli/ember-cli/pull/7702) Don't run `addon-import` blueprint if `project.isModuleUnification()` [@GavinJoyce](https://github.com/GavinJoyce)
-- [#7685](https://github.com/ember-cli/ember-cli/pull/7685) fix the shims messaging [@kellyselden](https://github.com/kellyselden)
-- [#7711](https://github.com/ember-cli/ember-cli/pull/7711) remove exists-sync, use fs.existsSync [@stefanpenner](https://github.com/stefanpenner)
-- [#7762](https://github.com/ember-cli/ember-cli/pull/7762) Remove default value for `ember addon --yarn` [@lennyburdette](https://github.com/lennyburdette)
-- [#7724](https://github.com/ember-cli/ember-cli/pull/7724) github package was renamed @octokit/rest [@kellyselden](https://github.com/kellyselden)
-- [#7758](https://github.com/ember-cli/ember-cli/pull/7758) Allowing cwd to be passed to testem without being overridden by ember-cli [@arthirm](https://github.com/arthirm)
-- [#7737](https://github.com/ember-cli/ember-cli/pull/7737) Fix issues identified with "delayed transpilation" system. [@rwjblue](https://github.com/rwjblue)
-- [#7735](https://github.com/ember-cli/ember-cli/pull/7735) Disable MU by default [@stefanpenner](https://github.com/stefanpenner)
-- [#7753](https://github.com/ember-cli/ember-cli/pull/7753) Update `qunit-dom` dependency [@Turbo87](https://github.com/Turbo87)
-- [#7764](https://github.com/ember-cli/ember-cli/pull/7764) Skip running custom "*-addon" blueprint if module unification [@GavinJoyce](https://github.com/GavinJoyce)
-- [#7767](https://github.com/ember-cli/ember-cli/pull/7767) Upgrade ember-load-initializers [@GavinJoyce](https://github.com/GavinJoyce)
-- [#7768](https://github.com/ember-cli/ember-cli/pull/7768) Don't try to use default addon-import if app is MU [@GavinJoyce](https://github.com/GavinJoyce)
-- [#7769](https://github.com/ember-cli/ember-cli/pull/7769) add blueprints to linting coverage [@kellyselden](https://github.com/kellyselden)
-- [#7771](https://github.com/ember-cli/ember-cli/pull/7771) forgot .eslintignore in MU [@kellyselden](https://github.com/kellyselden)
-
-Thank you to all who took the time to contribute!
-
-
 ## v3.1.2
 
 The following changes are required if you are upgrading from the previous
@@ -245,7 +183,7 @@ version:
 - [#7554](https://github.com/ember-cli/ember-cli/pull/7554) Make ember-try a direct addon dependency. [@rwjblue](https://github.com/rwjblue)
 - [#7522](https://github.com/ember-cli/ember-cli/pull/7522) utilities: Remove deprecated `deprecateUI()` function [@Turbo87](https://github.com/Turbo87)
 - [#7502](https://github.com/ember-cli/ember-cli/pull/7502) Cleanup and correct node-support.md. [@ember-cli](https://github.com/ember-cli)
-- [#7487](https://github.com/ember-cli/ember-cli/pull/7487) [BUGFIX] give `ember new` error messages consistent color [@GavinJoyce](https://github.com/GavinJoyce)
+- [#7487](https://github.com/ember-cli/ember-cli/pull/7487) [BUGFIX] give `ember new` error messages consistent color [@GavinJoyce/gj](https://github.com/GavinJoyce/gj)
 - [#7479](https://github.com/ember-cli/ember-cli/pull/7479) Improve default addon README [@Turbo87](https://github.com/Turbo87)
 - [#7512](https://github.com/ember-cli/ember-cli/pull/7512) fix alpha ordering in npmignore [@ember-cli](https://github.com/ember-cli)
 - [#7520](https://github.com/ember-cli/ember-cli/pull/7520) Remove deprecated commands [@Turbo87](https://github.com/Turbo87)
diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
index 05d7d44f1..095b04d14 100644
--- a/blueprints/app/files/package.json
+++ b/blueprints/app/files/package.json
@@ -28,15 +28,14 @@
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.1.1",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
-    "ember-data": "~3.2.0-beta.2",
+    "ember-data": "~3.1.0",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~3.2.0-beta.2<% if (welcome) { %>",
+    "ember-source": "~3.1.0<% if (welcome) { %>",
     "ember-welcome-page": "^3.0.0<% } %>",
     "eslint-plugin-ember": "^5.0.0",
     "loader.js": "^4.2.3",
diff --git a/blueprints/module-unification-app/files/package.json b/blueprints/module-unification-app/files/package.json
index ed1e2aa6a..47f9f5177 100644
--- a/blueprints/module-unification-app/files/package.json
+++ b/blueprints/module-unification-app/files/package.json
@@ -28,7 +28,6 @@
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.1.1",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-data": "~3.1.1",
diff --git a/package.json b/package.json
index ea0f65ad5..c8337bb6e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "3.2.0-beta.1",
+  "version": "3.1.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",


Test patch:
diff --git a/tests/fixtures/addon/npm/package.json b/tests/fixtures/addon/npm/package.json
index e3b736ca2..6d354ac2e 100644
--- a/tests/fixtures/addon/npm/package.json
+++ b/tests/fixtures/addon/npm/package.json
@@ -32,7 +32,6 @@
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.1.1",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-disable-prototype-extensions": "^1.1.2",
@@ -40,7 +39,7 @@
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~3.2.0-beta.2",
+    "ember-source": "~3.1.0",
     "ember-source-channel-url": "^1.0.1",
     "ember-try": "^0.2.23",
     "eslint-plugin-ember": "^5.0.0",
diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json
index a024a53fd..8f5fb5b50 100644
--- a/tests/fixtures/addon/yarn/package.json
+++ b/tests/fixtures/addon/yarn/package.json
@@ -32,7 +32,6 @@
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.1.1",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-disable-prototype-extensions": "^1.1.2",
@@ -40,7 +39,7 @@
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~3.2.0-beta.2",
+    "ember-source": "~3.1.0",
     "ember-source-channel-url": "^1.0.1",
     "ember-try": "^0.2.23",
     "ember-welcome-page": "^3.0.0",
diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json
index be8957088..1bc838d8e 100644
--- a/tests/fixtures/app/npm/package.json
+++ b/tests/fixtures/app/npm/package.json
@@ -28,15 +28,14 @@
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.1.1",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
-    "ember-data": "~3.2.0-beta.2",
+    "ember-data": "~3.1.0",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~3.2.0-beta.2",
+    "ember-source": "~3.1.0",
     "eslint-plugin-ember": "^5.0.0",
     "loader.js": "^4.2.3",
     "qunit-dom": "^0.6.2"
diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json
index ded3b6e70..a80bc8663 100644
--- a/tests/fixtures/app/yarn/package.json
+++ b/tests/fixtures/app/yarn/package.json
@@ -28,15 +28,14 @@
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.1.1",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
-    "ember-data": "~3.2.0-beta.2",
+    "ember-data": "~3.1.0",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~3.2.0-beta.2",
+    "ember-source": "~3.1.0",
     "ember-welcome-page": "^3.0.0",
     "eslint-plugin-ember": "^5.0.0",
     "loader.js": "^4.2.3",
diff --git a/tests/fixtures/module-unification-addon/package.json b/tests/fixtures/module-unification-addon/package.json
index b1569f77d..9ccbbe563 100644
--- a/tests/fixtures/module-unification-addon/package.json
+++ b/tests/fixtures/module-unification-addon/package.json
@@ -32,7 +32,6 @@
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.1.1",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-disable-prototype-extensions": "^1.1.2",
diff --git a/tests/fixtures/module-unification-app/npm/package.json b/tests/fixtures/module-unification-app/npm/package.json
index 82b5f2b4e..8a0d182b5 100644
--- a/tests/fixtures/module-unification-app/npm/package.json
+++ b/tests/fixtures/module-unification-app/npm/package.json
@@ -28,7 +28,6 @@
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.1.1",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-data": "~3.1.1",
diff --git a/tests/fixtures/module-unification-app/yarn/package.json b/tests/fixtures/module-unification-app/yarn/package.json
index d739ce201..f876c7db5 100644
--- a/tests/fixtures/module-unification-app/yarn/package.json
+++ b/tests/fixtures/module-unification-app/yarn/package.json
@@ -28,7 +28,6 @@
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.1.1",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-data": "~3.1.1",