composes -> @extend

darkroomengineering · Oct 16, 2024 · bf92021 · bf92021
1 parent 674cc17
commit bf92021
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,9 +15,11 @@
     "*.json": "jsonc",
     "*.css": "css"
   },
-  "css.lint.validProperties": ["composes", "user-drag"],
+  "css.lint.validProperties": [
+    "user-drag"
+  ],
   "css.lint.unknownAtRules": "ignore",
   "[jsonc]": {
     "editor.defaultFormatter": "vscode.json-language-features"
   }
-}
+}
diff --git a/app/(pages)/home/page.js b/app/(pages)/home/page.js
@@ -5,6 +5,9 @@ export default function Home() {
   return (
     <Wrapper theme="red" className={s.page}>
       {/* content  */}
+      <div className="layout-grid">
+        <p>Hello</p>
+      </div>
     </Wrapper>
   )
 }
diff --git a/biome.json b/biome.json
@@ -19,7 +19,8 @@
       "bun.lockb",
       "**/*.md",
       "**/*.mdx",
-      "**/public/*.js"
+      "**/public/*.js",
+      "**/.storybook/**"
     ]
   },
   "formatter": {
@@ -78,7 +79,9 @@
   },
   "overrides": [
     {
-      "include": ["**/*.css"],
+      "include": [
+        "**/*.css"
+      ],
       "linter": {
         "rules": {
           "correctness": {
@@ -88,4 +91,4 @@
       }
     }
   ]
-}
+}
diff --git a/bun.lockb b/bun.lockb
diff --git a/next.config.mjs b/next.config.mjs
@@ -14,6 +14,10 @@ const nextConfig = {
     },
     optimizeCss: true,
     nextScriptWorkers: true,
+    reactCompiler: true,
+  },
+  devIndicators: {
+    appIsrStatus: false,
   },
   typescript: {
     ignoreBuildErrors: true,

diff --git a/package.json b/package.json
@@ -22,10 +22,11 @@
     "@react-three/fiber": "^8.17.10",
     "@theatre/core": "^0.7.2",
     "@theatre/studio": "^0.7.2",
+    "babel-plugin-react-compiler": "^0.0.0-experimental-605e95c-20241015",
     "clsx": "^2.1.1",
     "gsap": "^3.12.5",
     "lenis": "1.1.14",
-    "next": "^15.0.0-canary.194",
+    "next": "^15.0.0-rc.1",
     "postprocessing": "^6.36.3",
     "react": "^19.0.0-rc-83825814-20241015",
     "react-aria-components": "^1.4.1",

diff --git a/styles/_layout.css b/styles/_layout.css
@@ -51,11 +51,11 @@
 }
 
 .layout-grid {
-  composes: layout-block;
-  composes: grid;
+  @extend .layout-block;
+  @extend .grid;
 }
 
 .layout-grid-inner {
-  composes: layout-block-inner;
-  composes: grid;
+  @extend .layout-block-inner;
+  @extend .grid;
 }