Skip to content

Commit

Permalink
Merge pull request #90 from etn-ccis/dev
Browse files Browse the repository at this point in the history
Update master
  • Loading branch information
huayunh authored Oct 13, 2023
2 parents 2a3783c + ae49918 commit 8b9210b
Show file tree
Hide file tree
Showing 17 changed files with 1,271 additions and 233 deletions.
19 changes: 0 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,6 @@ jobs:
- run:
name: Publish @brightlayer-ui/eslint-config
command: cd eslint-config && yarn publish:package -b $CIRCLE_BRANCH
tag:
docker:
- image: circleci/node:12.9.1-browsers
steps:
- checkout
- gh/setup
- run:
name: Tag @brightlayer-ui/prettier-config
command: cd prettier-config && yarn tag:package -b $CIRCLE_BRANCH -s -prettier-config
- run:
name: Tag @brightlayer-ui/eslint-config
command: cd eslint-config && yarn tag:package -b $CIRCLE_BRANCH -s -eslint-config

workflows:
version: 2
Expand All @@ -53,10 +41,3 @@ workflows:
only:
- master
- dev
- tag:
requires:
- publish
filters:
branches:
only:
- master
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @JeffGreiner-eaton @daileytj @surajeaton
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Bug Report
about: Report a bug with a Brightlayer UI resource
title: ''
labels: 'bug, needs-review, brightlayer-ui'
assignees: ''
---

#### Describe the bug / expected behavior

#### What are the steps to reproduce?

1. Go to...
2. Click on...

#### Screenshots / Screen recording

#### Code snippet / Link to minimum reproduction example

<!-- Please include a minimum code snippet (if relevant) that shows the bug, or link to a codesandbox or other running example where it can be observed -->

```
CODE HERE
```

#### Your environment information

<!-- Describe any relevant environment information (e.g., Operating System, Library version number, browser used, etc.) where the issue was discovered -->

#### Suggested fix

<!-- If you have a suggestion for what might be causing the issue or where to look as a starting point, please mention it here -->

#### Anything else to add?
15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
name: Feature Request
about: Suggest an idea for this resource
title: ''
labels: 'enhancement, needs-review, brightlayer-ui'
assignees: ''
---

#### Describe the desired feature/functionality

#### Additional Context (where / how would this be used)

#### Is this request related to a current issue?

#### Suggested implementation details
29 changes: 29 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<!-- If this pull request fixes an Issue, link it below. If not, you can remove the line below -->

Fixes # .

<!-- Include a bulleted list summarizing the main changes you have made in this PR -->

#### Changes proposed in this Pull Request:

-
-
-

<!-- Include screenshots if they will help illustrate the changes in this PR -->

#### Screenshots / Screen Recording (if applicable)

-

<!-- Instruction for PR reviewers, if more complicated than a simple yarn start -->

#### To Test:

-

<!-- Useful for draft pull requests -->

#### Any specific feedback you are looking for?

-
21 changes: 21 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
version: 2
updates:
- package-ecosystem: 'npm'
directory: '/eslint-config'
schedule:
interval: 'monthly'
day: 'monday'
open-pull-requests-limit: 1
target-branch: 'dev'
labels:
- 'external-dependency'

- package-ecosystem: 'npm'
directory: '/prettier-config'
schedule:
interval: 'monthly'
day: 'monday'
open-pull-requests-limit: 1
target-branch: 'dev'
labels:
- 'external-dependency'
18 changes: 18 additions & 0 deletions .github/workflows/blui-pr-actions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: blui-pr-actions
on:
pull_request_target:
types:
- opened

permissions:
pull-requests: write
contents: read

jobs:
pr-labels:
uses: etn-ccis/blui-automation/.github/workflows/blui-labels.yml@dev
secrets: inherit

pr-comment:
uses: etn-ccis/blui-automation/.github/workflows/blui-comment.yml@dev
secrets: inherit
23 changes: 23 additions & 0 deletions .github/workflows/tagging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Tagging

env:
GH_TOKEN: ${{ github.token }}
CURRENT_BRANCH: ${{ github.ref_name }}

on:
push:
branches:
- master

jobs:
tag-prettier-package:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: cd prettier-config && yarn tag:package -b ${CURRENT_BRANCH} -s -prettier-config
tag-lint-package:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: cd eslint-config && yarn tag:package -b ${CURRENT_BRANCH} -s -eslint-config

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
This repository contains resources for ensuring consistency and quality across different Brightlayer UI applications and materials.

## ESLint Configuration
Brightlayer UI has developed a custom ESLint configuration file that is used throughout Brightlayer UI. This package extends ESLint recommended settings with some specific modifications selected by the Brightlayer UI team. You can read more [here](https://github.com/brightlayer-ui/code-standards/tree/dev/eslint-config).
Brightlayer UI has developed a custom ESLint configuration file that is used throughout Brightlayer UI. This package extends ESLint recommended settings with some specific modifications selected by the Brightlayer UI team. You can read more [here](https://github.com/etn-ccis/blui-code-standards/tree/dev/eslint-config).

## Prettier Configuration / Editor Configuration
The Brightlayer UI prettier configuration and editor configuration files are used to maintain consistent coding style across Brightlayer UI applications. This package extends the recommended settings with some minor adjustments for team preferences. You can read more [here](https://github.com/brightlayer-ui/code-standards/tree/dev/prettier-config).
The Brightlayer UI prettier configuration and editor configuration files are used to maintain consistent coding style across Brightlayer UI applications. This package extends the recommended settings with some minor adjustments for team preferences. You can read more [here](https://github.com/etn-ccis/blui-code-standards/tree/dev/prettier-config).
6 changes: 3 additions & 3 deletions eslint-config/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

### Changed

- Eased `@typescript-eslint/naming-convention` rules to allow quoted properties ([#55](https://github.com/brightlayer-ui/code-standards/issues/55)).
- Eased `@typescript-eslint/naming-convention` rules to allow quoted properties ([#55](https://github.com/etn-ccis/blui-code-standards/issues/55)).

## v3.0.0 (January 14, 2022)

### Changed

- Updated all dependencies to latest available versions. (`[email protected]` `@typescript-eslint/[email protected]`, `[email protected]`) ([#50](https://github.com/brightlayer-ui/code-standards/issues/50)).
- Removed duplicated `no-shadow` rule and only use the `@typescript-eslint/no-shadow` rule. ([#33](https://github.com/brightlayer-ui/code-standards/issues/33)).
- Updated all dependencies to latest available versions. (`[email protected]` `@typescript-eslint/[email protected]`, `[email protected]`) ([#50](https://github.com/etn-ccis/blui-code-standards/issues/50)).
- Removed duplicated `no-shadow` rule and only use the `@typescript-eslint/no-shadow` rule. ([#33](https://github.com/etn-ccis/blui-code-standards/issues/33)).

## v2.0.5 (October 19, 2021)

Expand Down
8 changes: 5 additions & 3 deletions eslint-config/PUBLISHING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
## 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.
- The `dev` branch will publish versions marked as `alpha` or `beta`.
- The `master` branch will publish any version (`alpha`, `beta`, or `latest`).
In both cases, the code will only be published if the version number differs from the current version published under the respective dist tag.

- The `dev` branch will publish versions marked as `alpha` or `beta`.
- The `master` branch will publish any version (`alpha`, `beta`, or `latest`).

In both cases, the code will only be published if the version number differs from the current version published under the respective dist tag.

## Manually Publishing

Expand Down
6 changes: 3 additions & 3 deletions eslint-config/blui-rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const bluiRules = {
{
selector: 'property',
format: null,
modifiers: ['requiresQuotes']
modifiers: ['requiresQuotes'],
},
{
selector: 'enumMember',
Expand Down Expand Up @@ -110,8 +110,8 @@ 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;
8 changes: 4 additions & 4 deletions eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"license": "BSD-3-Clause",
"repository": {
"type": "git",
"url": "git+https://github.com/brightlayer-ui/code-standards.git"
"url": "git+https://github.com/etn-ccis/blui-code-standards.git"
},
"bugs": {
"url": "https://github.com/brightlayer-ui/code-standards/issues"
"url": "https://github.com/etn-ccis/blui-code-standards/issues"
},
"homepage": "https://github.com/brightlayer-ui/code-standards/tree/master/eslint-config#readme",
"homepage": "https://github.com/etn-ccis/blui-code-standards/tree/master/eslint-config#readme",
"files": [
"README.md",
"LICENSE.md",
Expand Down Expand Up @@ -54,7 +54,7 @@
"@typescript-eslint/eslint-plugin": "^5.9.0",
"eslint": ">= 8.6.0",
"eslint-plugin-react": "^7.28.0",
"prettier": "2.5.1",
"prettier": "3.0.3",
"typescript": ">= 4.0.0"
}
}
Loading

0 comments on commit 8b9210b

Please sign in to comment.