Merge branch 'master' into translation/web-html-constraint_validation

Author: undead404

.eslintrc.cjs

@@ -9,7 +9,6 @@ module.exports = {
     "plugin:promise/recommended",
     "plugin:array-func/all",
     "plugin:node/recommended",
-    "plugin:security/recommended",
     "plugin:unicorn/all",
     "plugin:prettier/recommended",
     "plugin:jest/all",
@@ -46,6 +45,7 @@ module.exports = {
         "no-magic-numbers": "off",
         "node/no-extraneous-import": "off",
         "jest/require-hook": "error",
+        "node/no-unpublished-import": "off",
       },
     },
     {
@@ -64,9 +64,15 @@ module.exports = {
         "import/extensions": ["error", "ignorePackages"],
       },
     },
+    {
+      files: ["**/front-matter-*.test.js"],
+      rules: {
+        "import/extensions": ["error", "never"],
+      },
+    },
   ],
   parserOptions: {
-    ecmaVersion: 2021,
+    ecmaVersion: 2024,
   },
   plugins: [
     "prettier",
@@ -77,7 +83,6 @@ module.exports = {
     "jest",
     "simple-import-sort",
     "editorconfig",
-    "security",
   ],
   root: true,
   rules: {
@@ -88,15 +93,7 @@ module.exports = {
     // 'import/prefer-await-to-then': 'off',
     // 'no-underscore-dangle': 'off',
     "unicorn/no-null": "off",
-    "import/extensions": [
-      "error",
-      "ignorePackages",
-      {
-        js: "never",
-        ts: "never",
-        tsx: "never",
-      },
-    ],
+    "import/extensions": ["error", "ignorePackages"],
     "no-void": ["error", { allowAsStatement: true }],
     "no-magic-numbers": [
       "error",
@@ -117,15 +114,19 @@ module.exports = {
         groups: [
           // Node.js builtins.
           // eslint-disable-next-line global-require
-          [`^(${require("module").builtinModules.join("|")})(/|$)`],
+          [`^(?:node:)?(${require("module").builtinModules.join("|")})(/|$)`],
           // Packages.
-          ["^@?(\\w|.)[^./]"],
+          [String.raw`^@?(\w|.)[^./]`],
           // Side effect imports.
-          ["^\\u0000"],
+          [String.raw`^\u0000`],
           // Parent imports. Put `..` last.
-          ["^\\.\\.(?!/?$)", "^\\.\\./?$"],
+          [String.raw`^\.\.(?!/?$)`, String.raw`^\.\./?$`],
           // Other relative imports. Put same-folder imports and `.` last.
-          ["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
+          [
+            String.raw`^\./(?=.*/)(?!/?$)`,
+            String.raw`^\.(?!/?$)`,
+            String.raw`^\./?$`,
+          ],
         ],
       },
     ],

.github/workflows/size-label.yml

@@ -1,5 +1,5 @@
 name: size-label
-on: pull_request
+on: pull_request_target
 jobs:
   size-label:
     permissions:
@@ -11,3 +11,33 @@ jobs:
         uses: "webdoky/size-label-action@main"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+  # assign-reviewers:
+  #   needs: [size-label]
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v4
+
+  #     - name: Assign/Remove reviewers based on size label
+  #       run: |
+  #         PR_NUMBER=${{ github.event.pull_request.number }}
+  #         LABELS=$(gh pr view $PR_NUMBER --json labels --jq '.labels[].name')
+  #         REVIEWER="${{ github.repository_owner }}/translators"
+
+  #         if [[ $LABELS == *"size/XS"* ]] || [[ $LABELS != *"size/"* ]]; then
+  #           gh api \
+  #             --method DELETE \
+  #             -H "Accept: application/vnd.github+json" \
+  #             -H "X-GitHub-Api-Version: 2022-11-28" \
+  #             /repos/${{ github.repository }}/pulls/$PR_NUMBER/requested_reviewers \
+  #             -f "team_reviewers[]=$REVIEWER"
+  #         else
+  #           gh api \
+  #             --method POST \
+  #             -H "Accept: application/vnd.github+json" \
+  #             -H "X-GitHub-Api-Version: 2022-11-28" \
+  #             /repos/${{ github.repository }}/pulls/$PR_NUMBER/requested_reviewers \
+  #             -f "team_reviewers[]=$REVIEWER"
+  #         fi
+  #       env:
+  #         GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/translation.yml

@@ -1,5 +1,5 @@
 name: spellcheck
-on: [pull_request]
+on: [pull_request_target]
 jobs:
   prepare:
     outputs:
@@ -10,8 +10,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ github.head_ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
       - id: changed-files
-        run: git diff --diff-filter=d --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} > ./changed_files.txt
+        run: git diff --diff-filter=d --name-only origin/${{ github.base_ref }}...${{ github.event.pull_request.head.sha }} > ./changed_files.txt
       - name: Check translation
         # Check there is only one translation change
         # If there are more than one, the workflow will fail
@@ -55,6 +57,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
       - name: Remove code blocks
         run: |
           file=${{ needs.prepare.outputs.translation }}
@@ -130,13 +135,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
       - uses: actions/download-artifact@v3
         with:
           name: result
           path: .
       - uses: actions/setup-node@v4
         with:
-          node-version: "16"
+          node-version: "20"
       - uses: actions/download-artifact@v3
         with:
           name: text
@@ -156,9 +164,15 @@ jobs:
     if: ${{ needs.prepare.outputs.translation != '' }}
     name: Set title
     needs: [prepare]
+    permissions:
+      contents: read
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
       - id: determine
         run: |
           translation=${{ needs.prepare.outputs.translation }}
@@ -185,20 +199,28 @@ jobs:
       - env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh pr edit ${{ github.event.pull_request.number }} --title "${{ needs.prepare.outputs.status }}(${{ steps.determine.outputs.section }}): ${{ steps.determine.outputs.slug }}"
+          gh pr edit ${{ github.event.pull_request.number }} --repo webdoky/content --title "${{ needs.prepare.outputs.status }}(${{ steps.determine.outputs.section }}): ${{ steps.determine.outputs.slug }}"
   set-translation-body:
     if: ${{ needs.prepare.outputs.translation != '' && needs.prepare.outputs.status == 'translation' }}
     name: Set translation body
     needs: [prepare]
+    permissions:
+      contents: read
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
       # set the last section of slug as name
       - id: create-body
         run: |
           translation=${{ needs.prepare.outputs.translation }}
+          echo $translation
           # get "slug" frontmatter value
           slug=$(cat $translation | grep -E "^slug: " | sed 's/slug: //')
+          echo $slug
           # get "title" frontmatter value
           title=$(cat $translation | grep -E "^title: " | sed 's/title: //')
           # escape HTML entities from title
@@ -212,11 +234,14 @@ jobs:
       - env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh pr edit ${{ github.event.pull_request.number }} --body "$(cat ./body.md)"
+          gh pr edit ${{ github.event.pull_request.number }} --body "$(cat ./body.md)"  --repo webdoky/content
   set-update-body:
     if: ${{ needs.prepare.outputs.translation != '' && needs.prepare.outputs.status == 'update' }}
     name: Set update body
     needs: [prepare]
+    permissions:
+      contents: read
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -275,4 +300,4 @@ jobs:
       - env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh pr edit ${{ github.event.pull_request.number }} --body "$(cat ./body.md)"
+          gh pr edit ${{ github.event.pull_request.number }} --body "$(cat ./body.md)"  --repo webdoky/content

.husky/pre-commit

@@ -1,4 +1,2 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx lint-staged
+# Ignore merge commits, for others run lint-staged
+git rev-parse -q --no-revs --verify MERGE_HEAD || npx lint-staged

.lintstagedrc.json

@@ -1,6 +1,6 @@
 {
   "*.js": ["eslint --quiet --fix"],
-  "*.md": [
+  "files/**/*.md": [
     "node scripts/markdownlint.js",
     "node scripts/front-matter-linter.js --fix true",
     "prettier --write --ignore-unknown"

.markdownlint.jsonc

@@ -1,10 +1,5 @@
-// This file defines our configuration for Markdownlint. See
-// https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md
-// for more details on each rule.
-
 {
   "default": true,
-  // Disabled, as some callouts include headings.
   "heading-increment": false,
   "ul-style": {
     "style": "dash"
@@ -17,17 +12,15 @@
   },
   "line-length": false,
   "no-duplicate-heading": {
-    "allow_different_nesting": true
+    "siblings_only": true
   },
   "single-title": {
     "front_matter_title": "^\\s*title\\s*[:=]"
   },
   "no-trailing-punctuation": {
     "punctuation": ".,;:"
   },
-  // Consecutive Notes/Callouts currently don't conform with this rule
   "no-blanks-blockquote": false,
-  // Force ordered numbering to catch accidental list ending from indenting
   "ol-prefix": {
     "style": "ordered"
   },
@@ -103,10 +96,8 @@
     ]
   },
   "no-bare-urls": false,
-  // Produces too many false positives
   "no-space-in-emphasis": false,
   "fenced-code-language": true,
-  // See https://github.com/mdn/content/pull/20026, as macros currently break this
   "no-empty-links": false,
   "code-block-style": {
     "style": "fenced"
@@ -117,10 +108,8 @@
   "strong-style": {
     "style": "asterisk"
   },
-  // Disabled, as yari generates link fragments by replacing spaces with underscores, not dashes.
   "link-fragments": false,
 
-  // https://github.com/OnkarRuikar/markdownlint-rule-search-replace
   "search-replace": {
     "rules": [
       {
@@ -250,7 +239,7 @@
       },
       {
         "name": "un-closed-md-link",
-        "message": "Missng closing bracket ')'",
+        "message": "Missing closing bracket ')'",
         "searchPattern": "/(\\[[^\\]]*?\\]\\(([^\\)\\n]|\\([^\\)\\n]\\)|\\s[\"'])+?)(\\n|\\s|[,:][\\s\\n])/gm",
         "searchScope": "text"
       },
@@ -259,6 +248,49 @@
         "name": "backticks-wrapped-macro",
         "replace": "$1",
         "searchPattern": "/`({{[^{}]+?}})`/gm"
+      },
+      {
+        "message": "Use notecard note marker",
+        "name": "notecard-note",
+        "replace": "$1> [!NOTE]\n$1> ",
+        "searchPattern": "/( *)> \\*\\*Примітка:\\*\\* /gm"
+      },
+      {
+        "message": "Use notecard warning marker",
+        "name": "notecard-warning",
+        "replace": "$1> [!WARNING]\n$1> ",
+        "searchPattern": "/( *)> \\*\\*Застереження:\\*\\* /gm"
+      },
+      {
+        "message": "Remove English markers",
+        "name": "no-english-marker",
+        "replace": "$1",
+        "searchPattern": "/ \\(англ\\.\\)(]|>)/g"
+      },
+      {
+        "message": "Use notecard callout marker",
+        "name": "notecard-callout",
+        "replace": "$1> [!CALLOUT]",
+        "searchPattern": "/( *)> \\*\\*Callout:\\*\\*/gm"
+      },
+      {
+        "message": "Use notecard note marker",
+        "name": "notecard-note-2",
+        "replace": "$1> [!NOTE]\n$1> ",
+        "searchPattern": "/( *)> \\*\\*Зауваження:\\*\\* /gm"
+      },
+      {
+        "message": "Use Ukrainian Learn Microsoft",
+        "name": "learn-microsoft",
+        "replace": "https://learn.microsoft.com/uk-ua/",
+        "search": "https://learn.microsoft.com/en-us/"
+      },
+      {
+        "message": "Use em dash between different words, not hyphen",
+        "name": "emdash-not-hyphen",
+        "replace": "$1 – ",
+        "searchPattern": "/([^ ]) - /gm",
+        "searchScope": "text"
       }
     ]
   }

.nvmrc

@@ -1 +1 @@
-16
+20

.prettierignore

@@ -0,0 +1,11 @@
+# This .prettierignore file uses .gitignore syntax
+# see https://prettier.io/docs/en/ignore.html#ignoring-files-prettierignore
+
+build/
+/files/uk/_githistory.json
+/tests/front-matter_test_files
+.markdownlint*
+
+# XXX Ignored until https://github.com/prettier/prettier/issues/15032 is fixed
+/files/uk/web/javascript/reference/operators/exponentiation/index.md
+/files/uk/web/javascript/reference/operators/exponentiation_assignment/index.md