Skip to content

Commit

Permalink
Merge branch 'develop' into dev-env
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonLantukh committed Jan 22, 2025
2 parents 8e6a0c7 + a5d4fb6 commit bc3bcdb
Show file tree
Hide file tree
Showing 495 changed files with 19,379 additions and 11,242 deletions.
2 changes: 2 additions & 0 deletions .commitlintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module.exports = {
2,
'always',
[
'deps',
'project',
'home',
'playlist',
Expand All @@ -31,6 +32,7 @@ module.exports = {
'tests',
'i18n',
'a11y',
'integrations',
],
],
},
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @AntonLantukh @dbudzins
6 changes: 1 addition & 5 deletions .github/workflows/release-build-tag-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,9 @@ jobs:
create-new-release-version:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-create-release-candidate-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.ACTION_TOKEN }}
ref: release
Expand All @@ -23,7 +23,7 @@ jobs:
git config --global user.email '[email protected]'
git fetch origin ${{ github.ref_name }}
git merge origin/${{ github.ref_name }}
yarn && yarn i18next
yarn && yarn workspace @jwp/ott-web run i18next
env:
GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }}

Expand All @@ -40,7 +40,7 @@ jobs:
input-file: 'CHANGELOG.md'

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.ACTION_TOKEN }}
title: Release Candidate - ${{ steps.changelog.outputs.tag }}${{ github.ref_name != 'develop' && ' (Hotfix)' || ''}}
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/test-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@ jobs:
lint:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
node-version: '22.x'
- name: yarn install, lint
run: |
yarn install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
16 changes: 6 additions & 10 deletions .github/workflows/test-unit-snapshot.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
name: Test - Unit and Snapshot
name: Test - Unit, Integration, Snapshot

on:
push:
branches: [ 'develop', 'release' ]
branches: ['develop', 'release']
pull_request:

jobs:
test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
node-version: '22.x'
- name: yarn install and test
run: |
yarn
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/web-test-deploy-preview-and-lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ defaults:
jobs:
build_and_preview:
name: Build and preview
if: '! github.event.pull_request.head.repo.fork '
runs-on: ubuntu-latest
outputs:
output1: ${{ steps.firebase_hosting_preview.outputs.details_url }}
Expand All @@ -29,6 +30,7 @@ jobs:

lhci:
name: Lighthouse
if: '! github.event.pull_request.head.repo.fork '
runs-on: ubuntu-latest
needs: build_and_preview
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web-test-deploy-preview-aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
- name: Install packages
run: yarn install --frozen-lockfile
- name: Build
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/web-test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Web - Test - End to End
on:
pull_request:
push:
branches: [ 'develop', 'release' ]
branches: ['develop', 'release']
schedule:
- cron: '30 3 * * 1-5'
workflow_dispatch:
Expand All @@ -19,15 +19,14 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18.x]
config: [desktop, mobile]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
node-version: '22.x'
- name: Install dependencies
run: |
yarn
Expand All @@ -41,7 +40,7 @@ jobs:
WORKER_COUNT: 2
- name: Uploading artifact
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: allure-report-${{ matrix.config }}
path: ./platforms/web/test-e2e/output/${{ matrix.config }}
Expand Down
82 changes: 16 additions & 66 deletions .syncpackrc.json
Original file line number Diff line number Diff line change
@@ -1,88 +1,38 @@
{
"$schema": "https://unpkg.com/[email protected]/dist/schema.json",
"sortFirst": [
"name",
"description",
"version",
"private",
"license",
"repository",
"author",
"main",
"exports",
"engines",
"workspaces",
"scripts"
],
"sortFirst": ["name", "description", "version", "private", "license", "repository", "author", "main", "exports", "engines", "workspaces", "scripts"],
"semverGroups": [
{
"dependencies": [
"codeceptjs",
"codeceptjs**",
"react-router",
"react-router-dom",
"typescript"
],
"packages": [
"**"
],
"dependencies": ["codeceptjs", "codeceptjs**", "react-router", "react-router-dom", "typescript"],
"packages": ["**"],
"isIgnored": true
},
{
"range": "^",
"dependencies": [
"**"
],
"packages": [
"**"
],
"dependencyTypes": [
"prod",
"dev",
"peer"
]
"dependencies": ["**"],
"packages": ["**"],
"dependencyTypes": ["prod", "dev", "peer"]
}
],
"versionGroups": [
{
"label": "Ensure semver ranges for locally developed packages satisfy the local version",
"dependencies": [
"@jwp/**",
"**-config-jwp"
],
"dependencyTypes": [
"peer"
],
"packages": [
"**"
],
"dependencies": ["@jwp/**", "**-config-jwp"],
"dependencyTypes": ["dev", "prod", "peer"],
"packages": ["**"],
"pinVersion": "*"
},
{
"label": "Ensure local packages are installed as peerDependency",
"dependencies": [
"@jwp/**",
"**-config-jwp"
],
"dependencyTypes": [
"dev",
"prod"
],
"packages": [
"**"
],
"label": "Ensure local packages are installed as dev or prod dependency",
"dependencies": ["@jwp/**", "**-config-jwp"],
"dependencyTypes": ["peer"],
"packages": ["**"],
"isBanned": true
},
{
"dependencies": [
"@types/**"
],
"dependencyTypes": [
"!dev"
],
"packages": [
"**"
],
"dependencies": ["@types/**"],
"dependencyTypes": ["!dev"],
"packages": ["**"],
"isBanned": true,
"label": "@types packages should only be under devDependencies"
}
Expand Down
Loading

0 comments on commit bc3bcdb

Please sign in to comment.