fix after merge

microsoft · May 21, 2024 · 6e18794 · 6e18794
1 parent 780065c
commit 6e18794
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/e2e/rspack/src/snapshots/output.css b/e2e/rspack/src/snapshots/output.css
@@ -25,7 +25,7 @@
   outline-offset: 5px;
 }
 @media (min-width: 968px) and (orientation: landscape) {
-  .fftofzc {
+  .f1tnsuik {
     width: 400px;
   }
 }
diff --git a/packages/babel-preset/__fixtures__/at-rules/output.ts b/packages/babel-preset/__fixtures__/at-rules/output.ts
@@ -2,16 +2,16 @@ import { __styles } from '@griffel/react';
 export const useStyles = __styles(
   {
     root: {
-      B3z2k6w: ['f1wfh65i', 'f1efhert'],
-      Bdn5tj5: ['f1efhert', 'f1wfh65i'],
+      wbkd2a: ['fgefjy', 'f1h4p6a1'],
+      Dt0rau: ['f1h4p6a1', 'fgefjy'],
       k2kg1z: ['f1dyc5nu', 'f1kq3x14'],
       Blnc60a: ['f1kq3x14', 'f1dyc5nu'],
     },
   },
   {
     m: [
       [
-        '@media (min-width: 600px){.f1efhert{padding-right:4px;}.f1wfh65i{padding-left:4px;}}',
+        '@media (min-width: 600px){.f1h4p6a1{padding-right:4px;}.fgefjy{padding-left:4px;}}',
         {
           m: '(min-width: 600px)',
         },

diff --git a/packages/babel-preset/__fixtures__/rules-with-metadata/output.ts b/packages/babel-preset/__fixtures__/rules-with-metadata/output.ts
@@ -2,13 +2,13 @@ import { __styles } from '@griffel/react';
 export const useStyles = __styles(
   {
     media: {
-      Be2dmvj: 'foh03df',
+      Bn3jx5e: 'ful25cn',
     },
   },
   {
     m: [
       [
-        '@media screen and (max-width: 100px){.foh03df{color:red;}}',
+        '@media screen and (max-width: 100px){.ful25cn{color:red;}}',
         {
           m: 'screen and (max-width: 100px)',
         },

diff --git a/packages/core/src/runtime/resolveStyleRules.test.ts b/packages/core/src/runtime/resolveStyleRules.test.ts
@@ -319,12 +319,12 @@ describe('resolveStyleRules', () => {
         }),
       ).toMatchInlineSnapshot(`
         @media screen and (max-width: 992px) {
-          .f1el5hyx {
-            text-align: left;
-          }
-          .f1qqk4p1 {
+          .f1avj2xq {
             text-align: right;
           }
+          .f1bxmk0a {
+            text-align: left;
+          }
         }
       `);
     });
@@ -560,7 +560,7 @@ describe('resolveStyleRules', () => {
           color: green;
         }
         @media screen and (max-width: 992px) {
-          .f2bvvla {
+          .f15as2e {
             color: red;
           }
         }
@@ -582,7 +582,7 @@ describe('resolveStyleRules', () => {
           color: green;
         }
         @media screen and (max-width: 992px) {
-          .fuy1c5o:hover {
+          .f1951wvx:hover {
             color: red;
           }
         }
@@ -603,12 +603,12 @@ describe('resolveStyleRules', () => {
           color: red;
         }
         @media screen and (max-width: 992px) {
-          .f2bvvla {
+          .f15as2e {
             color: red;
           }
         }
         @media screen and (max-width: 992px) and (min-width: 100px) {
-          .f1imqg8u {
+          .fnnlhvt {
             color: red;
           }
         }
@@ -985,8 +985,8 @@ describe('resolveStyleRules', () => {
 
       expect(result[1]).toEqual({
         m: [
-          ['@media screen{.f1f7xnks{color:red;}}', { m: 'screen' }],
-          ['@media screen{.f1pegaf3{padding:10px;}}', { m: 'screen', p: -1 }],
+          ['@media screen{.f12pk7j4{color:red;}}', { m: 'screen' }],
+          ['@media screen{.f1eoyco2{padding:10px;}}', { m: 'screen', p: -1 }],
         ],
       });
     });

diff --git a/packages/core/src/runtime/utils/hashClassName.test.ts b/packages/core/src/runtime/utils/hashClassName.test.ts
@@ -24,7 +24,7 @@ describe('hashClassName', () => {
     const hashB = hashClassName(defaultOptions, { ...defaultAtRules, media: '(min-width: 500px)' });
 
     expect(hashA).toMatchInlineSnapshot(`"f18ymuke"`);
-    expect(hashB).toMatchInlineSnapshot(`"f16oyr76"`);
+    expect(hashB).toMatchInlineSnapshot(`"f1hoxic9"`);
     expect(hashA).not.toBe(hashB);
   });
 

diff --git a/packages/core/src/runtime/utils/hashPropertyKey.test.ts b/packages/core/src/runtime/utils/hashPropertyKey.test.ts
@@ -16,7 +16,7 @@ describe('hashPropertyKey', () => {
     const hashB = hashPropertyKey('', 'color', { ...defaultAtRules, media: '(min-width: 500px)' });
 
     expect(hashA).toMatchInlineSnapshot(`"Bhkzl7a"`);
-    expect(hashB).toMatchInlineSnapshot(`"zc7s4b"`);
+    expect(hashB).toMatchInlineSnapshot(`"B3v6anr"`);
     expect(hashA).not.toBe(hashB);
   });
 });
diff --git a/packages/react/src/createDOMRenderer.test.tsx b/packages/react/src/createDOMRenderer.test.tsx
@@ -75,7 +75,7 @@ describe('createDOMRenderer', () => {
         ".rp2atum:hover{color:blue;}": "r",
         ".rp2atum{color:red;}": "r",
         "@keyframes f1kgwxhb{from{height:10px;}to{height:20px;}}": "k",
-        "@media screen and (max-width: 992px){.f1lksov6:hover{color:blue;}}": "m",
+        "@media screen and (max-width: 992px){.fzd6x39:hover{color:blue;}}": "m",
       }
     `);
     // There is no DOM on a server, style nodes should not be present

diff --git a/packages/react/src/renderToStyleElements-node.test.tsx b/packages/react/src/renderToStyleElements-node.test.tsx
@@ -123,7 +123,7 @@ describe('renderToStyleElements (node)', () => {
           data-make-styles-rehydration="true"
         >
           @media screen and (max-width: 992px) {
-            .f1lksov6:hover {
+            .fzd6x39:hover {
               color: blue;
             }
           }
@@ -197,7 +197,7 @@ describe('renderToStyleElements (node)', () => {
           data-make-styles-rehydration="true"
         >
           @media (max-width: 1px) {
-            .faiyvxi:hover {
+            .f13d6lhy:hover {
               color: blue;
             }
           }</style
@@ -208,7 +208,7 @@ describe('renderToStyleElements (node)', () => {
           data-make-styles-rehydration="true"
         >
           @media (max-width: 2px) {
-            .f1i64cxd:hover {
+            .f1b07yzi:hover {
               color: blue;
             }
           }</style
@@ -219,7 +219,7 @@ describe('renderToStyleElements (node)', () => {
           data-make-styles-rehydration="true"
         >
           @media (max-width: 3px) {
-            .f132yv2m:hover {
+            .f1cy3850:hover {
               color: blue;
             }
           }</style