Skip to content

Commit

Permalink
Merge branch 'main' into get-global-object
Browse files Browse the repository at this point in the history
  • Loading branch information
kimjg1119 authored Nov 21, 2024
2 parents fade924 + 5881c1f commit 4e71641
Show file tree
Hide file tree
Showing 15 changed files with 792 additions and 198 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on: [pull_request, push]
jobs:
build:
name: 'build & lint ecmarkup'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: ljharb/actions/node/install@d9f477827ed71a259056764107f74afc29febcae
- uses: actions/checkout@v4
- uses: ljharb/actions/node/install@6bc39109c48f74895ad72ec03ca0bb4e4da2fa3f
name: 'nvm install lts/* && npm ci --no-audit'
env:
NPM_CONFIG_AUDIT: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
jobs:
deploy:
name: 'deploy github pages'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: ${{ github.repository == 'tc39/ecma262' }}

steps:
- uses: actions/checkout@v3
- uses: ljharb/actions/node/install@d9f477827ed71a259056764107f74afc29febcae
- uses: actions/checkout@v4
- uses: ljharb/actions/node/install@6bc39109c48f74895ad72ec03ca0bb4e4da2fa3f
name: 'nvm install lts/* && npm ci --no-audit'
env:
NPM_CONFIG_AUDIT: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/enforce-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on: [pull_request]
jobs:
build:
name: 'enforce format'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: ljharb/actions/node/install@d9f477827ed71a259056764107f74afc29febcae
- uses: actions/checkout@v4
- uses: ljharb/actions/node/install@6bc39109c48f74895ad72ec03ca0bb4e4da2fa3f
name: 'nvm install lts/* && npm ci --no-audit'
env:
NPM_CONFIG_AUDIT: false
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/esmeta-typecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,28 @@ on: [pull_request]
jobs:
esmeta-typecheck:
name: 'esmeta typecheck'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

env:
ESMETA_HOME: vendor/esmeta

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17
- name: Setup SBT
uses: sbt/setup-sbt@v1
- name: download esmeta
run: |
mkdir -p "${ESMETA_HOME}"
cd "${ESMETA_HOME}"
git init
git remote add origin https://github.com/es-meta/esmeta.git
git fetch --depth 1 origin 088029201f0de736fdb8f30ca0a96bef26a52089 ;# v0.4.1
git fetch --depth 1 origin 400c5bfec94899d6d41d4cfe61f6fc258fe41fb5 ;# v0.4.3
git checkout FETCH_HEAD
- name: build esmeta
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ipr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ on:
jobs:
build:
name: 'check IPR form'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: ljharb/actions/node/install@d9f477827ed71a259056764107f74afc29febcae
- uses: actions/checkout@v4
- uses: ljharb/actions/node/install@6bc39109c48f74895ad72ec03ca0bb4e4da2fa3f
name: 'nvm install lts/* && npm ci --no-audit'
env:
NPM_CONFIG_AUDIT: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/preview-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on: [pull_request]
jobs:
build:
name: 'build PR preview'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: ljharb/actions/node/install@d9f477827ed71a259056764107f74afc29febcae
- uses: actions/checkout@v4
- uses: ljharb/actions/node/install@6bc39109c48f74895ad72ec03ca0bb4e4da2fa3f
name: 'nvm install lts/* && npm ci --no-audit'
env:
NPM_CONFIG_AUDIT: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
upload:
name: 'upload PR preview'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: >
${{
github.event.workflow_run.event == 'pull_request' &&
Expand All @@ -18,8 +18,8 @@ jobs:
}}
steps:
- uses: actions/checkout@v3
- uses: ljharb/actions/node/install@d9f477827ed71a259056764107f74afc29febcae
- uses: actions/checkout@v4
- uses: ljharb/actions/node/install@6bc39109c48f74895ad72ec03ca0bb4e4da2fa3f
name: 'nvm install lts/* && npm ci --no-audit'
env:
NPM_CONFIG_AUDIT: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-biblio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ on:
jobs:
publish:
name: 'publish ecma262-biblio'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: ${{ github.repository == 'tc39/ecma262' }}

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 'lts/*'
registry-url: 'https://registry.npmjs.org'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/require-allow-edits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
_:
name: "Require “Allow Edits”"

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: ljharb/require-allow-edits@main
6 changes: 3 additions & 3 deletions .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ on: [pull_request]
jobs:
spellcheck:
name: 'check for newly-introduced spelling errors'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- run: sudo apt-get install aspell
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Number of commits to fetch. 0 indicates all history for all branches and tags.
# Default: 1
fetch-depth: 0
- uses: ljharb/actions/node/install@d9f477827ed71a259056764107f74afc29febcae
- uses: ljharb/actions/node/install@6bc39109c48f74895ad72ec03ca0bb4e4da2fa3f
name: 'nvm install lts/* && npm ci --no-audit'
env:
NPM_CONFIG_AUDIT: false
Expand Down
6 changes: 3 additions & 3 deletions esmeta-ignore.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"GetThisValue",
"InnerModuleEvaluation",
"LabelledItem[1,0].LabelledEvaluation",
"LengthOfArrayLike",
"MethodDefinition[0,0].DefineMethod",
"ModuleNamespaceCreate",
"OrdinaryFunctionCreate",
Expand All @@ -41,5 +40,6 @@
"Statement[0,0].LabelledEvaluation",
"Statement[1,0].LabelledEvaluation",
"Statement[2,0].LabelledEvaluation",
"StringCreate"
]
"StringCreate",
"TypedArrayCreateFromConstructor"
]
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"license": "SEE LICENSE IN https://tc39.es/ecma262/#sec-copyright-and-software-license",
"homepage": "https://tc39.es/ecma262/",
"devDependencies": {
"ecmarkup": "^19.1.0",
"ecmarkup": "^20.0.0",
"glob": "^7.1.6",
"jsdom": "^15.0.0",
"pagedjs": "^0.4.3",
Expand Down
7 changes: 4 additions & 3 deletions scripts/check-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ const legacyCommitsWithUnknownAuthors = new Set([
'f424bf075fe582ed8acc36e8a420ee713a21561a', // https://github.com/tc39/ecma262/pull/3142
'bea8d0d682fcf2be2a29564bd2ae66ab9dcce21c', // https://github.com/tc39/ecma262/pull/612, user deleted their github
'329069469609d8f05ad64c328e2295c171050ce4', // https://github.com/tc39/ecma262/pull/3249, commit email doesn't point to the github user
'57f427b18bf7e629565ac2fcf2392ba7b7d0d8fb', // https://github.com/tc39/ecma262/pull/3127, user account deactivated
'aada40840dc152d4759b0e3353542e971db08ee7', // tutizaraz (signed) renamed their account to riwom -> dbarabashh
'57f427b18bf7e629565ac2fcf2392ba7b7d0d8fb', // https://github.com/tc39/ecma262/pull/3377, bojavou has not signed the form
]);

function getAuthorFromCommit(commitObj) {
Expand All @@ -116,7 +119,7 @@ async function getAllCommits(page = 1) {
const commitsURL = `https://api.github.com/repos/${slug}/commits?anon=1&per_page=${perPage}&page=${page}&sha=${sha}`;
const commits = await request(commitsURL).then((json) => JSON.parse(json));
return [...new Set([].concat(
commits.flatMap(x => getAuthorFromCommit(x) || []),
commits.filter(x => !legacyCommitsWithUnknownAuthors.has(x?.sha)).flatMap(x => getAuthorFromCommit(x) || []),
commits.length < perPage ? [] : await getAllCommits(page + 1),
))];
}
Expand Down Expand Up @@ -211,7 +214,6 @@ const legacy = new Set([
'himsngh',
'angleKH',
'ivan-pan',
'szuend',
'chrikrah',
'viktmv',
'bathos',
Expand Down Expand Up @@ -241,7 +243,6 @@ const legacy = new Set([
'DmitrySoshnikov',
'jsreeram',
'antony-jeong',
'bojavou',
].map(x => x.toLowerCase()));

Promise.all([usernames, authors, delegates, emeriti]).then(([usernames, authors, delegates, emeriti]) => {
Expand Down
Loading

0 comments on commit 4e71641

Please sign in to comment.