Merge pull request #945 from ember-learn/main-merge

Merge main into website-redesign

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

@@ -3,6 +3,7 @@ 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';
 
 if (macroCondition(isDevelopingApp())) {
   importSync('./deprecation-workflow');

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/templates/application.hbs

@@ -9,3 +9,4 @@
 </main>
 
 <EsFooter />
+<BasicDropdownWormhole />

package.json

@@ -61,11 +61,12 @@
     "broccoli-funnel": "^2.0.1",
     "ember-a11y-testing": "^5.2.1",
     "ember-anchor": "^1.0.3",
-    "ember-auto-import": "^2.7.2",
+    "ember-auto-import": "^2.10.0",
+    "ember-basic-dropdown": "^8.6.0",
     "ember-cli": "~3.28.6",
     "ember-cli-app-version": "^5.0.0",
     "ember-cli-autoprefixer": "^1.0.0",
-    "ember-cli-babel": "^7.26.10",
+    "ember-cli-babel": "^8.2.0",
     "ember-cli-browserstack": "^1.0.1",
     "ember-cli-clipboard": "^1.1.0",
     "ember-cli-dependency-checker": "^3.2.0",
@@ -81,7 +82,7 @@
     "ember-cli-showdown": "^9.0.1",
     "ember-cli-terser": "^4.0.2",
     "ember-composable-helpers": "^3.1.1",
-    "ember-concurrency": "^2.3.7",
+    "ember-concurrency": "^4.0.3",
     "ember-data": "~3.28.6",
     "ember-data-fastboot": "https://github.com/cardstack/ember-data-fastboot#6e6fb8bbf0b405ae174160cc1e4833c5582f68cd",
     "ember-decorators": "^6.1.1",
@@ -92,7 +93,7 @@
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-metrics": "^1.5.2",
     "ember-page-title": "^6.2.2",
-    "ember-power-select": "^7.2.0",
+    "ember-power-select": "^8.7.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
     "ember-rfc176-data": "^0.3.17",