Merge pull request ember-learn#573 from ember-learn/octane-merge-master

Merge latest master into Octane

Author: MelSumner

.local.dic

@@ -27,6 +27,7 @@ Ctrl-C
 customizations
 D3
 dasherize
+DataAdapter
 datepicker
 de
 debounce
@@ -36,6 +37,7 @@ deserializing
 draggable
 durations
 enumerables
+ember-a11y
 ember-cli-deprecation-workflow
 ember-cli-cjs-transform
 ember-cli-mirage.
@@ -46,13 +48,15 @@ erroring
 Evented
 facto
 falsy
+focusable
 frontend
 fullname
 geocode
 geocoding
 Geolocation
 globbing
 *google
+HammerJS
 hardcode
 hashchange
 Hoc
@@ -74,6 +78,8 @@ modularity
 naïve
 nav
 *NPM
+NVDA
+Orca
 Param
 param
 params
@@ -88,6 +94,7 @@ prepend
 pre-transition
 readme
 readonly
+recognizers
 relayout
 repo
 rerender
@@ -108,12 +115,18 @@ subexpression
 suboptimal
 substate
 substates
+syntaxes
+TalkBack
 teardown
 templating
 todo
 todos
 typeahead
+UIs
 unsilence
 untrusted
 usecase
-viewport
+viewport
+VoiceOver
+WAI-ARIA
+WCAG

.travis.yml

@@ -29,4 +29,5 @@ before_install:
 script:
   - npm run lint:hbs
   - npm run lint:js
+  - npm run lint:md
   - npm test

README.md

@@ -2,11 +2,11 @@
 ## Ember Guides Source [![Build Status](https://travis-ci.org/ember-learn/guides-source.svg?branch=master)](https://travis-ci.org/ember-learn/guides-source)
 
 This repository contains the written content
-for the [Ember.js Guides](https://guides.emberjs.com). 
-Here, contributors can file issues and submit PRs to 
+for the [Ember.js Guides](https://guides.emberjs.com).
+Here, contributors can file issues and submit PRs to
 help improve the learning experience of other developers.
 
-Looking for repositories for the other parts of [emberjs.com](https://emberjs.com)? 
+Looking for repositories for the other parts of [emberjs.com](https://emberjs.com)?
 Check out
 [website](https://github.com/emberjs/website),
 [ember-api-docs](https://github.com/ember-learn/ember-api-docs),
@@ -19,9 +19,9 @@ and [styleguide](https://github.com/ember-learn/ember-styleguide).
 
 Welcome and thanks for your help! Please see [CONTRIBUTING.md](CONTRIBUTING.md)
 for detailed instructions on how to format your work and submit a Pull Request.
-First-time contributors are encouraged to choose issues that are labeled 
+First-time contributors are encouraged to choose issues that are labeled
 "help wanted" or "good for new contributors." If you have questions or
-want a buddy to pair with, you can join the 
+want a buddy to pair with, you can join the
 [dev-ember-learning channel](https://discordapp.com/channels/480462759797063690/480777444203429888)
 in the [Ember Community Discord](https://discordapp.com/invite/zT3asNS).
 
@@ -30,14 +30,15 @@ in the [Ember Community Discord](https://discordapp.com/invite/zT3asNS).
 
 The Guides content takes the form of Markdown files (just like most READMEs).
 Each minor version of Ember has its own directory within `/guides/`.
-Pull requests should make edits to only the latest version of Ember,
-except in the case of bug reports for broken links.
+Pull requests should make edits to only the contents of the `guides/release` directory,
+which is the latest deployed version of the guides.
+The exception is that PRs to fix broken links in older versions of the guides are ok.
 On `ember serve`, the Markdown files are turned into HTML
-to create an app. Most of the functionality comes from 
-[guidemaker](https://github.com/empress/guidemaker) and 
+to create an app. Most of the functionality comes from
+[guidemaker](https://github.com/empress/guidemaker) and
 [guidemaker-ember-template](https://github.com/ember-learn/guidemaker-ember-template).
 The styles come from [ember-styleguide](https://github.com/ember-learn/ember-styleguide),
-the shared home of components and stylesheets used throughout the family of 
+the shared home of components and stylesheets used throughout the family of
 Ember sites.
 
 ## Local Development
@@ -50,6 +51,8 @@ npm install
 ember serve
 ```
 
+Visit [http://localhost:4200](http://localhost:4200)
+
 ## Running tests
 
 Use `npm` to run tests instead of `ember`, since we have additional
@@ -62,4 +65,4 @@ npm test
 
 ### Linting and spellchecking
 
-The guides are spellchecked and linted for Markdown consistency. You can test your contributions by running `npm run lint::md`. Linting and spellchecking must pass or they will fail in Travis-CI.  See [CONTRIBUTING.md](CONTRIBUTING.md) for more information on linting and spellchecking.
+The guides are spellchecked and linted for Markdown consistency. You can test your contributions by running `npm run lint:md`. Linting and spellchecking must pass or they will fail in Travis-CI.  See [CONTRIBUTING.md](CONTRIBUTING.md) for more information on linting and spellchecking.

app/router.js

@@ -1,9 +1,37 @@
 import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
+import { get } from '@ember/object';
+import { inject as service } from '@ember/service';
+import { scheduleOnce } from '@ember/runloop';
+
 const Router = EmberRouter.extend({
   location: config.locationType,
-  rootURL: config.rootURL
+  rootURL: config.rootURL,
+
+  metrics: service(),
+  fastboot: service(),
+
+  didTransition() {
+    this._super(...arguments);
+    this._trackPage();
+  },
+
+  _trackPage() {
+    if(get(this, 'fastboot.isFastBoot')) {
+      return;
+    }
+
+    scheduleOnce('afterRender', this, () => {
+      const page = this.url;
+      const title = this.getWithDefault('currentRouteName', 'unknown');
+
+      // this is constant for this app and is only used to identify page views in the GA dashboard
+      const hostname = 'guides.emberjs.com';
+
+      this.metrics.trackPage({ page, title, hostname });
+    });
+  },
 });
 
 Router.map(function() {

config/environment.js

@@ -45,6 +45,21 @@ module.exports = function(environment) {
     },
 
     deprecationsGuideURL: 'https://www.emberjs.com/deprecations/',
+
+    metricsAdapters: [
+      {
+        name: 'GoogleAnalytics',
+        environments: ['production'],
+        config: {
+          id: 'UA-27675533-1',
+          require: ['linkid']
+        }
+      },
+    ],
+    survey: {
+      link: 'https://emberjs.com/ember-community-survey-2019/',
+      title: '2019 Ember Community Survey'
+    },
   };
 
   if (environment === 'development') {

guides/release/applications/run-loop.md

@@ -15,7 +15,7 @@ For example:
 - DOM update and event callbacks
 - `setTimeout` and `setInterval` callbacks
 - `postMessage` and `messageChannel` event handlers
-- AJAX callbacks
+- Ajax callbacks
 - WebSocket callbacks
 
 ## Why is the run loop useful?

guides/release/components/adding-actions.md

@@ -205,7 +205,7 @@ more reusable components.
 
 ## Handling Action Completion
 
-Often actions perform asynchronous tasks, such as making an ajax request to a server.
+Often actions perform asynchronous tasks, such as making an Ajax request to a server.
 Since actions are functions that can be passed in by a parent component, they are able to return values when called.
 The most common scenario is for an action to return a promise so that the component can handle the action's completion.
 

guides/release/components/defining-a-component.md

@@ -27,6 +27,18 @@ Given the above template, you can now use the `<BlogPost />` component:
 {{/each}}
 ```
 
+<div class="cta">
+  <div class="cta-note">
+    <div class="cta-note-body">
+      <div class="cta-note-heading">Zoey says...</div>
+      <div class="cta-note-message">
+In Ember templates there are different ways to invoke a Component. The syntax above is referred to as angle bracket invocation syntax, and it might not look familiar if you are looking at older code samples that use the classic invocation syntax. For more examples of ways to use Components in a template, see the <a href="../../reference/syntax-conversion-guide">Syntax Conversion Guide</a>, a <a href="https://guides.emberjs.com/v3.6.0/components/defining-a-component/">previous version of the Guides</a> or <a href="https://emberjs.com/api/ember/3.6/classes/Component">Ember.js API documentation</a>.
+      </div>
+    </div>
+    <img src="/images/mascots/zoey.png" role="presentation" alt="Ember Mascot">
+  </div>
+</div>
+
 Its model is populated in `model` hook in the route handler:
 
 ```javascript {data-filename=app/routes/index.js}
@@ -43,7 +55,7 @@ Each component is backed by an element under the hood. By default,
 Ember will use a `<div>` element to contain your component's template.
 To learn how to change the element Ember uses for your component, see
 [Customizing a Component's
-Element](./customizing-a-components-element/).
+Element](../customizing-a-components-element/).
 
 
 ## Defining a Component Subclass

guides/release/components/wrapping-content-in-a-component.md

@@ -22,10 +22,7 @@ In addition to the simple form you've learned so far,
 components also support being used in **block form**.
 In block form, components can be passed a Handlebars template that is rendered inside the component's template wherever the `{{yield}}` expression appears.
 
-To use the block form, add a `#` character to the beginning of the component name,
-then make sure to add a closing tag.
-
-See the Handlebars documentation on [block expressions](http://handlebarsjs.com/#block-expressions) for more.
+To use the block form, change the self-closing tag to a separate opening and closing tag: `<BlogPost></BlogPost>`
 
 In that case, we can use the `<BlogPost />` component in **block form** and tell Ember where the block content should be rendered using the `{{yield}}` helper.
 To update the example above, we'll first change the component's template:

guides/release/ember-inspector/data.md

@@ -33,7 +33,8 @@ You can also filter records by entering a query in the search box.
 ### Building a Data Custom Adapter
 
 You can use your own data persistence library with the Inspector. Build a [data adapter][data-adapter-docs], and you can inspect your models
-using the Data tab. Use [Ember Data's data adapter][ember-data-data-adapter] as an example for how to build your data adapter.
+using the Data tab. Use [Ember Data's data adapter][ember-data-data-adapter] as an example for how to build your data adapter and [DataAdapter][class-data-adapter] documentation.
 
 [data-adapter-docs]: https://github.com/emberjs/ember.js/blob/3ac2fdb0b7373cbe9f3100bdb9035dd87a849f64/packages/ember-extension-support/lib/data_adapter.js
 [ember-data-data-adapter]:https://github.com/emberjs/data/blob/d7988679590bff63f4d92c4b5ecab173bd624ebb/packages/ember-data/lib/system/debug/debug_adapter.js
+[class-data-adapter]:https://emberjs.com/api/ember/release/classes/DataAdapter

guides/release/models/customizing-adapters.md

@@ -1,8 +1,7 @@
 In Ember Data, an Adapter determines how data is persisted to a
 backend data store. Things such as the backend host, URL format
  and headers used to talk to a REST API can all be configured 
- in an adapter. You can even switch to storing data in local storage
- using a [local storage adapter](https://github.com/locks/ember-localstorage-adapter). 
+ in an adapter.
 
 Ember Data's default Adapter has some built-in assumptions about
 how a [REST API should look](http://jsonapi.org/). If your backend conventions
@@ -55,7 +54,7 @@ want to create an adapter that is radically different from the other
 Ember adapters.
 
 - [DS.JSONAPIAdapter](https://www.emberjs.com/api/ember-data/release/classes/DS.JSONAPIAdapter)
-The `JSONAPIAdapter` is the default adapter and follows JSON API
+The `JSONAPIAdapter` is the default adapter and follows JSON:API
 conventions to communicate with an HTTP server by transmitting JSON
 via XHR.
 
@@ -82,10 +81,10 @@ store.findRecord('post', 1).then(function(post) {
 });
 ```
 
-The JSON API adapter will automatically send a `GET` request to `/posts/1`.
+The JSON:API adapter will automatically send a `GET` request to `/posts/1`.
 
 The actions you can take on a record map onto the following URLs in the
-JSON API adapter:
+JSON:API adapter:
 
 <table>
   <thead>
@@ -131,7 +130,7 @@ inflector.uncountable('advice');
 export default {};
 ```
 
-The JSON API adapter will now make requests for `Campus` models to
+The JSON:API adapter will now make requests for `Campus` models to
 `/campuses` and `/campuses/1` (instead of `/campus/` and `/campus/1`),
 and requests for `advice` to `/advice` and `/advice/1` (instead of
 `/advices/` and `/advices/1`).
@@ -203,7 +202,7 @@ Requests for `user-profile` would now target `/user_profile/1`.
 
 Some APIs require HTTP headers, e.g. to provide an API key. Arbitrary
 headers can be set as key/value pairs on the `JSONAPIAdapter`'s `headers`
-object and Ember Data will send them along with each ajax request.
+object and Ember Data will send them along with each Ajax request.
 (Note that we set headers in `init()` because default property values
 should not be arrays or objects.)