Skip to content

Commit b6735ba

Browse files
authored
Merge branch 'master' into update-da
Signed-off-by: Amit Amrutiya <amitamrutiya2210@gmail.com>
2 parents 3b058e0 + ffa3213 commit b6735ba

102 files changed

Lines changed: 4976 additions & 567 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/bump-meshery-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
cache: "npm"
117117
cache-dependency-path: '**/package-lock.json'
118118
- name: Make changes to pull request
119-
run: npm install @layer5/sistent@${{needs.versions-check.outputs.current}}
119+
run: npm install @layer5/sistent@${{needs.versions-check.outputs.current}} --legacy-peer-deps
120120
- name: Create Pull Request
121121
id: cpr
122122
uses: peter-evans/create-pull-request@v7

.github/workflows/checks.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/lint.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/node-checks.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Node version and Lint Check
2+
on:
3+
pull_request:
4+
types: [opened, synchronize]
5+
push:
6+
branches:
7+
- '*'
8+
paths-ignore:
9+
- 'system/**/*'
10+
- '.github/**/*'
11+
- '*.md'
12+
13+
jobs:
14+
compatibility-check:
15+
runs-on: ubuntu-latest
16+
strategy:
17+
matrix:
18+
node-version: [16, 18, 20]
19+
steps:
20+
- name: Checkout Repository
21+
uses: actions/checkout@v4
22+
23+
- name: Setup Node.js ${{ matrix.node-version }}
24+
uses: actions/setup-node@v4
25+
with:
26+
node-version: ${{ matrix.node-version }}
27+
28+
- name: Install Dependencies
29+
run: npm install
30+
31+
- name: Lint Check
32+
run: npm run lint
33+
34+
- name: Prettier Check
35+
run: npm run format:check
36+
37+
- name: Build Project
38+
run: npm run build
39+
40+
- name: Run Tests
41+
run: npm run test
42+
43+
- name: Log Node.js Version
44+
run: echo "Tested on Node.js version ${{ matrix.node-version }}"

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ Find out more on the <a href="https://layer5.io/community">Layer5 community</a>.
9191
<br /><br /><br /><br />
9292

9393
</p>
94-
9594
<div>&nbsp;</div>
9695

9796
<a href="https://slack.meshery.io">

package-lock.json

Lines changed: 58 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,13 @@
116116
"access": "public"
117117
},
118118
"dependencies": {
119+
"@layer5/meshery-design-embed": "^0.4.0",
119120
"billboard.js": "^3.14.3",
120121
"js-yaml": "^4.1.0",
121122
"lodash": "^4.17.21",
122123
"moment": "^2.30.1",
124+
"re-resizable": "^6.10.3",
125+
"react-draggable": "^4.4.6",
123126
"react-share": "^5.1.0"
124127
}
125128
}

site/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/base/Pagination/Pagination.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
import { Pagination as MuiPagination, PaginationProps as MuiPaginationProps } from '@mui/material';
1+
import {
2+
Pagination as MuiPagination,
3+
PaginationItem as MuiPaginationItem,
4+
PaginationProps as MuiPaginationProps
5+
} from '@mui/material';
26
import React from 'react';
37

48
const Pagination = React.forwardRef<HTMLDivElement, MuiPaginationProps>((props, ref) => {
59
return <MuiPagination {...props} ref={ref} />;
610
});
711

12+
export { MuiPaginationItem as PaginationItem };
813
export default Pagination;

src/base/Pagination/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { PaginationProps } from '@mui/material';
2-
import Pagination from './Pagination';
2+
import Pagination, { PaginationItem } from './Pagination';
33

4-
export { Pagination };
4+
export { Pagination, PaginationItem };
55
export type { PaginationProps };

0 commit comments

Comments
 (0)