Merge branch 'main' into catjohnson/fourth-graph-option

Khan · Dec 20, 2024 · 40040b0 · 40040b0
2 parents 2463ab5 + 00ec1f1
commit 40040b0
Show file tree

Hide file tree

Showing 57 changed files with 1,755 additions and 350 deletions.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -1,7 +1,7 @@
 {
-  "$schema": "https://unpkg.com/@changesets/config@1.7.0/schema.json",
+  "$schema": "https://unpkg.com/@changesets/config@2/schema.json",
   "changelog": ["@changesets/changelog-github", {"repo": "Khan/perseus"}],
-  "commit": true,
+  "commit": ["@changesets/cli/commit", { "skipCI": false }],
   "linked": [],
   "access": "public",
   "baseBranch": "main",

diff --git a/.changeset/quick-apes-crash.md b/.changeset/quick-apes-crash.md
diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
@@ -225,6 +225,32 @@ jobs:
                   git checkout main
                   git checkout $REF
 
+            # Helper to get the URL of the current run, if we need it.
+            - name: Get workflow run URL
+              id: get-run-url
+              run: echo "run_url=https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_OUTPUT
+
+            # We need to see if any releases are in progress.
+            # We do not want to try and publish anything if a publish is
+            # pending. We fail here, but we make sure to update the
+            # PR comment later. This has to come after the checkout.
+            - name: Check for release
+              id: check-release
+              env:
+                  GH_TOKEN: ${{ github.token }}
+              run: |
+                  # Releases are triggered by merging "Version Packages" PRs.
+                  # So we look for instances of the release.yml workflow, with
+                  # a title containing "Version Packages", that are in progress.
+                  release_count=$(gh run list --workflow release.yml --json status,displayTitle --jq '[.[] | select(.status == "in_progress" and (.displayTitle | contains("Version Packages")))] | length')
+                  echo "release_count=$release_count" >> $GITHUB_OUTPUT
+                  if [ "$release_count" -ne 0 ]; then
+                    echo "Error: There are $release_count releases in progress."
+                    exit 1
+                  else
+                    echo "No releases in progress."
+                  fi
+
             - name: Install & cache node_modules
               uses: ./.github/actions/shared-node-cache
               with:
@@ -249,6 +275,8 @@ jobs:
             # Note: these two actions are locked to the latest version that were
             # published when I created this yml file (just for security).
             - name: Find existing comment
+              # Even if we're failing, we want to update the comments.
+              if: always()
               uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e
               id: find-comment
               with:
@@ -282,7 +310,7 @@ jobs:
                       ./dev/tools/bump_perseus_version.sh -t PR${{ github.event.pull_request.number }}
                       ```
 
-            - name: Create or update npm snapshot comment - failure
+            - name: Create or update npm snapshot comment - failure, snapshot publish failed
               if: steps.publish-snapshot.outputs.npm_snapshot_tag == ''
               uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
               with:
@@ -295,3 +323,19 @@ jobs:
                       Oh noes!! We couldn't find any changesets in this PR (${{
                       steps.short-sha.outputs.short_sha }}). As a result, we did not
                       publish an npm snapshot for you.
+
+            - name: Create or update npm snapshot comment - failure, concurrent with release
+              if: failure() && steps.check-release.outputs.release_count != '0'
+              uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
+              with:
+                  issue-number: ${{ github.event.pull_request.number }}
+                  comment-id: ${{ steps.find-comment.outputs.comment-id }}
+                  edit-mode: replace
+                  body: |
+                      # npm Snapshot: **NOT** Published
+
+                      Oh noes!! We couldn't publish an npm snapshot for you because
+                      there is a release in progress. Please wait for the release to
+                      finish, then retry this workflow.
+
+                      [View the workflow run](${{ steps.get-run-url.outputs.run_url }})
diff --git a/config/build/CHANGELOG.md b/config/build/CHANGELOG.md
@@ -1,5 +1,17 @@
 # perseus-build-settings
 
+## 0.4.3
+
+### Patch Changes
+
+-   [#2040](https://github.com/Khan/perseus/pull/2040) [`1496a7a93`](https://github.com/Khan/perseus/commit/1496a7a93ef691c8e34da309c10cb77d35627bf3) Thanks [@somewhatabstract](https://github.com/somewhatabstract)! - Bump versions to fix release
+
+## 0.4.2
+
+### Patch Changes
+
+-   [#2027](https://github.com/Khan/perseus/pull/2027) [`368e222a6`](https://github.com/Khan/perseus/commit/368e222a6577dff38143d1584d6773129e8abbd7) Thanks [@handeyeco](https://github.com/handeyeco)! - Bump all packages to reset releases
+
 ## 0.4.1
 
 ### Patch Changes

diff --git a/config/build/package.json b/config/build/package.json
@@ -1,6 +1,6 @@
 {
     "name": "perseus-build-settings",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "license": "MIT",
     "private": true
 }
diff --git a/dev/CHANGELOG.md b/dev/CHANGELOG.md
@@ -1,5 +1,90 @@
 # @khanacademy/perseus-dev-ui
 
+## 5.0.9
+
+### Patch Changes
+
+-   Updated dependencies [[`9c17ab518`](https://github.com/Khan/perseus/commit/9c17ab5188052bb0f42de615e48af1a7439f2770)]:
+    -   @khanacademy/kmath@0.1.24
+
+## 5.0.8
+
+### Patch Changes
+
+-   Updated dependencies []:
+    -   @khanacademy/math-input@22.0.7
+
+## 5.0.7
+
+### Patch Changes
+
+-   [#2040](https://github.com/Khan/perseus/pull/2040) [`1496a7a93`](https://github.com/Khan/perseus/commit/1496a7a93ef691c8e34da309c10cb77d35627bf3) Thanks [@somewhatabstract](https://github.com/somewhatabstract)! - Bump versions to fix release
+
+-   Updated dependencies [[`1496a7a93`](https://github.com/Khan/perseus/commit/1496a7a93ef691c8e34da309c10cb77d35627bf3)]:
+    -   @khanacademy/kas@0.4.9
+    -   @khanacademy/kmath@0.1.23
+    -   @khanacademy/math-input@22.0.6
+    -   @khanacademy/perseus-core@3.0.5
+    -   @khanacademy/perseus-linter@1.2.11
+    -   @khanacademy/pure-markdown@0.3.20
+    -   @khanacademy/simple-markdown@0.13.13
+
+## 5.0.6
+
+### Patch Changes
+
+-   Updated dependencies [[`b80e7882b`](https://github.com/Khan/perseus/commit/b80e7882bf58f8e71cbf9482585577032c317428)]:
+    -   @khanacademy/kas@0.4.8
+    -   @khanacademy/kmath@0.1.22
+    -   @khanacademy/math-input@22.0.5
+    -   @khanacademy/perseus-core@3.0.4
+    -   @khanacademy/perseus-linter@1.2.10
+    -   @khanacademy/pure-markdown@0.3.19
+    -   @khanacademy/simple-markdown@0.13.12
+
+## 5.0.5
+
+### Patch Changes
+
+-   Updated dependencies [[`762b295ec`](https://github.com/Khan/perseus/commit/762b295eccd7d0dbc344edd271d3300b506adb93)]:
+    -   @khanacademy/kas@0.4.7
+    -   @khanacademy/kmath@0.1.21
+    -   @khanacademy/math-input@22.0.4
+    -   @khanacademy/perseus-core@3.0.3
+    -   @khanacademy/perseus-linter@1.2.9
+    -   @khanacademy/pure-markdown@0.3.18
+    -   @khanacademy/simple-markdown@0.13.11
+
+## 5.0.4
+
+### Patch Changes
+
+-   [#2027](https://github.com/Khan/perseus/pull/2027) [`368e222a6`](https://github.com/Khan/perseus/commit/368e222a6577dff38143d1584d6773129e8abbd7) Thanks [@handeyeco](https://github.com/handeyeco)! - Bump all packages to reset releases
+
+-   Updated dependencies [[`368e222a6`](https://github.com/Khan/perseus/commit/368e222a6577dff38143d1584d6773129e8abbd7)]:
+    -   @khanacademy/kas@0.4.6
+    -   @khanacademy/kmath@0.1.20
+    -   @khanacademy/math-input@22.0.3
+    -   @khanacademy/perseus-core@3.0.2
+    -   @khanacademy/perseus-linter@1.2.8
+    -   @khanacademy/pure-markdown@0.3.17
+    -   @khanacademy/simple-markdown@0.13.10
+
+## 5.0.3
+
+### Patch Changes
+
+-   [#1810](https://github.com/Khan/perseus/pull/1810) [`e21ead80e`](https://github.com/Khan/perseus/commit/e21ead80e7cf467a2003fc145bfa1f65973eb270) Thanks [@daniellewhyte](https://github.com/daniellewhyte)! - Update Dropdown widget to support displaying TeX
+
+-   Updated dependencies [[`e21ead80e`](https://github.com/Khan/perseus/commit/e21ead80e7cf467a2003fc145bfa1f65973eb270)]:
+    -   @khanacademy/math-input@22.0.2
+    -   @khanacademy/perseus-core@3.0.1
+    -   @khanacademy/kas@0.4.5
+    -   @khanacademy/kmath@0.1.19
+    -   @khanacademy/perseus-linter@1.2.7
+    -   @khanacademy/pure-markdown@0.3.16
+    -   @khanacademy/simple-markdown@0.13.9
+
 ## 5.0.2
 
 ### Patch Changes

diff --git a/dev/package.json b/dev/package.json
@@ -3,7 +3,7 @@
     "description": "Perseus dev UI",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "5.0.2",
+    "version": "5.0.9",
     "private": true,
     "repository": {
         "type": "git",
@@ -14,13 +14,13 @@
         "dev": "vite"
     },
     "dependencies": {
-        "@khanacademy/kas": "^0.4.4",
-        "@khanacademy/kmath": "^0.1.18",
-        "@khanacademy/math-input": "^22.0.1",
-        "@khanacademy/perseus-core": "3.0.0",
-        "@khanacademy/perseus-linter": "^1.2.6",
-        "@khanacademy/pure-markdown": "^0.3.15",
-        "@khanacademy/simple-markdown": "^0.13.8",
+        "@khanacademy/kas": "^0.4.9",
+        "@khanacademy/kmath": "^0.1.24",
+        "@khanacademy/math-input": "^22.0.7",
+        "@khanacademy/perseus-core": "3.0.5",
+        "@khanacademy/perseus-linter": "^1.2.11",
+        "@khanacademy/pure-markdown": "^0.3.20",
+        "@khanacademy/simple-markdown": "^0.13.13",
         "@khanacademy/wonder-blocks-banner": "4.0.3",
         "@khanacademy/wonder-blocks-icon": "5.0.3",
         "@khanacademy/wonder-blocks-icon-button": "6.0.3",

diff --git a/packages/kas/CHANGELOG.md b/packages/kas/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @khanacademy/kas
 
+## 0.4.9
+
+### Patch Changes
+
+-   [#2040](https://github.com/Khan/perseus/pull/2040) [`1496a7a93`](https://github.com/Khan/perseus/commit/1496a7a93ef691c8e34da309c10cb77d35627bf3) Thanks [@somewhatabstract](https://github.com/somewhatabstract)! - Bump versions to fix release
+
+-   Updated dependencies [[`1496a7a93`](https://github.com/Khan/perseus/commit/1496a7a93ef691c8e34da309c10cb77d35627bf3)]:
+    -   @khanacademy/perseus-core@3.0.5
+
+## 0.4.8
+
+### Patch Changes
+
+-   [#2037](https://github.com/Khan/perseus/pull/2037) [`b80e7882b`](https://github.com/Khan/perseus/commit/b80e7882bf58f8e71cbf9482585577032c317428) Thanks [@somewhatabstract](https://github.com/somewhatabstract)! - Nothing has changed, but our action requires a changeset per package and I don't know how to do an infrastructure update like this and pass that check
+
+-   Updated dependencies [[`b80e7882b`](https://github.com/Khan/perseus/commit/b80e7882bf58f8e71cbf9482585577032c317428)]:
+    -   @khanacademy/perseus-core@3.0.4
+
+## 0.4.7
+
+### Patch Changes
+
+-   [#2028](https://github.com/Khan/perseus/pull/2028) [`762b295ec`](https://github.com/Khan/perseus/commit/762b295eccd7d0dbc344edd271d3300b506adb93) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Forcing release
+
+-   Updated dependencies [[`762b295ec`](https://github.com/Khan/perseus/commit/762b295eccd7d0dbc344edd271d3300b506adb93)]:
+    -   @khanacademy/perseus-core@3.0.3
+
+## 0.4.6
+
+### Patch Changes
+
+-   [#2027](https://github.com/Khan/perseus/pull/2027) [`368e222a6`](https://github.com/Khan/perseus/commit/368e222a6577dff38143d1584d6773129e8abbd7) Thanks [@handeyeco](https://github.com/handeyeco)! - Bump all packages to reset releases
+
+-   Updated dependencies [[`368e222a6`](https://github.com/Khan/perseus/commit/368e222a6577dff38143d1584d6773129e8abbd7)]:
+    -   @khanacademy/perseus-core@3.0.2
+
+## 0.4.5
+
+### Patch Changes
+
+-   Updated dependencies [[`e21ead80e`](https://github.com/Khan/perseus/commit/e21ead80e7cf467a2003fc145bfa1f65973eb270)]:
+    -   @khanacademy/perseus-core@3.0.1
+
 ## 0.4.4
 
 ### Patch Changes

diff --git a/packages/kas/package.json b/packages/kas/package.json
@@ -3,7 +3,7 @@
     "description": "A lightweight JavaScript CAS for comparing expressions and equations.",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "0.4.4",
+    "version": "0.4.9",
     "publishConfig": {
         "access": "public"
     },
@@ -22,15 +22,16 @@
         "dist"
     ],
     "scripts": {
+        "prepublishOnly": "../../utils/package-pre-publish-check.sh",
         "gen:parsers": "node src/parser-generator.ts",
         "test": "bash -c 'yarn --silent --cwd \"../..\" test ${@:0} $($([[ ${@: -1} = -* ]] || [[ ${@: -1} = bash ]]) && echo $PWD)'"
     },
     "dependencies": {
-        "@khanacademy/perseus-core": "3.0.0"
+        "@khanacademy/perseus-core": "3.0.5"
     },
     "devDependencies": {
         "jison": "0.4.15",
-        "perseus-build-settings": "^0.4.1",
+        "perseus-build-settings": "^0.4.3",
         "underscore": "1.4.4"
     },
     "peerDependencies": {
@@ -43,4 +44,4 @@
         "algebra",
         "symbolic"
     ]
-}
+}
diff --git a/packages/kas/src/nodes.ts b/packages/kas/src/nodes.ts
@@ -1,6 +1,6 @@
 /* eslint-disable prettier/prettier */
 /* eslint-disable import/order */
-/* TODO(charlie): fix these lint errors (http://eslint.org/docs/rules): */
+/* TODO: fix these lint errors (http://eslint.org/docs/rules): */
 /* eslint-disable indent, no-undef, no-var, no-dupe-keys, no-new-func, no-redeclare, comma-dangle, max-len, prefer-spread, space-infix-ops, space-unary-ops */
 import _ from "underscore";
 

diff --git a/packages/keypad-context/CHANGELOG.md b/packages/keypad-context/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @khanacademy/keypad-context
 
+## 1.0.12
+
+### Patch Changes
+
+-   [#2047](https://github.com/Khan/perseus/pull/2047) [`4345801bf`](https://github.com/Khan/perseus/commit/4345801bfc09942e0d6dc0459d1e4d53c4f57561) Thanks [@somewhatabstract](https://github.com/somewhatabstract)! - Bump version for testing release protections.
+
+## 1.0.11
+
+### Patch Changes
+
+-   [#2040](https://github.com/Khan/perseus/pull/2040) [`1496a7a93`](https://github.com/Khan/perseus/commit/1496a7a93ef691c8e34da309c10cb77d35627bf3) Thanks [@somewhatabstract](https://github.com/somewhatabstract)! - Bump versions to fix release
+
+-   Updated dependencies [[`1496a7a93`](https://github.com/Khan/perseus/commit/1496a7a93ef691c8e34da309c10cb77d35627bf3)]:
+    -   @khanacademy/perseus-core@3.0.5
+
+## 1.0.10
+
+### Patch Changes
+
+-   [#2037](https://github.com/Khan/perseus/pull/2037) [`b80e7882b`](https://github.com/Khan/perseus/commit/b80e7882bf58f8e71cbf9482585577032c317428) Thanks [@somewhatabstract](https://github.com/somewhatabstract)! - Nothing has changed, but our action requires a changeset per package and I don't know how to do an infrastructure update like this and pass that check
+
+-   Updated dependencies [[`b80e7882b`](https://github.com/Khan/perseus/commit/b80e7882bf58f8e71cbf9482585577032c317428)]:
+    -   @khanacademy/perseus-core@3.0.4
+
+## 1.0.9
+
+### Patch Changes
+
+-   [#2028](https://github.com/Khan/perseus/pull/2028) [`762b295ec`](https://github.com/Khan/perseus/commit/762b295eccd7d0dbc344edd271d3300b506adb93) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Forcing release
+
+-   Updated dependencies [[`762b295ec`](https://github.com/Khan/perseus/commit/762b295eccd7d0dbc344edd271d3300b506adb93)]:
+    -   @khanacademy/perseus-core@3.0.3
+
+## 1.0.8
+
+### Patch Changes
+
+-   [#2027](https://github.com/Khan/perseus/pull/2027) [`368e222a6`](https://github.com/Khan/perseus/commit/368e222a6577dff38143d1584d6773129e8abbd7) Thanks [@handeyeco](https://github.com/handeyeco)! - Bump all packages to reset releases
+
+-   Updated dependencies [[`368e222a6`](https://github.com/Khan/perseus/commit/368e222a6577dff38143d1584d6773129e8abbd7)]:
+    -   @khanacademy/perseus-core@3.0.2
+
+## 1.0.7
+
+### Patch Changes
+
+-   Updated dependencies [[`e21ead80e`](https://github.com/Khan/perseus/commit/e21ead80e7cf467a2003fc145bfa1f65973eb270)]:
+    -   @khanacademy/perseus-core@3.0.1
+
 ## 1.0.6
 
 ### Patch Changes