Merge branch 'develop' into eriese-v3-printing

designs/breanna/src/dart-utils.mjs

@@ -84,27 +84,39 @@ export function getDartLocationsAsNumbers(options) {
   else return [loc1, loc2]
 }
 
-export const getDartPaths = (Path, points) => [
+export const getDartPaths = (Path, points) => {
-  new Path()
+  let dart_paths = [
-    .line(points.primaryBustDart1)
+    new Path()
-    .line(points.primaryBustDartTip)
+      .line(points.primaryBustDart1)
-    .line(points.primaryBustDart2),
+      .line(points.primaryBustDartTip)
-  new Path()
+      .line(points.primaryBustDart2),
-    .line(points.secondaryBustDart1)
+  ]
-    .line(points.secondaryBustDartTip)
+  if ('secondaryBustDart1' in points)
-    .line(points.secondaryBustDart2),
+    dart_paths.push(
-]
+      new Path()
+        .line(points.secondaryBustDart1)
+        .line(points.secondaryBustDartTip)
+        .line(points.secondaryBustDart2)
+    )
+  return dart_paths
+}
 
-export const getSaDartPaths = (Path, points) => [
+export const getSaDartPaths = (Path, points) => {
-  new Path()
+  let dart_paths = [
-    .line(points.primaryBustDart1)
+    new Path()
-    .line(points.primaryBustDartEdge)
+      .line(points.primaryBustDart1)
-    .line(points.primaryBustDart2),
+      .line(points.primaryBustDartEdge)
-  new Path()
+      .line(points.primaryBustDart2),
-    .line(points.secondaryBustDart1)
+  ]
-    .line(points.secondaryBustDartEdge)
+  if ('secondaryBustDart1' in points)
-    .line(points.secondaryBustDart2),
+    dart_paths.push(
-]
+      new Path()
+        .line(points.secondaryBustDart1)
+        .line(points.secondaryBustDartEdge)
+        .line(points.secondaryBustDart2)
+    )
+  return dart_paths
+}
 
 /*
  * Once the front is constructed with the theorethical bust darts, we

markdown/dev/guides/markdown/jargon/en.md

@@ -41,7 +41,7 @@ The file consists of key/value pairs where:
 The key in the jargon file should always be lowercase. That's because we
 lowercase the term before matching it.
 
-So in your text, you can use `ESM`, `ems`, or even `eSm`, but the key in
+So in your text, you can use `ESM`, `esm`, or even `eSm`, but the key in
 the jargon file should be `esm`.
 
 ### Tips for jargon values

markdown/dev/reference/api/en.md

@@ -55,7 +55,7 @@ facilitate unit testing and other specific use cases.
 | `Store`      | The [Store](/reference/api/store) constructor |
 
 
-The following named exports are **uitility methods**:
+The following named exports are **utility methods**:
 
 | Named export | Description |
 | ------------ | ------------|
@@ -77,6 +77,7 @@ The following named exports are **uitility methods**:
 | `pointOnCurve`            | See the [pointOnCurve](/reference/api/utils/pointoncurve) documentation |
 | `pointOnLine`             | See the [pointOnLine](/reference/api/utils/pointonline) documentation |
 | `rad2deg`                 | See the [rad2deg](/reference/api/utils/rad2deg) documentation |
+| `round`                   | See the [round](/reference/api/utils/round) documentation |
 | `splitCurve`              | See the [splitCurve](/reference/api/utils/splitcurve) documentation |
 | `stretchToScale`          | See the [stretchToScale](/reference/api/utils/stretchtoscale) documentation |
 | `units`                   | See the [units](/reference/api/utils/units) documentation |

markdown/dev/reference/api/utils/curveintersectsy/en.md

@@ -2,7 +2,7 @@
 title: utils.curveIntersectsY()
 ---
 
-The `utils.curveIntersectsX()` function finds the point(s) where a curve
+The `utils.curveIntersectsY()` function finds the point(s) where a curve
 intersects a given Y-value.
 
 ## Signature

package.json

@@ -75,7 +75,7 @@
     "chalk": "^4.1.0",
     "codecov": "^3.8.3",
     "cross-env": "^7.0.2",
-    "esbuild": "^0.15.3",
+    "esbuild": "^0.16.0",
     "esbuild-plugin-yaml": "^0.0.1",
     "eslint": "^8.23.1",
     "eslint-config-next": "^13.0.6",

packages/core/src/path.mjs

@@ -177,6 +177,7 @@ Path.prototype.bbox = function () {
  */
 Path.prototype.clean = function () {
   const ops = []
+  let cur
   for (const i in this.ops) {
     const op = this.ops[i]
     if (['move', 'close', 'noop'].includes(op.type)) ops.push(op)
@@ -186,7 +187,7 @@ Path.prototype.clean = function () {
       if (!(op.cp1.sitsRoughlyOn(cur) && op.cp2.sitsRoughlyOn(cur) && op.to.sitsRoughlyOn(cur)))
         ops.push(ops)
     }
-    const cur = op?.to
+    cur = op?.to
   }
 
   if (ops.length < this.ops.length) this.ops = ops

sites/backend/package.json

@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-sesv2": "^3.200.0",
-    "@prisma/client": "4.5.0",
+    "@prisma/client": "4.7.1",
     "bcryptjs": "^2.4.3",
     "crypto": "^1.0.1",
     "express": "4.18.2",
@@ -40,7 +40,7 @@
     "chai-http": "^4.3.0",
     "mocha": "^10.1.0",
     "mocha-steps": "^1.3.0",
-    "prisma": "4.6.1"
+    "prisma": "4.7.1"
   },
   "prisma": {
     "seed": "node prisma/seed.mjs"

sites/dev/package.json

@@ -41,7 +41,7 @@
     "react": "^18.2.0",
     "react-copy-to-clipboard": "^5.0.4",
     "react-dom": "^18.2.0",
-    "react-hotkeys-hook": "^3.4.4",
+    "react-hotkeys-hook": "^4.0.4",
     "react-instantsearch-dom": "^6.18.0",
     "react-markdown": "^8.0.3",
     "react-swipeable": "^7.0.0",

sites/lab/package.json

@@ -45,9 +45,9 @@
     "lodash.orderby": "^4.6.0",
     "lodash.set": "^4.3.2",
     "next": "latest",
-    "next-i18next": "^12.0.0",
+    "next-i18next": "^13.0.0",
     "react-copy-to-clipboard": "^5.0.4",
-    "react-hotkeys-hook": "^3.4.4",
+    "react-hotkeys-hook": "^4.0.4",
     "react-instantsearch-dom": "^6.18.0",
     "react-markdown": "^8.0.0",
     "react-swipeable": "^7.0.0",

sites/org/jargon.mjs

@@ -0,0 +1,3 @@
+const jargon = {}
+
+export default jargon

sites/org/package.json

@@ -41,7 +41,7 @@
     "lodash.orderby": "^4.6.0",
     "lodash.set": "^4.3.2",
     "next": "latest",
-    "react-hotkeys-hook": "^3.4.4",
+    "react-hotkeys-hook": "^4.0.4",
     "react-instantsearch-dom": "^6.18.0",
     "react-markdown": "^8.0.3",
     "react-swipeable": "^7.0.0",

sites/sanity/package.json

@@ -37,7 +37,7 @@
     "prop-types": "^15.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "sanity-plugin-markdown": "^2.1.1",
+    "sanity-plugin-markdown": "^3.0.1",
     "styled-components": "^5.2.0"
   },
   "devDependencies": {