Skip to content

Commit 2a9e43c

Browse files
PagebakersPagebakers
committed
Merge branch 'main' into v3
2 parents c51e12c + 5897727 commit 2a9e43c

File tree

339 files changed

+12847
-10111
lines changed

Some content is hidden

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

339 files changed

+12847
-10111
lines changed

‎.github/FUNDING.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github: saas-js
2-
custom: ["https://appulse.gumroad.com/l/saas-ui-pro-pre-order"]
2+
custom: ['https://saas-ui.lemonsqueezy.com/']

‎.github/workflows/pkg-pr.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Package PR
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v4
12+
13+
- run: corepack enable
14+
- uses: actions/setup-node@v4
15+
with:
16+
node-version: 20
17+
18+
- name: Install dependencies
19+
run: YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn
20+
21+
- name: Build
22+
run: yarn build:packages
23+
24+
- run: yarn dlx pkg-pr-new publish './packages/saas-ui-auth'

‎.husky/pre-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
yarn lint:staged
4+
# yarn lint:staged

‎.hygen.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ const path = require('path')
33

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

1313
const packageName = (org, name, separator = '/') => {
@@ -76,7 +76,7 @@ module.exports = {
7676
return path.join(config.appsDir, app)
7777
},
7878
/**
79-
* Returns the blocks directory, eg: packages/pro/saas-ui/blocks/src/
79+
* Returns the blocks directory, eg: packages/pro/packages/blocks/src/
8080
* @param {string} category
8181
* @param {string} name
8282
* @returns

‎.vscode/settings.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2-
"typescript.tsdk": "node_modules/typescript/lib"
2+
"search.exclude": {
3+
"packages/pro/**": true
4+
},
5+
"typescript.tsdk": "node_modules/typescript/lib",
6+
"typescript.preferences.importModuleSpecifierEnding": "minimal"
37
}

‎apps/palette/CHANGELOG.md

+121
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,126 @@
11
# palette
22

3+
## 1.5.12
4+
5+
### Patch Changes
6+
7+
- @saas-ui/react@2.11.4
8+
- @saas-ui/theme-glass@0.7.1
9+
10+
## 1.5.11
11+
12+
### Patch Changes
13+
14+
- @saas-ui/react@2.11.3
15+
- @saas-ui/theme-glass@0.7.1
16+
17+
## 1.5.10
18+
19+
### Patch Changes
20+
21+
- Updated dependencies [862937a]
22+
- @saas-ui/theme-glass@0.7.1
23+
- @saas-ui/react@2.11.2
24+
25+
## 1.5.9
26+
27+
### Patch Changes
28+
29+
- @saas-ui/react@2.11.1
30+
- @saas-ui/theme-glass@0.7.0
31+
32+
## 1.5.8
33+
34+
### Patch Changes
35+
36+
- Updated dependencies [803ede7]
37+
- @saas-ui/theme-glass@0.7.0
38+
- @saas-ui/palette@2.2.0
39+
- @saas-ui/react@2.11.0
40+
41+
## 1.5.7
42+
43+
### Patch Changes
44+
45+
- Updated dependencies [c9daf50]
46+
- @saas-ui/react@2.10.5
47+
- @saas-ui/theme-glass@0.6.1
48+
49+
## 1.5.6
50+
51+
### Patch Changes
52+
53+
- Updated dependencies [a863a5e]
54+
- @saas-ui/react@2.10.4
55+
- @saas-ui/theme-glass@0.6.1
56+
57+
## 1.5.5
58+
59+
### Patch Changes
60+
61+
- @saas-ui/react@2.10.3
62+
- @saas-ui/theme-glass@0.6.1
63+
64+
## 1.5.4
65+
66+
### Patch Changes
67+
68+
- Updated dependencies [7669720]
69+
- @saas-ui/react@2.10.2
70+
- @saas-ui/theme-glass@0.6.1
71+
72+
## 1.5.3
73+
74+
### Patch Changes
75+
76+
- Updated dependencies [5e24ec4]
77+
- @saas-ui/react@2.10.1
78+
- @saas-ui/theme-glass@0.6.1
79+
80+
## 1.5.2
81+
82+
### Patch Changes
83+
84+
- Updated dependencies [fc799df]
85+
- @saas-ui/react@2.10.0
86+
- @saas-ui/theme-glass@0.6.1
87+
88+
## 1.5.1
89+
90+
### Patch Changes
91+
92+
- f0ee3db: Updated to Chakra 2.10
93+
- Updated dependencies [f0ee3db]
94+
- @saas-ui/theme-glass@0.6.1
95+
- @saas-ui/react@2.9.1
96+
97+
## 1.5.0
98+
99+
### Minor Changes
100+
101+
- 2ac496a: Upgraded to Chakra UI v2.9.3
102+
103+
### Patch Changes
104+
105+
- Updated dependencies [2ac496a]
106+
- @saas-ui/theme-glass@0.6.0
107+
- @saas-ui/react@2.9.0
108+
109+
## 1.4.43
110+
111+
### Patch Changes
112+
113+
- Updated dependencies [5e000e0]
114+
- @saas-ui/react@2.8.11
115+
- @saas-ui/theme-glass@0.5.5
116+
117+
## 1.4.42
118+
119+
### Patch Changes
120+
121+
- @saas-ui/react@2.8.10
122+
- @saas-ui/theme-glass@0.5.5
123+
3124
## 1.4.41
4125

5126
### Patch Changes

‎apps/palette/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "palette-docs",
3-
"version": "1.4.41",
3+
"version": "1.5.12",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",

‎apps/palette/src/client/components/copy-button.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import {
44
Tooltip,
55
useClipboard,
66
} from '@chakra-ui/react'
7-
import React from 'react'
87

9-
import { CopyIcon, CheckIcon } from '@chakra-ui/icons'
8+
import React from 'react'
9+
import { FiCheck, FiCopy } from 'react-icons/fi'
1010

1111
interface CopyButtonProps extends ButtonProps {
1212
code: string
@@ -34,7 +34,7 @@ function CopyButton({ code, ...props }: CopyButtonProps) {
3434
aria-label="copy"
3535
onClick={onCopy}
3636
>
37-
{hasCopied ? <CheckIcon /> : <CopyIcon />}
37+
{hasCopied ? <FiCheck /> : <FiCopy />}
3838
</IconButton>
3939
</Tooltip>
4040
)

‎apps/website/CHANGELOG.md

+145
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,150 @@
11
# website
22

3+
## 2.4.14
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [091fd38]
8+
- @saas-ui/forms@2.11.0
9+
- @saas-ui/file-upload@0.6.1
10+
- @saas-ui/react@2.11.4
11+
12+
## 2.4.13
13+
14+
### Patch Changes
15+
16+
- Updated dependencies [eb53116]
17+
- @saas-ui/forms@2.10.0
18+
- @saas-ui/file-upload@0.6.1
19+
- @saas-ui/react@2.11.3
20+
21+
## 2.4.12
22+
23+
### Patch Changes
24+
25+
- Updated dependencies [2e9cbf1]
26+
- @saas-ui/command-bar@0.9.1
27+
28+
## 2.4.11
29+
30+
### Patch Changes
31+
32+
- Updated dependencies [9550dd4]
33+
- @saas-ui/command-bar@0.9.0
34+
35+
## 2.4.10
36+
37+
### Patch Changes
38+
39+
- Updated dependencies [862937a]
40+
- @saas-ui/command-bar@0.8.1
41+
- @saas-ui/file-upload@0.6.1
42+
- @saas-ui/forms@2.9.1
43+
- @saas-ui/react@2.11.2
44+
45+
## 2.4.9
46+
47+
### Patch Changes
48+
49+
- @saas-ui/react@2.11.1
50+
51+
## 2.4.8
52+
53+
### Patch Changes
54+
55+
- Updated dependencies [803ede7]
56+
- @saas-ui/command-bar@0.8.0
57+
- @saas-ui/file-upload@0.6.0
58+
- @saas-ui/palette@2.2.0
59+
- @saas-ui/forms@2.9.0
60+
- @saas-ui/react@2.11.0
61+
62+
## 2.4.7
63+
64+
### Patch Changes
65+
66+
- Updated dependencies [c9daf50]
67+
- @saas-ui/react@2.10.5
68+
- @saas-ui/forms@2.8.2
69+
- @saas-ui/file-upload@0.5.0
70+
71+
## 2.4.6
72+
73+
### Patch Changes
74+
75+
- Updated dependencies [a863a5e]
76+
- @saas-ui/react@2.10.4
77+
78+
## 2.4.5
79+
80+
### Patch Changes
81+
82+
- @saas-ui/react@2.10.3
83+
84+
## 2.4.4
85+
86+
### Patch Changes
87+
88+
- Updated dependencies [7669720]
89+
- @saas-ui/react@2.10.2
90+
91+
## 2.4.3
92+
93+
### Patch Changes
94+
95+
- Updated dependencies [5e24ec4]
96+
- @saas-ui/react@2.10.1
97+
- @saas-ui/forms@2.8.1
98+
- @saas-ui/file-upload@0.5.0
99+
100+
## 2.4.2
101+
102+
### Patch Changes
103+
104+
- Updated dependencies [fc799df]
105+
- @saas-ui/command-bar@0.7.0
106+
- @saas-ui/forms@2.8.0
107+
- @saas-ui/react@2.10.0
108+
109+
## 2.4.1
110+
111+
### Patch Changes
112+
113+
- f0ee3db: Updated to Chakra 2.10
114+
- Updated dependencies [f0ee3db]
115+
- @saas-ui/command-bar@0.6.1
116+
- @saas-ui/forms@2.7.1
117+
- @saas-ui/react@2.9.1
118+
119+
## 2.4.0
120+
121+
### Minor Changes
122+
123+
- 2ac496a: Upgraded to Chakra UI v2.9.3
124+
125+
### Patch Changes
126+
127+
- Updated dependencies [2ac496a]
128+
- @saas-ui/command-bar@0.6.0
129+
- @saas-ui/forms@2.7.0
130+
- @saas-ui/react@2.9.0
131+
132+
## 2.3.41
133+
134+
### Patch Changes
135+
136+
- Updated dependencies [5e000e0]
137+
- @saas-ui/react@2.8.11
138+
- @saas-ui/forms@2.6.11
139+
140+
## 2.3.40
141+
142+
### Patch Changes
143+
144+
- Updated dependencies [fc2203a]
145+
- @saas-ui/forms@2.6.10
146+
- @saas-ui/react@2.8.10
147+
3148
## 2.3.39
4149

5150
### Patch Changes

‎apps/website/contentlayer.config.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,10 @@ const contentLayerConfig = makeSource({
118118
contentDirPath: 'src/pages',
119119

120120
documentTypes: [Blog, Doc, Changelog],
121+
121122
mdx: {
122-
rehypePlugins: [rehypeMdxCodeMeta],
123-
remarkPlugins: [rehypeSlug, remarkGfm, remarkEmoji],
123+
rehypePlugins: [rehypeSlug, rehypeMdxCodeMeta],
124+
remarkPlugins: [remarkGfm, remarkEmoji],
124125
},
125126
})
126127

‎apps/website/next-env.d.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3+
/// <reference types="next/navigation-types/compat/navigation" />
34

45
// NOTE: This file should not be edited
5-
// see https://nextjs.org/docs/basic-features/typescript for more information.
6+
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

0 commit comments

Comments
 (0)