Skip to content

Commit 1c25232

Browse files
authored
Merge branch 'master' into 976-fix/local-build-errors
Signed-off-by: mahadevan <[email protected]>
2 parents 5d00682 + dbf9276 commit 1c25232

File tree

114 files changed

+2402
-931
lines changed

Some content is hidden

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

114 files changed

+2402
-931
lines changed

.husky/commit-msg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
npx --no -- commitlint --edit $1

README.md

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ make build
5050
If you wish to build in watch mode:
5151

5252
```
53-
make watchmode-build
53+
make build-watch
5454
```
5555

5656
To check if your code meets the formatting standards, you can run:
@@ -71,12 +71,55 @@ To run tests:
7171
make tests
7272
```
7373

74-
To attach sistent to your project use:
74+
#### Using your local Sistent Fork in a Project
75+
76+
1. Install your local Sistent package in the project
7577

7678
```
7779
npm install <path-to-sistent-on-local-machine>
7880
```
7981

82+
> Example:
83+
>
84+
> ```
85+
> # relative path
86+
> npm install ../../sistent
87+
>
88+
> # absolute path
89+
> npm install /home/five/code/sistent
90+
> ```
91+
92+
This will update your Sistent dependency to:
93+
94+
```
95+
"@layer5/sistent" : "file:../../sistent"
96+
```
97+
98+
2. Build your local Sistent fork
99+
100+
After making changes to your fork, run this command in your local Sistent package.
101+
102+
```
103+
make build
104+
```
105+
106+
3. Run the build command in the project where your local Sistent fork is installed.
107+
108+
```
109+
# example, Meshery UI
110+
make ui-build
111+
```
112+
113+
Now your project should reflect changes from your local Sistent fork.
114+
115+
If you want to remove the local Sistent fork from your project, run:
116+
117+
```
118+
npm uninstall @layer5/sistent
119+
```
120+
121+
This will remove the local Sistent package from your project. You will have to install the standard package again after running this command.
122+
80123
> [!NOTE]
81124
> Avoid using `type any` in your code. Always specify explicit types to ensure type safety and maintainability.
82125

examples/next-12/package-lock.json

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

package-lock.json

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

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"commitlint": "commitlint --edit",
1919
"coverage": "jest --coverage",
2020
"dev": "NODE_ENV=development tsup",
21+
"dev:watch": "NODE_ENV=development tsup",
2122
"format:check": "prettier --check \"**/*.{ts,tsx,md}\" --config ./.prettierrc",
2223
"format:write": "prettier --write \"**/*.{ts,tsx,md}\" --config ./.prettierrc",
2324
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
@@ -99,15 +100,17 @@
99100
"@emotion/react": "^11.11.3",
100101
"@emotion/styled": "^11.11.0",
101102
"@layer5/meshery-design-embed": "^0.4.0",
103+
"@layer5/schemas": "^0.0.6-16",
102104
"@mui/material": "^5.15.11",
103105
"@types/mui-datatables": "*",
104106
"billboard.js": "^3.14.3",
105107
"js-yaml": "^4.1.0",
106108
"lodash": "^4.17.21",
107-
"moment-timezone": "^0.5.47",
109+
"moment": "^2.30.1",
108110
"mui-datatables": "*",
109111
"re-resizable": "^6.10.3",
110112
"react-draggable": "^4.4.6",
111-
"react-share": "^5.1.0"
113+
"react-share": "^5.1.0",
114+
"use-debounce": "^10.0.4"
112115
}
113116
}

site/gatsby-browser.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from "react";
22
import { ThemeProvider } from './src/components/Theme';
33
import './src/styles/global.css';
4+
import React from "react";
45

56
export const wrapRootElement = ({ element }) => <ThemeProvider>{element}</ThemeProvider>;

0 commit comments

Comments
 (0)