Skip to content

Commit

Permalink
Merge branch 'master' into feature/component-data-table
Browse files Browse the repository at this point in the history
  • Loading branch information
Imad A. Bakir committed Jan 14, 2025
2 parents 31ac8d7 + 5c27f50 commit 166de08
Show file tree
Hide file tree
Showing 74 changed files with 8,823 additions and 1,296 deletions.
1 change: 1 addition & 0 deletions .github/workflows/chromatic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
chromatic:
if: false # Temporarily disable until https://github.com/fortanix/baklava/issues/81 is resolved
name: Run Chromatic
runs-on: ubuntu-latest
steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ jobs:
#- run: npm run build --if-present
- run: npm run verify verify:source
- run: npm test
- run: cd tests/installation && npm ci && npm test
8 changes: 5 additions & 3 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ const preview = {
'Colors',
'Typography',
'Iconography',
'Change log',
],
'typography',
[
Expand Down Expand Up @@ -63,10 +62,13 @@ const preview = {
],
'overlays',
[
'ModalProvider',
'SpinnerModal',
'DialogModal',
'Tooltip',
'TooltipProvider',
'Dropdown',
'Modal',
'DropdownMenu',
'Toast',
],
'lists',
[
Expand Down
4 changes: 1 addition & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@

# Change Log

**v1.0.0**

* Initial release.
See [releases](https://github.com/fortanix/baklava/releases).
27 changes: 27 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,30 @@ To create a new release:
- Hit "Publish the release".

- Once the release has been created, a GitHub Actions workflow will automatically run to publish this release to npm.


**Script:**

```shell
VERSION=x.y.z
git co -b release/v${VERSION}
sed -i '' "s/version: '.*'/version: '${VERSION}'/" package.json.js
npm run install-project
git add package.json.js package.json package-lock.json
git ci -m "Release v${VERSION}"
git push -u origin HEAD
npm run automate github:create-release-pr
# Follow instructions from above command
```

## Publishing to npm

To publish to npm:

```shell
npm publish --scope=@fortanix --access=public --dry-run # --tag=beta
```

Set the --tag as appropriate: beta for beta releases, or remove the --tag if you want to publish a stable release. Remove the --dry-run once you’ve confirmed there are no issues.

**Note: you rarely need to do this manually. Instead, see the "Release workflow" above, which will trigger an npm publish automatically upon creation of a GitHub release.**
4 changes: 3 additions & 1 deletion app/lib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ export { Stepper } from '../src/components/navigations/Stepper/Stepper.tsx';
export { Tab, Tabs } from '../src/components/navigations/Tabs/Tabs.tsx';

// Overlays
export { ModalProvider } from '../src/components/overlays/ModalProvider/ModalProvider.tsx';
export { SpinnerModal } from '../src/components/overlays/SpinnerModal/SpinnerModal.tsx';
export { DialogModal } from '../src/components/overlays/DialogModal/DialogModal.tsx';
export { DropdownMenu } from '../src/components/overlays/DropdownMenu/DropdownMenu.tsx';
export { DropdownMenuProvider } from '../src/components/overlays/DropdownMenu/DropdownMenuProvider.tsx';
export { Modal } from '../src/components/overlays/Modal/Modal.tsx';
export { type ToastContent, ToastProvider, ToastMessage } from '../src/components/overlays/Toast/Toast.tsx';
export { Tooltip } from '../src/components/overlays/Tooltip/Tooltip.tsx';
export { TooltipProvider } from '../src/components/overlays/Tooltip/TooltipProvider.tsx';
Expand Down
6 changes: 4 additions & 2 deletions biome.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
"linter": {
"enabled": true,
"include": ["app/**/*", "src/**/*", "tests/**/*"],

"ignore": [
"src/components/tables/MultiSearch/MultiSearch.tsx" // Ignore for now (need to focus on type errors first)
],
"src/components/tables/MultiSearch/MultiSearch.tsx", // Ignore for now (need to focus on type errors first)
"tests/installation/**/*"
],
"rules": {
"recommended": true,
"complexity": {
Expand Down
Loading

0 comments on commit 166de08

Please sign in to comment.