Merge branch 'master' into dependabot/npm_and_yarn/word-wrap-1.2.4

Author: nickschot

addon/constants/links.js

@@ -65,11 +65,21 @@ export default [
         name: 'Editions',
         type: 'link',
       },
+      {
+        href: 'https://emberjs.com/browser-support',
+        name: 'Browser Support',
+        type: 'link',
+      },
       {
         href: 'https://deprecations.emberjs.com',
         name: 'Deprecations',
         type: 'link',
       },
+      {
+        href: 'https://rfcs.emberjs.com',
+        name: 'RFCs Website',
+        type: 'link',
+      },
     ],
   },
   {
@@ -92,24 +102,34 @@ export default [
         type: 'link',
       },
       {
-        href: 'https://help-wanted.emberjs.com/',
-        name: 'Help Wanted',
+        href: 'https://emberjs.com/community/black-lives-matter/',
+        name: 'Black Lives Matter',
         type: 'link',
       },
       {
         type: 'divider',
       },
       {
-        href: 'https://emberjs.com/community/meetups',
-        name: 'Meetups',
+        href: 'https://help-wanted.emberjs.com/',
+        name: 'Help Wanted',
+        type: 'link',
+      },
+      {
+        href: 'https://emberjs.com/survey',
+        name: 'Ember Community Survey',
         type: 'link',
       },
       {
         type: 'divider',
       },
       {
-        href: 'http://emberconf.com/',
-        name: 'Ember Conf',
+        href: 'https://emberconf.com/',
+        name: 'EmberConf',
+        type: 'link',
+      },
+      {
+        href: 'https://emberjs.com/community/meetups',
+        name: 'Meetups',
         type: 'link',
       },
     ],
@@ -119,7 +139,7 @@ export default [
     type: 'dropdown',
     items: [
       {
-        href: 'https://emberjs.com/team',
+        href: 'https://emberjs.com/teams',
         name: 'The Team',
         type: 'link',
       },

config/ember-try.js

@@ -43,6 +43,7 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': await getChannelURL('release'),
+            '@ember/string': '*',
           },
           overrides: {
             'ember-source': '$ember-source',

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-styleguide",
-  "version": "8.3.0",
+  "version": "8.4.0",
   "description": "Addon to help standardize the ember family of websites",
   "keywords": [
     "ember-addon"