Skip to content

Commit 17b16a6

Browse files
Merge branch 'master' into M-DEV-1/add-source-structure-to-sistent
2 parents 6a2ecec + 84ba19a commit 17b16a6

File tree

104 files changed

+7074
-2269
lines changed

Some content is hidden

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

104 files changed

+7074
-2269
lines changed

.eslintignore

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

.eslintrc.js

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

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: 🙋🏾🙋🏼‍Question
4+
url: https://discuss.layer5.io
5+
about: Submit your question on the discussion forum.

.github/ISSUE_TEMPLATE/question.md

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

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ jobs:
3939
cache-dependency-path: '**/package-lock.json'
4040
- name: Make changes to pull request
4141
working-directory: ui
42-
run: npm install @layer5/sistent@${{needs.versions-check.outputs.current}}
42+
run: npm install @sistent/sistent@${{needs.versions-check.outputs.current}}
4343
- name: Create Pull Request
4444
id: cpr
4545
uses: peter-evans/create-pull-request@v7
4646
with:
4747
token: ${{ secrets.RELEASEDRAFTER_PAT }}
48-
commit-message: Bump sistent v${{ needs.versions-check.outputs.current }} dependencies
48+
commit-message: Update to Sistent v${{ needs.versions-check.outputs.current }} dependencies
4949
committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
5050
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
5151
signoff: true
5252
branch: bump-sistent-bot
5353
delete-branch: true
54-
title: '[Chore]: Bump Sistent v${{ needs.versions-check.outputs.current }}'
54+
title: '[Chore]: Update to Sistent v${{ needs.versions-check.outputs.current }}'
5555
add-paths: |
5656
ui/package.json
5757
ui/package-lock.json
@@ -78,19 +78,19 @@ jobs:
7878
cache-dependency-path: '**/package-lock.json'
7979
- name: Make changes to pull request
8080
working-directory: meshmap
81-
run: npm install @layer5/sistent@${{needs.versions-check.outputs.current}}
81+
run: npm install @sistent/sistent@${{needs.versions-check.outputs.current}}
8282
- name: Create Pull Request
8383
id: cpr
8484
uses: peter-evans/create-pull-request@v7
8585
with:
8686
token: ${{ secrets.RELEASEDRAFTER_PAT }}
87-
commit-message: Bump sistent v${{ needs.versions-check.outputs.current }} dependencies
87+
commit-message: Update to Sistent v${{ needs.versions-check.outputs.current }} dependencies
8888
committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
8989
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
9090
signoff: true
9191
branch: bump-sistent-bot
9292
delete-branch: true
93-
title: '[Chore]: Bump Sistent v${{needs.versions-check.outputs.current }}'
93+
title: '[Chore]: Update to Sistent v${{needs.versions-check.outputs.current }}'
9494
add-paths: |
9595
meshmap/package.json
9696
meshmap/package-lock.json
@@ -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}} --legacy-peer-deps
119+
run: npm install @sistent/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
@@ -128,7 +128,7 @@ jobs:
128128
signoff: true
129129
branch: bump-sistent-bot
130130
delete-branch: true
131-
title: '[Chore]: Bump Sistent v${{ needs.versions-check.outputs.current }}'
131+
title: '[Chore]: Update to Sistent v${{ needs.versions-check.outputs.current }}'
132132
add-paths: |
133133
package.json
134134
package-lock.json
@@ -155,19 +155,19 @@ jobs:
155155
cache-dependency-path: '**/package-lock.json'
156156
- name: Make changes to pull request
157157
working-directory: ui
158-
run: npm install @layer5/sistent@${{needs.versions-check.outputs.current}}
158+
run: npm install @sistent/sistent@${{needs.versions-check.outputs.current}}
159159
- name: Create Pull Request
160160
id: cpr
161161
uses: peter-evans/create-pull-request@v7
162162
with:
163163
token: ${{ secrets.RELEASEDRAFTER_PAT }}
164-
commit-message: Bump sistent v${{ needs.versions-check.outputs.current }} dependencies
164+
commit-message: Update to Sistent v${{ needs.versions-check.outputs.current }} dependencies
165165
committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
166166
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
167167
signoff: true
168168
branch: bump-sistent-bot
169169
delete-branch: true
170-
title: '[Chore]: Bump Sistent v${{ needs.versions-check.outputs.current }}'
170+
title: '[Chore]: Update to Sistent v${{ needs.versions-check.outputs.current }}'
171171
add-paths: |
172172
ui/package.json
173173
ui/package-lock.json

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
node-version: '20.x'
3939
registry-url: "https://registry.npmjs.org"
40-
scope: "@layer5"
40+
scope: "@sistent"
4141
- run: |
4242
npm install
4343
npm run build
@@ -68,4 +68,4 @@ jobs:
6868
name: version-number
6969
path: |
7070
version/number
71-
retention-days: 14
71+
retention-days: 14

.github/workflows/slack.yml

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
11
name: Slack Notify
2-
on:
2+
3+
on:
34
watch:
5+
types: [started]
46
issues:
5-
types: [started]
7+
types: [labeled]
8+
69
jobs:
710
star-notify:
811
if: github.event_name == 'watch'
912
name: Notify Slack on star
1013
runs-on: ubuntu-latest
1114
steps:
12-
- name: Get current star count
13-
run: |
14-
echo "STARS=$(curl --silent 'https://api.github.com/repos/${{github.repository}}' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV
15-
- name: Notify slack
16-
env:
17-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
18-
uses: pullreminders/slack-action@master
19-
with:
20-
args: '{\"channel\":\"CSK7N9TGX\",\"text\":\"${{ github.actor }} just starred ${{github.repository}}! (https://github.com/${{github.repository}}/stargazers) Total ⭐️: ${{env.STARS}}\"}'
15+
- name: Get current star count
16+
run: |
17+
echo "STARS=$(curl --silent 'https://api.github.com/repos/${{ github.repository }}' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV
18+
19+
- name: Notify Slack
20+
uses: slackapi/[email protected]
21+
with:
22+
method: chat.postMessage
23+
token: ${{ secrets.SLACK_BOT_TOKEN }}
24+
payload: |
25+
channel: CSK7N9TGX
26+
type: "mrkdwn"
27+
text: "<https://github.com/${{ github.actor }}|${{ github.actor }}> just starred <https://github.com/${{ github.repository }}/stargazers|${{ github.repository }}> bringing the total ⭐️ count up to: ${{ env.STARS }}"
28+
2129
good-first-issue-notify:
22-
if: github.event_name == 'issues' && github.event.label.name == 'good first issue' || github.event.label.name == 'first-timers-only'
30+
if: github.event_name == 'issues' && (github.event.label.name == 'good first issue' || github.event.label.name == 'first-timers-only')
2331
name: Notify Slack for new good-first-issue
2432
runs-on: ubuntu-latest
2533
steps:
26-
- name: Notify slack
27-
env:
28-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
29-
uses: pullreminders/slack-action@master
34+
- name: Notify Slack
35+
uses: slackapi/[email protected]
3036
with:
31-
args: '{\"channel\":\"C019426UBNY\",\"text\":\"A good first issue label was just added to ${{github.event.issue.html_url}}.\"}'
37+
method: chat.postMessage
38+
token: ${{ secrets.SLACK_BOT_TOKEN }}
39+
payload: |
40+
channel: C019426UBNY
41+
text: ":new: Good first issue up for grabs: <${{ github.event.issue.html_url }}|${{ github.event.issue.title }}>"

.husky/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
npx lint-staged
1+
npm test

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ This repository and site are available as open source under the terms of the [Ap
182182

183183
**Community First**
184184

185-
<p>The <a href="https://layer5.io">Layer5</a> community represents the largest collection of service mesh projects and their maintainers in the world.</p>
185+
<p>The <a href="https://layer5.io/community">Layer5 community</a> represents the largest collection of service mesh projects and their maintainers in the world.</p>
186186

187187
**Open Source First**
188188

189-
<p>Our projects establish industry standards and enable service developers, owners, and operators with repeatable patterns and best practices for managing all aspects of distributed services. Our shared commitment to the open source spirit push the Layer5 community and its projects forward.</p>
189+
<p>At Layer5, we champion developer-defined infrastructure, giving engineers the power to reshape application delivery. We empower operators in reimagining how they manage modern infrastructure: collaboratively.</p>

README.md

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,6 @@
1-
# Layer5 Design System Sistent
1+
# Sistent Design System Sistent
22

3-
The Sistent Design System from Layer5 provides the open source building blocks to design and implement consistent, accessible, and delightful product experiences.
4-
5-
<hr>
6-
<h3 align="center"> --> Visit <a href="https://layer5.io/projects/sistent">https://layer5.io/projects/sistent</a></h3>
7-
<hr>
8-
9-
## Using Sistent
10-
11-
Visit the Sistent website for further instructions.
12-
13-
### Brand
14-
15-
- Layer5 Brand Guide ([PDF](https://layer5.io/brand/brand-guide.pdf))
16-
- [Layer5 Logos](https://layer5.io/company/brand) (more assets available in shared Community drive).
17-
18-
### Components and Packages
19-
20-
- Design System components in React.js
3+
The Sistent Design System provides the open source building blocks to design and implement consistent, accessible, and delightful product experiences. Visit the <a href="https://layer5.io/projects/sistent">project website</a> for more information.
214

225
## Contributing to Sistent
236

@@ -94,7 +77,7 @@ npm install <path-to-sistent-on-local-machine>
9477
This will update your Sistent dependency to:
9578
9679
```
97-
"@layer5/sistent" : "file:../../sistent"
80+
"@sistent/sistent" : "file:../../sistent"
9881
```
9982
10083
2. Build your local Sistent fork
@@ -117,12 +100,13 @@ Now, your project should reflect changes from your local Sistent fork.
117100
If you want to remove the local Sistent fork from your project, run:
118101
119102
```
120-
npm uninstall @layer5/sistent
103+
npm uninstall @sistent/sistent
121104
```
122105
123106
This will remove the local Sistent package from your project. You will have to reinstall the official package using this command:
107+
124108
```
125-
npm install @layer5/sistent
109+
npm install @sistent/sistent
126110
```
127111
128112
#### Method 2: Using `npm link`
@@ -140,7 +124,7 @@ This creates a global symlink which points to the local Sistent fork.
140124
2. Link the local Sistent fork to your project
141125
142126
```
143-
npm link @layer5/sistent
127+
npm link @sistent/sistent
144128
```
145129
146130
3.Build your local Sistent fork
@@ -168,24 +152,25 @@ To verify that the correct link has been created, run this command:
168152
npm ls -g
169153

170154
# Expected output:
171-
# ├── @layer5/sistent@0.14.11 -> ./../../../../<path-to-local-sistent-fork>
155+
# ├── @sistent/sistent@0.14.11 -> ./../../../../<path-to-local-sistent-fork>
172156
```
173157
174158
To verify that the created link is correctly used in your project, run this command in the directory where you linked the Sistent fork:
175159
176160
```
177-
ls -l node_modules/@layer5/sistent
161+
ls -l node_modules/@sistent/sistent
178162

179163
# Expected output:
180-
# node_modules/@layer5/sistent -> ../../../../../sistent
164+
# node_modules/@sistent/sistent -> ../../../../../sistent
181165
```
182166
183167
To revert back to the official package, first unlink the package, then install the official package using the following commands:
184168
185169
```
186-
npm unlink @layer5/sistent
187-
npm install @layer5/sistent
170+
npm unlink @sistent/sistent
171+
npm install @sistent/sistent
188172
```
173+
189174
> [!NOTE]
190175
> Avoid using `type any` in your code. Always specify explicit types to ensure type safety and maintainability.
191176
@@ -228,4 +213,4 @@ Find out more on the <a href="https://layer5.io/community">Layer5 community</a>.
228213
✔️<em><strong>Explore more</strong></em> in the <a href="https://layer5.io/community/handbook">Community Handbook</a>.<br />
229214
</p>
230215
<p align="center">
231-
<i>Not sure where to start?</i> Grab an open issue with the <a href="https://github.com/issues?q=is%3Aopen+is%3Aissue+archived%3Afalse+org%3Alayer5io+org%3Ameshery+org%3Alayer5labs+org%3Aservice-mesh-performance+org%3Aservice-mesh-patterns+label%3A%22help+wanted%22+">help-wanted label</a>.</p>
216+
<i>Not sure where to start?</i> Grab an open issue with the <a href="https://github.com/issues?q=is%3Aopen+is%3Aissue+archived%3Afalse+(org%3Alayer5io+OR+org%3Ameshery+OR+org%3Alayer5labs+OR+org%3Aservice-mesh-performance+OR+org%3Aservice-mesh-patterns+OR+org%3Ameshery-extensions)+label%3A%22help+wanted%22">help-wanted label</a>.</p>

0 commit comments

Comments
 (0)