Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ COPY --link . ./
# Development image
FROM base as dev

CMD ["sh", "-c", "yarn storybook --no-open"]
CMD ["sh", "-c", "yarn storybook --no-open --host 0.0.0.0"]

FROM base as ci

Expand Down
5 changes: 4 additions & 1 deletion api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"php": ">=8.2",
"ext-ctype": "*",
"ext-iconv": "*",
"api-platform/core": "^4.0.6",
"api-platform/core": "^4.1.30",
"doctrine/doctrine-bundle": "^2.7",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^3.0",
Expand Down Expand Up @@ -46,6 +46,9 @@
"allow-plugins": {
"symfony/flex": true,
"symfony/runtime": true
},
"platform": {
"php": "8.2.0"
}
},
"autoload": {
Expand Down
2,048 changes: 1,160 additions & 888 deletions api/composer.lock

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions api/symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@
"src/ApiResource/.gitignore"
]
},
"doctrine/deprecations": {
"version": "1.1",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "1.0",
"ref": "fdd756167454623e21f1d769c5b814b243782a67"
}
},
"doctrine/doctrine-bundle": {
"version": "2.11",
"recipe": {
Expand Down
1 change: 1 addition & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ services:
ports:
- target: 3000
published: ${PWA_PORT:-3000}
host_ip: 127.0.0.1

###> doctrine/doctrine-bundle ###
database:
Expand Down
33 changes: 15 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"sideEffects": false,
"dependencies": {
"@api-platform/api-doc-parser": "^0.16.12",
"@marmelab/query-string": "^7.1.4",
"jsonld": "^8.3.3",
"lodash.isplainobject": "^4.0.6",
"react-admin": "^5.15.5"
Expand All @@ -27,16 +28,16 @@
"@babel/preset-env": "^7.23.3",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@storybook/addon-essentials": "^8.6.15",
"@storybook/addon-interactions": "^8.6.15",
"@storybook/addon-links": "^8.6.15",
"@storybook/addon-mdx-gfm": "^8.6.15",
"@storybook/addon-onboarding": "^8.6.15",
"@storybook/addon-essentials": "^8.6.19",
"@storybook/addon-interactions": "^8.6.19",
"@storybook/addon-links": "^8.6.19",
"@storybook/addon-mdx-gfm": "^8.6.19",
"@storybook/addon-onboarding": "^8.6.19",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/blocks": "^8.6.15",
"@storybook/react": "^8.6.15",
"@storybook/react-webpack5": "^8.6.15",
"@storybook/test": "^8.6.15",
"@storybook/blocks": "^8.6.19",
"@storybook/react": "^8.6.19",
"@storybook/react-webpack5": "^8.6.19",
"@storybook/test": "^8.6.19",
"@storybook/test-runner": "^0.17.0",
"@tanstack/react-query-devtools": "^5.80.6",
"@testing-library/jest-dom": "^6.1.0",
Expand All @@ -62,6 +63,7 @@
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-storybook": "^0.6.15",
"eslint-plugin-tree-shaking": "^1.10.0",
"http-server": "^14.1.1",
"jest": "^29.0.0",
"jest-environment-jsdom": "^29.0.0",
"jest-fetch-mock": "^3.0.3",
Expand All @@ -71,9 +73,8 @@
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-test-renderer": "^18.0.0",
"rimraf": "^5.0.0",
"serve": "^14.2.1",
"storybook": "^8.6.15",
"rimraf": "^6.1.4",
"storybook": "^8.6.19",
"ts-jest": "^29.0.0",
"ts-node": "^10.4.0",
"typescript": "^5.2.0"
Expand All @@ -92,12 +93,8 @@
"watch": "tsc --watch",
"storybook": "storybook dev -p 3000",
"storybook:build": "storybook build",
"storybook:serve": "serve storybook-static",
"storybook:serve": "http-server storybook-static",
"storybook:test": "test-storybook"
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
"resolutions": {
"react-router-dom": "^6",
"react-router": "^6"
}
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
2 changes: 1 addition & 1 deletion src/dataProvider/restDataProvider.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { stringify } from 'query-string';
import { stringify } from '@marmelab/query-string';
import { fetchUtils } from 'react-admin';
import type { DataProvider } from 'react-admin';
import { removeTrailingSlash } from '../removeTrailingSlash.js';
Expand Down
Loading
Loading