Skip to content

Commit

Permalink
Merge pull request #2327 from exadel-inc/tech/port-lint-and-build-cha…
Browse files Browse the repository at this point in the history
…nges

[maintain] Porting build and lint changes for `4.16.0`
  • Loading branch information
ala-n authored Apr 9, 2024
2 parents aa4fbe1 + a6e15df commit d4c29ab
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 27 deletions.
1 change: 1 addition & 0 deletions .commitlintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ rules:
- esl-trigger
- esl-utils
- site
- patch
- deps
- deps-dev
- lint
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extends:
- 'eslint:recommended'
- 'plugin:import/typescript'
- 'plugin:@typescript-eslint/recommended'
- 'plugin:@exadel/esl/default-4'
- 'plugin:@exadel/esl/default'

# Library base set
- './linting/codestyle.eslintrc.yml'
Expand Down
32 changes: 9 additions & 23 deletions eslint/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,10 @@
import deprecatedAlertActionParams from './rules/4/deprecated.alert-action-params';
import deprecatedGenerateUid from './rules/4/deprecated.generate-uid';
import deprecatedDeepCompare from './rules/4/deprecated.deep-compare';
import deprecatedEventUtils from './rules/4/deprecated.event-utils';
import deprecatedPanelActionParams from './rules/4/deprecated.panel-action-params';
import deprecatedPopupActionParams from './rules/4/deprecated.popup-action-params';
import deprecatedTraversingQuery from './rules/4/deprecated.traversing-query';
import deprecatedToggleableActionParams from './rules/4/deprecated.toggleable-action-params';
import deprecatedTooltipActionParams from './rules/4/deprecated.tooltip-action-params';
import DEPRECATED_4_RULES from './rules/4/all.rules';
import DEPRECATED_5_RULES from './rules/5/all.rules';

import type {Rule} from 'eslint';

export type logLevel = 'warn' | 'error';

const DEPRECATED_4_RULES = {
'deprecated-4/alert-action-params': deprecatedAlertActionParams,
'deprecated-4/generate-uid': deprecatedGenerateUid,
'deprecated-4/deep-compare': deprecatedDeepCompare,
'deprecated-4/event-utils': deprecatedEventUtils,
'deprecated-4/panel-action-params': deprecatedPanelActionParams,
'deprecated-4/popup-action-params': deprecatedPopupActionParams,
'deprecated-4/traversing-query': deprecatedTraversingQuery,
'deprecated-4/toggleable-action-params': deprecatedToggleableActionParams,
'deprecated-4/tooltip-action-params': deprecatedTooltipActionParams
};

const buildDefault = (definition: Record<string, Rule.RuleModule>, level: logLevel): Record<string, logLevel> => {
const config: Record<string, logLevel> = {};
for (const name of Object.keys(definition)) {
Expand All @@ -33,7 +14,7 @@ const buildDefault = (definition: Record<string, Rule.RuleModule>, level: logLev
return config;
};

export const rules = Object.assign({}, DEPRECATED_4_RULES);
export const rules = Object.assign({}, DEPRECATED_4_RULES, DEPRECATED_5_RULES);

export const configs = {
'default-4': {
Expand All @@ -43,7 +24,12 @@ export const configs = {
},
'default-5': {
rules: {
...buildDefault(DEPRECATED_4_RULES, 'error')
...buildDefault(DEPRECATED_5_RULES, 'warn')
}
},
'default': {
rules: {
...buildDefault(DEPRECATED_5_RULES, 'warn')
}
}
};
13 changes: 13 additions & 0 deletions eslint/src/rules/4/all.rules.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import deprecatedGenerateUid from './deprecated.generate-uid';
import deprecatedDeepCompare from './deprecated.deep-compare';
import deprecatedEventUtils from './deprecated.event-utils';
import deprecatedTraversingQuery from './deprecated.traversing-query';
import deprecatedToggleableActionParams from './deprecated.toggleable-action-params';

export default {
'deprecated-4/generate-uid': deprecatedGenerateUid,
'deprecated-4/deep-compare': deprecatedDeepCompare,
'deprecated-4/event-utils': deprecatedEventUtils,
'deprecated-4/traversing-query': deprecatedTraversingQuery,
'deprecated-4/toggleable-action-params': deprecatedToggleableActionParams
};
11 changes: 11 additions & 0 deletions eslint/src/rules/5/all.rules.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import deprecatedAlertActionParams from './deprecated.alert-action-params';
import deprecatedPanelActionParams from './deprecated.panel-action-params';
import deprecatedPopupActionParams from './deprecated.popup-action-params';
import deprecatedTooltipActionParams from './deprecated.tooltip-action-params';

export default {
'deprecated-5/alert-action-params': deprecatedAlertActionParams,
'deprecated-5/panel-action-params': deprecatedPanelActionParams,
'deprecated-5/popup-action-params': deprecatedPopupActionParams,
'deprecated-5/tooltip-action-params': deprecatedTooltipActionParams
};
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"scope": "@exadel"
},
"files": [
"modules/**/*",
"polyfills/**/*",
"modules/**/*.{js,ts,less,css,md}",
"polyfills/**/*.{js,ts,less,css,md}",
"tsconfig.json",
"CLA.md"
],
Expand Down
2 changes: 1 addition & 1 deletion site/11ty/env.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const isDev = env === 'development' || isE2E;
const date = new Date();

const buildVersion = process.env['BUILD_VERSION'] || 'local';
const packageVersion = process.env.npm_package_version;
const packageVersion = require('@exadel/esl/package.json').version;
const version = `${packageVersion}-${buildVersion}`; // e.g. 1.0.0-123

const context = {isDev, isE2E, version, env, date, buildVersion, packageVersion};
Expand Down

0 comments on commit d4c29ab

Please sign in to comment.