Merge branch 'ember-learn:main' into lazy-load-highcharts

Author: IgnaceMaes

.github/workflows/ci.yml

@@ -6,6 +6,10 @@ on:
       - main
   pull_request:
 
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 env:
   NODE_VERSION: 20
   PERCY_PARALLEL_NONCE: ${{ github.run_id }}-${{ github.run_number }}
@@ -17,71 +21,52 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
-      - name: Check out a copy of the repo
-        uses: actions/checkout@v2
-
-      - uses: mansona/npm-lockfile-version@v1
-
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
         with:
-          cache: 'npm'
+          cache: 'pnpm'
           node-version: ${{ env.NODE_VERSION }}
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Lint
-        run: npm run lint
+      - run: pnpm i --frozen-lockfile
+      - run: pnpm run lint
 
   test-app:
     name: Test app
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - name: Check out a copy of the repo
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
         with:
-          cache: 'npm'
+          cache: 'pnpm'
           node-version: ${{ env.NODE_VERSION }}
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Test
-        run: npx percy exec -- npm run test
+      - run: pnpm i --frozen-lockfile
+      - run: pnpm percy exec -- npm run test
         env:
           PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
           PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
-          PERCY_TOKEN: c08aaada222e9cb103a28b98e94d71ff8baaddb5a548237432d900f1d4a9ec27
+          PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
 
   lighthouse-ci:
     name: Run Lighthouse
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - name: Check out a copy of the repo
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
         with:
-          cache: 'npm'
+          cache: 'pnpm'
           node-version: ${{ env.NODE_VERSION }}
-
-      - name: Install dependencies
-        run: npm ci
-
+      - run: pnpm i --frozen-lockfile
       - name: Build production app
-        run: npm run build
+        run: pnpm run build
 
       - name: Run Lighthouse
-        run: npx @lhci/[email protected] autorun
+        run: pnpm lhci autorun
         env:
           LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
           LHCI_TOKEN: ${{ secrets.LHCI_TOKEN }}

.github/workflows/ember-assets.yml

@@ -8,9 +8,10 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
-        fetch-depth: 0 
+        fetch-depth: 0
+    - uses: pnpm/action-setup@v4
     - uses: mainmatter/ember-asset-size-action@v3
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.netlifyredirects

@@ -12,7 +12,7 @@
 /legal  /about/legal
 /meetup-assets  /community/meetups/assets
 /statusboard  https://github.com/emberjs/rfc-tracking/issues
-/survey  /survey/2022
+/survey  /survey/2024
 /team  /teams
 /tomster/*  /mascots/:splat
 /zoey  /mascots

.npmrc

@@ -0,0 +1,2 @@
+ignore-scripts=false
+use-node-version=20.18.3

README.md

@@ -19,11 +19,11 @@ You will need the following things properly installed on your computer.
 
 * `git clone <repository-url>` this repository
 * `cd ember-website`
-* `npm install`
+* `pnpm install`
 
 ## Running / Development
 
-* `npm start`
+* `pnpm start`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 * Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
@@ -33,17 +33,17 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Running Tests
 
-* `npm test`
-* `npm test --server`
+* `pnpm test`
+* `pnpm test --server`
 
 ### Linting
 
-* `npm run lint`
-* `npm run lint:fix`
+* `pnpm run lint`
+* `pnpm run lint:fix`
 
 ### Building
 
-* `npm run build` (production)
+* `pnpm run build` (production)
 
 ### Deploying
 

app/adapters/application.js

@@ -1,6 +1,14 @@
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 
 export default class ApplicationAdapter extends JSONAPIAdapter {
+  shouldBackgroundReloadAll() {
+    return false;
+  }
+
+  shouldBackgroundReloadRecord() {
+    return false;
+  }
+
   urlForFindAll(modelName) {
     const path = this.pathForType(modelName);
     return `/data/${path}/all.json`;

app/components/community-trends.hbs

@@ -0,0 +1,9 @@
+  {{! optional content, for meme / participating in the broader JS ecosystem, maintaining relevance }}
+  {{#if (qp 'uwu')}}
+    {{!-- lint incorrectly says this is already called out by a screen reader --}}
+    {{!-- template-lint-disable require-valid-alt-text --}}
+    <img
+      class="uwu-logo"
+      alt="ember uwu / kawaii logo (from internet trend / meme)"
+      src="/images/ember-uwu-meme.png">
+  {{/if}}

app/components/mascots/mascot-list/item.hbs

@@ -1,4 +1,4 @@
-<figure>
+<figure class="mascot-item" id={{@mascot.id}}>
   <div class="well well-1/1">
     <ResponsiveImage
       @src="/images/tomsters/{{@mascot.image}}"

app/components/teams/team.hbs

@@ -1,6 +1,7 @@
 <h2
   class="text-center"
   data-test-field="Team Name"
+  id={{dasherize @name}}
 >
   {{@name}}
 </h2>

app/controllers/application.js

@@ -4,6 +4,7 @@ import headerLinks from 'ember-styleguide/constants/links';
 import replaceLinks from 'ember-website/utils/replace-links';
 
 export default class ApplicationController extends Controller {
+  queryParams = ['uwu'];
   links = replaceLinks(headerLinks);
   infoLinks = replaceLinks(infoLinks);
 }