[pull] master from probot:master

.eleventy.js

@@ -1,13 +1,14 @@
-const htmlmin = require("html-minifier");
-const syntaxHighlight = require("@11ty/eleventy-plugin-syntaxhighlight");
-const {Liquid} = require("liquidjs");
-const markdownIt = require("markdown-it");
+import htmlmin from "html-minifier";
+import syntaxHighlight from "@11ty/eleventy-plugin-syntaxhighlight";
+import {Liquid} from "liquidjs";
+import markdownIt from "markdown-it";
+import octiconTag from "./js/octicons-liquid/tag.js";
 
 function watchAndPass(file, config) {
     config.addWatchTarget(file);
     config.addPassthroughCopy(file);
 }
-module.exports = function (eleventyConfig) {
+export default function (eleventyConfig) {
     watchAndPass("./assets/js", eleventyConfig);
     watchAndPass("./assets/dist", eleventyConfig);
     watchAndPass("./assets/img", eleventyConfig);
@@ -24,8 +25,8 @@ module.exports = function (eleventyConfig) {
     eleventyConfig.addPlugin(syntaxHighlight);
 
     // Reduce HTML output size
-    eleventyConfig.addTransform("htmlmin", function(content, outputPath) {
-        if( this.outputPath && this.outputPath.endsWith(".html") ) {
+    eleventyConfig.addTransform("htmlmin", (content, outputPath) => {
+        if(outputPath && outputPath.endsWith(".html") ) {
           let minified = htmlmin.minify(content, {
             useShortDoctype: true,
             removeComments: true,
@@ -37,11 +38,11 @@ module.exports = function (eleventyConfig) {
         return content;
     });
 
-    eleventyConfig.addCollection("apps", function(collectionApi) {
-        return collectionApi.getFilteredByGlob("_apps/*.md").sort((a, b) => b.data.starts - a.data.starts);
+    eleventyConfig.addCollection("apps", (collectionApi) => {
+        return collectionApi.getFilteredByGlob("_apps/*.md").sort((a, b) => b.data.stars - a.data.stars);
     });
 
-    eleventyConfig.addCollection("docs", function(collectionApi) {
+    eleventyConfig.addCollection("docs", (collectionApi) => {
         return collectionApi.getFilteredByGlob("_docs/*.md");
     });
 
@@ -53,7 +54,7 @@ module.exports = function (eleventyConfig) {
         root: ["_includes"]
     };
     const liquid = new Liquid(options);
-    liquid.registerTag('octicon', require("./js/octicons-liquid/tag.js"));
+    liquid.registerTag('octicon', octiconTag);
     eleventyConfig.setLibrary("liquid", liquid);
 
     // Customize markdown-it settings
@@ -63,7 +64,7 @@ module.exports = function (eleventyConfig) {
         linkify: true
     });
 
-    eleventyConfig.addFilter('markdown', function(value) {
+    eleventyConfig.addFilter('markdown', (value) => {
         return markdown.render(value);
     });
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,6 +14,7 @@ App Review Process: https://github.com/probot/probot.github.io/blob/master/.gith
 - [ ] All comments in frontmatter need to be removed.
 - [ ] Performs a useful action through the GitHub API that solves an existing problem for developers: {explain the action here}
 - [ ] Is original: for example, it does something not already done by an existing Probot app
+- [ ] Is using the probot version (v12 or latest)
 - [ ] [Has tests](yourURLhere)
 - [ ] [Has documentation](yourURLhere)
 - [ ] [Is open source](yourURLhere)

.github/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "github>probot/.github"
+  ]
+}

.github/workflows/build.yml

@@ -1,38 +1,73 @@
 name: Build Eleventy
 
 on:
+  # Runs on pushes targeting the default branch
   push:
-    branches:
-      - main
-      - master
+    branches: [master]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
 
 jobs:
+  # Build job
   build:
-    runs-on: ubuntu-20.04
-
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
 
-      - name: Install Node.js
-        uses: actions/setup-node@v2
+      - name: Restore yarn cache
+        uses: actions/cache@v4
         with:
-          node-version: '16'
-          cache: 'yarn'
-
-      - name: Install dependencies & build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          git submodule init
-          git submodule update 
-          yarn
-          yarn sass
-          yarn build
-          # Prevent GitHub from trying to use Jekyll
-          touch _site/.nojekyll
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+          path: |
+            .yarn/cache
+          # Generate a new cache whenever packages or source files change.
+          key: ${{ runner.os }}-website-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
+          # If source files changed but packages didn't, rebuild from a prior cache.
+          restore-keys: |
+            ${{ runner.os }}-website-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Build CSS
+        run: yarn sass
+
+      - name: Build with Eleventy
+        run: yarn build
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          publish_dir: ./_site
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          path: ./_site
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/sync.yml

@@ -3,18 +3,21 @@ name: Sync app data
 on:
   schedule:
     - cron:  '0 0 * * *'
+  workflow_dispatch: {}
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Install Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '20'
           cache: 'yarn'
 
       - name: Install dependencies & sync data
@@ -24,15 +27,39 @@ jobs:
           yarn install
           yarn sync-data
 
-      - name: Determine default branch
+      - name: Commit & Push changes
         run: |
-          DEFAULT_BRANCH=$(git remote show origin | awk '/HEAD branch/ {print $NF}')
-          echo "default_branch=$DEFAULT_BRANCH" >> $GITHUB_ENV
-          echo "default_branch_ref=refs/heads/$DEFAULT_BRANCH" >> $GITHUB_ENV
+          git submodule init
+          git submodule update 
+          git config user.name Probot Bot
+          git config user.email [email protected]
+          git add .
+          # do not error if there is nothing to commit
+          git commit -m "chore: Sync data" && git push || true
 
-      - name: Commit & Push changes
-        uses: davidolrik/push@b88b2c57f3a4c23bf2abf091c319e77088dd0172
+
+      - name: Build CSS
+        run: yarn sass
+
+      - name: Build with Eleventy
+        run: yarn build
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          message: 'chore: Sync data'
-          branch: ${{ env.default_branch }}
+          path: ./_site
+
+  deploy:
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -6,7 +6,9 @@
 !.yarn/versions
 .pnp.*
 .env
+.netlify
 private
 lib/tsconfig.tsbuildinfo
 _site
 node_modules
+assets/dist