Feat: Add auto-import, remove pretender shim

Closes #1469

index.js

@@ -21,9 +21,6 @@ module.exports = {
       'fake-xml-http-request': npmAsset({
         import: ['fake_xml_http_request.js']
       }),
-      'pretender': npmAsset({
-        import: ['pretender.js']
-      }),
       'faker': npmAsset({
         import: ['build/build/faker.js']
       })
@@ -62,13 +59,6 @@ module.exports = {
     } else {
       this.mirageDirectory = path.join(this.app.project.root, '/mirage');
     }
-
-    if (this._shouldIncludeFiles()) {
-      app.import('vendor/ember-cli-mirage/pretender-shim.js', {
-        type: 'vendor',
-        exports: { 'pretender': ['default'] }
-      });
-    }
   },
 
   blueprintsPath() {

package.json

@@ -37,11 +37,12 @@
   "dependencies": {
     "@xg-wang/whatwg-fetch": "^3.0.0",
     "broccoli-file-creator": "^2.1.1",
-    "broccoli-string-replace": "^0.1.2",
-    "chalk": "^1.1.1",
     "broccoli-funnel": "^2.0.1",
     "broccoli-merge-trees": "^3.0.2",
     "broccoli-stew": "^2.0.1",
+    "broccoli-string-replace": "^0.1.2",
+    "chalk": "^1.1.1",
+    "ember-auto-import": "^1.2.19",
     "ember-cli-babel": "^6.16.0",
     "ember-cli-node-assets": "^0.2.2",
     "ember-get-config": "^0.2.2",
@@ -50,35 +51,35 @@
     "fake-xml-http-request": "^2.0.0",
     "faker": "^3.0.0",
     "jsdom": "^13.1.0",
-    "pretender": "2.1.1",
+    "pretender": "^1 || ^2",
     "route-recognizer": "^0.3.4"
   },
   "devDependencies": {
     "@ember/jquery": "^0.5.2",
     "@ember/optional-features": "^0.6.3",
     "active-model-adapter": "^2.0.3",
     "babel-eslint": "^8.2.6",
+    "broccoli-asset-rev": "^2.7.0",
     "broccoli-test-helper": "^1.3.0",
     "chai": "^4.1.0",
+    "ember-ajax": "^3.1.0",
+    "ember-cli": "~3.4.4",
     "ember-cli-addon-docs": "^0.6.2",
     "ember-cli-addon-docs-esdoc": "^0.2.1",
     "ember-cli-app-version": "^2.0.0",
+    "ember-cli-dependency-checker": "^3.0.0",
     "ember-cli-deploy": "^1.0.2",
     "ember-cli-deploy-build": "^1.1.1",
     "ember-cli-deploy-git": "^1.3.3",
     "ember-cli-deploy-git-ci": "^1.0.1",
-    "ember-cli-favicon": "^1.0.0-beta.4",
-    "ember-cli-release": "^0.2.9",
-    "broccoli-asset-rev": "^2.7.0",
-    "ember-ajax": "^3.1.0",
-    "ember-cli": "~3.4.4",
-    "ember-cli-dependency-checker": "^3.0.0",
     "ember-cli-eslint": "^4.2.3",
     "ember-cli-fastboot": "^1.1.4-beta.1",
+    "ember-cli-favicon": "^1.0.0-beta.4",
     "ember-cli-htmlbars": "^3.0.0",
     "ember-cli-htmlbars-inline-precompile": "^1.0.3",
     "ember-cli-inject-live-reload": "^1.8.2",
     "ember-cli-qunit": "^4.4.0",
+    "ember-cli-release": "^0.2.9",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-template-lint": "^1.0.0-beta.1",
     "ember-cli-uglify": "^2.1.0",

test-projects/02-app-that-excludes-mirage/app/templates/application.hbs

@@ -3,3 +3,17 @@
 {{#if wifi.isConnected}}
   <p>We ran the initializer</p>
 {{/if}}
+
+<p>
+  Mirage modules in project:
+  <span data-test-id="mirage-module-count">
+    {{mirageModules.length}}
+  </span>
+</p>
+
+<p>
+  Other modules in project:
+  <span data-test-id="other-module-count">
+    {{otherIncludedModules.length}}
+  </span>
+</p>

test-projects/02-app-that-excludes-mirage/package.json

@@ -42,7 +42,8 @@
     "fastboot": "*",
     "jsdom": "*",
     "loader.js": "*",
-    "qunit": "*"
+    "qunit": "*",
+    "qunit-dom": "*"
   },
   "engines": {
     "node": ">= 8.*"

test-projects/02-app-that-excludes-mirage/tests/acceptance/modules-test.js

@@ -0,0 +1,14 @@
+import { module, test } from 'qunit';
+import { visit } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
+
+module('Acceptance | modules', function(hooks) {
+  setupApplicationTest(hooks);
+
+  test('only 1 module (the no-op initializer) is included in the build', async function(assert) {
+    await visit('/');
+
+    assert.dom('[data-test-id="mirage-module-count"]').hasText('0');
+    assert.dom('[data-test-id="other-module-count"]').hasText('1');
+  });
+});