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

BLUI-6371 Master release for showcase demo MUI 6 #187

Merged
merged 102 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
232a24a
Bump @babel/traverse from 7.20.1 to 7.23.2
dependabot[bot] Oct 18, 2023
79f5d7b
Merge pull request #142 from etn-ccis/dependabot/npm_and_yarn/babel/t…
JeffGreiner-eaton Oct 18, 2023
8e8e4e5
Bump @brightlayer-ui/react-themes from 7.1.0 to 7.2.0
dependabot[bot] Nov 1, 2023
c13825e
Merge pull request #143 from etn-ccis/dependabot/npm_and_yarn/dev/bri…
JeffGreiner-eaton Nov 3, 2023
1cae22a
Migrate showcase to vite
JeffGreiner-eaton Nov 8, 2023
f4af039
prettier
JeffGreiner-eaton Nov 8, 2023
98152b5
update file extension
JeffGreiner-eaton Nov 8, 2023
a31f32c
use dist for firebase
JeffGreiner-eaton Nov 8, 2023
ad2694d
add browsers list back in package
JeffGreiner-eaton Nov 8, 2023
a5926e4
Merge pull request #145 from etn-ccis/feature/migrate-to-vite
joebochill Nov 9, 2023
1661718
Bump @adobe/css-tools from 4.3.1 to 4.3.2
dependabot[bot] Dec 1, 2023
6349a22
Bump @mui/docs from 5.14.17 to 5.14.19
dependabot[bot] Dec 1, 2023
269f1a0
Merge pull request #146 from etn-ccis/dependabot/npm_and_yarn/adobe/c…
surajeaton Dec 4, 2023
8ef650c
Merge pull request #147 from etn-ccis/dependabot/npm_and_yarn/dev/mui…
JeffGreiner-eaton Dec 4, 2023
865cb5c
Bump vite from 4.5.0 to 4.5.1
dependabot[bot] Dec 6, 2023
cc1fffb
Merge pull request #148 from etn-ccis/dependabot/npm_and_yarn/vite-4.5.1
JeffGreiner-eaton Dec 6, 2023
eca9f6b
Bump @mui/icons-material from 5.14.16 to 5.15.2
dependabot[bot] Jan 1, 2024
071fc5d
Merge pull request #149 from etn-ccis/dependabot/npm_and_yarn/dev/mui…
JeffGreiner-eaton Jan 2, 2024
0e79200
Bump vite from 4.5.1 to 4.5.2
dependabot[bot] Jan 20, 2024
642b8f2
Merge pull request #150 from etn-ccis/dependabot/npm_and_yarn/vite-4.5.2
JeffGreiner-eaton Jan 22, 2024
bf2f8b6
Bump @mui/system from 5.14.17 to 5.15.7
dependabot[bot] Feb 1, 2024
d48a542
Merge pull request #151 from etn-ccis/dependabot/npm_and_yarn/dev/mui…
JeffGreiner-eaton Feb 1, 2024
ca2c804
Bump ip from 1.1.8 to 1.1.9
dependabot[bot] Feb 20, 2024
9683e0f
Merge pull request #152 from etn-ccis/dependabot/npm_and_yarn/ip-1.1.9
surajeaton Feb 21, 2024
535b697
Bump @types/react-dom from 18.2.15 to 18.2.19
dependabot[bot] Mar 1, 2024
0925207
Merge pull request #153 from etn-ccis/dependabot/npm_and_yarn/dev/typ…
surajeaton Mar 4, 2024
38f3687
Bump express from 4.18.2 to 4.19.2
dependabot[bot] Mar 28, 2024
6d73851
Merge pull request #154 from etn-ccis/dependabot/npm_and_yarn/express…
JeffGreiner-eaton Mar 28, 2024
77bb6cc
Bump ts-node from 10.9.1 to 10.9.2
dependabot[bot] Apr 1, 2024
b54d8b4
Merge pull request #155 from etn-ccis/dependabot/npm_and_yarn/dev/ts-…
JeffGreiner-eaton Apr 2, 2024
edd7753
Bump vite from 4.5.2 to 4.5.3
dependabot[bot] Apr 4, 2024
23ebeb7
Added blui ci github actions
surajeaton Apr 4, 2024
7bc6728
Removed circle ci config
surajeaton Apr 4, 2024
107b68f
Added name to checkout steps
surajeaton Apr 5, 2024
fd5555d
Updated save build steps
surajeaton Apr 5, 2024
abd513f
Merge pull request #156 from etn-ccis/dependabot/npm_and_yarn/vite-4.5.3
surajeaton Apr 5, 2024
a855861
update jest config & update snapshots
JeffGreiner-eaton Apr 5, 2024
efbf8fe
Merge pull request #157 from etn-ccis/feature/5519-github-actions
surajeaton Apr 8, 2024
6ed0b39
Bump tar from 6.2.0 to 6.2.1
dependabot[bot] Apr 11, 2024
0361239
Merge pull request #158 from etn-ccis/dependabot/npm_and_yarn/tar-6.2.1
JeffGreiner-eaton Apr 11, 2024
720e312
add build badge & remove reference to circleCI
JeffGreiner-eaton Apr 30, 2024
c45d633
use yarn --immutable
JeffGreiner-eaton May 1, 2024
2e68407
Merge pull request #159 from etn-ccis/fix/blui-5710-update-badge
JeffGreiner-eaton May 1, 2024
374c72f
Bump ejs from 3.1.9 to 3.1.10
dependabot[bot] May 1, 2024
efaeb54
Merge pull request #160 from etn-ccis/dependabot/npm_and_yarn/ejs-3.1.10
JeffGreiner-eaton May 1, 2024
b8c1f5c
Bump @mui/base from 5.0.0-beta.25 to 5.0.0-beta.40
dependabot[bot] May 1, 2024
c80ebde
Merge pull request #161 from etn-ccis/dependabot/npm_and_yarn/dev/mui…
JeffGreiner-eaton May 2, 2024
126edeb
Bump firebase-tools from 11.30.0 to 13.6.0
dependabot[bot] May 3, 2024
0c5dc77
Merge pull request #162 from etn-ccis/dependabot/npm_and_yarn/firebas…
surajeaton May 6, 2024
8d83b69
Bump @mui/material from 5.14.17 to 5.15.19
dependabot[bot] Jun 1, 2024
9d2e0d0
Merge pull request #163 from etn-ccis/dependabot/npm_and_yarn/dev/mui…
surajeaton Jun 3, 2024
1774e86
Bump @grpc/grpc-js from 1.8.21 to 1.8.22
dependabot[bot] Jun 11, 2024
0dee0fa
update node version for ci
JeffGreiner-eaton Jun 11, 2024
575c00b
update test results
JeffGreiner-eaton Jun 11, 2024
1f23336
Merge pull request #164 from etn-ccis/dependabot/npm_and_yarn/grpc/gr…
JeffGreiner-eaton Jun 11, 2024
f4bc525
Bump ws from 7.5.9 to 7.5.10
dependabot[bot] Jun 18, 2024
0afd966
Merge pull request #165 from etn-ccis/dependabot/npm_and_yarn/ws-7.5.10
JeffGreiner-eaton Jun 18, 2024
ae0aaf4
Bump firebase-tools from 13.6.0 to 13.14.2
dependabot[bot] Aug 1, 2024
218dcc1
test pr deploy
JeffGreiner-eaton Aug 2, 2024
2386e66
revert change pr deploy test
JeffGreiner-eaton Aug 2, 2024
8fcb357
Merge pull request #167 from etn-ccis/dependabot/npm_and_yarn/dev/fir…
JeffGreiner-eaton Aug 2, 2024
9303448
Bump @brightlayer-ui/icons-mui from 3.5.0 to 3.6.0
dependabot[bot] Sep 1, 2024
97c07aa
Merge pull request #168 from etn-ccis/dependabot/npm_and_yarn/dev/bri…
JeffGreiner-eaton Sep 9, 2024
0b3717a
Bump vite from 4.5.3 to 4.5.5
dependabot[bot] Sep 18, 2024
3497e09
Merge pull request #169 from etn-ccis/dependabot/npm_and_yarn/vite-4.5.5
JeffGreiner-eaton Sep 19, 2024
19db813
Bump express from 4.19.2 to 4.21.0
dependabot[bot] Sep 19, 2024
da28335
Merge pull request #170 from etn-ccis/dependabot/npm_and_yarn/express…
JeffGreiner-eaton Sep 19, 2024
3a1fd13
Bump body-parser from 1.20.2 to 1.20.3
dependabot[bot] Sep 19, 2024
5f47501
Merge pull request #171 from etn-ccis/dependabot/npm_and_yarn/body-pa…
JeffGreiner-eaton Sep 19, 2024
f39e97b
Bump rollup from 3.29.4 to 3.29.5
dependabot[bot] Sep 27, 2024
f4812e3
Merge pull request #172 from etn-ccis/dependabot/npm_and_yarn/rollup-…
JeffGreiner-eaton Sep 27, 2024
4cd96ab
Bump basic-auth-connect from 1.0.0 to 1.1.0
dependabot[bot] Sep 30, 2024
5137728
Merge pull request #173 from etn-ccis/dependabot/npm_and_yarn/basic-a…
JeffGreiner-eaton Oct 1, 2024
cbd25c4
Updated the package to use MUI 6
shubham-eaton Oct 25, 2024
e2d5d22
Bump @mui/styled-engine from 5.15.7 to 6.1.6
dependabot[bot] Nov 1, 2024
b15da6d
Merge pull request #175 from etn-ccis/dependabot/npm_and_yarn/dev/mui…
JeffGreiner-eaton Nov 4, 2024
663eafd
update react themes package
ektaghag-eaton Nov 8, 2024
ce46d10
updated yarn lock
shubham-eaton Nov 11, 2024
7004e21
Updated showcase examples to MUI 6 and fixed prettier issues
shubham-eaton Nov 19, 2024
a269806
update showcase
JeffGreiner-eaton Nov 20, 2024
3151819
eslint ignore
JeffGreiner-eaton Nov 20, 2024
d003ce9
Merge pull request #178 from etn-ccis/feat/update-showcase
shubham-eaton Nov 20, 2024
9a1766a
Updated test snapshot
shubham-eaton Nov 20, 2024
629120f
Merge pull request #177 from etn-ccis/feature/6312-MUI6-showcase-update
shubham-eaton Nov 21, 2024
c8bdef7
Bump @types/jest from 27.5.2 to 29.5.14
dependabot[bot] Dec 1, 2024
db2c84a
Merge pull request #179 from etn-ccis/dependabot/npm_and_yarn/dev/typ…
surajeaton Dec 2, 2024
2b13c41
Passed direaction with theam
shubham-eaton Dec 4, 2024
2f2cd9e
Merge pull request #180 from etn-ccis/bug/6340-RTL-drawer-issue
JeffGreiner-eaton Dec 4, 2024
1bf58ad
Crash issue fix for table on checkbox click
shubham-eaton Dec 9, 2024
d529829
Fixed lint issue
shubham-eaton Dec 9, 2024
c10a861
type change for onPointerLeaveCapture
shubham-eaton Dec 9, 2024
9db47c0
Merge pull request #181 from etn-ccis/bug/6375-crashfix-table-checkbo…
JeffGreiner-eaton Dec 9, 2024
74491a0
Update firebase deploy to use latest
JeffGreiner-eaton Dec 11, 2024
04991de
Bump nanoid from 3.3.7 to 3.3.8
dependabot[bot] Dec 14, 2024
c3d0d4a
Merge pull request #182 from etn-ccis/feature/blui-6355-firebase-deploy
shubham-eaton Dec 16, 2024
bcc409d
Merge pull request #183 from etn-ccis/dependabot/npm_and_yarn/nanoid-…
surajeaton Dec 16, 2024
ea2ace4
Error fix for build fail
shubham-eaton Dec 17, 2024
b64d7a1
Merge pull request #185 from etn-ccis/feature/mui-6
shubham-eaton Dec 17, 2024
04af0d7
Updated package with latest version of react theme and component
shubham-eaton Dec 20, 2024
6acf0f0
Updated package version
shubham-eaton Dec 20, 2024
b863a94
snapshots updated
shubham-eaton Dec 20, 2024
933325e
Merge pull request #186 from etn-ccis/feature/BLUI-6371-publish-package
shubham-eaton Dec 20, 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
75 changes: 0 additions & 75 deletions .circleci/config.yml

This file was deleted.

9 changes: 5 additions & 4 deletions .eslintrc.js → .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
module.exports = {
root: true,
env: { browser: true, es2020: true },
parser: '@typescript-eslint/parser',
extends: ['@brightlayer-ui/eslint-config/tsx'],
ignorePatterns: ['dist', '.eslintrc.cjs', 'jest.config.ts', 'vite.config.ts'],
parserOptions: {
project: './tsconfig.json',
},
env: {
browser: true,
jest: true,
},
plugins: ['react-refresh'],
rules: {
'@typescript-eslint/no-empty-function': 'off',
'no-empty-function': 'off',
'react/react-in-jsx-scope': 'off',
'@typescript-eslint/naming-convention': [
'error',
{
Expand Down
86 changes: 86 additions & 0 deletions .github/workflows/blui-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
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:
prettier_lint:
runs-on: ubuntu-latest

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

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: yarn --immutable
- run: yarn prettier
- run: yarn lint

unit_test:
runs-on: ubuntu-latest

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

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: yarn --immutable
- run: yarn test --coverage
- name: Upload to Codecov
uses: codecov/codecov-action@v3
with:
directory: ./coverage/
files: clover.xml
flags: unittests
name: codecov-report
verbose: true

build:
runs-on: ubuntu-latest

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

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: yarn --immutable
- run: yarn build
- name: Save build
uses: actions/upload-artifact@v3
with:
name: dist
if-no-files-found: error
path: dist
8 changes: 4 additions & 4 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on merge
'on':
on:
push:
branches:
- master
jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- run: yarn && yarn build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BLUI_REACT_SHOWCASE }}'
repoToken: ${{ secrets.GITHUB_TOKEN }}
firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_BLUI_REACT_SHOWCASE }}
channelId: live
projectId: blui-react-showcase
14 changes: 9 additions & 5 deletions .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on PR
'on': pull_request
on: pull_request
permissions:
checks: write
contents: read
pull-requests: write
jobs:
build_and_preview:
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- run: yarn && yarn build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BLUI_REACT_SHOWCASE }}'
repoToken: ${{ secrets.GITHUB_TOKEN }}
firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_BLUI_REACT_SHOWCASE }}
expires: 2d
projectId: blui-react-showcase
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

# production
/build
/dist

# misc
.DS_Store
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## v3.0.0

### Changed

- Updated to latest version of MUI 6, components and themes

## v2.0.0

### Changed
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# React Showcase Demo

[![](https://img.shields.io/circleci/build/github/etn-ccis/blui-react-showcase-demo/master.svg?style=flat)](https://circleci.com/gh/brightlayer-ui/react-showcase-demo/tree/master) [![codecov](https://codecov.io/gh/etn-ccis/blui-react-showcase-demo/branch/master/graph/badge.svg?token=DNI4Z1LUL3)](https://codecov.io/gh/etn-ccis/blui-react-showcase-demo)
[![Build](https://github.com/etn-ccis/blui-react-showcase-demo/actions/workflows/blui-ci.yml/badge.svg?branch=master)](https://github.com/etn-ccis/blui-react-showcase-demo/actions/workflows/blui-ci.yml) [![codecov](https://codecov.io/gh/etn-ccis/blui-react-showcase-demo/branch/master/graph/badge.svg?token=DNI4Z1LUL3)](https://codecov.io/gh/etn-ccis/blui-react-showcase-demo)

This applications is a demo applications that is used to demonstrate and test various Brightlayer UI components, resources, etc.

Expand Down
24 changes: 14 additions & 10 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
{
"hosting": {
"public": "build",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
"hosting": {
"public": "dist",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
}
19 changes: 19 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="/logo192.png" />
<link rel="manifest" href="/manifest.json" />
<title>react-showcase-demo</title>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<script type="module" src="/src/index.tsx"></script>
</body>
</html>
11 changes: 11 additions & 0 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export default {
preset: 'ts-jest',
testEnvironment: 'jest-environment-jsdom',
transform: {
'^.+\\.tsx?$': 'ts-jest',
// process `*.tsx` files with `ts-jest`
},
moduleNameMapper: {
'\\.(gif|ttf|eot|svg|png)$': '<rootDir>/test/__mocks__/fileMock.js',
},
};
Loading
Loading