emberjs · runspired · Mar 29, 2018 · Jan 24, 2018
diff --git a/.npmignore b/.npmignore
@@ -4,7 +4,6 @@
 /node-tests
 /tests
 /tmp
-/benchmarks
 /bin
 /docs
 

diff --git a/benchmarks/.gitignore b/benchmarks/.gitignore
diff --git a/benchmarks/BenchmarkGuide.md b/benchmarks/BenchmarkGuide.md
diff --git a/benchmarks/bash-analyze.js b/benchmarks/bash-analyze.js
diff --git a/benchmarks/bash-run.js b/benchmarks/bash-run.js
diff --git a/benchmarks/config.js b/benchmarks/config.js
diff --git a/benchmarks/index.js b/benchmarks/index.js
diff --git a/benchmarks/results/development-stripped/.gitkeep b/benchmarks/results/development-stripped/.gitkeep
diff --git a/benchmarks/results/development/.gitkeep b/benchmarks/results/development/.gitkeep
diff --git a/benchmarks/results/production-stripped/.gitkeep b/benchmarks/results/production-stripped/.gitkeep
diff --git a/benchmarks/results/production/.gitkeep b/benchmarks/results/production/.gitkeep
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,44 +1,10 @@
 /* eslint-env node */
 var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 var merge    = require('broccoli-merge-trees');
-var Funnel   = require('broccoli-funnel');
 var yuidoc   = require('./lib/yuidoc');
-var StripClassCallCheck = require('babel6-plugin-strip-class-callcheck');
-var path = require('path');
-
-// allow toggling of heimdall instrumentation
-var INSTRUMENT_HEIMDALL = false;
-var args = process.argv;
-
-for (var i = 0; i < args.length; i++) {
-  if (args[i] === '--instrument') {
-    INSTRUMENT_HEIMDALL = true;
-    break;
-  }
-}
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
-    // use babel6 options until we are using ember-cli@2.13
-    babel6: {
-      postTransformPlugins: [
-        // while ember-data strips itself, ember does not currently
-        [StripClassCallCheck]
-      ]
-    }
-  });
-
-  if (INSTRUMENT_HEIMDALL) {
-    console.warn('IMPORTED HEIMDALL & SET EMBER TO PRODUCTION');
-    var heimdallTree = new Funnel('node_modules/heimdalljs', {
-      destDir: 'heimdalljs'
-    });
-
-    app.trees.vendor = merge([app.trees.vendor, heimdallTree]);
-
-    app.import('vendor/heimdalljs/dist/heimdalljs.iife.js', {prepend: true});
-    app.vendorFiles['ember.js'].development = path.join(app.bowerDirectory, 'ember/ember.prod.js');
-  }
+  var app = new EmberAddon(defaults, {});
 
   /*
     This build file specifies the options for the dummy test app of this

diff --git a/package.json b/package.json
@@ -100,16 +100,11 @@
     "ember-source-channel-url": "^1.0.1",
     "ember-try": "^0.2.23",
     "ember-watson": "^0.7.0",
-    "express": "^4.14.0",
-    "faker": "^3.1.0",
     "github": "^1.1.1",
     "glob": "^5.0.13",
-    "heimdall-query": "^0.1.0",
-    "json-api-mock-server": "0.1.1",
     "loader.js": "^4.5.0",
     "mocha": "^2.4.5",
     "mocha-only-detector": "0.0.2",
-    "morgan": "^1.7.0",
     "rimraf": "2.5.2",
     "rsvp": "4.8.0",
     "testdouble": "^3.2.6",

diff --git a/server/index.js b/server/index.js
diff --git a/server/models/baz.js b/server/models/baz.js
diff --git a/server/models/complex.js b/server/models/complex.js
diff --git a/server/models/foo.js b/server/models/foo.js
diff --git a/server/models/heavy-baz.js b/server/models/heavy-baz.js
diff --git a/server/models/heavy-foo.js b/server/models/heavy-foo.js
diff --git a/server/models/heavy.js b/server/models/heavy.js
diff --git a/server/models/simple.js b/server/models/simple.js
diff --git a/server/scenarios/default.js b/server/scenarios/default.js
diff --git a/tests/dummy/app/adapters/application.js b/tests/dummy/app/adapters/application.js
diff --git a/tests/dummy/app/models/baz.js b/tests/dummy/app/models/baz.js
diff --git a/tests/dummy/app/models/complex.js b/tests/dummy/app/models/complex.js
diff --git a/tests/dummy/app/models/foo.js b/tests/dummy/app/models/foo.js
diff --git a/tests/dummy/app/models/heavy-baz.js b/tests/dummy/app/models/heavy-baz.js
diff --git a/tests/dummy/app/models/heavy-foo.js b/tests/dummy/app/models/heavy-foo.js