Skip to content

Commit b5eff9b

Browse files
authored
Merge pull request #7 from acrool/main
deploy storybook
2 parents c89d9ed + 0c98049 commit b5eff9b

File tree

21 files changed

+1715
-4310
lines changed

21 files changed

+1715
-4310
lines changed

.github/workflows/deploy.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,13 @@ jobs:
3030
- name: Replace local links with actual versions
3131
run: |
3232
sed -i 's#"@acrool/react-toaster": "link:.."#"@acrool/react-toaster": "latest"#' package.json
33-
sed -i 's#"framer-motion": "link:../node_modules/framer-motion"#"framer-motion": "^11.11.8"#' package.json
34-
sed -i 's#"react": "link:../node_modules/react"#"react": "^18.0.0"#' package.json
35-
sed -i 's#"react-dom": "link:../node_modules/react-dom"#"react-dom": "^18.0.0"#' package.json
33+
sed -i 's#"react": "link:../node_modules/react"#"react": "^19.1.0"#' package.json
34+
sed -i 's#"react-dom": "link:../node_modules/react-dom"#"react-dom": "^19.1.0"#' package.json
3635
3736
- name: Install dependencies
3837
run: yarn install
3938

40-
- name: Build Storybook
41-
run: yarn build-storybook
42-
43-
- name: Install Wrangler
44-
run: yarn global add wrangler
45-
46-
- name: Deploy to Cloudflare Pages
47-
run: wrangler pages deploy ./storybook-static --project-name=acrool-react-img --branch main
39+
- name: Build Storybook & Deploy to Cloudflare Pages
40+
run: yarn pages:deploy
4841
env:
4942
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,26 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### [3.2.1](https://github.com/acrool/acrool-react-toaster/compare/v3.2.1-alpha.0...v3.2.1) (2025-04-24)
6+
7+
### [3.2.1-alpha.0](https://github.com/acrool/acrool-react-toaster/compare/v3.2.0...v3.2.1-alpha.0) (2025-04-24)
8+
9+
## [3.2.0](https://github.com/acrool/acrool-react-toaster/compare/v3.1.11...v3.2.0) (2025-04-21)
10+
11+
### [3.1.11](https://github.com/acrool/acrool-react-toaster/compare/v3.1.11-alpha.5...v3.1.11) (2025-02-15)
12+
13+
### [3.1.11-alpha.5](https://github.com/acrool/acrool-react-toaster/compare/v3.1.11-alpha.4...v3.1.11-alpha.5) (2025-02-15)
14+
15+
### [3.1.11-alpha.4](https://github.com/acrool/acrool-react-toaster/compare/v3.1.11-alpha.3...v3.1.11-alpha.4) (2025-02-06)
16+
17+
### [3.1.11-alpha.3](https://github.com/acrool/acrool-react-toaster/compare/v3.1.11-alpha.2...v3.1.11-alpha.3) (2024-11-29)
18+
19+
### [3.1.11-alpha.2](https://github.com/acrool/acrool-react-toaster/compare/v3.1.11-alpha.1...v3.1.11-alpha.2) (2024-11-27)
20+
21+
### [3.1.11-alpha.1](https://github.com/acrool/acrool-react-toaster/compare/v3.1.11-alpha.0...v3.1.11-alpha.1) (2024-11-27)
22+
23+
### [3.1.11-alpha.0](https://github.com/acrool/acrool-react-toaster/compare/v3.1.10...v3.1.11-alpha.0) (2024-11-27)
24+
525
### [3.1.10](https://github.com/acrool/acrool-react-toaster/compare/v3.1.10-alpha.0...v3.1.10) (2024-10-26)
626

727
### [3.1.10-alpha.0](https://github.com/acrool/acrool-react-toaster/compare/v3.1.9...v3.1.10-alpha.0) (2024-10-16)

README.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
</div>
2121

2222

23+
`^3.2.0 support react >=18.0.0 <20.0.0`
2324

2425

2526
## Features
@@ -34,16 +35,9 @@
3435
## Install
3536

3637
```bash
37-
yarn add framer-motion @acrool/react-toaster
38+
yarn add @acrool/react-toaster
3839
```
3940

40-
in your packages. (Make the version of styled-component you use match the version of styled-component used in acrool-react-gird)
41-
42-
```json
43-
"resolutions": {
44-
"framer-motion": "^11.x"
45-
}
46-
```
4741

4842
## Usage
4943

@@ -55,7 +49,9 @@ import "@acrool/react-toaster/dist/index.css";
5549
add in your App.tsx
5650

5751
```tsx
58-
import {ToasterPortal} from "@acrool/react-toaster";
52+
import {ToasterPortal, themeMap} from "@acrool/react-toaster";
53+
import CustomCheckIcon from '../../../assets/custom_check.svg?react';
54+
5955

6056
const App = () => {
6157
return (
@@ -68,6 +64,13 @@ const App = () => {
6864
vertical: 'top',
6965
horizontal: 'center',
7066
}}
67+
themeMap={{
68+
...themeMap,
69+
success: {
70+
...themeMap.success,
71+
icon: CustomCheckIcon,
72+
}
73+
}}
7174
/>
7275
</div>
7376
);

example/package.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010
"pages:deploy": "NODE_VERSION=18 yarn build-storybook && wrangler pages deploy ./storybook-static --project-name=acrool-react-toaster --branch main"
1111
},
1212
"resolutions": {
13-
"styled-components": "5.3.9",
14-
"framer-motion": "11.11.8"
13+
"styled-components": "6.1.17"
1514
},
1615
"dependencies": {
17-
"@acrool/js-utils": "^3.2.12",
18-
"@acrool/react-grid": "^5.2.5",
16+
"@acrool/js-utils": "^3.2.15",
17+
"@acrool/react-grid": "^6.0.2",
1918
"@acrool/react-toaster": "link:..",
2019
"@chromatic-com/storybook": "^1.5.0",
2120
"@emotion/is-prop-valid": "^1.2.2",
@@ -28,20 +27,18 @@
2827
"@storybook/react-vite": "^8.1.10",
2928
"@storybook/test": "^8.1.10",
3029
"@swc/core": "^1.3.68",
31-
"@swc/plugin-styled-components": "^1.5.68",
30+
"@swc/plugin-styled-components": "6.8.2",
3231
"@types/dom-to-image": "^2.6.7",
33-
"@types/react": "^18.0.28",
34-
"@types/react-dom": "^18.0.11",
35-
"@types/styled-components": "^5.1.26",
32+
"@types/react": "^19.1.2",
33+
"@types/react-dom": "^19.1.2",
3634
"@vitejs/plugin-react-swc": "^3.0.0",
3735
"dom-to-image": "^2.6.0",
38-
"framer-motion": "link:../node_modules/framer-motion",
3936
"react": "link:../node_modules/react",
4037
"react-dom": "link:../node_modules/react-dom",
4138
"sass": "^1.77.1",
4239
"storybook": "^8.1.10",
4340
"storybook-dark-mode": "^4.0.2",
44-
"styled-components": "5.3.9",
41+
"styled-components": "6.1.17",
4542
"typescript": "^5.2.2",
4643
"vite": "^5.2.0",
4744
"vite-plugin-svgr": "^4.2.0",

example/src/assets/custom_check.svg

Lines changed: 10 additions & 0 deletions
Loading

example/src/components/data.tsx

Lines changed: 0 additions & 171 deletions
This file was deleted.

0 commit comments

Comments
 (0)