Merge remote-tracking branch 'upstream/master' into dependabot/github_actions/codecov/codecov-action-4.0.1

build(deps-dev): bump @testing-library/jest-dom from 6.3.0 to 6.4.2 (#3641 )
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 6.3.0 to 6.4.2. - [Release notes](https://github.com/testing-library/jest-dom/releases) - [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/jest-dom/compare/v6.3.0...v6.4.2) --- updated-dependencies: - dependency-name: "@testing-library/jest-dom" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexandr <qwerty541zxc@gmail.com>
2024-02-08 13:42:03 +02:00 · 2024-02-07 13:15:53 +02:00 · 2024-02-07 13:12:48 +02:00 · 2024-02-07 13:05:55 +02:00 · 2024-02-06 12:14:45 +01:00 · 2024-02-05 21:58:18 +02:00
21 changed files with 502 additions and 372 deletions
@@ -1,53 +1,95 @@
-themes: themes/index.js
-doc-translation: docs/*
+themes:
+  - changed-files:
+      - any-glob-to-any-file:
+          - themes/index.js
+
+doc-translation:
+  - changed-files:
+      - any-glob-to-any-file:
+          - docs/*
+
 card-i18n:
-  - src/translations.js
-  - src/common/I18n.js
+  - changed-files:
+      - any-glob-to-any-file:
+          - src/translations.js
+          - src/common/I18n.js
+
 documentation:
-  - readme.md
-  - CONTRIBUTING.md
-  - CODE_OF_CONDUCT.md
-  - SECURITY.md
+  - changed-files:
+      - any-glob-to-any-file:
+          - readme.md
+          - CONTRIBUTING.md
+          - CODE_OF_CONDUCT.md
+          - SECURITY.md
+
 dependencies:
-  - package.json
-  - package-lock.json
+  - changed-files:
+      - any-glob-to-any-file:
+          - package.json
+          - package-lock.json
+
 lang-card:
-  - api/top-langs.js
-  - src/cards/top-languages-card.js
-  - src/fetchers/top-languages-fetcher.js
-  - tests/fetchTopLanguages.test.js
-  - tests/renderTopLanguagesCard.test.js
-  - tests/top-langs.test.js
+  - changed-files:
+      - any-glob-to-any-file:
+          - api/top-langs.js
+          - src/cards/top-languages-card.js
+          - src/fetchers/top-languages-fetcher.js
+          - tests/fetchTopLanguages.test.js
+          - tests/renderTopLanguagesCard.test.js
+          - tests/top-langs.test.js
+
 repo-card:
-  - api/pin.js
-  - src/cards/repo-card.js
-  - src/fetchers/repo-fetcher.js
-  - tests/fetchRepo.test.js
-  - tests/renderRepoCard.test.js
-  - tests/pin.test.js
+  - changed-files:
+      - any-glob-to-any-file:
+          - api/pin.js
+          - src/cards/repo-card.js
+          - src/fetchers/repo-fetcher.js
+          - tests/fetchRepo.test.js
+          - tests/renderRepoCard.test.js
+          - tests/pin.test.js
+
 stats-card:
-  - api/index.js
-  - src/cards/stats-card.js
-  - src/fetchers/stats-fetcher.js
-  - tests/fetchStats.test.js
-  - tests/renderStatsCard.test.js
-  - tests/api.test.js
+  - changed-files:
+      - any-glob-to-any-file:
+          - api/index.js
+          - src/cards/stats-card.js
+          - src/fetchers/stats-fetcher.js
+          - tests/fetchStats.test.js
+          - tests/renderStatsCard.test.js
+          - tests/api.test.js
+
 wakatime-card:
-  - api/wakatime.js
-  - src/cards/wakatime-card.js
-  - src/fetchers/wakatime-fetcher.js
-  - tests/fetchWakatime.test.js
-  - tests/renderWakatimeCard.test.js
-  - tests/wakatime.test.js
+  - changed-files:
+      - any-glob-to-any-file:
+          - api/wakatime.js
+          - src/cards/wakatime-card.js
+          - src/fetchers/wakatime-fetcher.js
+          - tests/fetchWakatime.test.js
+          - tests/renderWakatimeCard.test.js
+          - tests/wakatime.test.js
+
 gist-card:
-  - api/gist.js
-  - src/cards/gist-card.js
-  - src/fetchers/gist-fetcher.js
-  - tests/fetchGist.test.js
-  - tests/renderGistCard.test.js
-  - tests/gist.test.js
-ranks: src/calculateRank.js
+  - changed-files:
+      - any-glob-to-any-file:
+          - api/gist.js
+          - src/cards/gist-card.js
+          - src/fetchers/gist-fetcher.js
+          - tests/fetchGist.test.js
+          - tests/renderGistCard.test.js
+          - tests/gist.test.js
+
+ranks:
+  - changed-files:
+      - any-glob-to-any-file:
+          - src/calculateRank.js
+
 ci:
-  - .github/workflows/*
-  - scripts/*
-infrastructure: .eslintrc.json
+  - changed-files:
+      - any-glob-to-any-file:
+          - .github/workflows/*
+          - scripts/*
+
+infrastructure:
+  - changed-files:
+      - any-glob-to-any-file:
+          - .eslintrc.json
@@ -20,7 +20,7 @@ jobs:
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Setup Node
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
        with:
          node-version: ${{ matrix.node-version }}
          cache: npm
@@ -30,7 +30,7 @@ jobs:
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Run empty issues closer action
-        uses: rickstaa/empty-issues-closer-action@e0fb1033c83cf13e0c98c2c9d0419d3040a6a1d0 # v1.1.50
+        uses: rickstaa/empty-issues-closer-action@5de6805e71f0a2b80e5e6c174467feceb94b935a # v1.1.70
        env:
          github_token: ${{ secrets.GITHUB_TOKEN }}
        with:
@@ -32,7 +32,7 @@ jobs:
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Setup Node
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
        with:
          node-version: ${{ matrix.node-version }}
          cache: npm
@@ -21,6 +21,7 @@ jobs:
    if: github.repository == 'anuraghazra/github-readme-stats'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594 # v4.3.0
+      - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
        with:
          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          sync-labels: true
@@ -35,7 +35,7 @@ jobs:
      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
      # format to the repository Actions tab.
      - name: "Upload artifact"
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
        with:
          name: SARIF file
          path: results.sarif
@@ -33,12 +33,12 @@ jobs:
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Setup Node
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
        with:
          node-version: ${{ matrix.node-version }}
          cache: npm

-      - uses: bahmutov/npm-install@2509f13e8485d88340a789a3f7ca11aaac47c9fc # v1.8.36
+      - uses: bahmutov/npm-install@d476752204653fb5cce6c09db0eaf220761f5d9e # v1.8.37
        with:
          useLockFile: false

@@ -39,12 +39,12 @@ jobs:
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Setup Node
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
        with:
          node-version: ${{ matrix.node-version }}
          cache: npm

-      - uses: bahmutov/npm-install@2509f13e8485d88340a789a3f7ca11aaac47c9fc # v1.8.36
+      - uses: bahmutov/npm-install@d476752204653fb5cce6c09db0eaf220761f5d9e # v1.8.37
        with:
          useLockFile: false

@@ -21,7 +21,7 @@ jobs:
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Setup Node
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
        with:
          node-version: ${{ matrix.node-version }}
          cache: npm
@@ -44,4 +44,4 @@ jobs:
          npm run format:check

      - name: Code Coverage
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+        uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
@@ -34,7 +34,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Run top issues action
-        uses: rickstaa/top-issues-action@04028f4fc0f1c217e571be72102b6ea4827b8468 # v1.3.75
+        uses: rickstaa/top-issues-action@c5580f47f44c69df300606554f428f040026d72a # v1.3.95
        env:
          github_token: ${{ secrets.GITHUB_TOKEN }}
        with:
@@ -39,7 +39,7 @@ jobs:
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Setup Node
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
        with:
          node-version: ${{ matrix.node-version }}
          cache: npm
@@ -1,6 +1,3 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npm test
 npm run lint
 npx lint-staged
@@ -29,7 +29,7 @@
    "generate-langs-json": "node scripts/generate-langs-json",
    "format": "prettier --write .",
    "format:check": "prettier --check .",
-    "prepare": "husky install",
+    "prepare": "husky",
    "lint": "npx eslint --max-warnings 0 \"./src/**/*.js\" \"./scripts/**/*.js\" \"./tests/**/*.js\" \"./api/**/*.js\" \"./themes/**/*.js\"",
    "bench": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config jest.bench.config.js"
  },
@@ -38,27 +38,27 @@
  "devDependencies": {
    "@actions/core": "^1.10.1",
    "@actions/github": "^6.0.0",
-    "@testing-library/dom": "^9.3.3",
-    "@testing-library/jest-dom": "^6.1.4",
+    "@testing-library/dom": "^9.3.4",
+    "@testing-library/jest-dom": "^6.4.2",
    "@uppercod/css-to-object": "^1.1.1",
    "axios-mock-adapter": "^1.22.0",
    "color-contrast-checker": "^2.1.0",
-    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
    "hjson": "^3.2.2",
-    "husky": "^8.0.3",
+    "husky": "^9.0.10",
    "jest": "^29.7.0",
-    "jest-bench": "^29.4.1",
+    "jest-bench": "^29.7.1",
    "jest-environment-jsdom": "^29.7.0",
    "js-yaml": "^4.1.0",
-    "lint-staged": "^15.1.0",
+    "lint-staged": "^15.2.2",
    "lodash.snakecase": "^4.1.1",
    "parse-diff": "^0.11.1",
-    "prettier": "^3.1.0"
+    "prettier": "^3.2.5"
  },
  "dependencies": {
-    "axios": "^1.6.2",
-    "dotenv": "^16.3.1",
+    "axios": "^1.6.7",
+    "dotenv": "^16.4.1",
    "emoji-name-map": "^1.2.8",
    "github-username-regex": "^1.0.0",
    "upgrade": "^1.1.0",
@@ -432,7 +432,7 @@ If we don't support your language, please consider contributing! You can find mo
 | `custom_title` | Sets a custom title for the card. | string | `WakaTime Stats` |
 | `layout` | Switches between two available layouts `default` & `compact`. | enum | `default` |
 | `langs_count` | Limits the number of languages on the card, defaults to all reported languages. | integer | `null` |
-| `api_domain` | Sets a custom API domain for the card, e.g. to use services like [Hakatime](https://github.com/mujx/hakatime) or [Wakapi](https://github.com/muety/wakapi) | string | `Waka API` |
+| `api_domain` | Sets a custom API domain for the card, e.g. to use services like [Hakatime](https://github.com/mujx/hakatime) or [Wakapi](https://github.com/muety/wakapi) | string | `wakatime.com` |
 | `display_format` | Sets the WakaTime stats display format. Choose `time` to display time-based stats or `percent` to show percentages. | enum | `time` |
 | `disable_animations` | Disables all animations in the card. | boolean | `false` |

@@ -518,7 +518,7 @@ const renderStatsCard = (stats, options = {}) => {
      if (key === "commits") {
        return `${i18n.t("statcard.commits")} ${
          include_all_commits ? "" : `in ${new Date().getFullYear()}`
-        } : ${totalStars}`;
+        } : ${STATS[key].value}`;
      }
      return `${STATS[key].label}: ${STATS[key].value}`;
    })
@@ -46,7 +46,7 @@ export type TopLangOptions = CommonOptions & {
  hide_progress: boolean;
 };

-type WakaTimeOptions = CommonOptions & {
+export type WakaTimeOptions = CommonOptions & {
  hide_title: boolean;
  hide: string[];
  line_height: string;
@@ -39,6 +39,20 @@ const noCodingActivityNode = ({ color, text }) => {
 * @typedef {import('../fetchers/types').WakaTimeLang} WakaTimeLang
 */

+/**
+ * Format language value.
+ *
+ * @param {Object} args The function arguments.
+ * @param {WakaTimeLang} args.lang The language object.
+ * @param {"time" | "percent"} args.display_format The display format of the language node.
+ * @returns {string} The formatted language value.
+ */
+const formatLanguageValue = ({ display_format, lang }) => {
+  return display_format === "percent"
+    ? `${lang.percent.toFixed(2).toString()} %`
+    : lang.text;
+};
+
 /**
 * Create compact WakaTime layout.
 *
@@ -51,10 +65,7 @@ const noCodingActivityNode = ({ color, text }) => {
 */
 const createCompactLangNode = ({ lang, x, y, display_format }) => {
  const color = languageColors[lang.name] || "#858585";
-  const value =
-    display_format === "percent"
-      ? `${lang.percent.toFixed(2).toString()} %`
-      : lang.text;
+  const value = formatLanguageValue({ display_format, lang });

  return `
    <g transform="translate(${x}, ${y})">
@@ -341,10 +352,7 @@ const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
            return createTextNode({
              id: language.name,
              label: language.name,
-              value:
-                display_format === "percent"
-                  ? `${language.percent.toFixed(2).toString()} %`
-                  : language.text,
+              value: formatLanguageValue({ display_format, lang: language }),
              index,
              percent: language.percent,
              // @ts-ignore
@@ -130,6 +130,7 @@
    "Easybuild": "#069406",
    "Ecere Projects": "#913960",
    "Ecmarkup": "#eb8131",
+    "EdgeQL": "#31A7FF",
    "EditorConfig": "#fff1f2",
    "Eiffel": "#4d6977",
    "Elixir": "#6e4a7e",
@@ -170,8 +171,8 @@
    "Game Maker Language": "#71b417",
    "Gemfile.lock": "#701516",
    "Gemini": "#ff6900",
-    "Genero": "#63408e",
-    "Genero Forms": "#d8df39",
+    "Genero 4gl": "#63408e",
+    "Genero per": "#d8df39",
    "Genie": "#fb855d",
    "Genshi": "#951531",
    "Gentoo Ebuild": "#9400ff",
@@ -182,6 +183,7 @@
    "Git Config": "#F44D27",
    "Git Revision List": "#F44D27",
    "Gleam": "#ffaff3",
+    "Glimmer JS": "#F5835F",
    "Glyph": "#c1ac7f",
    "Gnuplot": "#f0a9f0",
    "Go": "#00ADD8",
@@ -386,6 +388,7 @@
    "PostScript": "#da291c",
    "PowerBuilder": "#8f0f8d",
    "PowerShell": "#012456",
+    "Praat": "#c8506d",
    "Prisma": "#0c344b",
    "Processing": "#0096D8",
    "Procfile": "#3B2F63",
@@ -478,7 +481,7 @@
    "SugarSS": "#2fcc9f",
    "SuperCollider": "#46390b",
    "Svelte": "#ff3e00",
-    "Sway": "#dea584",
+    "Sway": "#00F58C",
    "Sweave": "#198ce7",
    "Swift": "#F05138",
    "SystemVerilog": "#DAE1C2",
@@ -494,9 +497,11 @@
    "Tcl": "#e4cc98",
    "TeX": "#3D6117",
    "Terra": "#00004c",
+    "Terraform Template": "#7b42bb",
    "TextMate Properties": "#df66e4",
    "Textile": "#ffe7ac",
    "Thrift": "#D12127",
+    "Toit": "#c2c9fb",
    "Turing": "#cf142b",
    "Twig": "#c1d026",
    "TypeScript": "#3178c6",
@@ -14,19 +14,20 @@ import { expect, describe, beforeAll, test } from "@jest/globals";

 const REPO = "curly-fiesta";
 const USER = "catelinemnemosyne";
+const STATS_CARD_USER = "e2eninja";
 const GIST_ID = "372cef55fd897b31909fdeb3a7262758";

 const STATS_DATA = {
-  name: "Cateline Mnemosyne",
-  totalPRs: 2,
+  name: "E2ENinja",
+  totalPRs: 1,
  totalReviews: 0,
-  totalCommits: 8,
+  totalCommits: 3,
  totalIssues: 1,
  totalStars: 1,
-  contributedTo: 1,
+  contributedTo: 0,
  rank: {
    level: "C",
-    percentile: 98.06929469995667,
+    percentile: 98.73972605284538,
  },
 };

@@ -116,15 +117,17 @@ describe("Fetch Cards", () => {

    // Check if the Vercel preview instance stats card function is up and running.
    await expect(
-      axios.get(`${VERCEL_PREVIEW_URL}/api?username=${USER}`),
+      axios.get(`${VERCEL_PREVIEW_URL}/api?username=${STATS_CARD_USER}`),
    ).resolves.not.toThrow();

    // Get local stats card.
-    const localStatsCardSVG = renderStatsCard(STATS_DATA);
+    const localStatsCardSVG = renderStatsCard(STATS_DATA, {
+      include_all_commits: true,
+    });

    // Get the Vercel preview stats card response.
    const serverStatsSvg = await axios.get(
-      `${VERCEL_PREVIEW_URL}/api?username=${USER}&${CACHE_BURST_STRING}`,
+      `${VERCEL_PREVIEW_URL}/api?username=${STATS_CARD_USER}&include_all_commits=true&${CACHE_BURST_STRING}`,
    );

    // Check if stats card from deployment matches the stats card from local.
@@ -387,7 +387,9 @@ describe("Test renderStatsCard", () => {
      document.querySelector(
        'g[transform="translate(0, 25)"]>.stagger>.stat.bold',
      ).textContent,
-    ).toMatchInlineSnapshot(`"累计提交数（commit） (2023):"`);
+    ).toMatchInlineSnapshot(
+      `"累计提交数（commit） (${new Date().getFullYear()}):"`,
+    );
    expect(
      document.querySelector(
        'g[transform="translate(0, 50)"]>.stagger>.stat.bold',