Merge branch 'dev' into dris0000/tooltip-focus-click-fix

Esri · Jul 29, 2024 · 1dc2c78 · 1dc2c78
2 parents c447a5e + 5d121e2
commit 1dc2c78
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "@types/dedent": "0.7.2",
     "@types/eslint": "8.56.10",
     "@types/estree": "1.0.5",
-    "@types/github-script": "github:actions/github-script#pull/482",
+    "@types/github-script": "github:actions/github-script",
     "@types/jest": "29.5.12",
     "@types/jest-axe": "3.5.9",
     "@types/jsdom": "21.1.7",
@@ -129,7 +129,7 @@
   },
   "packageManager": "npm@10.2.3",
   "volta": {
-    "node": "20.12.1"
+    "node": "20.16.0"
   },
   "dependencies": {
     "patch-package": "8.0.0"

diff --git a/packages/calcite-design-tokens/package.json b/packages/calcite-design-tokens/package.json
@@ -36,5 +36,8 @@
   "devDependencies": {
     "ts-jest-resolver": "2.0.1",
     "ts-node": "10.9.2"
+  },
+  "volta": {
+    "extends": "../../package.json"
   }
 }