Skip to content

Commit bc3bcdb

Browse files
committed
Merge branch 'develop' into dev-env
2 parents 8e6a0c7 + a5d4fb6 commit bc3bcdb

File tree

495 files changed

+19379
-11242
lines changed

Some content is hidden

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

495 files changed

+19379
-11242
lines changed

.commitlintrc.js

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module.exports = {
55
2,
66
'always',
77
[
8+
'deps',
89
'project',
910
'home',
1011
'playlist',
@@ -31,6 +32,7 @@ module.exports = {
3132
'tests',
3233
'i18n',
3334
'a11y',
35+
'integrations',
3436
],
3537
],
3638
},

.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @AntonLantukh @dbudzins

.github/workflows/release-build-tag-release.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@ jobs:
99
create-new-release-version:
1010
runs-on: ubuntu-latest
1111

12-
strategy:
13-
matrix:
14-
node-version: [18.x]
15-
1612
steps:
1713
- name: Checkout code
18-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1915
with:
2016
persist-credentials: false
2117

.github/workflows/release-create-release-candidate-branch.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
with:
1616
token: ${{ secrets.ACTION_TOKEN }}
1717
ref: release
@@ -23,7 +23,7 @@ jobs:
2323
git config --global user.email '[email protected]'
2424
git fetch origin ${{ github.ref_name }}
2525
git merge origin/${{ github.ref_name }}
26-
yarn && yarn i18next
26+
yarn && yarn workspace @jwp/ott-web run i18next
2727
env:
2828
GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }}
2929

@@ -40,7 +40,7 @@ jobs:
4040
input-file: 'CHANGELOG.md'
4141

4242
- name: Create Pull Request
43-
uses: peter-evans/create-pull-request@v5
43+
uses: peter-evans/create-pull-request@v6
4444
with:
4545
token: ${{ secrets.ACTION_TOKEN }}
4646
title: Release Candidate - ${{ steps.changelog.outputs.tag }}${{ github.ref_name != 'develop' && ' (Hotfix)' || ''}}

.github/workflows/test-linting.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@ jobs:
66
lint:
77
runs-on: ubuntu-latest
88

9-
strategy:
10-
matrix:
11-
node-version: [18.x]
12-
139
steps:
14-
- uses: actions/checkout@v3
15-
- name: Use Node.js ${{ matrix.node-version }}
16-
uses: actions/setup-node@v3
10+
- uses: actions/checkout@v4
11+
- name: Use Node.js
12+
uses: actions/setup-node@v4
1713
with:
18-
node-version: ${{ matrix.node-version }}
14+
node-version: '22.x'
1915
- name: yarn install, lint
2016
run: |
2117
yarn install

.github/workflows/test-static-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
3535
# If this step fails, then you should remove it and run the build manually (see below)
3636
- name: Autobuild
37-
uses: github/codeql-action/autobuild@v2
37+
uses: github/codeql-action/autobuild@v3
3838

3939
- name: Perform CodeQL Analysis
40-
uses: github/codeql-action/analyze@v2
40+
uses: github/codeql-action/analyze@v3

.github/workflows/test-unit-snapshot.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
1-
name: Test - Unit and Snapshot
1+
name: Test - Unit, Integration, Snapshot
22

33
on:
44
push:
5-
branches: [ 'develop', 'release' ]
5+
branches: ['develop', 'release']
66
pull_request:
77

88
jobs:
99
test:
1010
runs-on: ubuntu-latest
1111

12-
strategy:
13-
matrix:
14-
node-version: [18.x]
15-
1612
steps:
17-
- uses: actions/checkout@v3
18-
- name: Use Node.js ${{ matrix.node-version }}
19-
uses: actions/setup-node@v3
13+
- uses: actions/checkout@v4
14+
- name: Use Node.js
15+
uses: actions/setup-node@v4
2016
with:
21-
node-version: ${{ matrix.node-version }}
17+
node-version: '22.x'
2218
- name: yarn install and test
2319
run: |
2420
yarn

.github/workflows/web-test-deploy-preview-and-lighthouse.yml

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ defaults:
1010
jobs:
1111
build_and_preview:
1212
name: Build and preview
13+
if: '! github.event.pull_request.head.repo.fork '
1314
runs-on: ubuntu-latest
1415
outputs:
1516
output1: ${{ steps.firebase_hosting_preview.outputs.details_url }}
@@ -29,6 +30,7 @@ jobs:
2930

3031
lhci:
3132
name: Lighthouse
33+
if: '! github.event.pull_request.head.repo.fork '
3234
runs-on: ubuntu-latest
3335
needs: build_and_preview
3436
steps:

.github/workflows/web-test-deploy-preview-aws.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- uses: actions/checkout@v4
4040
- uses: actions/setup-node@v4
4141
with:
42-
node-version: '20'
42+
node-version: '22'
4343
- name: Install packages
4444
run: yarn install --frozen-lockfile
4545
- name: Build

.github/workflows/web-test-e2e.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Web - Test - End to End
33
on:
44
pull_request:
55
push:
6-
branches: [ 'develop', 'release' ]
6+
branches: ['develop', 'release']
77
schedule:
88
- cron: '30 3 * * 1-5'
99
workflow_dispatch:
@@ -19,15 +19,14 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
node-version: [18.x]
2322
config: [desktop, mobile]
2423

2524
steps:
26-
- uses: actions/checkout@v3
27-
- name: Use Node.js ${{ matrix.node-version }}
28-
uses: actions/setup-node@v3
25+
- uses: actions/checkout@v4
26+
- name: Use Node.js
27+
uses: actions/setup-node@v4
2928
with:
30-
node-version: ${{ matrix.node-version }}
29+
node-version: '22.x'
3130
- name: Install dependencies
3231
run: |
3332
yarn
@@ -41,7 +40,7 @@ jobs:
4140
WORKER_COUNT: 2
4241
- name: Uploading artifact
4342
if: always()
44-
uses: actions/upload-artifact@v3
43+
uses: actions/upload-artifact@v4
4544
with:
4645
name: allure-report-${{ matrix.config }}
4746
path: ./platforms/web/test-e2e/output/${{ matrix.config }}

.syncpackrc.json

+16-66
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,38 @@
11
{
22
"$schema": "https://unpkg.com/[email protected]/dist/schema.json",
3-
"sortFirst": [
4-
"name",
5-
"description",
6-
"version",
7-
"private",
8-
"license",
9-
"repository",
10-
"author",
11-
"main",
12-
"exports",
13-
"engines",
14-
"workspaces",
15-
"scripts"
16-
],
3+
"sortFirst": ["name", "description", "version", "private", "license", "repository", "author", "main", "exports", "engines", "workspaces", "scripts"],
174
"semverGroups": [
185
{
19-
"dependencies": [
20-
"codeceptjs",
21-
"codeceptjs**",
22-
"react-router",
23-
"react-router-dom",
24-
"typescript"
25-
],
26-
"packages": [
27-
"**"
28-
],
6+
"dependencies": ["codeceptjs", "codeceptjs**", "react-router", "react-router-dom", "typescript"],
7+
"packages": ["**"],
298
"isIgnored": true
309
},
3110
{
3211
"range": "^",
33-
"dependencies": [
34-
"**"
35-
],
36-
"packages": [
37-
"**"
38-
],
39-
"dependencyTypes": [
40-
"prod",
41-
"dev",
42-
"peer"
43-
]
12+
"dependencies": ["**"],
13+
"packages": ["**"],
14+
"dependencyTypes": ["prod", "dev", "peer"]
4415
}
4516
],
4617
"versionGroups": [
4718
{
4819
"label": "Ensure semver ranges for locally developed packages satisfy the local version",
49-
"dependencies": [
50-
"@jwp/**",
51-
"**-config-jwp"
52-
],
53-
"dependencyTypes": [
54-
"peer"
55-
],
56-
"packages": [
57-
"**"
58-
],
20+
"dependencies": ["@jwp/**", "**-config-jwp"],
21+
"dependencyTypes": ["dev", "prod", "peer"],
22+
"packages": ["**"],
5923
"pinVersion": "*"
6024
},
6125
{
62-
"label": "Ensure local packages are installed as peerDependency",
63-
"dependencies": [
64-
"@jwp/**",
65-
"**-config-jwp"
66-
],
67-
"dependencyTypes": [
68-
"dev",
69-
"prod"
70-
],
71-
"packages": [
72-
"**"
73-
],
26+
"label": "Ensure local packages are installed as dev or prod dependency",
27+
"dependencies": ["@jwp/**", "**-config-jwp"],
28+
"dependencyTypes": ["peer"],
29+
"packages": ["**"],
7430
"isBanned": true
7531
},
7632
{
77-
"dependencies": [
78-
"@types/**"
79-
],
80-
"dependencyTypes": [
81-
"!dev"
82-
],
83-
"packages": [
84-
"**"
85-
],
33+
"dependencies": ["@types/**"],
34+
"dependencyTypes": ["!dev"],
35+
"packages": ["**"],
8636
"isBanned": true,
8737
"label": "@types packages should only be under devDependencies"
8838
}

0 commit comments

Comments
 (0)