Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/media-container-…
Browse files Browse the repository at this point in the history
…toggleable

# Conflicts:
#	src/modules/esl-media/core/esl-media.ts
  • Loading branch information
ala-n committed Jan 30, 2025
2 parents eef78ba + c5e01d0 commit 48e827d
Show file tree
Hide file tree
Showing 171 changed files with 9,978 additions and 5,738 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ updates:
# Maintain core dependencies for npm
- package-ecosystem: "npm"
# Temporarily before the release of the main branch
target-branch: "main-beta"
target-branch: "main"
directory: "/"
versioning-strategy: increase
open-pull-requests-limit: 10
Expand Down
63 changes: 63 additions & 0 deletions .github/workflows/fix-labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Fix Release Labels (Maintainers Only)

on:
# Runs manually by maintainer
workflow_dispatch:

permissions:
contents: write
issues: write
pull-requests: write
statuses: write

jobs:
find-n-fix-release-label:
name: Find and Fix Release Labels
runs-on: ubuntu-latest

steps:
# Check permissions
- uses: tspascoal/get-user-teams-membership@v3
id: permissions
with:
username: ${{ github.actor }}
team: 'ESL Core Maintainers'
GITHUB_TOKEN: ${{ secrets.PERMISSION_CHECK_TOKEN }}

- if: ${{ steps.permissions.outputs.isTeamMember == 'true' }}
name: Access Check Passed
run: echo ${{ github.actor }} is in 'ESL Core Maintainers' group
- if: ${{ steps.permissions.outputs.isTeamMember == 'false' }}
name: Access Denied
run: exit 1

- name: Find and fix 'released on @beta' issues without 'released' label
id: find-issues
uses: actions/github-script@v7
with:
script: |
const issues = await github.paginate(github.rest.issues.listForRepo, {
owner: context.repo.owner,
repo: context.repo.repo,
labels: 'released on @beta',
state: 'all'
});
const issuesWithoutReleasedLabel = issues.filter(issue => !issue.labels.some(label => label.name === 'released'));
console.log('Found %d issues without "released" label', issuesWithoutReleasedLabel.length);
for (const issue of issuesWithoutReleasedLabel) {
console.log(`Adding 'released' label to issue #${issue.number}`);
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue.number,
labels: ['released']
});
console.log(`Removing 'released on @beta' label from issue #${issue.number}`);
await github.rest.issues.removeLabel({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue.number,
name: 'released on @beta'
});
}
1 change: 1 addition & 0 deletions .releaserc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,4 @@ plugins:
label: Released ESLint Config NPM Tarball
- path: CHANGELOG.md
label: Changelog
successComment: false
218 changes: 218 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

106 changes: 65 additions & 41 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,15 @@ with excellent performance.
- ##### [ESL A11yGroup](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-a11y-group/README.md) (beta)
- ##### [ESL Alert](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-alert/README.md)
- ##### [ESL Animate](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-animate/README.md)
- ##### [ESL Carousel](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-carousel/README.md) (beta)
- ##### [ESL Footnotes](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-footnotes/README.md) (beta)
- ##### [ESL Image Utils](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-image-utils/README.md)
- ##### [ESL Image (Legacy)](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-image/README.md)
- ##### [ESL Media](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-media/README.md)
- ##### [ESL Panel](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-panel/README.md)
- ##### [ESL Panel Group](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-panel-group/README.md)
- ##### [ESL Popup](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-popup/README.md) (beta)
- ##### [ESL Related Target](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-related-target/README.md) (beta)
- ##### [ESL Related Target](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-related-target/README.md)
- ##### [ESL Scrollbar](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-scrollbar/README.md)
- ##### [ESL Select](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-forms/esl-select/README.md) (beta)
- ##### [ESL Select List](https://github.com/exadel-inc/esl/blob/HEAD/src/modules/esl-forms/esl-select-list/README.md) (beta)
Expand Down Expand Up @@ -146,26 +147,35 @@ you can find useful information about the project processes and agreements here:
**ESL Core Team**
People who architect, maintain, and keep the idea of the ESL
People who actively architect, maintain, and keep the idea of the ESL
<table><tbody><tr>
<td align="center" valign="top" width="16.6%">
<a href="https://github.com/ala-n">
<img src="https://github.com/ala-n.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Alexey Stsefanovich
</a>
</a><br/>
Architect
</td>
<td align="center" valign="top" width="16.6%">
<a href="https://github.com/julia-murashko">
<img src="https://github.com/julia-murashko.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Julia Murashko
</a>
<a href="https://github.com/abarmina">
<img src="https://github.com/abarmina.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Anna Barmina
</a><br/>
Maintainer
</td>
<td align="center" valign="top" width="16.6%">
<a href="https://github.com/NastaLeo">
<img src="https://github.com/NastaLeo.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Anastasiya Lesun
</a><br/>
Maintainer
</td>
<td align="center" valign="top" width="16.6%">
<a href="https://github.com/yadamskaya">
<img src="https://github.com/yadamskaya.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Yuliya Adamskaya
</a>
</a><br/>
</td>
<td align="center" valign="top" width="16.6%">
<a href="https://github.com/dshovchko">
Expand All @@ -174,38 +184,50 @@ People who architect, maintain, and keep the idea of the ESL
</a>
</td>
<td align="center" valign="top" width="16.6%">
<a href="https://github.com/abarmina">
<img src="https://github.com/abarmina.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Anna Barmina
</a>
</td>
<td align="center" valign="top" width="16.6%">
<a href="https://github.com/NastaLeo">
<img src="https://github.com/NastaLeo.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Anastasiya Lesun
<a href="https://github.com/fshovchko">
<img src="https://github.com/fshovchko.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Feoktyst Shovchko
</a>
</td>
</tr></tbody></table>
**ESL Contributors**:
People who are actively contributing to the ESL
People who contributed to the ESL project
<table><tbody><tr>
<td align="center" valign="top" width="20%">
<a href="https://github.com/Anna-MariiaPetryk">
<img src="https://github.com/Anna-MariiaPetryk.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Anna-Mariia Petryk
<a href="https://github.com/julia-murashko">
<img src="https://github.com/julia-murashko.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Julia Murashko
</a><br/>
Developer
Initial Core Team Member
</td>
<td align="center" valign="top" width="20%">
<a href="https://github.com/fshovchko">
<img src="https://github.com/fshovchko.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Feoktyst Shovchko
</a><br/>
Developer
<a href="https://github.com/Natalie-Smirnova">
<img src="https://github.com/Natalie-Smirnova.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Natalie Smirnova
</a>
</td>
<td align="center" valign="top" width="20%">
<a href="https://github.com/grechihinrhp">
<img src="https://github.com/grechihinrhp.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Ruslan Grechihin
</a>
</td>
<td align="center" valign="top" width="20%">
<a href="https://github.com/HenadzV">
<img src="https://github.com/HenadzV.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Henadz Varany
</a>
</td>
<td align="center" valign="top" width="20%">
<a href="https://github.com/AlexanderBazukevich">
<img src="https://github.com/AlexanderBazukevich.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Alexander Bazukevich
</a>
</td>
</tr><tr>
<td align="center" valign="top" width="20%">
<a href="https://github.com/nattallius">
<img src="https://github.com/nattallius.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Expand All @@ -214,27 +236,19 @@ People who are actively contributing to the ESL
Developer
</td>
<td align="center" valign="top" width="20%">
<a href="https://github.com/YanaBr">
<img src="https://github.com/YanaBr.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Yana Bernatskaya
<a href="https://github.com/Anna-MariiaPetryk">
<img src="https://github.com/Anna-MariiaPetryk.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Anna-Mariia Petryk
</a><br/>
Developer
</td>
<td align="center" valign="top" width="20%">
<a href="https://github.com/Natalie-Smirnova">
<img src="https://github.com/Natalie-Smirnova.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Natalie Smirnova
<a href="https://github.com/YanaBr">
<img src="https://github.com/YanaBr.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Yana Bernatskaya
</a><br/>
Developer
</td>
</tr><tr>
<td align="center" valign="top" width="20%">
<a href="https://www.linkedin.com/in/iryna-pavlenko-270930107">
<img src="https://static-exp1.licdn.com/sc/h/244xhbkr7g40x6bsu4gi6q4ry?s=75" width="75" height="75" style="min-width: 75px"><br/>
Iryna Pavlenko
</a><br/>
Designer
</td>
<td align="center" valign="top" width="20%">
<a href="https://github.com/alexanderavseev">
<img src="https://github.com/alexanderavseev.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Expand All @@ -249,6 +263,8 @@ People who are actively contributing to the ESL
</a><br/>
Consultant
</td>
</tr><tr>
<td align="center" valign="top" width="20%"></td>
<td align="center" valign="top" width="20%">
<a href="https://github.com/dmantsevich">
<img src="https://github.com/dmantsevich.png?s=75" width="75" height="75" style="min-width: 75px"><br/>
Expand All @@ -263,6 +279,14 @@ People who are actively contributing to the ESL
</a><br/>
Consultant
</td>
<td align="center" valign="top" width="20%">
<a href="https://www.linkedin.com/in/iryna-pavlenko-270930107">
<img src="https://static-exp1.licdn.com/sc/h/244xhbkr7g40x6bsu4gi6q4ry?s=75" width="75" height="75" style="min-width: 75px"><br/>
Iryna Pavlenko
</a><br/>
Designer
</td>
<td align="center" valign="top" width="20%"></td>
</tr></tbody></table>
**Exadel, Inc.**
Expand Down
2 changes: 1 addition & 1 deletion docs/COMMIT_CONVENTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ You can increase the importance of the patch changes to the minor using the `MIN
feat!: Hey I'm breaking something that already exist
```

**Identify everything that break or change existing API or behaviour with the `BREACKING CHAGES:` list
**Identify everything that break or change existing API or behavior with the `BREACKING CHAGES:` list
```text
feat!: Hey I'm breaking something that already exist
Expand Down
6 changes: 3 additions & 3 deletions e2e/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@exadel/esl-snapshot-tests",
"version": "5.0.0-beta.39",
"version": "5.0.1-beta.2",
"description": "Integration snapshot tests for ESL",
"homepage": "https://esl-ui.com/",
"license": "MIT",
Expand All @@ -17,9 +17,9 @@
"@types/jest-environment-puppeteer": "^5.0.6",
"@types/pixelmatch": "^5.2.6",
"@types/puppeteer": "^7.0.4",
"jest-puppeteer": "^10.1.4",
"jest-puppeteer": "^11.0.0",
"pixelmatch": "^5.3.0",
"puppeteer": "^23.7.1",
"puppeteer": "^24.1.1",
"rimraf": "^6.0.1",
"sharp": "^0.33.5",
"stucumber": "^0.19.0"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@exadel/eslint-config-esl",
"private": false,
"version": "5.0.0-beta.39",
"version": "5.0.1-beta.2",
"keywords": [
"eslint",
"eslint-config",
Expand All @@ -22,13 +22,13 @@
"test": ""
},
"dependencies": {
"@eslint/js": "^9.14.0",
"@stylistic/eslint-plugin": "^2.10.1",
"@eslint/js": "^9.19.0",
"@stylistic/eslint-plugin": "^2.13.0",
"eslint-plugin-editorconfig": "^4.0.3",
"eslint-plugin-import-x": "^4.4.0",
"eslint-plugin-import-x": "^4.6.1",
"eslint-plugin-sonarjs": "^1.0.4",
"eslint-plugin-tsdoc": "^0.3.0",
"typescript-eslint": "^8.13.0"
"eslint-plugin-tsdoc": "^0.4.0",
"typescript-eslint": "^8.21.0"
},
"peerDependencies": {
"eslint": ">=9.0.0"
Expand Down
4 changes: 2 additions & 2 deletions eslint-config/rules/eslint.config.codestyle.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ module.exports = [
// Prefer const declaration operator
'prefer-const': 'error',

// Limit max lines count per file to 400
'max-lines': ['warn', 450],
// Limit max lines count per file to 500
'max-lines': ['warn', 500],

// Do not enforce dot notation whenever possible
'dot-notation': 'off',
Expand Down
3 changes: 0 additions & 3 deletions eslint-config/rules/eslint.config.sonarjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ module.exports = [
// Disallows empty catch statements
'sonarjs/no-useless-catch': 'error',

// Return of boolean literal statements wrapped into if-then-else ones should be simplified.
'sonarjs/prefer-single-boolean-return': 'error',

/** When only the condition expression is defined in a for loop, and the initialization and
* increment expressions are missing, a while loop should be used instead to increase readability.
*/
Expand Down
3 changes: 1 addition & 2 deletions eslint-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@exadel/eslint-plugin-esl",
"private": false,
"version": "5.0.0-beta.39",
"version": "5.0.1-beta.2",
"keywords": [
"eslint",
"eslint-plugin",
Expand Down Expand Up @@ -32,7 +32,6 @@
"@types/eslint": "^9.6.1"
},
"peerDependencies": {
"@exadel/esl": "^5.0.0 || ^5.0.0-beta.0",
"eslint": ">=8.0.0 || >=9.0.0"
},
"maintainers": [
Expand Down
9 changes: 1 addition & 8 deletions eslint-plugin/src/core/deprecated-class-method.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import {buildLoggingRule} from './log';
import type * as ESTree from 'estree';
import type {Rule} from 'eslint';

Expand All @@ -23,19 +22,13 @@ export interface ESLintDeprecationStaticMethodCfg {
deprecatedMethod: string;
/** Function that returns recommended method */
getReplacementMethod: (expression: ESTree.CallExpression) => ESLintReplacementMethodCfg | string;
/** Data that indicates whether the rule should be skipped */
skipOn?: {actual: boolean, message: string};
}

type StaticMethodNode = ESTree.MemberExpression & Rule.NodeParentExtension;

/** Builds deprecation rule from {@link ESLintDeprecationStaticMethodCfg} object */
export function buildRule(configs: ESLintDeprecationStaticMethodCfg | ESLintDeprecationStaticMethodCfg[]): Rule.RuleModule {
configs = (Array.isArray(configs) ? configs : [configs]).filter((config) => {
const {skipOn} = config;
if (!skipOn || skipOn.actual) return true;
buildLoggingRule(skipOn.message);
});
configs = (Array.isArray(configs) ? configs : [configs]);

const create = (context: Rule.RuleContext): Rule.RuleListener => {
return {
Expand Down
Loading

0 comments on commit 48e827d

Please sign in to comment.