fix a breaking error and release (sad it lasted that long)

KTibow · Dec 15, 2024 · 19465aa · 19465aa
1 parent 778e219
commit 19465aa
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 62 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "m3-svelte",
-  "version": "3.4.4",
+  "version": "3.4.5",
   "license": "Apache-2.0 OR GPL-3.0-only",
   "repository": "KTibow/m3-svelte",
   "author": {
@@ -37,7 +37,6 @@
     }
   },
   "devDependencies": {
-    "@material/material-color-utilities": "^0.3.0",
     "@sveltejs/adapter-static": "^3.0.6",
     "@sveltejs/kit": "^2.11.1",
     "@sveltejs/package": "^2.3.7",
@@ -60,6 +59,7 @@
   "dependencies": {
     "@iconify/types": "^2.0.0",
     "@ktibow/iconset-material-symbols": "^0.0.1732258297",
+    "@material/material-color-utilities": "^0.3.0",
     "svelte": "^5.3.0"
   },
   "files": [

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/lib/misc/serializeScheme.ts b/src/lib/misc/serializeScheme.ts
@@ -1,60 +1,5 @@
 import { DynamicScheme, MaterialDynamicColors } from "@material/material-color-utilities";
-import type { Color, SerializedScheme } from "./utils";
-
-export const pairs = [
-  ["primary", "onPrimary"],
-  ["primaryContainer", "onPrimaryContainer"],
-  ["secondary", "onSecondary"],
-  ["secondaryContainer", "onSecondaryContainer"],
-  ["tertiary", "onTertiary"],
-  ["tertiaryContainer", "onTertiaryContainer"],
-  ["background", "onBackground"],
-  ["surface", "onSurface"],
-  ["inverseSurface", "inverseOnSurface"],
-  ["surfaceVariant", "onSurfaceVariant"],
-  ["error", "onError"],
-  ["errorContainer", "onErrorContainer"],
-];
-
-export const colors: Color[] = [
-  "primary",
-  "onPrimary",
-  "primaryContainer",
-  "onPrimaryContainer",
-  "inversePrimary",
-  "secondary",
-  "onSecondary",
-  "secondaryContainer",
-  "onSecondaryContainer",
-  "tertiary",
-  "onTertiary",
-  "tertiaryContainer",
-  "onTertiaryContainer",
-  "error",
-  "onError",
-  "errorContainer",
-  "onErrorContainer",
-  "background",
-  "onBackground",
-  "surface",
-  "onSurface",
-  "surfaceVariant",
-  "onSurfaceVariant",
-  "inverseSurface",
-  "inverseOnSurface",
-  "outline",
-  "outlineVariant",
-  "shadow",
-  "scrim",
-  "surfaceDim",
-  "surfaceBright",
-  "surfaceContainerLowest",
-  "surfaceContainerLow",
-  "surfaceContainer",
-  "surfaceContainerHigh",
-  "surfaceContainerHighest",
-  "surfaceTint",
-];
+import { colors, type SerializedScheme } from "./utils";
 
 /**
  * @description Serializes the {@link DynamicScheme} so that it can be used by {@link StyleFromScheme} and {@link genCSS}.

diff --git a/src/lib/misc/utils.ts b/src/lib/misc/utils.ts
@@ -38,6 +38,61 @@ export type Color =
   | "surfaceTint";
 export type SerializedScheme = Record<Color, number>;
 
+export const pairs = [
+  ["primary", "onPrimary"],
+  ["primaryContainer", "onPrimaryContainer"],
+  ["secondary", "onSecondary"],
+  ["secondaryContainer", "onSecondaryContainer"],
+  ["tertiary", "onTertiary"],
+  ["tertiaryContainer", "onTertiaryContainer"],
+  ["background", "onBackground"],
+  ["surface", "onSurface"],
+  ["inverseSurface", "inverseOnSurface"],
+  ["surfaceVariant", "onSurfaceVariant"],
+  ["error", "onError"],
+  ["errorContainer", "onErrorContainer"],
+];
+
+export const colors: Color[] = [
+  "primary",
+  "onPrimary",
+  "primaryContainer",
+  "onPrimaryContainer",
+  "inversePrimary",
+  "secondary",
+  "onSecondary",
+  "secondaryContainer",
+  "onSecondaryContainer",
+  "tertiary",
+  "onTertiary",
+  "tertiaryContainer",
+  "onTertiaryContainer",
+  "error",
+  "onError",
+  "errorContainer",
+  "onErrorContainer",
+  "background",
+  "onBackground",
+  "surface",
+  "onSurface",
+  "surfaceVariant",
+  "onSurfaceVariant",
+  "inverseSurface",
+  "inverseOnSurface",
+  "outline",
+  "outlineVariant",
+  "shadow",
+  "scrim",
+  "surfaceDim",
+  "surfaceBright",
+  "surfaceContainerLowest",
+  "surfaceContainerLow",
+  "surfaceContainer",
+  "surfaceContainerHigh",
+  "surfaceContainerHighest",
+  "surfaceTint",
+];
+
 /**
  * @returns A string of CSS code with custom properties representing the color scheme values.
  * */

diff --git a/src/routes/theme/SchemeShowcase.svelte b/src/routes/theme/SchemeShowcase.svelte
@@ -11,7 +11,8 @@
   import StyleFromScheme from "$lib/misc/StyleFromScheme.svelte";
   import Button from "$lib/buttons/Button.svelte";
   import ColorCard from "./ColorCard.svelte";
-  import { pairs, serializeScheme } from "$lib/misc/serializeScheme";
+  import { pairs } from "$lib/misc/utils";
+  import { serializeScheme } from "$lib/misc/serializeScheme";
 
   export let schemeLight: DynamicScheme;
   export let schemeDark: DynamicScheme;