Merge branch 'main' into feature/client-validation

# Conflicts: # packages/perseus/src/index.ts # packages/perseus/src/widgets/dropdown/score-dropdown.test.ts
Khan · Dec 20, 2024 · a423410 · a423410
2 parents a1e22a4 + 00ec1f1
commit a423410
Show file tree

Hide file tree

Showing 94 changed files with 3,189 additions and 999 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": false,
+  "commit": ["@changesets/cli/commit", { "skipCI": false }],
   "linked": [],
   "access": "public",
   "baseBranch": "main",

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,122 @@
 # @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
+
+-   [#2022](https://github.com/Khan/perseus/pull/2022) [`266d240ed`](https://github.com/Khan/perseus/commit/266d240ed01f9b32242d150414e18fcfa8bd5230) Thanks [@somewhatabstract](https://github.com/somewhatabstract)! - Update to Wonder Blocks without custom ID generation API
+
+-   Updated dependencies [[`266d240ed`](https://github.com/Khan/perseus/commit/266d240ed01f9b32242d150414e18fcfa8bd5230)]:
+    -   @khanacademy/math-input@22.0.1
+
+## 5.0.1
+
+### Patch Changes
+
+-   [#2014](https://github.com/Khan/perseus/pull/2014) [`763d2d0f1`](https://github.com/Khan/perseus/commit/763d2d0f14e3aade030b1ef0aa28c3895c17b685) Thanks [@somewhatabstract](https://github.com/somewhatabstract)! - Migrate off deprecated ID generation APIs
+
+## 5.0.0
+
+### Major Changes
+
+-   [#2007](https://github.com/Khan/perseus/pull/2007) [`ea1bf0c2c`](https://github.com/Khan/perseus/commit/ea1bf0c2cfc7ae552d039549950d1973b56f5ca9) Thanks [@somewhatabstract](https://github.com/somewhatabstract)! - Update to latest webapp dependencies and prepare for deprecation of custom WB ID generators
+
+### Patch Changes
+
+-   Updated dependencies [[`ea1bf0c2c`](https://github.com/Khan/perseus/commit/ea1bf0c2cfc7ae552d039549950d1973b56f5ca9)]:
+    -   @khanacademy/math-input@22.0.0
+    -   @khanacademy/perseus-core@3.0.0
+    -   @khanacademy/kas@0.4.4
+    -   @khanacademy/kmath@0.1.18
+    -   @khanacademy/perseus-linter@1.2.6
+    -   @khanacademy/pure-markdown@0.3.15
+    -   @khanacademy/simple-markdown@0.13.8
+
 ## 4.0.4
 
 ### Patch Changes

diff --git a/dev/gallery.tsx b/dev/gallery.tsx
@@ -1,14 +1,14 @@
 /* eslint monorepo/no-internal-import: "off", monorepo/no-relative-import: "off", import/no-relative-packages: "off" */
 import Button from "@khanacademy/wonder-blocks-button";
-import {useUniqueIdWithMock, View} from "@khanacademy/wonder-blocks-core";
+import {View} from "@khanacademy/wonder-blocks-core";
 import {OptionItem, MultiSelect} from "@khanacademy/wonder-blocks-dropdown";
 import {Strut} from "@khanacademy/wonder-blocks-layout";
 import SearchField from "@khanacademy/wonder-blocks-search-field";
 import Switch from "@khanacademy/wonder-blocks-switch";
 import {spacing} from "@khanacademy/wonder-blocks-tokens";
 import {css, StyleSheet} from "aphrodite";
 import * as React from "react";
-import {useEffect, useMemo, useState} from "react";
+import {useEffect, useId, useMemo, useState} from "react";
 
 import {Renderer} from "../packages/perseus/src";
 import {mockStrings} from "../packages/perseus/src/strings";
@@ -98,7 +98,6 @@ function capitalize(key: string): string {
 }
 
 export function Gallery() {
-    const ids = useUniqueIdWithMock();
     const params = useMemo(
         () => new URLSearchParams(window.location.search),
         [],
@@ -148,10 +147,10 @@ export function Gallery() {
         return acc;
     }, {});
 
-    const mobileId = ids.get("mobile");
-    const tooltipId = ids.get("tooltip");
-    const flagsId = ids.get("flags");
-    const searchId = ids.get("search");
+    const mobileId = useId();
+    const tooltipId = useId();
+    const flagsId = useId();
+    const searchId = useId();
 
     const insertShowTooltips = ([question, i]): [PerseusRenderer, number] => {
         Object.keys(question.widgets).forEach((widgetName) => {

diff --git a/dev/package.json b/dev/package.json
@@ -3,7 +3,7 @@
     "description": "Perseus dev UI",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "4.0.4",
+    "version": "5.0.9",
     "private": true,
     "repository": {
         "type": "git",
@@ -14,23 +14,23 @@
         "dev": "vite"
     },
     "dependencies": {
-        "@khanacademy/kas": "^0.4.3",
-        "@khanacademy/kmath": "^0.1.17",
-        "@khanacademy/math-input": "^21.1.7",
-        "@khanacademy/perseus-core": "2.0.0",
-        "@khanacademy/perseus-linter": "^1.2.5",
-        "@khanacademy/pure-markdown": "^0.3.14",
-        "@khanacademy/simple-markdown": "^0.13.7",
-        "@khanacademy/wonder-blocks-banner": "3.1.7",
-        "@khanacademy/wonder-blocks-icon": "4.1.3",
-        "@khanacademy/wonder-blocks-icon-button": "5.3.4",
-        "@khanacademy/wonder-blocks-link": "6.1.6",
-        "@khanacademy/wonder-blocks-search-field": "2.2.23",
-        "@khanacademy/wonder-blocks-timing": "5.0.1",
-        "@khanacademy/wonder-blocks-tokens": "2.0.0",
-        "@khanacademy/wonder-blocks-toolbar": "3.0.35",
-        "@khanacademy/wonder-blocks-tooltip": "2.4.0",
-        "@khanacademy/wonder-stuff-core": "1.5.2",
+        "@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",
+        "@khanacademy/wonder-blocks-link": "7.0.3",
+        "@khanacademy/wonder-blocks-search-field": "4.0.1",
+        "@khanacademy/wonder-blocks-timing": "6.0.0",
+        "@khanacademy/wonder-blocks-tokens": "3.0.0",
+        "@khanacademy/wonder-blocks-toolbar": "5.0.3",
+        "@khanacademy/wonder-blocks-tooltip": "4.0.1",
+        "@khanacademy/wonder-stuff-core": "1.5.4",
         "@phosphor-icons/core": "^2.0.2"
     },
     "devDependencies": {

diff --git a/package.json b/package.json
@@ -27,11 +27,11 @@
         "@cypress/code-coverage": "^3.12.24",
         "@cypress/react": "^8.0.0",
         "@jest/globals": "^29.7.0",
-        "@khanacademy/eslint-config": "^4.0.0",
-        "@khanacademy/eslint-plugin": "^3.0.1",
-        "@khanacademy/mathjax-renderer": "^2.1.0",
-        "@khanacademy/wonder-blocks-button": "6.3.8",
-        "@khanacademy/wonder-blocks-layout": "2.1.3",
+        "@khanacademy/eslint-config": "^5.0.1",
+        "@khanacademy/eslint-plugin": "^3.1.1",
+        "@khanacademy/mathjax-renderer": "^2.1.1",
+        "@khanacademy/wonder-blocks-button": "7.0.3",
+        "@khanacademy/wonder-blocks-layout": "3.0.3",
         "@khanacademy/wonder-blocks-spacing": "^4.0.1",
         "@popperjs/core": "^2.10.2",
         "@rollup/plugin-alias": "^3.1.9",
@@ -109,7 +109,7 @@
         "react-router": "5.3.4",
         "react-router-dom": "5.3.4",
         "react-transition-group": "^4.4.1",
-        "react-window": "^1.8.5",
+        "react-window": "^1.8.10",
         "rollup": "^2.70.2",
         "rollup-plugin-auto-external": "^2.0.0",
         "rollup-plugin-executable-output": "^1.3.0",