Skip to content

Commit 09ca5cf

Browse files
WorldLanguagesWorldLanguages
authored
Merge branch 'master' into master
2 parents 2f07320 + 5106a40 commit 09ca5cf

File tree

592 files changed

+9016
-2688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

592 files changed

+9016
-2688
lines changed

‎.eslintrc.json‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121
*.md export-ignore
2222
LICENSE export-ignore
23+
eslint.config.mjs export-ignore
2324
.* export-ignore
25+
dist export-ignore
2426
typedef.js export-ignore
2527

2628
libraries/README.md -export-ignore

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/.github/ @Hans5958
2-
/addons/addons.json @WorldLanguages # New addons
3-
/addon-api @WorldLanguages @apple502j
4-
/background @WorldLanguages @apple502j
5-
/content-scripts @WorldLanguages @apple502j
6-
/libraries @WorldLanguages @apple502j
7-
manifest.json @WorldLanguages @apple502j
2+
# /addons/addons.json @WorldLanguages # New addons
3+
/addon-api @WorldLanguages
4+
/background @WorldLanguages
5+
/content-scripts @WorldLanguages
6+
/libraries @WorldLanguages
7+
manifest.json @WorldLanguages
8+
README.md @WorldLanguages

‎.github/workflows/eslint.yml‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
1-
name: ESLint
1+
name: Scan code using ESLint
22

33
on:
44
push:
5-
branches: [ "master" ]
5+
branches:
6+
- master
7+
paths:
8+
- '**/*.js'
9+
- eslint.config.mjs
10+
- .github/workflows/eslint.yml
611
pull_request:
7-
# The branches below must be a subset of the branches above
8-
branches: [ "master" ]
12+
branches:
13+
- master
14+
paths:
15+
- '**/*.js'
16+
- eslint.config.mjs
17+
- .github/workflows/eslint.yml
918

1019
jobs:
11-
eslint:
12-
name: Run eslint scanning
20+
scan:
21+
name: Scan
1322
runs-on: ubuntu-latest
1423
permissions:
1524
contents: read
1625
steps:
1726
- name: Checkout code
18-
uses: actions/checkout@v3
19-
20-
- name: Install ESLint
21-
run: |
22-
npm install eslint
27+
uses: actions/checkout@v4
2328

2429
- name: Run ESLint
25-
run: npx eslint .
26-
--config .eslintrc.json
27-
--ext .js
30+
run: |
31+
npm i globals @eslint/js @eslint/eslintrc
32+
npx eslint . --config eslint.config.mjs
2833
continue-on-error: true

‎.github/workflows/format-code.yml‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
name: Format code using Prettier
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
# Please also update the paths listed on .prettierignore.
5+
paths-ignore:
6+
- libraries/thirdparty/*
7+
- '*.md'
8+
- addons-l10n/*/*.json
9+
- '!addons-l10n/en/*.json'
10+
- _locales/*/messages.json
11+
- '!_locales/en/messages.json'
12+
- .github/*
13+
- '!.github/*.mjs'
14+
pull_request:
15+
paths-ignore:
16+
- libraries/thirdparty/*
17+
- '*.md'
18+
- addons-l10n/*/*.json
19+
- '!addons-l10n/en/*.json'
20+
- _locales/*/messages.json
21+
- '!_locales/en/messages.json'
22+
- .github/*
23+
- '!.github/*.mjs'
24+
workflow_dispatch:
325

426
jobs:
527
format:
@@ -8,10 +30,10 @@ jobs:
830

931
steps:
1032
- name: Checkout code
11-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
1234

1335
- name: Generate token
14-
uses: tibdex/github-app-token@v1
36+
uses: tibdex/github-app-token@v2
1537
id: generate-token
1638
if: github.repository_owner == 'ScratchAddons'
1739
continue-on-error: true
@@ -24,7 +46,7 @@ jobs:
2446
uses: ScratchAddons/prettier_action@master
2547
with:
2648
prettier_options: --write .
27-
prettier_version: 3.1.0
49+
prettier_version: 3.2.5
2850
commit_message: Format code
2951
env:
3052
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
@@ -34,7 +56,7 @@ jobs:
3456
uses: ScratchAddons/prettier_action@master
3557
with:
3658
prettier_options: --write .
37-
prettier_version: 3.1.0
59+
prettier_version: 3.2.5
3860
commit_message: Format code
3961
env:
4062
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/packer.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ jobs:
55
pack:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v3
8+
- uses: actions/checkout@v4
99
- name: Setup Node.js
10-
uses: actions/setup-node@v3
10+
uses: actions/setup-node@v4
1111
with:
12-
node-version: 18.x
12+
node-version: 20.x
1313
- name: Pack extensions for Firefox
1414
uses: ScratchAddons/packer-script@main
1515
env:
@@ -19,7 +19,7 @@ jobs:
1919
env:
2020
ENVIRONMENT: chrome
2121
- name: Upload packed extensions
22-
uses: actions/upload-artifact@v3
22+
uses: actions/upload-artifact@v4
2323
with:
2424
name: Packed Extensions (zip)
25-
path: .dist/*.zip
25+
path: dist/*.zip

‎.github/workflows/schema-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Find changed files (push, PR)
2323
if: github.event_name == 'push' || github.event_name == 'pull_request'

‎.github/workflows/stale-issues.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
if: github.repository_owner == 'ScratchAddons'
1111
steps:
1212
- name: Generate token
13-
uses: tibdex/github-app-token@v1
13+
uses: tibdex/github-app-token@v2
1414
id: generate-token
1515
with:
1616
app_id: ${{ secrets.BOT_APP_ID }}
1717
private_key: ${{ secrets.BOT_PRIVATE_KEY }}
1818
- name: Execute Action
19-
uses: actions/stale@v6
19+
uses: actions/stale@v9
2020
with:
2121
stale-issue-message: 'Ping! There has been no activity for 7 days.'
2222
stale-pr-message: 'Ping! There has been no activity for 7 days.'

‎.github/workflows/transifex.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
name: Pull and push strings via Transifex
1+
name: Sync strings with Transifex
22
on:
33
workflow_dispatch:
44
schedule:
55
- cron: "0 0 * * *"
66
jobs:
77
transifex:
8+
name: Transifex
89
runs-on: ubuntu-latest
910
if: github.repository_owner == 'ScratchAddons'
1011
steps:
11-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1213
- name: Setup Node.js
13-
uses: actions/setup-node@v3
14+
uses: actions/setup-node@v4
1415
with:
15-
node-version: 18.x
16+
node-version: 20.x
1617
- name: Generate token
17-
uses: tibdex/github-app-token@v1
18+
uses: tibdex/github-app-token@v2
1819
id: generate-token
1920
with:
2021
app_id: ${{ secrets.BOT_APP_ID }}

‎.github/workflows/unittest.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ jobs:
66
runs-on: ubuntu-latest
77
if: github.repository_owner == 'ScratchAddons'
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@v4
1010
- name: Setup Node.js
11-
uses: actions/setup-node@v3
11+
uses: actions/setup-node@v4
1212
with:
13-
node-version: 18.x
13+
node-version: 20.x
1414
- name: Generate token
15-
uses: tibdex/github-app-token@v1
15+
uses: tibdex/github-app-token@v2
1616
id: generate-token
1717
with:
1818
app_id: ${{ secrets.BOT_APP_ID }}

0 commit comments

Comments
 (0)