Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feature/kunal7000…
Browse files Browse the repository at this point in the history
…6/60

Signed-off-by: Kunaldeep singh <[email protected]>
  • Loading branch information
kunal70006 committed Aug 30, 2023
2 parents 0229cea + 2a73654 commit 4eba416
Show file tree
Hide file tree
Showing 108 changed files with 1,625 additions and 2,026 deletions.
8 changes: 0 additions & 8 deletions .changeset/README.md

This file was deleted.

11 changes: 0 additions & 11 deletions .changeset/config.json

This file was deleted.

51 changes: 32 additions & 19 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
name: Release
name: Publish NPM Package

on:
push:
branches:
- master
release:
types: [published]
workflow_dispatch:
inputs:
release-type:
required: true

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
release:
name: Release
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
Expand All @@ -20,20 +23,30 @@ jobs:
with:
node-version: 18

- name: Install Dependencies
run: yarn
- name: Install deps and build
run: |
yarn
yarn build-all
publish-gpr:
needs: build
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout Repo
uses: actions/checkout@v3

- name: Create Release Pull Request or Publish to npm
id: changesets
uses: changesets/action@v1
- name: Setup Node.js 18.x
uses: actions/setup-node@v3
with:
# This expects you to have a script called release which does a build for your packages and calls changeset publish
publish: yarn release
node-version: 18
registry-url: "https://registry.npmjs.org"
scope: "@layer5"

- name: Publish to npm
run: yarn publish --release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

#- name: Send a Slack notification if a publish happens
#if: steps.changesets.outputs.published == 'true'
# You can do something when a publish happens.
#run: my-slack-bot send-notification --message "A new version of ${GITHUB_REPOSITORY} was published!"
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn format:check && yarn lint-staged
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Ignore artifacts:
dist
coverage

12 changes: 6 additions & 6 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"semi": true,
"tabWidth": 2,
"printWidth": 100,
"singleQuote": true,
"trailingComma": "none",
"jsxBracketSameLine": true
"semi": true,
"tabWidth": 2,
"printWidth": 100,
"singleQuote": true,
"trailingComma": "none",
"plugins": ["prettier-plugin-organize-imports"]
}
29 changes: 8 additions & 21 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
check:
golangci-lint run
setup:
yarn install

check-clean-cache:
golangci-lint cache clean
build: install
yarn run build-all

protoc-setup:
wget -P meshes https://raw.githubusercontent.com/layer5io/meshery/master/meshes/meshops.proto
format-check:
yarn run format:check

proto:
protoc -I meshes/ meshes/meshops.proto --go_out=plugins=grpc:./meshes/





site:
$(jekyll) serve --drafts --livereload

build:
$(jekyll) build --drafts

docker:
docker run --name site -d --rm -p 4000:4000 -v `pwd`:"/srv/jekyll" jekyll/jekyll:4.0.0 bash -c "bundle install; jekyll serve --drafts --livereload"
format-fix:
yarn run format:write
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@ The Sistent Design System from Layer5 provides the open source building blocks t
### Packages

- Design System components in React.js
- npm package: `@layer5/sistent-components`
- npm package:

`@layer5/sistent-components`
`@layer5/sistent-svg`

### Brand

- Layer5 Brand Guide ([PDF](https://layer5.io/brand/brand-guide.pdf))
- [Layer5 Logos](https://layer5.io/company/brand) (more assets available in shared Community drive).

### How to get started

1. Install `[email protected]`
2. Use `yarn` to install dependencies

<div>&nbsp;</div>

## Join the Layer5 community!
Expand Down
24 changes: 16 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,25 @@
"packages/*"
],
"packageManager": "[email protected]",
"dependencies": {
"@changesets/cli": "^2.26.2"
},
"devDependencies": {
"prettier": "^3.0.2"
"eslint": "^8.48.0",
"husky": "^8.0.3",
"lint-staged": "^14.0.1",
"prettier": "^3.0.2",
"prettier-plugin-organize-imports": "^3.2.3"
},
"scripts": {
"build-all": "yarn workspaces run build",
"format": "prettier --write \"**/*.{ts,tsx,md}\" --config ./.prettierrc",
"changeset": "changeset",
"version-packages": "changeset version",
"release": "yarn run build-all && changeset publish"
"format:check": "prettier --check \"**/*.{ts,tsx,md}\" --config ./.prettierrc",
"format:write": "prettier --write \"**/*.{ts,tsx,md}\" --config ./.prettierrc",
"postinstall": "husky install",
"prepack": "pinst --disable",
"postpack": "pinst --enable"
},
"lint-staged": {
"*.{ts,tsx,md}": [
"eslint --fix",
"yarn format:write"
]
}
}
12 changes: 6 additions & 6 deletions packages/components/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"semi": true,
"tabWidth": 2,
"printWidth": 100,
"singleQuote": true,
"trailingComma": "none",
"jsxBracketSameLine": true
"semi": true,
"tabWidth": 2,
"printWidth": 100,
"singleQuote": true,
"trailingComma": "none",
"jsxBracketSameLine": true
}
2 changes: 1 addition & 1 deletion packages/components/src/accordion.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AccordionProps, Accordion as MuiAccordion } from '@mui/material';
import React from 'react';
import { Accordion as MuiAccordion, AccordionProps } from '@mui/material';

export function Accordion(props: AccordionProps) {
return <MuiAccordion {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/accordionactions.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AccordionActionsProps, AccordionActions as MuiAccordionActions } from '@mui/material';
import React from 'react';
import { AccordionActions as MuiAccordionActions, AccordionActionsProps } from '@mui/material';

export function AccordionActions(props: AccordionActionsProps) {
return <MuiAccordionActions {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/accordiondetails.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AccordionDetailsProps, AccordionDetails as MuiAccordionDetails } from '@mui/material';
import React from 'react';
import { AccordionDetails as MuiAccordionDetails, AccordionDetailsProps } from '@mui/material';

export function AccordionDetails(props: AccordionDetailsProps) {
return <MuiAccordionDetails {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/accordionsummary.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AccordionSummaryProps, AccordionSummary as MuiAccordionSummary } from '@mui/material';
import React from 'react';
import { AccordionSummary as MuiAccordionSummary, AccordionSummaryProps } from '@mui/material';

export function AccordionSummary(props: AccordionSummaryProps) {
return <MuiAccordionSummary {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/appbar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppBarProps, AppBar as MuiAppBar } from '@mui/material';
import React from 'react';
import { AppBar as MuiAppBar, AppBarProps } from '@mui/material';

export function AppBar(props: AppBarProps) {
return <MuiAppBar {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/avatar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AvatarProps, Avatar as MuiAvatar } from '@mui/material';
import React from 'react';
import { Avatar as MuiAvatar, AvatarProps } from '@mui/material';

export function Avatar(props: AvatarProps) {
return <MuiAvatar {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/avatargroup.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AvatarGroupProps, AvatarGroup as MuiAvatarGroup } from '@mui/material';
import React from 'react';
import { AvatarGroup as MuiAvatarGroup, AvatarGroupProps } from '@mui/material';

export function AvatarGroup(props: AvatarGroupProps) {
return <MuiAvatarGroup {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/backdrop.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BackdropProps, Backdrop as MuiBackdrop } from '@mui/material';
import React from 'react';
import { Backdrop as MuiBackdrop, BackdropProps } from '@mui/material';

export function Backdrop(props: BackdropProps) {
return <MuiBackdrop {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/badge.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BadgeProps, Badge as MuiBadge } from '@mui/material';
import React from 'react';
import { Badge as MuiBadge, BadgeProps } from '@mui/material';

export function Badge(props: BadgeProps) {
return <MuiBadge {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/box.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BoxProps, Box as MuiBox } from '@mui/material';
import React from 'react';
import { Box as MuiBox, BoxProps } from '@mui/material';

export function Box(props: BoxProps) {
return <MuiBox {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/button.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ButtonProps, Button as MuiButton } from '@mui/material';
import * as React from 'react';
import { Button as MuiButton, ButtonProps } from '@mui/material';

export const BaseButton = (props: ButtonProps) => {
return <MuiButton {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/buttongroup.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ButtonGroupProps, ButtonGroup as MuiButtonGroup } from '@mui/material';
import React from 'react';
import { ButtonGroup as MuiButtonGroup, ButtonGroupProps } from '@mui/material';

export const ButtonGroup = (props: ButtonGroupProps) => {
return <MuiButtonGroup {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/card.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CardProps, Card as MuiCard } from '@mui/material';
import React from 'react';
import { Card as MuiCard, CardProps } from '@mui/material';

export const Card = (props: CardProps) => {
return <MuiCard {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/checkbox.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CheckboxProps, Checkbox as MuiCheckbox } from '@mui/material';
import React from 'react';
import { Checkbox as MuiCheckbox, CheckboxProps } from '@mui/material';

export function Checkbox(props: CheckboxProps) {
return <MuiCheckbox {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/chip.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ChipProps, Chip as MuiChip } from '@mui/material';
import React from 'react';
import { Chip as MuiChip, ChipProps } from '@mui/material';

export function Chip(props: ChipProps) {
return <MuiChip {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/dialog.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DialogProps, Dialog as MuiDialog } from '@mui/material';
import React from 'react';
import { Dialog as MuiDialog, DialogProps } from '@mui/material';

export function Dialog(props: DialogProps) {
return <MuiDialog {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/dialogactions.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DialogActionsProps, DialogActions as MuiDialogActions } from '@mui/material';
import React from 'react';
import { DialogActions as MuiDialogActions, DialogActionsProps } from '@mui/material';

export function DialogActions(props: DialogActionsProps) {
return <MuiDialogActions {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/dialogcontent.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DialogContentProps, DialogContent as MuiDialogContent } from '@mui/material';
import React from 'react';
import { DialogContent as MuiDialogContent, DialogContentProps } from '@mui/material';

export function DialogContent(props: DialogContentProps) {
return <MuiDialogContent {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/dialogcontenttext.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DialogContentTextProps, DialogContentText as MuiDialogContentText } from '@mui/material';
import React from 'react';
import { DialogContentText as MuiDialogContentText, DialogContentTextProps } from '@mui/material';

export function DialogContentText(props: DialogContentTextProps) {
return <MuiDialogContentText {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/dialogtitle.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DialogTitleProps, DialogTitle as MuiDialogTitle } from '@mui/material';
import React from 'react';
import { DialogTitle as MuiDialogTitle, DialogTitleProps } from '@mui/material';

export function DialogTitle(props: DialogTitleProps) {
return <MuiDialogTitle {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/divider.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DividerProps, Divider as MuiDivider } from '@mui/material';
import React from 'react';
import { Divider as MuiDivider, DividerProps } from '@mui/material';

export function Divider(props: DividerProps) {
return <MuiDivider {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/drawer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DrawerProps, Drawer as MuiDrawer } from '@mui/material';
import React from 'react';
import { Drawer as MuiDrawer, DrawerProps } from '@mui/material';

export function Drawer(props: DrawerProps) {
return <MuiDrawer {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/iconbutton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IconButton as MuiIconButton, IconButtonProps } from '@mui/material';
import { IconButtonProps, IconButton as MuiIconButton } from '@mui/material';
import React from 'react';

export function IconButton(props: IconButtonProps) {
Expand Down
Loading

0 comments on commit 4eba416

Please sign in to comment.