Skip to content

Commit 88e93cb

Browse files
committed
Merge branch 'develop'
2 parents 71e65d1 + ded3dc5 commit 88e93cb

File tree

7 files changed

+162
-103
lines changed

7 files changed

+162
-103
lines changed

apps/demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@mui/lab": "^7.0.0-beta.14",
3535
"@mui/material": "^7.1.2",
3636
"@mui/x-date-pickers": "^7.29.4",
37-
"@ui-controls/progress": "~0.1.0",
37+
"@ui-controls/progress": "~0.2.0",
3838
"@ui-schema/dictionary": "~0.1.0-alpha.4",
3939
"@ui-schema/ds-material": "~0.5.0-alpha.3",
4040
"@ui-schema/kit-codemirror": "^1.0.0-alpha.3",
@@ -57,7 +57,7 @@
5757
"react-api-fetch": "~0.3.6",
5858
"react-dom": "^19.1",
5959
"react-i18next": "^15.5.3",
60-
"react-progress-state": "~0.3.5",
60+
"react-progress-state": "~0.4.0",
6161
"react-router": "^7.6.3",
6262
"react-router-dom": "^7.6.3",
6363
"react-use-snack": "~0.2.1",

apps/demo/src/components/ApiPing.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Box from '@mui/material/Box'
44
import { config } from '../config.js'
55
import { useAppApi } from '../lib/useAppApi.js'
66
import { ButtonProgress } from '@ui-controls/progress/ButtonProgress'
7-
import { ps, useProgress } from 'react-progress-state/useProgressNext'
7+
import { ps, useProgress } from 'react-progress-state/useProgress'
88
import { CustomCodeMirror } from './CustomCodeMirror.js'
99
import { json } from '@codemirror/lang-json'
1010

apps/demo/src/pages/PageComplex.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import React from 'react'
55
import { useTranslation } from 'react-i18next'
66
import Container from '@mui/material/Container'
77
import Grid from '@mui/material/Grid'
8-
import { ps, useProgress } from 'react-progress-state/useProgressNext'
8+
import { ps, useProgress } from 'react-progress-state/useProgress'
99
import { useAppApi } from '../lib/useAppApi.js'
1010
import { config } from '../config.js'
1111
import LinearProgress from '@mui/material/LinearProgress'

apps/sandbox/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@lezer/highlight": "^1.0.0",
3535
"@codemirror/state": "^6.0.0",
3636
"@codemirror/view": "^6.0.0",
37-
"@content-ui/input": "^0.3.1",
37+
"@content-ui/input": "^0.4.0",
3838
"@content-ui/md": "^0.0.15",
3939
"@content-ui/md-mui": "^0.2.1",
4040
"@content-ui/react": "^0.2.1",
@@ -44,7 +44,7 @@
4444
"@mui/icons-material": "^7.1.2",
4545
"@mui/lab": "^7.0.0-beta.14",
4646
"@mui/material": "^7.1.2",
47-
"@ui-controls/progress": "~0.1.0",
47+
"@ui-controls/progress": "~0.2.0",
4848
"@ui-schema/ds-material": "~0.5.0-alpha.1",
4949
"@ui-schema/kit-codemirror": "^1.0.0-alpha.2",
5050
"@ui-schema/material-code": "~0.5.0-alpha.3",
@@ -55,7 +55,7 @@
5555
"cross-env": "^7.0.3",
5656
"react": "^19.1",
5757
"react-dom": "^19.1",
58-
"react-progress-state": "~0.3.5",
58+
"react-progress-state": "~0.4.0",
5959
"react-router": "^7.6.3",
6060
"react-router-dom": "^7.6.3",
6161
"vfile": "^6.0.2",

package-lock.json

Lines changed: 93 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/input/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@content-ui/input",
3-
"version": "0.3.1",
3+
"version": "0.4.0",
44
"description": "",
55
"author": "Michael Becker <[email protected]> (https://bemit.codes)",
66
"license": "MIT",
@@ -22,8 +22,8 @@
2222
"@mui/icons-material": "^7.1",
2323
"@mui/material": "^7.1",
2424
"@ui-schema/kit-codemirror": "^1.0.0-alpha.2",
25-
"react-progress-state": "~0.3.3",
26-
"@ui-controls/progress": "~0.1.0",
25+
"react-progress-state": "~0.4.0",
26+
"@ui-controls/progress": "~0.2.0",
2727
"@content-ui/react": "~0.2.1",
2828
"@content-ui/md-mui": "~0.2.1",
2929
"react": "^19",
@@ -34,8 +34,8 @@
3434
"@mui/icons-material": "^5.10 || ^6.1 || ^7.1",
3535
"@mui/material": "^5.1 || ^6.1 || ^7.1",
3636
"@ui-schema/kit-codemirror": "^1.0.0-alpha.0",
37-
"react-progress-state": "~0.3.5",
38-
"@ui-controls/progress": "~0.1.0",
37+
"react-progress-state": "~0.4.0",
38+
"@ui-controls/progress": "~0.2.0",
3939
"@content-ui/react": "~0.2.1",
4040
"@content-ui/md-mui": "~0.2.1",
4141
"react": "^18 || ^19",

0 commit comments

Comments
 (0)