Skip to content

Commit 921bee9

Browse files
authored
Merge branch 'main' into feature/pictogrammes
Signed-off-by: Maxence Gama <72473014+Maxenceee@users.noreply.github.com>
2 parents 921ea28 + 5675965 commit 921bee9

File tree

219 files changed

+2035
-9648
lines changed

Some content is hidden

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

219 files changed

+2035
-9648
lines changed

package.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@codegouvfr/react-dsfr",
3-
"version": "1.23.14",
3+
"version": "1.24.1",
44
"description": "French State Design System React integration library",
55
"repository": {
66
"type": "git",
@@ -9,7 +9,6 @@
99
"scripts": {
1010
"prepare": "patch-package",
1111
"build": "ts-node -T scripts/build",
12-
"rebuild-picto": "ts-node -T scripts/picto-builder.ts src/picto/pictogrammes-svg src/picto",
1312
"_link": "ts-node -T scripts/link-in-integration-apps.ts",
1413
"link-external": "ts-node -T scripts/link-in-external-project.ts",
1514
"start-cra": "yarn build && yarn _link && ((tsc -w -p src) & (cd test/integration/cra && yarn start))",
@@ -76,11 +75,11 @@
7675
}
7776
},
7877
"devDependencies": {
78+
"@gouvfr/dsfr-chart": "^1.0.0",
7979
"@babel/core": "^7.20.2",
8080
"@emotion/react": "^11.10.4",
8181
"@emotion/styled": "^11.10.4",
8282
"@gouvfr/dsfr": "1.13.2",
83-
"@gouvfr/dsfr-chart": "^1.0.0",
8483
"@mui/icons-material": "^5.14.18",
8584
"@mui/material": "^5.14.18",
8685
"@storybook/addon-a11y": "^6.5.16",
@@ -95,7 +94,6 @@
9594
"@tanstack/react-virtual": "^3.0.0-beta.39",
9695
"@types/css": "^0.0.33",
9796
"@types/memoizee": "^0.4.8",
98-
"@types/mustache": "^4.2.6",
9997
"@types/node": "^18.7.18",
10098
"@types/react": "18.0.21",
10199
"@types/react-dom": "18.0.6",
@@ -112,22 +110,20 @@
112110
"husky": "^4.3.8",
113111
"lint-staged": "^11.0.0",
114112
"memoizee": "^0.4.15",
115-
"mustache": "^4.2.0",
116113
"next": "13.5.1",
117114
"parse-numeric-range": "^1.3.0",
118-
"patch-package": "^8.0.0",
119115
"powerhooks": "^0.22.0",
120116
"prettier": "^2.3.0",
121117
"react": "18.2.0",
122118
"react-dom": "18.2.0",
123119
"remixicon": "^4.2.0",
124120
"storybook-dark-mode": "^1.1.2",
125-
"svgo": "^3.3.2",
126121
"ts-node": "^10.9.1",
127122
"tss-react": "^4.9.1",
128123
"type-route": "^1.0.1",
129124
"typescript": "^4.9.1",
130-
"vitest": "^0.24.3"
125+
"vitest": "^0.24.3",
126+
"patch-package": "^8.0.0"
131127
},
132128
"main": "dist/fr/index.js",
133129
"types": "dist/fr/index.d.ts",

scripts/picto-builder.ts

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

src/next-app-router/DsfrProvider.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,9 @@ export function DsfrProviderBase(
7979
"nextParams": {
8080
"doPersistDarkModePreferenceWithCookie": false,
8181
"registerEffectAction": action => {
82-
console.log("registerEffectAction", action);
83-
8482
if (isAfterFirstEffect) {
85-
console.log("run now");
8683
action();
8784
} else {
88-
console.log("push");
8985
actions.push(action);
9086
}
9187
}
@@ -122,7 +118,6 @@ function dsfrEffect(): void {
122118
}
123119
isAfterFirstEffect = true;
124120
actions.forEach(action => {
125-
console.log("running action", action);
126121
action();
127122
});
128123
}

src/picto/Accessibility.tsx

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

src/picto/Airport.tsx

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

0 commit comments

Comments
 (0)