Update to @gouvfr/dsfr 1.9.0

garronej · garronej · commit 8df44c003d33 · 2023-03-05T16:39:36.000+01:00
diff --git a/package.json b/package.json
@@ -66,10 +66,10 @@
         "tsafe": "^1.4.0"
     },
     "devDependencies": {
+        "@gouvfr/dsfr": "1.9.0",
         "@babel/core": "^7.20.2",
         "@emotion/react": "^11.10.4",
         "@emotion/styled": "^11.10.4",
-        "@gouvfr/dsfr": "1.8.5",
         "@mui/icons-material": "^5.11.0",
         "@mui/material": "^5.11.0",
         "@storybook/addon-a11y": "^6.5.16",
diff --git a/src/scripts/build/cssToTs/cssVariable.ts b/src/scripts/build/cssToTs/cssVariable.ts
@@ -47,7 +47,7 @@ export const createGetCssVariable = memoize((rawCssCode: string) => {
                                             case "light":
                                                 return "";
                                             case "dark":
-                                                return `:where([${data_fr_theme}="dark"])`;
+                                                return `:where([${data_fr_theme}=dark])`;
                                         }
                                     })()
                             )
diff --git a/test/runtime/scripts/colorDecisions/generateGetColorDecisionsTsCode.test.ts b/test/runtime/scripts/colorDecisions/generateGetColorDecisionsTsCode.test.ts
@@ -17,7 +17,7 @@ it("Generates the correct TS code for breakpoints", () => {
   --background-contrast-overlap-grey: var(--grey-950-150);
 }
 
-:root:where([data-fr-theme="dark"]) {
+:root:where([data-fr-theme=dark]) {
   --grey-1000-50-hover: #000000;
   --grey-1000-50: #000000;
   --orange-terre-battue-850-200: #000000;
diff --git a/test/runtime/scripts/colorDecisions/parseColorDecision.test.ts b/test/runtime/scripts/colorDecisions/parseColorDecision.test.ts
@@ -18,7 +18,7 @@ it("Color decisions to be successfully parsed", () => {
   --background-contrast-overlap-grey: var(--grey-950-150);
 }
 
-:root:where([data-fr-theme="dark"]) {
+:root:where([data-fr-theme=dark]) {
   --grey-1000-50-hover: #000000;
   --grey-1000-50: #000000;
   --orange-terre-battue-850-200: #000000;
diff --git a/test/runtime/scripts/colorDecisions/parseColorDecisionName.test.ts b/test/runtime/scripts/colorDecisions/parseColorDecisionName.test.ts
@@ -21,7 +21,7 @@ describe("Color decision css variable correctly parsed", () => {
 
 }
 
-:root:where([data-fr-theme="dark"]) {
+:root:where([data-fr-theme=dark]) {
   --grey-1000-50-hover: #000000;
   --grey-1000-50: #000000;
   --orange-terre-battue-850-200: #000000;
diff --git a/test/runtime/scripts/colorOptions/generateGetColorOptionsTsCode.test.ts b/test/runtime/scripts/colorOptions/generateGetColorOptionsTsCode.test.ts
@@ -27,7 +27,7 @@ it("Generate the correct TS code for colors options", () => {
   --background-default-grey: var(--grey-1000-50);
   --background-default-grey-hover: var(--grey-1000-50-hover);
 }
-:root:where([data-fr-theme="dark"]) {
+:root:where([data-fr-theme=dark]) {
   --name1-name2-111-222: #100000;
   --name1-name2-111-222-hover: #200000;
   --name1-name2-sun-111-222: #300000;
diff --git a/test/runtime/scripts/colorOptions/parseColorOptions.test.ts b/test/runtime/scripts/colorOptions/parseColorOptions.test.ts
@@ -28,7 +28,7 @@ it("Successfully parse color options", () => {
   --background-default-grey: var(--grey-1000-50);
   --background-default-grey-hover: var(--grey-1000-50-hover);
 }
-:root:where([data-fr-theme="dark"]) {
+:root:where([data-fr-theme=dark]) {
   --name1-name2-111-222: #100000;
   --name1-name2-111-222-hover: #200000;
   --name1-name2-sun-111-222: #300000;
diff --git a/test/runtime/scripts/cssVariable.test.ts b/test/runtime/scripts/cssVariable.test.ts
@@ -15,7 +15,7 @@ const rawCssCode = `
 	--my-var-4: #ffffff;
 }
 
-:root:where([data-fr-theme="dark"]) {
+:root:where([data-fr-theme=dark]) {
 	--my-var-2: #000000;
 }
 
@@ -24,7 +24,7 @@ const rawCssCode = `
 
 @media (min-width: 48em) { 
 
-    :root:where([data-fr-theme="dark"]) {
+    :root:where([data-fr-theme=dark]) {
         --my-var-4: #000000;
     }
 
diff --git a/yarn.lock b/yarn.lock
@@ -1342,10 +1342,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.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@gouvfr/dsfr/-/dsfr-1.8.5.tgz#e99d095e99debcce0c41db18989637290d588b78"
-  integrity sha512-29L+THvWmYJXztPa0Os5TS9yD2WQbrH7VnCKxkyUXQZQ+6lsGebtz0GdCnLexOWDfCn1y53Mh7+/ihxI/z0Vjw==
+"@gouvfr/dsfr@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@gouvfr/dsfr/-/dsfr-1.9.0.tgz#5d6b97328b8c239d0d4383708a5fa59fd5290e4c"
+  integrity sha512-CWckBrvCL28QV2K1+GK/AjW40aGHmd1oXnCSFRD4iRhsIgXkE/+t6pH24L+6BKVBCSYfp2RTGAgRwVN06PqGMw==
 
 "@humanwhocodes/config-array@^0.5.0":
   version "0.5.0"

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export const createGetCssVariable = memoize((rawCssCode: string) => {`
`47`	`47`	`case "light":`
`48`	`48`	`return "";`
`49`	`49`	`case "dark":`
`50`		- return `:where([${data_fr_theme}="dark"])`;
	`50`	+ return `:where([${data_fr_theme}=dark])`;
`51`	`51`	`}`
`52`	`52`	`})()`
`53`	`53`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ it("Generates the correct TS code for breakpoints", () => {`
`17`	`17`	`--background-contrast-overlap-grey: var(--grey-950-150);`
`18`	`18`	`}`
`19`	`19`
`20`		`-:root:where([data-fr-theme="dark"]) {`
	`20`	`+:root:where([data-fr-theme=dark]) {`
`21`	`21`	`--grey-1000-50-hover: #000000;`
`22`	`22`	`--grey-1000-50: #000000;`
`23`	`23`	`--orange-terre-battue-850-200: #000000;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ it("Color decisions to be successfully parsed", () => {`
`18`	`18`	`--background-contrast-overlap-grey: var(--grey-950-150);`
`19`	`19`	`}`
`20`	`20`
`21`		`-:root:where([data-fr-theme="dark"]) {`
	`21`	`+:root:where([data-fr-theme=dark]) {`
`22`	`22`	`--grey-1000-50-hover: #000000;`
`23`	`23`	`--grey-1000-50: #000000;`
`24`	`24`	`--orange-terre-battue-850-200: #000000;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ describe("Color decision css variable correctly parsed", () => {`
`21`	`21`
`22`	`22`	`}`
`23`	`23`
`24`		`-:root:where([data-fr-theme="dark"]) {`
	`24`	`+:root:where([data-fr-theme=dark]) {`
`25`	`25`	`--grey-1000-50-hover: #000000;`
`26`	`26`	`--grey-1000-50: #000000;`
`27`	`27`	`--orange-terre-battue-850-200: #000000;`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ it("Generate the correct TS code for colors options", () => {`
`27`	`27`	`--background-default-grey: var(--grey-1000-50);`
`28`	`28`	`--background-default-grey-hover: var(--grey-1000-50-hover);`
`29`	`29`	`}`
`30`		`-:root:where([data-fr-theme="dark"]) {`
	`30`	`+:root:where([data-fr-theme=dark]) {`
`31`	`31`	`--name1-name2-111-222: #100000;`
`32`	`32`	`--name1-name2-111-222-hover: #200000;`
`33`	`33`	`--name1-name2-sun-111-222: #300000;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ it("Successfully parse color options", () => {`
`28`	`28`	`--background-default-grey: var(--grey-1000-50);`
`29`	`29`	`--background-default-grey-hover: var(--grey-1000-50-hover);`
`30`	`30`	`}`
`31`		`-:root:where([data-fr-theme="dark"]) {`
	`31`	`+:root:where([data-fr-theme=dark]) {`
`32`	`32`	`--name1-name2-111-222: #100000;`
`33`	`33`	`--name1-name2-111-222-hover: #200000;`
`34`	`34`	`--name1-name2-sun-111-222: #300000;`
Original file line number	Diff line number	Diff line change
@@ -15,7 +15,7 @@ const rawCssCode = `
`15`	`15`	`--my-var-4: #ffffff;`
`16`	`16`	`}`
`17`	`17`
`18`		`-:root:where([data-fr-theme="dark"]) {`
	`18`	`+:root:where([data-fr-theme=dark]) {`
`19`	`19`	`--my-var-2: #000000;`
`20`	`20`	`}`
`21`	`21`
@@ -24,7 +24,7 @@ const rawCssCode = `
`24`	`24`
`25`	`25`	`@media (min-width: 48em) {`
`26`	`26`
`27`		`- :root:where([data-fr-theme="dark"]) {`
	`27`	`+ :root:where([data-fr-theme=dark]) {`
`28`	`28`	`--my-var-4: #000000;`
`29`	`29`	`}`
`30`	`30`