Merge pull request ember-cli#983 from rjackson/do-not-wrap-vendor-in-…

…eval Do not wrap vendor in eval when `wrapInEval` is set.
WMeldon · Jun 11, 2014 · 675d247 · 675d247
2 parents bea80d2 + 639f8e9
commit 675d247
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
 * [ENHANCEMENT] Provide `--watcher` option for switching between polling and events-based file watching. [#970](https://github.com/stefanpenner/ember-cli/pull/970)
 * [BUGFIX] Ensure that tmp/ is cleaned up after running `ember server` or `ember test --server`. [#971](https://github.com/stefanpenner/ember-cli/pull/971)
 * [BUGFIX] Fix errors with certain `generate` commands that depend on `inflection`. [f016820](https://github.com/stefanpenner/ember-cli/commit/f016820)
+* [BUGFIX] Do not wrap `vendor` assets in eval when `wrapInEval` is set. [#983](https://github.com/stefanpenner/ember-cli/pull/983)
+* [ENHANCEMENT] Use `wrapInEval` by default for application assets when running in development. [#983](https://github.com/stefanpenner/ember-cli/pull/983)
 
 ### 0.0.33
 

diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
@@ -56,7 +56,7 @@ function EmberApp(options) {
 
   this.options = defaults(options, {
     es3Safe: true,
-    wrapInEval: false,
+    wrapInEval: !isProduction,
     minifyCSS: {
       enabled: true,
       options: {}
@@ -282,8 +282,7 @@ EmberApp.prototype.javascript = memoize(function() {
 
   var vendor = concatFiles(applicationJs, {
     inputFiles: legacyFilesToAppend,
-    outputFile: '/assets/vendor.js',
-    wrapInEval: this.options.wrapInEval
+    outputFile: '/assets/vendor.js'
   });
 
   var vendorAndApp = mergeTrees([vendor, es6]);