Merge remote-tracking branch 'origin/main' into cable/reporting

adobe · Oct 17, 2024 · 7dbd4bf · 7dbd4bf
2 parents 0378d72 + 70360e2
commit 7dbd4bf
Show file tree

Hide file tree

Showing 27 changed files with 1,555 additions and 2,805 deletions.
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 pnpm --no-install commitlint --edit ""
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 pnpm run pre-commit
diff --git a/.moon/toolchain.yml b/.moon/toolchain.yml
@@ -20,7 +20,7 @@ node:
 
   # The version of the package manager (above) to use.
   pnpm:
-    version: "9.0.6"
+    version: "9.12.1"
 
   # Add `node.version` as a constraint in the root `package.json` `engines`.
   addEnginesConstraint: true

diff --git a/docs/site/package.json b/docs/site/package.json
@@ -8,18 +8,18 @@
     "url": "git+https://github.com/adobe/spectrum-tokens.git"
   },
   "dependencies": {
-    "@spectrum-css/link": "^4.2.5",
-    "@spectrum-css/page": "^7.1.4",
-    "@spectrum-css/sidenav": "^4.2.4",
-    "@spectrum-css/table": "^5.2.5",
-    "@spectrum-css/tokens": "^13.2.0",
-    "@spectrum-css/typography": "^5.1.5",
-    "ajv": "^8.12.0",
+    "@spectrum-css/link": "^5.1.3",
+    "@spectrum-css/page": "^8.1.3",
+    "@spectrum-css/sidenav": "^5.1.3",
+    "@spectrum-css/table": "^6.1.3",
+    "@spectrum-css/tokens": "^14.4.0",
+    "@spectrum-css/typography": "^6.1.3",
+    "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
-    "next": "^14.2.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "rimraf": "^5.0.5"
+    "next": "^14.2.15",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "rimraf": "^6.0.1"
   },
   "license": "Apache-2.0",
   "bugs": {

diff --git a/docs/site/public/schemas/token-types/color-set.json b/docs/site/public/schemas/token-types/color-set.json
@@ -24,14 +24,11 @@
             "dark": {
               "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/color.json"
             },
-            "darkest": {
-              "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/color.json"
-            },
             "wireframe": {
               "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/color.json"
             }
           },
-          "required": ["light", "dark", "darkest", "wireframe"]
+          "required": ["light", "dark"]
         },
         {
           "properties": {
@@ -41,14 +38,11 @@
             "dark": {
               "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/alias.json"
             },
-            "darkest": {
-              "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/alias.json"
-            },
             "wireframe": {
               "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/alias.json"
             }
           },
-          "required": ["light", "dark", "darkest", "wireframe"]
+          "required": ["light", "dark"]
         },
         {
           "properties": {
@@ -58,26 +52,19 @@
             "dark": {
               "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/opacity.json"
             },
-            "darkest": {
-              "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/opacity.json"
-            },
             "wireframe": {
               "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/opacity.json"
             }
           },
-          "required": ["light", "dark", "darkest", "wireframe"]
+          "required": ["light", "dark"]
         }
       ]
     },
     "component": {},
     "private": {},
     "deprecated": {},
     "deprecated_comment": {},
-    "uuid": {
-      "type": "string",
-      "pattern": "^[0-9a-fA-F]{8}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{12}$",
-      "format": "uuid"
-    }
+    "uuid": {}
   },
-  "required": ["sets", "uuid"]
+  "required": ["sets"]
 }
diff --git a/docs/site/public/schemas/token-types/gradient-stop.json b/docs/site/public/schemas/token-types/gradient-stop.json
@@ -0,0 +1,27 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/gradient-stop.json",
+  "title": "Color Stop",
+  "description": "Gradient stop positions, being a ratio along the gradient's axis. Start is 0, end is 1.",
+  "type": "object",
+  "allOf": [
+    {
+      "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/token.json"
+    }
+  ],
+  "properties": {
+    "$schema": {
+      "const": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/gradient-stop.json"
+    },
+    "value": {
+      "type": "number",
+      "minimum": 0,
+      "maximum": 1
+    },
+    "component": {},
+    "private": {},
+    "deprecated": {},
+    "deprecated_comment": {},
+    "uuid": {}
+  }
+}
diff --git a/docs/site/public/schemas/token-types/multiplier.json b/docs/site/public/schemas/token-types/multiplier.json
@@ -14,7 +14,7 @@
       "const": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/multiplier.json"
     },
     "value": {
-      "type": "string",
+      "type": "number",
       "pattern": "^(?:\\d+\\.?\\d*)|(?:\\.?\\d+)$"
     },
     "component": {},

diff --git a/docs/site/public/schemas/token-types/scale-set.json b/docs/site/public/schemas/token-types/scale-set.json
@@ -26,6 +26,9 @@
             },
             {
               "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/alias.json"
+            },
+            {
+              "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/multiplier.json"
             }
           ]
         },
@@ -39,6 +42,9 @@
             },
             {
               "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/alias.json"
+            },
+            {
+              "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/multiplier.json"
             }
           ]
         }
@@ -49,11 +55,7 @@
     "private": {},
     "deprecated": {},
     "deprecated_comment": {},
-    "uuid": {
-      "type": "string",
-      "pattern": "^[0-9a-fA-F]{8}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{12}$",
-      "format": "uuid"
-    }
+    "uuid": {}
   },
-  "required": ["sets", "uuid"]
+  "required": ["sets"]
 }
diff --git a/docs/site/public/schemas/token-types/text-align.json b/docs/site/public/schemas/token-types/text-align.json
@@ -0,0 +1,27 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/text-align.json",
+  "title": "Text align",
+  "description": "Sets the horizontal alignment of the inline-level content inside a block element",
+  "type": "object",
+  "allOf": [
+    {
+      "$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/token.json"
+    }
+  ],
+  "properties": {
+    "$schema": {
+      "const": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/text-align.json"
+    },
+    "value": {
+      "type": "string",
+      "enum": ["start", "center", "end"],
+      "default": "start"
+    },
+    "component": {},
+    "private": {},
+    "deprecated": {},
+    "deprecated_comment": {},
+    "uuid": {}
+  }
+}
diff --git a/docs/site/public/schemas/token-types/token.json b/docs/site/public/schemas/token-types/token.json
@@ -6,7 +6,14 @@
   "type": "object",
   "properties": {
     "value": {
-      "type": "string"
+      "anyOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "component": {
       "type": "string"

diff --git a/docs/visualizer/CHANGELOG.md b/docs/visualizer/CHANGELOG.md
@@ -0,0 +1,7 @@
+# stvt
+
+## 0.0.1
+
+### Patch Changes
+
+- [#436](https://github.com/adobe/spectrum-tokens/pull/436) [`101e1e1`](https://github.com/adobe/spectrum-tokens/commit/101e1e1d58d75e780334588f69d2f2947e35b776) Thanks [@GarthDB](https://github.com/GarthDB)! - Tokens recently changed to use numbers for certain values (multipliers, etc). This caused a bug in the visualizer.
diff --git a/docs/visualizer/package.json b/docs/visualizer/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "access": "restricted",
   "type": "module",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/adobe/spectrum-tokens.git"
@@ -14,26 +14,26 @@
   },
   "homepage": "https://github.com/adobe/spectrum-tokens/tree/main/docs/visualizer#readme",
   "devDependencies": {
-    "@types/node": "^20.14.11",
-    "typescript": "^5.5.3",
-    "vite": "^5.3.4"
+    "@types/node": "^22.7.5",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.8"
   },
   "dependencies": {
-    "@spectrum-web-components/action-button": "^0.44.0",
-    "@spectrum-web-components/button": "^0.44.0",
-    "@spectrum-web-components/button-group": "^0.44.0",
-    "@spectrum-web-components/field-group": "^0.44.0",
-    "@spectrum-web-components/field-label": "^0.44.0",
-    "@spectrum-web-components/link": "^0.44.0",
-    "@spectrum-web-components/overlay": "^0.44.0",
-    "@spectrum-web-components/popover": "^0.44.0",
-    "@spectrum-web-components/search": "^0.44.0",
-    "@spectrum-web-components/slider": "^0.44.0",
-    "@spectrum-web-components/switch": "^0.44.0",
-    "@spectrum-web-components/textfield": "^0.44.0",
-    "@spectrum-web-components/theme": "^0.44.0",
-    "@spectrum-web-components/toast": "^0.44.0",
-    "@spectrum-web-components/tooltip": "^0.44.0",
-    "lit": "^3.1.4"
+    "@spectrum-web-components/action-button": "^0.48.1",
+    "@spectrum-web-components/button": "^0.48.1",
+    "@spectrum-web-components/button-group": "^0.48.1",
+    "@spectrum-web-components/field-group": "^0.48.1",
+    "@spectrum-web-components/field-label": "^0.48.1",
+    "@spectrum-web-components/link": "^0.48.1",
+    "@spectrum-web-components/overlay": "^0.48.1",
+    "@spectrum-web-components/popover": "^0.48.1",
+    "@spectrum-web-components/search": "^0.48.1",
+    "@spectrum-web-components/slider": "^0.48.1",
+    "@spectrum-web-components/switch": "^0.48.1",
+    "@spectrum-web-components/textfield": "^0.48.1",
+    "@spectrum-web-components/theme": "^0.48.1",
+    "@spectrum-web-components/toast": "^0.48.1",
+    "@spectrum-web-components/tooltip": "^0.48.1",
+    "lit": "^3.2.1"
   }
 }
diff --git a/docs/visualizer/src/controllers/graph-data-source.ts b/docs/visualizer/src/controllers/graph-data-source.ts
@@ -208,7 +208,7 @@ export class GraphDataSource {
       const rawValues: string[] = [];
       foundValues.forEach((foundValueItem) => {
         const valuePath = foundValueItem.path;
-        let foundValue = foundValueItem.value;
+        let foundValue = foundValueItem.value.toString();
         // is this found value a downstream adjacency?
         // if so, add it to the graph...
         if (

diff --git a/package.json b/package.json
@@ -24,21 +24,19 @@
   "homepage": "https://github.com/adobe/spectrum-tokens#readme",
   "devDependencies": {
     "@action-validator/core": "^0.6.0",
-    "@changesets/cli": "^2.27.1",
-    "@commitlint/cli": "^19.2.2",
-    "@commitlint/config-conventional": "^19.2.2",
+    "@changesets/changelog-github": "^0.5.0",
+    "@changesets/cli": "^2.27.9",
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
     "@moonrepo/cli": "^1.29.0",
-    "ava": "^6.1.2",
-    "glob": "^10.3.12",
-    "husky": "^9.0.11",
-    "lint-staged": "^15.2.2",
-    "prettier": "^3.2.5"
+    "ava": "^6.1.3",
+    "glob": "^11.0.0",
+    "husky": "^9.1.6",
+    "lint-staged": "^15.2.10",
+    "prettier": "^3.3.3"
   },
   "engines": {
     "node": "~20.12"
   },
-  "packageManager": "pnpm@9.0.6",
-  "dependencies": {
-    "@changesets/changelog-github": "^0.5.0"
-  }
+  "packageManager": "pnpm@9.12.1"
 }
diff --git a/packages/tokens/package.json b/packages/tokens/package.json
@@ -23,14 +23,14 @@
   },
   "homepage": "https://github.com/adobe/spectrum-tokens/tree/main/packages/tokens#readme",
   "devDependencies": {
-    "ajv": "^8.12.0",
+    "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
     "deep-object-diff": "^1.1.9",
     "find-duplicated-property-keys": "^1.2.9",
-    "glob": "^10.3.12",
+    "glob": "^11.0.0",
     "style-dictionary": "^3.9.2",
     "style-dictionary-sets": "^2.3.0",
-    "tar": "^7.0.1",
+    "tar": "^7.4.3",
     "tmp-promise": "^3.0.3"
   }
 }