Skip to content

Commit

Permalink
Merge branch 'main' into website
Browse files Browse the repository at this point in the history
  • Loading branch information
Pagebakers committed Nov 11, 2024
2 parents 9002236 + ca30827 commit decea62
Show file tree
Hide file tree
Showing 53 changed files with 2,912 additions and 1,866 deletions.
6 changes: 3 additions & 3 deletions .hygen.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ const path = require('path')

// Todo read this from the main package.json or git?
const config = {
author: 'Eelco Wiersma <eelco@appulse.nl>',
author: 'Eelco Wiersma <eelco@saas-ui.dev>',
org: 'saas-ui',
packagesDir: 'packages',
appsDir: 'apps',
blocksDir: 'packages/pro/saas-ui/blocks/src',
blocksDir: 'packages/pro/packages/blocks/src',
}

const packageName = (org, name, separator = '/') => {
Expand Down Expand Up @@ -76,7 +76,7 @@ module.exports = {
return path.join(config.appsDir, app)
},
/**
* Returns the blocks directory, eg: packages/pro/saas-ui/blocks/src/
* Returns the blocks directory, eg: packages/pro/packages/blocks/src/
* @param {string} category
* @param {string} name
* @returns
Expand Down
8 changes: 8 additions & 0 deletions apps/palette/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# palette

## 1.5.10

### Patch Changes

- Updated dependencies [862937a]
- @saas-ui/theme-glass@0.7.1
- @saas-ui/react@2.11.2

## 1.5.9

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions apps/palette/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "palette-docs",
"version": "1.5.9",
"version": "1.5.10",
"private": true,
"scripts": {
"dev": "next dev",
Expand All @@ -11,7 +11,7 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@chakra-ui/react": "^2.10.1",
"@chakra-ui/react": "^2.10.4",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@fontsource/inter": "^5.1.0",
Expand All @@ -23,7 +23,7 @@
"@types/lodash.debounce": "^4.0.9",
"framer-motion": "^11.9.0",
"lodash.debounce": "^4.0.8",
"next": "^14.2.14",
"next": "^14.2.17",
"next-seo": "^6.6.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
10 changes: 10 additions & 0 deletions apps/website/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# website

## 2.4.10

### Patch Changes

- Updated dependencies [862937a]
- @saas-ui/command-bar@0.8.1
- @saas-ui/file-upload@0.6.1
- @saas-ui/forms@2.9.1
- @saas-ui/react@2.11.2

## 2.4.9

### Patch Changes
Expand Down
15 changes: 8 additions & 7 deletions apps/website/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "website",
"version": "2.4.9",
"version": "2.4.10",
"private": true,
"author": "Eelco Wiersma <[email protected]>",
"scripts": {
Expand All @@ -17,10 +17,10 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@ark-ui/react": "^4.1.0",
"@chakra-ui/next-js": "^2.4.1",
"@chakra-ui/props-docs": "^2.4.1",
"@chakra-ui/react": "^2.10.1",
"@ark-ui/react": "^4.3.0",
"@chakra-ui/next-js": "^2.4.3",
"@chakra-ui/props-docs": "^2.4.3",
"@chakra-ui/react": "^2.10.4",
"@chakra-ui/react-env": "^3.1.0",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
Expand All @@ -34,6 +34,7 @@
"@next/bundle-analyzer": "^14.2.14",
"@octokit/rest": "^21.0.2",
"@radix-ui/react-navigation-menu": "^1.2.1",
"@saas-ui-pro/react": "workspace:*",
"@saas-ui/command-bar": "workspace:^",
"@saas-ui/file-upload": "workspace:*",
"@saas-ui/forms": "workspace:*",
Expand All @@ -51,8 +52,8 @@
"framer-motion": "^11.9.0",
"github-slugger": "^2.0.0",
"match-sorter": "^6.3.4",
"next": "14.2.12",
"next-contentlayer2": "^0.5.1",
"next": "14.2.17",
"next-contentlayer2": "^0.5.3",
"next-mdx-remote": "^4.4.1",
"next-seo": "^6.6.0",
"prism-react-renderer": "^1.3.5",
Expand Down
4 changes: 2 additions & 2 deletions apps/website/public/blog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

<item>
<guid>https://saas-ui.dev/blog/building-a-multi-tenant-b2b-saas-with-vite-tanstack-router</guid>
<title>Building a multi-tenant B2B SaaS with Vite and Tanstack Router & Query - Part 1: The boilerplate</title>
<title>Building a multi-tenant B2B SaaS with Vite, Tanstack React Router and Query - Part 1: The boilerplate</title>
<link>https://saas-ui.dev/blog/building-a-multi-tenant-b2b-saas-with-vite-tanstack-router</link>
<description>In this article, we'll start building a multi-tenant B2B SaaS using Vite, Tanstack Router & Query, Chakra UI and Saas UI.</description>
<description>In this article, we'll start building a multi-tenant B2B SaaS using Vite, Tanstack React Router, React Query, Chakra UI and Saas UI.</description>
<pubDate>Fri, 23 Feb 2024 00:00:00 GMT</pubDate>
<author>[email protected] (Eelco Wiersma)</author>
<category>vite</category><category>tanstack router</category><category>react query</category><category>react</category><category>saas ui</category><category>chakra ui</category>
Expand Down
Loading

0 comments on commit decea62

Please sign in to comment.