Merge 'origin/website-redesign' into layout

# Conflicts:
#	app/routes/project-version/functions/function.js
#	app/routes/project-version/modules/module.js
#	app/routes/project-version/namespaces/namespace.js
#	app/templates/project-version/functions/function.hbs
#	package.json
#	pnpm-lock.yaml

Author: mansona

.github/workflows/gh-pages.yml

@@ -10,12 +10,14 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '14'
-      - run: npm install -g npm@7
-      - run: npm install
+          cache: 'pnpm'
+          node-version: 20
+      - run: pnpm i --frozen-lockfile
       - run: npx lint-to-the-future output -o lttfOutput --rootUrl ember-api-docs --previous-results https://ember-learn.github.io/ember-api-docs/data.json
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3

app/app.js

@@ -2,8 +2,12 @@ import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'ember-api-docs/config/environment';
+import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
+import 'ember-power-select/styles';
 
-import './deprecation-workflow';
+if (macroCondition(isDevelopingApp())) {
+  importSync('./deprecation-workflow');
+}
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;

app/components/search-input.hbs

@@ -16,10 +16,9 @@
     @targetAttachment='bottom left'
     @attachment='top left'
     @constraints={{this._resultTetherConstraints}}
-    @class='ds-dropdown-results'
+    class='ds-dropdown-results'
   >
     <SearchInput::Dropdown
-      @isVisible={{this._focused}}
       @results={{this.searchService.results}}
       @noResults={{if
         (and

app/components/search-input/dropdown.js

@@ -14,8 +14,6 @@ export default class Dropdown extends Component {
   // Public API
   role = 'listbox';
 
-  isVisible = false;
-
   // show
   // Massage data to make it easier for displaying on the template
   // Returned object:

app/controllers/project-version.js

@@ -2,7 +2,7 @@
 import { action, computed, set } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { readOnly, alias } from '@ember/object/computed';
-import Controller from '@ember/controller';
+import Controller, { inject as controller } from '@ember/controller';
 import { A } from '@ember/array';
 import values from 'lodash.values';
 import groupBy from 'lodash.groupby';
@@ -19,6 +19,16 @@ export default class ProjectVersionController extends Controller {
   @service
   project;
 
+  @service router;
+  @service('project') projectService;
+
+  @controller('project-version.classes.class') classController;
+  @controller('project-version.modules.module') moduleController;
+  @controller('project-version.namespaces.namespace') namespaceController;
+  @controller('project-version.classes.class.methods') methodsController;
+  @controller('project-version.classes.class.events') eventsController;
+  @controller('project-version.classes.class.properties') propertiesController;
+
   @alias('filterData.sideNav.showPrivate')
   showPrivateClasses;
 
@@ -128,4 +138,102 @@ 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.moduleController.model.name);
+        endingRoute = `modules/${moduleName}`;
+        break;
+      }
+      case 'project-version.namespaces.namespace.index': {
+        let namespaceName = this.namespaceController.model.name;
+        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.methodsController.anchor;
+        endingRoute = `classes/${className}/methods/${methodName}?anchor=${methodName}`;
+        break;
+      }
+      case 'project-version.classes.class.events.event': {
+        let className = this._getEncodedNameForCurrentClass();
+        let eventName = this.eventsController.anchor;
+        endingRoute = `classes/${className}/events/${eventName}?anchor=${eventName}`;
+        break;
+      }
+      case 'project-version.classes.class.properties.property': {
+        let className = this._getEncodedNameForCurrentClass();
+        let propertyName = this.propertiesController.anchor;
+        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}`);
+    }
+  }
+
+  _getEncodedNameForCurrentClass() {
+    // escape any reserved characters for url, like slashes
+    return encodeURIComponent(this.classController.model.get('name'));
+  }
+
+  // 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
+  _shouldConvertPackages(targetVer, previousVer) {
+    let targetVersion = getCompactVersion(targetVer.id);
+    let previousVersion = getCompactVersion(previousVer);
+    let previousComparison = semverCompare(previousVersion, '2.16');
+    let targetComparison = semverCompare(targetVersion, '2.16');
+    return (
+      (previousComparison < 0 && targetComparison >= 0) ||
+      (previousComparison >= 0 && targetComparison < 0)
+    );
+  }
 }

app/deprecation-workflow.js

@@ -1,13 +1,14 @@
 import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';
 
 setupDeprecationWorkflow({
+  throwOnUnhandled: true,
   workflow: [
-    { handler: 'silence', matchId: 'ember.component.reopen' },
-    { handler: 'silence', matchId: 'implicit-injections' },
-    { handler: 'silence', matchId: 'this-property-fallback' },
-    { handler: 'silence', matchId: 'ember-component.is-visible' },
+    { handler: 'throw', matchId: 'ember.component.reopen' },
+    { handler: 'throw', matchId: 'implicit-injections' },
+    { handler: 'throw', matchId: 'this-property-fallback' },
+    { handler: 'throw', matchId: 'ember-component.is-visible' },
     {
-      handler: 'silence',
+      handler: 'throw',
       matchId: 'deprecated-run-loop-and-computed-dot-access',
     },
   ],

app/helpers/github-link.js

@@ -2,10 +2,17 @@ import { helper } from '@ember/component/helper';
 import githubMap, { mainDir } from '../utils/github-map';
 
 export function githubLink([project, version, file, line], { isEdit = false }) {
+  const isEmberProject = project === 'ember';
+  const majorVersion = parseInt(version?.split('.')[0].replace('v', ''), 10);
+
+  // Check if the project is 'ember' and adjust the tag only if the major version is >= 6 to match the Git tags
+  const adjustedVersion =
+    isEmberProject && majorVersion >= 6 ? `${version}-ember-source` : version;
+
   if (isEdit) {
     return `https://github.com/${githubMap[project]}/edit/release${mainDir(
       project,
-      version
+      adjustedVersion
     )}${file}#L${line}`;
   }
 
@@ -22,9 +29,11 @@ export function githubLink([project, version, file, line], { isEdit = false }) {
   // 'https://github.com/emberjs/data/tree/v4.10.0/packages/packages/store/addon/-private/record-arrays/identifier-array.ts#L118'
   const fixedFile = file?.replace('../packages/', '../');
 
-  return `https://github.com/${githubMap[project]}/tree/v${version}${mainDir(
+  return `https://github.com/${
+    githubMap[project]
+  }/tree/v${adjustedVersion}${mainDir(
     project,
-    version
+    adjustedVersion
   )}${fixedFile}#L${line}`;
 }
 

app/routes/application.js

@@ -2,7 +2,6 @@ import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import { set } from '@ember/object';
 import ENV from 'ember-api-docs/config/environment';
-import getCompactVersion from 'ember-api-docs/utils/get-compact-version';
 
 export default class ApplicationRoute extends Route {
   @service
@@ -11,22 +10,6 @@ export default class ApplicationRoute extends Route {
   @service
   legacyModuleMappings;
 
-  title(tokens) {
-    let [version, entity] = tokens;
-    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 '';
-  }
-
   async afterModel() {
     set(this, 'headData.cdnDomain', ENV.API_HOST);
     await this.legacyModuleMappings.initMappings();