Rm unused packages, disable jquery integration, mirage classes, fix t…

…racking

package.json

@@ -33,8 +33,7 @@
   },
   "dependencies": {
     "ember-cli-babel": "^7.26.6",
-    "ember-cli-htmlbars": "^4.0.1",
-    "global": "^4.3.2"
+    "ember-cli-htmlbars": "^4.0.1"
   },
   "devDependencies": {
     "@ember/jquery": "^1.1.0",
@@ -47,7 +46,6 @@
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.0.3",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-ajax": "^5.0.0",
     "ember-auto-import": "^1.5.3",
     "ember-cli": "~3.28.0",
     "ember-cli-addon-docs": "^3.0.0",
@@ -98,7 +96,6 @@
     "qunit": "^2.17.0",
     "qunit-dom": "^1.0.0",
     "sass": "^1.17.2",
-    "strip-indent": "^3.0.0",
     "tachyons": "4.11.1"
   },
   "engines": {

tests/dummy/app/pods/docs/guides/data-fetching/demo-1/component.js

@@ -1,15 +1,16 @@
 import Component from '@glimmer/component';
-import { computed } from '@ember/object';
 import { task } from 'ember-concurrency';
 import { inject as service } from '@ember/service';
-import { readOnly } from '@ember/object/computed';
 import { A } from '@ember/array';
+import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import podNames from 'ember-component-css/pod-names';
 
 export default class Demo1Component extends Component {
   @service store;
 
+  @tracked visitedRoutes;
+
   get serverPosts() {
     return window.server.db.dump().posts;
   }
@@ -62,12 +63,6 @@ export default class Demo1Component extends Component {
     return yield this.routes[routeName].model.call(this);
   }
 
-  reset() {
-    this.store.unloadAll('post');
-    this.store.resetCache();
-    this.visitedRoutes = A(['/']);
-  }
-
   @action visitRoute(routeName) {
     if (routeName !== this.activeRoute) {
       this.visit.perform(routeName);
@@ -78,7 +73,9 @@ export default class Demo1Component extends Component {
     this.isExpanded = !this.isExpanded;
   }
 
-  @action resetState() {
-    this.reset();
+  @action reset() {
+    this.store.unloadAll('post');
+    this.store.resetCache();
+    this.visitedRoutes = A(['/']);
   }
 }

tests/dummy/app/pods/docs/guides/data-fetching/demo-1/template.hbs

@@ -4,7 +4,7 @@
     <div class="demo1__flex">
       <h2 class="demo1__section-heading">App</h2>
       <div class="demo1__mla">
-        <button {{on "click" this.resetState}} type="button" class='demo1__btn'>Reset</button>
+        <button {{on "click" this.reset}} type="button" class='demo1__btn'>Reset</button>
       </div>
     </div>
 
@@ -24,7 +24,7 @@
       </div>
 
       {{#if this.visit.isRunning}}
-        <p class='demo1__subtle'>{{fa-icon 'spinner' spin=true}} Loading {{this.activeRoute}}...</p>
+        <p class='demo1__subtle'><FaIcon @icon='spinner' @spin={{true}} /> Loading {{this.activeRoute}}...</p>
       {{else}}
         {{#if (eq this.activeRoute '/posts/1')}}
           <p>
@@ -52,9 +52,9 @@
     <div class='demo1__expander'>
       <a {{on "click" this.toggleExpand}}>
         {{#if this.isExpanded}}
-          {{fa-icon 'angle-up'}}
+          <FaIcon @icon='angle-up' />
         {{else}}
-          {{fa-icon 'angle-down'}}
+          <FaIcon @icon='angle-down' />
         {{/if}}
       </a>
     </div>

tests/dummy/app/pods/docs/guides/data-fetching/demo-2/component.js

@@ -1,15 +1,16 @@
 import Component from '@glimmer/component';
-import { computed } from '@ember/object';
 import { task } from 'ember-concurrency';
 import { inject as service } from '@ember/service';
-import { readOnly } from '@ember/object/computed';
 import { A } from '@ember/array';
+import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import podNames from 'ember-component-css/pod-names';
 
 export default class Demo2Component extends Component {
   @service store;
 
+  @tracked visitedRoutes;
+
   get serverPosts() {
     return window.server.db.dump().posts;
   }
@@ -62,12 +63,6 @@ export default class Demo2Component extends Component {
     return yield this.routes[routeName].model.call(this);
   }
 
-  reset() {
-    this.store.unloadAll('post');
-    this.store.resetCache();
-    this.visitedRoutes = A(['/']);
-  }
-
   @action visitRoute(routeName) {
     if (routeName !== this.activeRoute) {
       this.visit.perform(routeName);
@@ -78,7 +73,9 @@ export default class Demo2Component extends Component {
     this.isExpanded = !this.isExpanded;
   }
 
-  @action resetState() {
-    this.reset();
+  @action reset() {
+    this.store.unloadAll('post');
+    this.store.resetCache();
+    this.visitedRoutes = A(['/']);
   }
 }

tests/dummy/app/pods/docs/guides/data-fetching/demo-2/template.hbs

@@ -4,7 +4,7 @@
     <div class="demo2__flex">
       <h2 class="demo2__section-heading">App</h2>
       <div class="demo2__mla">
-        <button {{on "click" this.resetState}} type="button" class='demo2__btn'>Reset</button>
+        <button {{on "click" this.reset}} type="button" class='demo2__btn'>Reset</button>
       </div>
     </div>
 
@@ -27,7 +27,7 @@
 
       <div data-test-id='app-ui'>
         {{#if this.visit.isRunning}}
-          <p class='demo2__subtle'>{{fa-icon 'spinner' spin=true}} Loading {{this.activeRoute}}...</p>
+          <p class='demo2__subtle'><FaIcon @icon='spinner' @spin={{true}} /> Loading {{this.activeRoute}}...</p>
         {{else}}
           {{#if (eq this.activeRoute '/posts/1')}}
             <p>
@@ -56,9 +56,9 @@
     <div class='demo2__expander'>
       <a {{on "click" this.toggleExpand}}>
         {{#if this.isExpanded}}
-          {{fa-icon 'angle-up'}}
+          <FaIcon @icon='angle-up' />
         {{else}}
-          {{fa-icon 'angle-down'}}
+          <FaIcon @icon='angle-down' />
         {{/if}}
       </a>
     </div>

tests/dummy/app/pods/docs/guides/data-fetching/template.md

@@ -20,7 +20,7 @@ In the following example, compare how the app behaves when you visit the routes
 
 If you followed the steps above, what you'll notice is that under the second scenario, the `/posts` route was actually rendered in two states. First, it showed `post:1` in the list, and then after about a second the app re-rendered and the other two posts appeared.
 
-This is because the `/posts/1` route had already loaded the `post:1` record into Ember Data's store. By the time you visited the `/posts` index route, the promise from the store's `findAll` method resolved immediately with that `post:1` record, and then triggered a background reload of the entire `posts` collection. (Click the {{fa-icon 'angle-down'}} above to expand the demo for more details about what's happening as you navigate through the app.)
+This is because the `/posts/1` route had already loaded the `post:1` record into Ember Data's store. By the time you visited the `/posts` index route, the promise from the store's `findAll` method resolved immediately with that `post:1` record, and then triggered a background reload of the entire `posts` collection. (Click the <FaIcon @icon='angle-down' /> above to expand the demo for more details about what's happening as you navigate through the app.)
 
 Ember Data's `findAll` method accepts a `reload` option that we can use to force the promise to block, but then we'd lose the benefits of caching. (Note how after visiting `/posts` for the first time, it's fast on all subsequent visits.)
 

tests/dummy/config/optional-features.json

@@ -1,6 +1,6 @@
 {
   "application-template-wrapper": false,
   "default-async-observers": true,
-  "jquery-integration": true,
+  "jquery-integration": false,
   "template-only-glimmer-components": true
 }

tests/dummy/config/targets.js

@@ -6,6 +6,21 @@ const browsers = [
   'last 2 Safari versions'
 ];
 
+// Ember's browser support policy is changing, and IE11 support will end in
+// v4.0 onwards.
+//
+// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
+//
+// If you need IE11 support on a version of Ember that still offers support
+// for it, uncomment the code block below.
+//
+// const isCI = Boolean(process.env.CI);
+// const isProduction = process.env.EMBER_ENV === 'production';
+//
+// if (isCI || isProduction) {
+//   browsers.push('ie 11');
+// }
+
 module.exports = {
   browsers
 };

tests/dummy/mirage/serializers/application.js

@@ -1,7 +1,7 @@
 import { JSONAPISerializer } from 'ember-cli-mirage';
 
-export default JSONAPISerializer.extend({
+export default class ApplicationSerializer extends JSONAPISerializer {
 
-  alwaysIncludeLinkageData: false
+  alwaysIncludeLinkageData = false;
 
-});
+}

tests/dummy/mirage/serializers/post.js

@@ -1,6 +1,6 @@
 import ApplicationSerializer from './application';
 
-export default ApplicationSerializer.extend({
+export default class PostSerializer extends ApplicationSerializer {
 
   links(model) {
     return {
@@ -13,4 +13,4 @@ export default ApplicationSerializer.extend({
     };
   }
 
-});
+}