Rollback to gouvfr/dsfr 1.9.3 (very temporaly)

codegouvfr · Jul 26, 2023 · 38df017 · 38df017
1 parent f28b3ab
commit 38df017
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@codegouvfr/react-dsfr",
-    "version": "0.73.1",
+    "version": "0.73.2",
     "description": "French State Design System React integration library",
     "repository": {
         "type": "git",
@@ -66,7 +66,7 @@
         "@babel/core": "^7.20.2",
         "@emotion/react": "^11.10.4",
         "@emotion/styled": "^11.10.4",
-        "@gouvfr/dsfr": "1.10.0",
+        "@gouvfr/dsfr": "1.9.3",
         "@mui/icons-material": "^5.11.16",
         "@mui/material": "^5.13.3",
         "@storybook/addon-a11y": "^6.5.16",

diff --git a/src/assets/dsfr_plus_icons.scss b/src/assets/dsfr_plus_icons.scss
@@ -0,0 +1,2 @@
+@use '../dsfr/utility/icons/icons.min.css';
+@use '../dsfr/dsfr.min.css';
diff --git a/src/next-appdir/DsfrHead.tsx b/src/next-appdir/DsfrHead.tsx
@@ -8,7 +8,10 @@ import { getScriptToRunAsap } from "../useIsDark/scriptToRunAsap";
 import { fontUrlByFileBasename } from "./zz_internal/fontUrlByFileBasename";
 import { getDefaultColorSchemeServerSide } from "./zz_internal/defaultColorScheme";
 import { setLink, type RegisteredLinkProps } from "../link";
-import "../assets/dsfr_plus_icons.css";
+//NOTE: As of now there is no way to enforce ordering in Next Appdir
+//See: https://github.com/vercel/next.js/issues/16630
+// @import url(...) doesn't work. Using Sass and @use is our last resort.
+import "../assets/dsfr_plus_icons.scss";
 
 export type DsfrHeadProps = {
     /** If not provided no fonts are preloaded.

diff --git a/yarn.lock b/yarn.lock
@@ -1394,10 +1394,10 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@gouvfr/dsfr@1.10.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@gouvfr/dsfr/-/dsfr-1.10.0.tgz#a3f4939c728e35d8c9ecf06f7a62369ae46256db"
-  integrity sha512-fHqGCvc8jGtkX2AKRCWi9o3jf/kirP/BeeZ2FBVGwS9Oxd8KsG22xk/6Tls8nA+qPaI+2ZkZQxATBV8KlhwNhQ==
+"@gouvfr/dsfr@1.9.3":
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/@gouvfr/dsfr/-/dsfr-1.9.3.tgz#289148c79566f6332cc930230742c4fe509d96f2"
+  integrity sha512-toPM1nvzSxPAwpLhnIgf7a/TJV0WOUa6sDqYummvMhZ9PBolFPGuD+3r8e3vg0bR5BkYxOt9hFErOPDU1tU4sQ==
 
 "@humanwhocodes/config-array@^0.5.0":
   version "0.5.0"