Skip to content

Commit

Permalink
Merge branch 'sistent-site-draft' of https://github.com/coder12git/si…
Browse files Browse the repository at this point in the history
…stent into sistent-site-draft
  • Loading branch information
coder12git committed Nov 7, 2023
2 parents e09d7c0 + 39a38f1 commit bb15cc8
Show file tree
Hide file tree
Showing 55 changed files with 2,007 additions and 531 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/build-and-deploy-site.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Build and Deploy Site
on:
push:
branches: [ master ]
paths:
- '!**'
- 'site/**'
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@master
with:
fetch-depth: 1

- name: Install and Build 🔧
run: |
cd site
npm install
npm run build
- name: Deploy 🚀
uses: JamesIves/[email protected]
with:
branch: site # The branch the action should deploy to.
folder: public # The folder the action should deploy.
clean: true
34 changes: 34 additions & 0 deletions .github/workflows/build-and-preview-site.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Build and Preview Site
on:
pull_request:
branches: [ master ]
types: [opened, synchronize, reopened]
paths:
- '!**'
- 'site/**'

jobs:
site-preview:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@master
with:
persist-credentials: false
fetch-depth: 1

- name: Install and Build 🔧
run: |
cd site
npm install
npm run noIndex
- name: Zip Site
run: bash site/script.sh
- name: Upload files
uses: actions/upload-artifact@master
with:
name: public-dir
path: ./public-dir.zip
retention-days: 1
- name: Triger Inner workflow
run: echo "trigering inner workflow"
46 changes: 46 additions & 0 deletions .github/workflows/preview-site.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Deploy Preview
on:
workflow_run:
workflows:
- Build and Preview Site
types:
- completed

jobs:
deploy-preview:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/[email protected]

- name: Download Site dir
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{ secrets.GH_ACCESS_TOKEN }}
workflow: build-and-preview-site.yml
run_id: ${{ github.event.workflow_run.id }}
name: public-dir

- name: Unzip Site
run: |
rm -rf ./site/public
unzip public-dir.zip
rm -f public-dir.zip
- name: Deploy to Netlify
id: netlify
uses: nwtgck/[email protected]
with:
publish-dir: 'site/public'
production-deploy: false
github-token: ${{ secrets.GH_ACCESS_TOKEN }}
enable-commit-comment: false
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

- name: Comment Deploy URL
uses: ./.github/actions/comment-preview-on-pr
with:
token: ${{ secrets.GH_ACCESS_TOKEN }}
deploy_url: "${{ steps.netlify.outputs.deploy-url }}"
18 changes: 8 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,16 @@ jobs:
- name: Publish to npm
run: |
- run: npm publish --verbose
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor}}@users.noreply.github.com"
# git config user.name "${{ github.actor }}"
# git config user.email "${{ github.actor}}@users.noreply.github.com"
# if [ ${{ github.base_ref }} = development ]; then
# HUSKY=0 npx lerna version --no-private --conventional-commits --conventional-prerelease --preid beta --yes
# else
# HUSKY=0 npx lerna version --no-private --conventional-commits --yes
# fi
if [ ${{ github.base_ref }} = development ]; then
HUSKY=0 npx lerna version --no-private --conventional-commits --conventional-prerelease --preid beta --yes
else
HUSKY=0 npx lerna version --no-private --conventional-commits --yes
fi
# HUSKY=0 npx lerna publish from-git --yes
HUSKY=0 npx lerna publish from-git --no-private --yes
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@ dist/**
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
!.yarn/versions

packages/design-system/dist/**
lerna-debug.log
pub.sh
1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
design.layer5.io
13 changes: 13 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,19 @@ Please contribute! Layer5 documentation uses Jekyll and GitHub Pages to host doc
`git push origin <my-changes>`
1. Open a pull request (in your web browser) against the repo.

### Commit Message Format

We follow the [Conventional Commits](https://www.conventionalcommits.org/) standard for our commit messages. Each commit should have a type, an optional scope, and a descriptive message. Examples of commit types include "feat," "fix," "docs," and more.

Here's a basic commit message format:

For example:

- `feat(auth): add user authentication feature`
- `fix(ui): resolve styling issue in the header`

Please ensure that your commits adhere to this format to maintain a clear and organized commit history.

#### Tests

Users can now test their code on their local machine against the CI checks implemented using `make run-tests`.
Expand Down
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
setup:
.PHONY: setup build format-check format-fix

## Install Sistent dependencies your local machine.
package-setup:
yarn install

build: install
## Build Sistent components and packages on your local machine.
package-build: setup
yarn run build-all

format-check:
package-format-check:
yarn run format:check

format-fix:
package-format-fix:
yarn run format:write
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sistent Design System
# Layer5 Design System Sistent

The Sistent Design System from Layer5 provides the open source building blocks to design and implement consistent, accessible, and delightful product experiences.

Expand Down
10 changes: 5 additions & 5 deletions apps/design-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@
},
"dependencies": {
"@layer5/sistent-components": "workspace:^",
"@layer5/sistent-svg": "workspace:^",
"@mui/material": "^5.14.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"@layer5/sistent-svg": "workspace:^"
},
"devDependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/material": "^5.14.16",
"@storybook/addon-essentials": "^7.4.3",
"@storybook/addon-interactions": "^7.4.3",
"@storybook/addon-links": "^7.4.3",
Expand All @@ -42,8 +40,10 @@
"eslint-plugin-storybook": "^0.6.13",
"msw": "^1.3.0",
"msw-storybook-addon": "^1.8.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"storybook": "^7.4.3",
"typescript": "^5.0.2",
"vite": "^4.4.5"
"vite": "^4.5.0"
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"lint-staged": "^14.0.1",
"prettier": "^3.0.3",
"prettier-plugin-organize-imports": "^3.2.3",
"tsconfig": "workspace:^",
"typescript": "^5.2.2"
},
"packageManager": "[email protected]",
Expand Down
72 changes: 72 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,78 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.8.1-beta.6](https://github.com/layer5io/sistent/compare/@layer5/[email protected]...@layer5/[email protected]) (2023-11-02)

**Note:** Version bump only for package @layer5/sistent-components

## [0.8.1-beta.5](https://github.com/layer5io/sistent/compare/@layer5/[email protected]...@layer5/[email protected]) (2023-11-02)

### Bug Fixes

- hardcode svg version ([#214](https://github.com/layer5io/sistent/issues/214)) ([9ea5966](https://github.com/layer5io/sistent/commit/9ea59667f9eaa50c8df846eb2477166633d0b0fb))

## [0.8.1-beta.4](https://github.com/layer5io/sistent/compare/@layer5/[email protected]...@layer5/[email protected]) (2023-11-02)

### Bug Fixes

- **components:** move svg package to dep ([#213](https://github.com/layer5io/sistent/issues/213)) ([ecacb63](https://github.com/layer5io/sistent/commit/ecacb63bb65af29e650629bf0cb84f472ae6866d))

## [0.8.1-beta.3](https://github.com/layer5io/sistent/compare/@layer5/[email protected]...@layer5/[email protected]) (2023-11-02)

### Bug Fixes

- **components:** support react 17 and 18 ([#211](https://github.com/layer5io/sistent/issues/211)) ([db071a1](https://github.com/layer5io/sistent/commit/db071a127d053e6da1467ef4c19f3efeb122e6a3))

## [0.8.1-beta.2](https://github.com/layer5io/sistent/compare/@layer5/[email protected]...@layer5/[email protected]) (2023-11-02)

### Bug Fixes

- export mui datatables ([#209](https://github.com/layer5io/sistent/issues/209)) ([0ee51b2](https://github.com/layer5io/sistent/commit/0ee51b21fbd5a99eb923910a7fa337b1bb3129e5))

## [0.8.1-beta.1](https://github.com/layer5io/sistent/compare/@layer5/[email protected]...@layer5/[email protected]) (2023-11-02)

### Bug Fixes

- **components:** hardcode svg package version ([#207](https://github.com/layer5io/sistent/issues/207)) ([11bf98b](https://github.com/layer5io/sistent/commit/11bf98bb135a1378545ee5617bfbebfa81ffcd93))

## [0.8.1-beta.0](https://github.com/layer5io/sistent/compare/@layer5/[email protected]...@layer5/[email protected]) (2023-11-02)

### Bug Fixes

- **components:** refactored vite config in components ([#204](https://github.com/layer5io/sistent/issues/204)) ([ee88dae](https://github.com/layer5io/sistent/commit/ee88dae5c6c897b6d47570f0ca44d3c2e4542293))
- **svg:** redo svg pkg vite config ([#202](https://github.com/layer5io/sistent/issues/202)) ([d3ac6bb](https://github.com/layer5io/sistent/commit/d3ac6bb4904b57b4b539f1335f74b65ffef3555a))

# [0.8.0](https://github.com/layer5io/sistent/compare/@layer5/[email protected]...@layer5/[email protected]) (2023-10-31)

### Bug Fixes

- **components:** export toolbar ([#186](https://github.com/layer5io/sistent/issues/186)) ([74c8330](https://github.com/layer5io/sistent/commit/74c83301fc9a40d7a0c36a076fb8a91c7e6ad2cc))
- correct sx properties for select and popper ([dbd37ee](https://github.com/layer5io/sistent/commit/dbd37ee4a41905f26979022cb6b21e454e2f294f))

### Features

- **customcolumn:** add column visibility ([11cd979](https://github.com/layer5io/sistent/commit/11cd9794f8de9ad5fa1a3075074cf22cc1865fbf))
- **filter:** add custom filter ([0c02847](https://github.com/layer5io/sistent/commit/0c0284794a9f46e1a45efe2a034e7201244d1505))
- incorporate changes to ErrorBoundary ([fcbbe77](https://github.com/layer5io/sistent/commit/fcbbe77e906e31720611e0e7dfcb1fe99bcbcb7f))
- **search-bar:** add custom search bar component ([088e92c](https://github.com/layer5io/sistent/commit/088e92c79eaf84da04de876dada98d198ad55f99))
- **search-bar:** fix issues ([8c0c50b](https://github.com/layer5io/sistent/commit/8c0c50bec00a4da818e8521296d17a9b0e32ddb4))
- **tooltip:** conditional tooltip ([9db1729](https://github.com/layer5io/sistent/commit/9db172934bb2437b150f8dffaca6311643d95be2))

# [0.7.0](https://github.com/layer5io/sistent/compare/@layer5/[email protected]...@layer5/[email protected]) (2023-10-30)

### Bug Fixes

- correct sx properties for select and popper ([dbd37ee](https://github.com/layer5io/sistent/commit/dbd37ee4a41905f26979022cb6b21e454e2f294f))

### Features

- **customcolumn:** add column visibility ([11cd979](https://github.com/layer5io/sistent/commit/11cd9794f8de9ad5fa1a3075074cf22cc1865fbf))
- **filter:** add custom filter ([0c02847](https://github.com/layer5io/sistent/commit/0c0284794a9f46e1a45efe2a034e7201244d1505))
- incorporate changes to ErrorBoundary ([fcbbe77](https://github.com/layer5io/sistent/commit/fcbbe77e906e31720611e0e7dfcb1fe99bcbcb7f))
- **search-bar:** add custom search bar component ([088e92c](https://github.com/layer5io/sistent/commit/088e92c79eaf84da04de876dada98d198ad55f99))
- **search-bar:** fix issues ([8c0c50b](https://github.com/layer5io/sistent/commit/8c0c50bec00a4da818e8521296d17a9b0e32ddb4))
- **tooltip:** conditional tooltip ([9db1729](https://github.com/layer5io/sistent/commit/9db172934bb2437b150f8dffaca6311643d95be2))

# 0.6.0 (2023-10-16)

### Bug Fixes
Expand Down
Loading

0 comments on commit bb15cc8

Please sign in to comment.