Merge branch 'master' into improve-docs

# Conflicts:
#	package.json
#	yarn.lock

Author: dwickern

.github/workflows/ci.yml

@@ -23,7 +23,6 @@
 #$   - scenario: ember-default-with-jquery
 #$   - scenario: ember-classic
 #$   - scenario: embroider-safe
-#$   - scenario: embroider-optimized
 #$ nodeVersion: 12.x
 #$ packageManager: yarn
 #
@@ -181,8 +180,7 @@ jobs:
           ember-canary,
           ember-default-with-jquery,
           ember-classic,
-          embroider-safe,
-          embroider-optimized
+          embroider-safe
         ]
 
     steps:

.travis.yml

@@ -54,7 +54,7 @@ jobs:
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
     - env: EMBER_TRY_SCENARIO=ember-classic
     - env: EMBER_TRY_SCENARIO=embroider-safe
-    - env: EMBER_TRY_SCENARIO=embroider-optimized
+#    - env: EMBER_TRY_SCENARIO=embroider-optimized
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash

ember-cli-build.js

@@ -5,8 +5,8 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 module.exports = function (defaults) {
   let app = new EmberAddon(defaults, {
     'ember-bootstrap': {
-      bootstrapVersion: 3,
-      importBootstrapFont: true,
+      bootstrapVersion: 5,
+      importBootstrapFont: false,
       importBootstrapCSS: false,
     },
     snippetSearchPaths: ['addon', 'tests/dummy/app'],

package.json

@@ -46,11 +46,11 @@
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
-    "bootstrap-sass": "^3.3.7",
+    "bootstrap": "^5.0.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^2.2.4",
     "ember-basic-dropdown": "^4.0.1",
-    "ember-bootstrap": "^4.6.2",
+    "ember-bootstrap": "^5.0.0-beta.2",
     "ember-cli": "~3.28.4",
     "ember-cli-addon-docs": "^4.2.1",
     "ember-cli-addon-docs-yuidoc": "^1.0.0",
@@ -65,7 +65,6 @@
     "ember-click-outside": "^2.0.0",
     "ember-concurrency": "^2.2.0",
     "ember-concurrency-decorators": "^2.0.3",
-    "ember-crumbly": "^3.0.1",
     "ember-data": "^3.24.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-event-helpers": "^0.1.1",
@@ -76,7 +75,7 @@
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-simple-set-helper": "^0.1.2",
+    "ember-set-helper": "^2.0.1",
     "ember-source": "~3.28.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^3.6.0",
@@ -96,6 +95,7 @@
     "webpack": "^5.65.0"
   },
   "resolutions": {
+    "ember-raf-scheduler": "^0.3.0",
     "ember-svg-jar": "^2.3.3"
   },
   "engines": {

tests/dummy/app/components/demo-navigation.hbs

@@ -2,7 +2,8 @@
   <demo.example @name="demo-navigation.hbs">
     <NavigationExample/>
   </demo.example>
-  <demo.snippet @name="navigation-example.hbs"/>
+  <demo.snippet @label="component.hbs" @name="navigation-example.hbs"/>
+  <demo.snippet @label="component.js" @name="navigation-example.js"/>
   <demo.snippet @label="content.hbs" @name="navigation-content.hbs"/>
   <demo.snippet @label="router.js" @name="navigation.js"/>
 </DocsDemo>

tests/dummy/app/components/navigation-example/index.hbs

@@ -1,6 +1,10 @@
 <div class="navigation-example">
   {{! BEGIN-SNIPPET navigation-example.hbs }}
-  <BreadCrumbs @outputStyle="bootstrap" @linkable={{false}}/>
+  Current route:
+
+  <span class="text-monospace">
+    {{this.router.currentRouteName}}
+  </span>
 
   <BasicTree @contentComponent={{component "navigation-example/content"}} as |tree|>
     <tree.Node @label="root" @route="docs.examples.navigation" @isExpanded={{true}}>

tests/dummy/app/components/navigation-example/index.js

@@ -0,0 +1,8 @@
+// BEGIN-SNIPPET navigation-example.js
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+
+export default class extends Component {
+  @service router;
+}
+// END-SNIPPET

tests/dummy/app/components/recursive-example/children.hbs

@@ -6,7 +6,7 @@
         @directory={{directory}}
         @isExpandable={{true}}
         @isExpanded={{directory.isExpanded}}
-        @onExpanded={{set directory.isExpanded}}
+        @onExpanded={{set directory "isExpanded"}}
       />
     {{/each}}
     {{#each @node.directory.files as |file|}}

tests/dummy/app/components/recursive-example/index.hbs

@@ -7,7 +7,7 @@
     @directory={{@root}}
     @isExpandable={{true}}
     @isExpanded={{@root.isExpanded}}
-    @onExpanded={{set @root.isExpanded}}
+    @onExpanded={{set @root "isExpanded"}}
   />
 </BasicTree>
 {{! END-SNIPPET }}

tests/dummy/app/styles/app.scss

@@ -24,17 +24,12 @@
   .navigation-example-link {
     margin: 1px 2px;
     padding: 1px 3px;
+    text-decoration: none;
     border-radius: $nav-pills-border-radius;
 
-    &:hover,
-    &:focus {
-      text-decoration: none;
-      background-color: $nav-link-hover-bg;
-    }
-
     &.active {
-      color: $nav-pills-active-link-hover-color;
-      background-color: $nav-pills-active-link-hover-bg;
+      color: $nav-pills-link-active-color;
+      background-color: $nav-pills-link-active-bg;
     }
   }
 }