build: fix build setup

cog.toml

@@ -1,5 +1,5 @@
 from_latest_tag = true
-ignore_merge_commits = false
+ignore_merge_commits = true
 disable_changelog = false
 disable_bump_commit = false
 tag_prefix = "v"

packages/core/package.json

@@ -4,10 +4,12 @@
 	"module": "src/style.scss",
 	"type": "module",
 	"scripts": {
-    "ci:publish": "bun publish --production --frozen-lockfile --silent"
+		"build": "bun sass --style compressed src/style.scss dist/style.css",
+		"ci:publish": "bun run build && bun publish --production --frozen-lockfile --silent"
 	},
 	"devDependencies": {
-    "@types/bun": "latest"
+		"@types/bun": "latest",
+		"sass": "^1.83.0"
 	},
 	"peerDependencies": {
 		"typescript": "^5.0.0"

packages/core/src/_tokens.scss

@@ -1,12 +1,13 @@
 @use "sass:color";
+@use "sass:map";
 @use "colors";
 
 /* Using catppuccin for now, make a theme switcher later */
 @use "../themes/catppuccin/catppuccin";
 
 @function getColor($color) {
-  $ctp-theme: map-get(catppuccin.$palette, "macchiato");
-  @return map-get($ctp-theme, $color);
+  $ctp-theme: map.get(catppuccin.$palette, "macchiato");
+  @return map.get($ctp-theme, $color);
 }
 
 /*
@@ -50,7 +51,10 @@ $msp-colors: (
   "--msp-color-bg": #{getColor("mantle")},
   "--msp-color-bg-transparent": #{color.scale(getColor("mantle"), $alpha: -10%)},
   "--msp-color-bg-surface-1": #{getColor("base")},
-  "--msp-color-bg-surface-2": #{darken(getColor("surface0"), 2%)},
+  "--msp-color-bg-surface-2": #{color.adjust(
+      getColor("surface0"),
+      $lightness: -2%
+    )},
   "--msp-color-bg-surface-3": #{getColor("surface1")},
 
   "--msp-color-bg-accent": #{getColor("teal")},

packages/core/src/_utils.scss

@@ -1,5 +1,6 @@
 @use "./tokens" as *;
 @use "./mixins";
+@use "sass:math";
 
 .msp-position-fixed {
   position: fixed;
@@ -214,20 +215,20 @@
 }
 @for $i from 0 through 100 {
   .msp-w-#{$i} {
-    width: percentage(calc($i / 100));
+    width: math.percentage(calc($i / 100));
   }
   .msp-h-#{$i} {
-    height: percentage(calc($i / 100));
+    height: math.percentage(calc($i / 100));
   }
 }
 
 @include mixins.responsive-steps(0, 100) using ($breakpoint, $index) {
   .msp-w-#{$breakpoint}-#{$index} {
-    width: percentage(calc($index / 100));
+    width: math.percentage(calc($index / 100));
   }
 
   .msp-h-#{$breakpoint}-#{$index} {
-    height: percentage(calc($index / 100));
+    height: math.percentage(calc($index / 100));
   }
 }
 

packages/core/src/components/form.scss

@@ -2,6 +2,7 @@
 @use "../mixins";
 @use "sass:color";
 @use "sass:string";
+@use "sass:map";
 
 fieldset:not(.msp-fieldset-border) {
   min-width: 0;
@@ -72,7 +73,7 @@ input[type="checkbox"] {
     background-color: var(--msp-color-bg-checkbox);
     border-color: var(--msp-color-bg-checkbox);
 
-    $stroke-color: "%23#{string.slice(map-get($msp-colors, "--msp-color-text-checkbox"), 2, -1)}";
+    $stroke-color: "%23#{string.slice(map.get($msp-colors, "--msp-color-text-checkbox"), 2, -1)}";
     --msp-form-check-bg-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path fill="none" stroke="#{$stroke-color}" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="m6 10 3 3 6-6"/></svg>');
   }
 }
@@ -106,7 +107,7 @@ input[type="radio"] {
     background-color: var(--msp-color-bg-checkbox);
     border-color: var(--msp-color-bg-checkbox);
 
-    $fill-color: "%23#{string.slice(map-get($msp-colors, "--msp-color-text-checkbox"), 2, -1)}";
+    $fill-color: "%23#{string.slice(map.get($msp-colors, "--msp-color-text-checkbox"), 2, -1)}";
     --msp-form-check-bg-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='2' fill='#{$fill-color}'/%3e%3c/svg%3e");
   }
 }

packages/website/package.json

@@ -13,7 +13,8 @@
 		"serve": "docusaurus serve",
 		"write-translations": "docusaurus write-translations",
 		"write-heading-ids": "docusaurus write-heading-ids",
-    "typecheck": "tsc"
+		"typecheck": "tsc",
+		"ci:publish": "docusaurus build"
 	},
 	"dependencies": {
 		"@docusaurus/core": "3.6.1",
@@ -31,11 +32,7 @@
 		"typescript": "~5.6.2"
 	},
 	"browserslist": {
-    "production": [
-      ">0.5%",
-      "not dead",
-      "not op_mini all"
-    ],
+		"production": [">0.5%", "not dead", "not op_mini all"],
 		"development": [
 			"last 3 chrome version",
 			"last 3 firefox version",