ember-learn · jaredgalanis · Feb 2, 2024 · Feb 2, 2024 · Feb 2, 2024 · Feb 2, 2024
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+nodejs 18.17.1
diff --git a/app/controllers/project-version.js b/app/controllers/project-version.js
@@ -128,4 +128,92 @@ export default class ProjectVersionController extends Controller {
   togglePrivateClasses() {
     set(this, 'showPrivateClasses', !this.showPrivateClasses);
   }
+
+  @action
+  updateProject(project, ver /*, component */) {
+    let projectVersionID = ver.compactVersion;
+    let endingRoute;
+    switch (this.router.currentRouteName) {
+      case 'project-version.classes.class': {
+        let className = this._getEncodedNameForCurrentClass();
+        endingRoute = `classes/${className}`;
+        break;
+      }
+      case 'project-version.classes.class.index': {
+        let className = this._getEncodedNameForCurrentClass();
+        endingRoute = `classes/${className}`;
+        break;
+      }
+      case 'project-version.modules.module.index': {
+        let moduleName = encodeURIComponent(
+          this.paramsFor('project-version.modules.module').module
+        );
+        endingRoute = `modules/${moduleName}`;
+        break;
+      }
+      case 'project-version.namespaces.namespace.index': {
+        let namespaceName = this.paramsFor(
+          'project-version.namespaces.namespace'
+        ).namespace;
+        endingRoute = `namespaces/${namespaceName}`;
+        break;
+      }
+      case 'project-version.classes.class.methods.index': {
+        let className = this._getEncodedNameForCurrentClass();
+        endingRoute = `classes/${className}/methods`;
+        break;
+      }
+      case 'project-version.classes.class.events.index': {
+        let className = this._getEncodedNameForCurrentClass();
+        endingRoute = `classes/${className}/events`;
+        break;
+      }
+      case 'project-version.classes.class.properties.index': {
+        let className = this._getEncodedNameForCurrentClass();
+        endingRoute = `classes/${className}/properties`;
+        break;
+      }
+      case 'project-version.classes.class.methods.method': {
+        let className = this._getEncodedNameForCurrentClass();
+        let methodName = this.paramsFor(
+          'project-version.classes.class.methods.method'
+        ).method;
+        endingRoute = `classes/${className}/methods/${methodName}?anchor=${methodName}`;
+        break;
+      }
+      case 'project-version.classes.class.events.event': {
+        let className = this._getEncodedNameForCurrentClass();
+        let eventName = this.paramsFor(
+          'project-version.classes.class.events.event'
+        ).event;
+        endingRoute = `classes/${className}/events/${eventName}?anchor=${eventName}`;
+        break;
+      }
+      case 'project-version.classes.class.properties.property': {
+        let className = this._getEncodedNameForCurrentClass();
+        let propertyName = this.paramsFor(
+          'project-version.classes.class.properties.property'
+        ).property;
+        endingRoute = `classes/${className}/properties/${propertyName}?anchor=${propertyName}`;
+        break;
+      }
+      default:
+        endingRoute = '';
+        break;
+    }
+    // if the user is navigating to/from api versions >= 2.16, take them
+    // to the home page instead of trying to translate the url
+    let shouldConvertPackages = this.shouldConvertPackages(
+      ver,
+      this.project.version
+    );
+    let isEmberProject = project === 'ember';
+    if (!isEmberProject || !shouldConvertPackages) {
+      this.router.transitionTo(
+        `/${project}/${projectVersionID}/${endingRoute}`
+      );
+    } else {
+      this.router.transitionTo(`/${project}/${projectVersionID}`);
+    }
+  }
 }
diff --git a/app/routes/application.js b/app/routes/application.js
@@ -11,8 +11,9 @@
   @service
   legacyModuleMappings;
 
-  title(tokens) {
-    let [version, entity] = tokens;
+  title() {
+    let entity = this.headData.modelName;
+    let version = this.headData.modelVersion;
     if (!entity) {
       entity = 'Ember';
     }
@@ -30,6 +31,22 @@
   async afterModel() {
     set(this, 'headData.cdnDomain', ENV.API_HOST);
     await this.legacyModuleMappings.initMappings();
+
+    let entity = this.headData.modelName;
+    let version = this.headData.modelVersion;
+    if (!entity) {
+      entity = 'Ember';
+    }
+    if (version) {
+      const compactVersion = getCompactVersion(version);
+      const title = `${[entity, compactVersion].join(
+        ' - '
+      )} - Ember API Documentation`;
+      set(this, 'headData.title', title);
+      return title;
+    }
+    return '';
+
     return super.afterModel(...arguments);
   }
 }
diff --git a/app/routes/project-version.js b/app/routes/project-version.js
@@ -1,4 +1,3 @@
-import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import semverCompare from 'semver-compare';
@@ -44,6 +43,10 @@ export default class ProjectVersionRoute extends Route {
     });
   }
 
+  afterModel(model) {
+    this.headData.modelVersion = model.version;
+  }
+
   // Using redirect instead of afterModel so transition succeeds and returns 307
   redirect(model, transition) {
     const lookupParams = (routeName) => {
@@ -144,94 +147,6 @@ export default class ProjectVersionRoute extends Route {
     };
   }
 
-  @action
-  updateProject(project, ver /*, component */) {
-    let projectVersionID = ver.compactVersion;
-    let endingRoute;
-    switch (this.router.currentRouteName) {
-      case 'project-version.classes.class': {
-        let className = this._getEncodedNameForCurrentClass();
-        endingRoute = `classes/${className}`;
-        break;
-      }
-      case 'project-version.classes.class.index': {
-        let className = this._getEncodedNameForCurrentClass();
-        endingRoute = `classes/${className}`;
-        break;
-      }
-      case 'project-version.modules.module.index': {
-        let moduleName = encodeURIComponent(
-          this.paramsFor('project-version.modules.module').module
-        );
-        endingRoute = `modules/${moduleName}`;
-        break;
-      }
-      case 'project-version.namespaces.namespace.index': {
-        let namespaceName = this.paramsFor(
-          'project-version.namespaces.namespace'
-        ).namespace;
-        endingRoute = `namespaces/${namespaceName}`;
-        break;
-      }
-      case 'project-version.classes.class.methods.index': {
-        let className = this._getEncodedNameForCurrentClass();
-        endingRoute = `classes/${className}/methods`;
-        break;
-      }
-      case 'project-version.classes.class.events.index': {
-        let className = this._getEncodedNameForCurrentClass();
-        endingRoute = `classes/${className}/events`;
-        break;
-      }
-      case 'project-version.classes.class.properties.index': {
-        let className = this._getEncodedNameForCurrentClass();
-        endingRoute = `classes/${className}/properties`;
-        break;
-      }
-      case 'project-version.classes.class.methods.method': {
-        let className = this._getEncodedNameForCurrentClass();
-        let methodName = this.paramsFor(
-          'project-version.classes.class.methods.method'
-        ).method;
-        endingRoute = `classes/${className}/methods/${methodName}?anchor=${methodName}`;
-        break;
-      }
-      case 'project-version.classes.class.events.event': {
-        let className = this._getEncodedNameForCurrentClass();
-        let eventName = this.paramsFor(
-          'project-version.classes.class.events.event'
-        ).event;
-        endingRoute = `classes/${className}/events/${eventName}?anchor=${eventName}`;
-        break;
-      }
-      case 'project-version.classes.class.properties.property': {
-        let className = this._getEncodedNameForCurrentClass();
-        let propertyName = this.paramsFor(
-          'project-version.classes.class.properties.property'
-        ).property;
-        endingRoute = `classes/${className}/properties/${propertyName}?anchor=${propertyName}`;
-        break;
-      }
-      default:
-        endingRoute = '';
-        break;
-    }
-    // if the user is navigating to/from api versions >= 2.16, take them
-    // to the home page instead of trying to translate the url
-    let shouldConvertPackages = this.shouldConvertPackages(
-      ver,
-      this.projectService.version
-    );
-    let isEmberProject = project === 'ember';
-    if (!isEmberProject || !shouldConvertPackages) {
-      this.router.transitionTo(
-        `/${project}/${projectVersionID}/${endingRoute}`
-      );
-    } else {
-      this.router.transitionTo(`/${project}/${projectVersionID}`);
-    }
-  }
-
   // Input some version info, returns a boolean based on
   // whether the user is switching versions for a 2.16 docs release or later.
   // The urls for pre-2.16 classes and later packages are quite different

diff --git a/app/routes/project-version/classes/class.js b/app/routes/project-version/classes/class.js
@@ -36,6 +36,10 @@
     return this.find('class', `${project}-${projectVersion}-${klass}`);
   }
 
+  afterModel(model) {
+    this.headData.modelName = model.name;
+  }
+
   find(typeName, param) {
     return this.store.find(typeName, param).catch((e1) => {
       if (typeName != 'namespace') {
@@ -91,7 +95,7 @@
    }
  }

  afterModel(klass) {
    if (!klass.isError) {
      let description = klass.get('ogDescription') || klass.get('description');
      if (description) {

diff --git a/app/routes/project-version/functions/function.js b/app/routes/project-version/functions/function.js
@@ -56,6 +56,8 @@ export default class FunctionRoute extends Route {
     if (description) {
       set(this, 'headData.description', createExcerpt(description));
     }
+
+    this.headData.functionName = model?.fn?.name;
   }
 
   getFunctionObjFromList(classObj, functionName) {

diff --git a/app/services/head-data.js b/app/services/head-data.js
@@ -9,4 +9,6 @@ export default class HeadDataService extends Service {
   @tracked canonicalUrl;
   @tracked description;
   @tracked cdnDomain;
+  @tracked modelName;
+  @tracked modelVersion;
 }
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
@@ -3,10 +3,10 @@
     <SearchInput />
   </EsNavbar>
 </EsHeader>
-<main class="container">
+<main class='container'>
   {{outlet}}
 </main>
 <EsFooter />
 
-{{!-- required by ember-cli-meta-tags --}}
-<HeadLayout />
+{{! required by ember-cli-meta-tags }}
+<HeadLayout />
diff --git a/app/templates/head.hbs b/app/templates/head.hbs
@@ -1,12 +1,12 @@
 <title>{{this.model.title}}</title>
 
-<link rel="dns-prefetch" href="{{this.model.cdnDomain}}">
-<meta property="og:title" content={{this.model.title}}>
+<link rel='dns-prefetch' href='{{this.model.cdnDomain}}' />
+<meta property='og:title' content={{this.model.title}} />
 
 {{#if this.model.description}}
-  <meta name="description" content={{this.model.description}}>
-  <meta property="og:description" content={{this.model.description}}>
+  <meta name='description' content={{this.model.description}} />
+  <meta property='og:description' content={{this.model.description}} />
 {{/if}}
 {{#unless this.model.isRelease}}
-  <link rel="canonical" href={{this.model.canonicalUrl}}>
+  <link rel='canonical' href={{this.model.canonicalUrl}} />
 {{/unless}}
diff --git a/app/templates/project-version.hbs b/app/templates/project-version.hbs
@@ -16,7 +16,7 @@
 
   <div class="select-container">
     <PowerSelect
-      @onChange={{route-action "updateProject" this.activeProject}}
+      @onChange={{fn this.updateProject this.activeProject}}
       @options={{this.projectVersions}}
       @selected={{this.selectedProjectVersion}}
       @ariaLabel="Select a version"

diff --git a/config/deprecation-workflow.js b/config/deprecation-workflow.js
@@ -1,7 +1,7 @@
 self.deprecationWorkflow = self.deprecationWorkflow || {};
 self.deprecationWorkflow.config = {
   workflow: [
-    { handler: 'silence', matchId: 'ember-global' },
+    { handler: 'throw', matchId: 'ember-global' },
     { handler: 'silence', matchId: 'ember.component.reopen' },
     { handler: 'silence', matchId: 'implicit-injections' },
     { handler: 'silence', matchId: 'manager-capabilities.modifiers-3-13' },

diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-funnel": "^2.0.1",
     "broccoli-merge-trees": "^2.0.0",
-    "ember-a11y-testing": "^0.5.4",
+    "ember-a11y-testing": "^5.2.1",
     "ember-anchor": "^1.0.3",
     "ember-auto-import": "^2.7.2",
     "ember-cli": "~3.28.6",
@@ -71,17 +71,16 @@
     "ember-cli-babel": "^7.26.10",
     "ember-cli-bourbon": "^2.0.1",
     "ember-cli-browserstack": "^1.0.1",
-    "ember-cli-clipboard": "^0.8.1",
+    "ember-cli-clipboard": "^1.1.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-deploy": "^1.0.1",
     "ember-cli-deploy-build": "^1.1.0",
     "ember-cli-deploy-gzip": "^1.0.0",
     "ember-cli-deprecation-workflow": "^2.1.0",
-    "ember-cli-document-title-northm": "^1.0.3",
     "ember-cli-fastboot": "^4.1.5",
+    "ember-cli-head": "^2.0.0",
     "ember-cli-htmlbars": "^6.1.1",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-meta-tags": "^7.0.0",
     "ember-cli-sass": "^10.0.1",
     "ember-cli-showdown": "^9.0.1",
     "ember-cli-terser": "^4.0.2",
@@ -91,25 +90,22 @@
     "ember-data-fastboot": "https://github.com/cardstack/ember-data-fastboot#6e6fb8bbf0b405ae174160cc1e4833c5582f68cd",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.1.1",
-    "ember-inflector": "^3.0.0",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-metrics": "^1.5.2",
     "ember-page-title": "^6.2.2",
-    "ember-power-select": "^6.0.1",
+    "ember-power-select": "^7.2.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
     "ember-rfc176-data": "^0.3.17",
-    "ember-route-action-helper": "^2.0.5",
-    "ember-showdown-shiki": "^1.2.1",
     "ember-sinon": "^4.1.1",
     "ember-source": "~3.28.8",
-    "ember-styleguide": "^3.3.0",
+    "ember-styleguide": "3.3.0",
     "ember-svg-jar": "^2.4.2",
     "ember-template-lint": "^3.15.0",
     "ember-test-selectors": "^6.0.0",
-    "ember-tether": "1.0.0",
-    "ember-truth-helpers": "^2.1.0",
+    "ember-tether": "2.0.1",
+    "ember-truth-helpers": "^4.0.3",
     "ember-web-app": "^2.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",