Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publish 4.0.0 #124

Merged
merged 72 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
9e54b48
Bump eslint from 8.31.0 to 8.52.0 in /eslint-config
dependabot[bot] Nov 1, 2023
9dfe175
Merge pull request #91 from etn-ccis/dependabot/npm_and_yarn/eslint-c…
surajeaton Nov 1, 2023
9e6c2a0
Bump prettier from 3.0.3 to 3.1.0 in /prettier-config
dependabot[bot] Dec 1, 2023
a9dce9d
Bump prettier from 3.0.3 to 3.1.0 in /eslint-config
dependabot[bot] Dec 1, 2023
46cb13a
Merge pull request #93 from etn-ccis/dependabot/npm_and_yarn/eslint-c…
ektaghag-eaton Dec 1, 2023
6a3928e
Merge pull request #92 from etn-ccis/dependabot/npm_and_yarn/prettier…
ektaghag-eaton Dec 1, 2023
98b4384
Bump prettier from 3.1.0 to 3.1.1 in /prettier-config
dependabot[bot] Jan 1, 2024
2a3ffe0
Bump eslint from 8.52.0 to 8.56.0 in /eslint-config
dependabot[bot] Jan 1, 2024
23465bb
Merge pull request #95 from etn-ccis/dependabot/npm_and_yarn/eslint-c…
surajeaton Jan 2, 2024
d418257
Merge pull request #94 from etn-ccis/dependabot/npm_and_yarn/prettier…
surajeaton Jan 2, 2024
fc091db
Bump prettier from 3.1.1 to 3.2.4 in /prettier-config
dependabot[bot] Feb 1, 2024
c3639ad
Bump eslint-plugin-react from 7.33.1 to 7.33.2 in /eslint-config
dependabot[bot] Feb 1, 2024
858bfba
Merge pull request #98 from etn-ccis/dependabot/npm_and_yarn/eslint-c…
surajeaton Feb 1, 2024
b3c79aa
Merge pull request #97 from etn-ccis/dependabot/npm_and_yarn/prettier…
surajeaton Feb 1, 2024
82558ed
Bump prettier from 3.2.4 to 3.2.5 in /prettier-config
dependabot[bot] Mar 1, 2024
3fe4f4c
Bump prettier from 3.1.0 to 3.2.5 in /eslint-config
dependabot[bot] Mar 1, 2024
2165fb7
Merge pull request #100 from etn-ccis/dependabot/npm_and_yarn/eslint-…
ektaghag-eaton Mar 1, 2024
8258adb
Merge pull request #99 from etn-ccis/dependabot/npm_and_yarn/prettier…
ektaghag-eaton Mar 1, 2024
3fda633
Bump eslint-config-prettier from 8.8.0 to 9.1.0 in /eslint-config
dependabot[bot] Apr 1, 2024
8440994
Merge pull request #101 from etn-ccis/dependabot/npm_and_yarn/eslint-…
surajeaton Apr 1, 2024
f87a4d0
Bump eslint from 8.56.0 to 8.57.0 in /eslint-config
dependabot[bot] May 1, 2024
acc4bf3
Merge pull request #102 from etn-ccis/dependabot/npm_and_yarn/eslint-…
JeffGreiner-eaton May 1, 2024
8c08299
Add blui-ci workflow
JeffGreiner-eaton May 13, 2024
b95d4f0
skip node
JeffGreiner-eaton May 13, 2024
d0cc11d
remove setup node
JeffGreiner-eaton May 13, 2024
d5d7b1d
add build badge
JeffGreiner-eaton May 13, 2024
ea3e7c4
ignore DS Store
JeffGreiner-eaton May 14, 2024
87faa2e
update pub
JeffGreiner-eaton May 14, 2024
0b56bc7
Merge pull request #103 from etn-ccis/feature/blui-5593-github-ci
surajeaton May 15, 2024
6d534f4
Update work directory
JeffGreiner-eaton May 15, 2024
97570c9
Merge pull request #104 from etn-ccis/feature/blui-5593-github-ci
surajeaton May 16, 2024
3a767f5
Added a checkout step before changing the working directory
surajeaton May 16, 2024
72262be
Merge pull request #105 from etn-ccis/feature/blui-5593-github-ci
ektaghag-eaton May 16, 2024
a46252b
Bump typescript from 5.1.6 to 5.4.5 in /eslint-config
dependabot[bot] Jun 1, 2024
649e406
Merge pull request #106 from etn-ccis/dependabot/npm_and_yarn/eslint-…
ektaghag-eaton Jun 3, 2024
076d0ee
Bump braces from 3.0.2 to 3.0.3 in /eslint-config
dependabot[bot] Jun 16, 2024
5c93fdd
Merge pull request #107 from etn-ccis/dependabot/npm_and_yarn/eslint-…
surajeaton Jun 17, 2024
fe9cf02
Bump prettier from 3.2.5 to 3.3.2 in /prettier-config
dependabot[bot] Jul 1, 2024
9fdaf41
Bump eslint-plugin-react from 7.33.2 to 7.34.3 in /eslint-config
dependabot[bot] Jul 1, 2024
6ea4eec
Merge pull request #108 from etn-ccis/dependabot/npm_and_yarn/prettie…
surajeaton Jul 1, 2024
a25fe1c
Merge pull request #109 from etn-ccis/dependabot/npm_and_yarn/eslint-…
surajeaton Jul 1, 2024
058f216
Bump prettier from 3.3.2 to 3.3.3 in /prettier-config
dependabot[bot] Aug 1, 2024
5bb6aaf
Bump eslint-plugin-react from 7.34.3 to 7.35.0 in /eslint-config
dependabot[bot] Aug 1, 2024
6586365
Merge pull request #111 from etn-ccis/dependabot/npm_and_yarn/eslint-…
surajeaton Aug 1, 2024
043bd07
Merge pull request #110 from etn-ccis/dependabot/npm_and_yarn/prettie…
surajeaton Aug 1, 2024
14fe4a8
Bump typescript from 5.4.5 to 5.5.4 in /eslint-config
dependabot[bot] Sep 1, 2024
282d326
Bump micromatch from 4.0.5 to 4.0.8 in /eslint-config
dependabot[bot] Sep 2, 2024
0aa65b1
Merge pull request #113 from etn-ccis/dependabot/npm_and_yarn/eslint-…
JeffGreiner-eaton Sep 9, 2024
45b86f2
Merge pull request #112 from etn-ccis/dependabot/npm_and_yarn/eslint-…
JeffGreiner-eaton Sep 9, 2024
5421c34
Bump eslint-plugin-react from 7.35.0 to 7.37.0 in /eslint-config
dependabot[bot] Oct 1, 2024
c9c87e8
Merge pull request #115 from etn-ccis/dependabot/npm_and_yarn/eslint-…
surajeaton Oct 1, 2024
4bbdce4
Upgade ESlint version 9
JeffGreiner-eaton Oct 18, 2024
d302eea
update no-unused-expressions
JeffGreiner-eaton Oct 22, 2024
2867ac6
remove rule no-unused-expressions
JeffGreiner-eaton Oct 23, 2024
3299260
update configs to support flat config
JeffGreiner-eaton Oct 24, 2024
9f07661
update configs
JeffGreiner-eaton Oct 24, 2024
f141df8
update change log
JeffGreiner-eaton Oct 24, 2024
2f17cba
Merge pull request #116 from etn-ccis/feature/blui-6228-eslint-9
joebochill Oct 24, 2024
eb7bda9
Bump @eslint/js from 9.12.0 to 9.13.0 in /eslint-config
dependabot[bot] Nov 1, 2024
d13b7f1
Merge pull request #117 from etn-ccis/dependabot/npm_and_yarn/eslint-…
JeffGreiner-eaton Nov 4, 2024
05f785c
Bump @eslint/plugin-kit from 0.2.0 to 0.2.3 in /eslint-config
dependabot[bot] Nov 15, 2024
6f37c2f
Merge pull request #118 from etn-ccis/dependabot/npm_and_yarn/eslint-…
surajeaton Nov 18, 2024
5313d36
Bump cross-spawn from 7.0.3 to 7.0.5 in /eslint-config
dependabot[bot] Nov 18, 2024
0c47b6a
Merge pull request #119 from etn-ccis/dependabot/npm_and_yarn/eslint-…
surajeaton Nov 18, 2024
5ce13ef
Bump prettier from 3.3.3 to 3.4.1 in /prettier-config
dependabot[bot] Dec 1, 2024
17c039f
Bump typescript from 5.5.4 to 5.7.2 in /eslint-config
dependabot[bot] Dec 1, 2024
151467e
Merge pull request #120 from etn-ccis/dependabot/npm_and_yarn/prettie…
surajeaton Dec 2, 2024
9258ad0
Merge pull request #121 from etn-ccis/dependabot/npm_and_yarn/eslint-…
surajeaton Dec 2, 2024
9019280
Created CODEOWNERS file
KomalGDhere-eaton Dec 18, 2024
aa6b44f
Merge pull request #122 from etn-ccis/KomalGDhere-eaton-patch-1
shubham-eaton Dec 18, 2024
f8bd9b8
Update dev prepare for release
JeffGreiner-eaton Dec 18, 2024
3a8d6e5
Merge pull request #123 from etn-ccis/feature/prepare-release
surajeaton Dec 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
43 changes: 0 additions & 43 deletions .circleci/config.yml

This file was deleted.

76 changes: 76 additions & 0 deletions .github/workflows/blui-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Build

on:
push:
branches: ["dev", "master"]
pull_request:
branches: ["dev", "master"]
pull_request_target:
types:
- opened
branches:
- "*/*"

permissions:
pull-requests: write
contents: read

jobs:
verify_artifacts:
runs-on: ubuntu-latest

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

steps:
- name: Checkout
uses: actions/checkout@v4
- run: yarn test
working-directory: eslint-config
- run: yarn test
working-directory: prettier-config

publish_prettier_config:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') }}
needs: verify_artifacts
strategy:
matrix:
node-version: [20.x]
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
BRANCH: ${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
steps:
- name: Checkout
uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
registry-url: "https://registry.npmjs.org"
- run: yarn --immutable
working-directory: prettier-config
- run: npm run publish:package -- -b ${{env.BRANCH}}
working-directory: prettier-config

publish_eslint_config:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') }}
needs: verify_artifacts
strategy:
matrix:
node-version: [20.x]
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
BRANCH: ${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
steps:
- name: Checkout
uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
registry-url: "https://registry.npmjs.org"
- run: yarn --immutable
working-directory: eslint-config
- run: npm run publish:package -- -b ${{env.BRANCH}}
working-directory: eslint-config
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
**/**/node_modules
.idea/
**/**/.DS_Store
1 change: 1 addition & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @JeffGreiner-eaton @surajeaton @ektaghag-eaton
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Brightlayer UI Code Standards
[![](https://img.shields.io/npm/v/@brightlayer-ui/eslint-config?label=%40brightlayer-ui%2Feslint-config&style=flat)](https://www.npmjs.com/package/@brightlayer-ui/eslint-config)
[![](https://img.shields.io/npm/v/@brightlayer-ui/prettier-config?label=%40brightlayer-ui%2Fprettier-config&style=flat)](https://www.npmjs.com/package/@brightlayer-ui/prettier-config)
[![](https://img.shields.io/npm/v/@brightlayer-ui/prettier-config?label=%40brightlayer-ui%2Fprettier-config&style=flat)](https://www.npmjs.com/package/@brightlayer-ui/prettier-config)
[![Build](https://github.com/etn-ccis/blui-code-standards/actions/workflows/blui-ci.yml/badge.svg?branch=master)](https://github.com/etn-ccis/blui-code-standards/actions/workflows/blui-ci.yml)

This repository contains resources for ensuring consistency and quality across different Brightlayer UI applications and materials.

Expand Down
12 changes: 12 additions & 0 deletions eslint-config/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## v4.0.0 (December 19, 2024)

### Changed

- Update to support ESlint version 9.
- Removed deprecated no-var-requires rule in favor of no-require-imports rule.
- Removed deprecated no-throw-literal rule.

### Fixed

- Update naming-convention rules ([#96](https://github.com/etn-ccis/blui-code-standards/issues/96)).

## v3.0.1 (June 8, 2022)

### Changed
Expand Down
4 changes: 2 additions & 2 deletions eslint-config/PUBLISHING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Automatic Publishing

This package is published to NPM automatically by CircleCI when code is merged into the `dev` or `master` branches. To publish a new version, simply update the version in `package.json` and merge your code into the appropriate branch.
This package is published to NPM automatically by Github when code is merged into the `dev` or `master` branches. To publish a new version, simply update the version in `package.json` and merge your code into the appropriate branch.

- The `dev` branch will publish versions marked as `alpha` or `beta`.
- The `master` branch will publish any version (`alpha`, `beta`, or `latest`).
Expand All @@ -25,4 +25,4 @@ For this command to work, you must have an NPM token configured in your environm
npm adduser && yarn publish:package
```

> Publishing manually should only be done for `alpha` or `beta` packages. The command will work for `latest` packages, but this should be avoided except in rare situations where the automatic publishing functionality is not working in CircleCI.
> Publishing manually should only be done for `alpha` or `beta` packages. The command will work for `latest` packages, but this should be avoided except in rare situations where the automatic publishing functionality is not working in Github.
17 changes: 8 additions & 9 deletions eslint-config/blui-rules.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const bluiRules = {
module.exports = {
'@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
'@typescript-eslint/consistent-type-definitions': ['error', 'type'],
'@typescript-eslint/explicit-function-return-type': 'error',
'@typescript-eslint/naming-convention': [
'error',
{
selector: 'default',
format: ['camelCase'],
format: ['camelCase', 'PascalCase'],
},
{
selector: 'variable',
Expand Down Expand Up @@ -36,18 +36,20 @@ const bluiRules = {
format: ['camelCase'],
leadingUnderscore: 'require',
},

{
selector: 'typeLike',
format: ['PascalCase'],
},
{
selector: 'import',
format: ['camelCase', 'PascalCase'],
},
],
'@typescript-eslint/no-floating-promises': 'error',
'@typescript-eslint/explicit-module-boundary-types': ['error', { allowArgumentsExplicitlyTypedAsAny: true }],
'@typescript-eslint/no-array-constructor': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-require-imports': 'off',
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-unnecessary-condition': 'off',
'@typescript-eslint/no-unnecessary-qualifier': 'error',
Expand Down Expand Up @@ -90,7 +92,6 @@ const bluiRules = {
'no-return-assign': 'error',
'no-self-compare': 'error',
'no-sequences': 'error',
'no-throw-literal': 'error',
'no-unused-expressions': 'error',
'no-useless-call': 'error',
'no-undef-init': 'error',
Expand All @@ -110,8 +111,6 @@ const bluiRules = {
'prefer-spread': 'error',
'prefer-template': 'error',
'sort-imports': 'off',
'no-shadow': 'off',
'@typescript-eslint/no-shadow': ['error'],
"no-shadow": "off",
"@typescript-eslint/no-shadow": ["error"]
};

module.exports = bluiRules;
24 changes: 12 additions & 12 deletions eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@brightlayer-ui/eslint-config",
"version": "3.0.1",
"version": "4.0.0",
"description": "ESLint profile for Brightlayer UI",
"author": "Brightlayer UI <[email protected]>",
"main": "index.js",
Expand Down Expand Up @@ -30,16 +30,18 @@
"prettier": "prettier \"**/**.{ts,tsx,js,jsx,json,css,scss,html,md}\" --write"
},
"peerDependencies": {
"@typescript-eslint/eslint-plugin": "^5.9.0",
"eslint": ">= 8.6.0",
"typescript": ">= 4.0.0"
"typescript": "5.7.2"
},
"dependencies": {
"@typescript-eslint/parser": "^5.9.0",
"eslint-config-prettier": ">= 8.0.0"
"@eslint/js": "^9.13.0",
"typescript-eslint": "^8.11.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-config-prettier":"^9.1.0",
"@typescript-eslint/parser": "^8.10.0",
"eslint": ">= 9.12.0"
},
"optionalDependencies": {
"eslint-plugin-react": "^7.28.0"
"eslint-plugin-react": "^7.37.1"
},
"keywords": [
"eslint",
Expand All @@ -51,10 +53,8 @@
"prettier": "@brightlayer-ui/prettier-config",
"devDependencies": {
"@brightlayer-ui/prettier-config": "^1.0.3",
"@typescript-eslint/eslint-plugin": "^5.9.0",
"eslint": ">= 8.6.0",
"eslint-plugin-react": "^7.28.0",
"prettier": "3.0.3",
"typescript": ">= 4.0.0"
"eslint-plugin-react": "^7.37.1",
"prettier": "3.2.5",
"typescript": "5.7.2"
}
}
31 changes: 20 additions & 11 deletions eslint-config/ts.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
const tsProfile = {
parser: '@typescript-eslint/parser', // Specifies the ESLint parser
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',
'eslint-config-prettier',
],
rules: require('./blui-rules'),
};
const js = require('@eslint/js');
const tseslint = require('typescript-eslint');
const prettierRecommended = require('eslint-plugin-prettier/recommended');
const typescriptEslintParser = require('@typescript-eslint/parser');
const bluiRules = require('./blui-rules.js');

module.exports = tsProfile;
module.exports = [
js.configs.recommended,
tseslint.configs.eslintRecommended,
...tseslint.configs.recommendedTypeChecked,
...tseslint.configs.stylisticTypeChecked,
prettierRecommended,
{
languageOptions: {
parser: typescriptEslintParser
},
rules: {
...bluiRules
},
}
];
47 changes: 26 additions & 21 deletions eslint-config/tsx.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
const tsxProfile = {
parser: '@typescript-eslint/parser', // Specifies the ESLint parser
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',
'eslint-config-prettier',
],
settings: {
react: {
version: 'detect',
const js = require('@eslint/js');
const reactRecommened = require('eslint-plugin-react/configs/recommended.js');
const tseslint = require('typescript-eslint');
const prettierRecommended = require('eslint-plugin-prettier/recommended');
const typescriptEslintParser = require('@typescript-eslint/parser');
const bluiRules = require('./blui-rules.js');

module.exports = [
js.configs.recommended,
tseslint.configs.eslintRecommended,
...tseslint.configs.recommendedTypeChecked,
...tseslint.configs.stylisticTypeChecked,
reactRecommened,
prettierRecommended,
{
languageOptions: {
parser: typescriptEslintParser
},
settings: {
react: {
version: 'detect',
},
},
},
rules: Object.assign(
{
rules: {
'react/prop-types': 'off',
'react/display-name': 'off',
...bluiRules
},
require('./blui-rules')
),
};

module.exports = tsxProfile;
}
];
Loading
Loading