Skip to content

Commit

Permalink
Merge branch 'main' into LEMS-2484-minimally-describe-sinusoid
Browse files Browse the repository at this point in the history
  • Loading branch information
anakaren-rojas committed Jan 13, 2025
2 parents 4299dd5 + b846392 commit 0ceef0e
Show file tree
Hide file tree
Showing 383 changed files with 6,708 additions and 1,815 deletions.
8 changes: 0 additions & 8 deletions .changeset/shaggy-insects-fix.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/soft-rocks-breathe.md

This file was deleted.

2 changes: 1 addition & 1 deletion data/find-questions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import fs from "fs";
import path from "path";

import type {PerseusRenderer} from "@khanacademy/perseus";
import type {PerseusRenderer} from "@khanacademy/perseus-core";

// ==========================
// MODIFY THIS WHEN SEARCHING
Expand Down
26 changes: 26 additions & 0 deletions dev/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,31 @@
# @khanacademy/perseus-dev-ui

## 5.0.12

### Patch Changes

- [#2093](https://github.com/Khan/perseus/pull/2093) [`766d33577`](https://github.com/Khan/perseus/commit/766d33577a5ea83ef8f8c291534eb34833c54197) Thanks [@handeyeco](https://github.com/handeyeco)! - Remove exports from Perseus that were moved to Perseus-Core

* [#2086](https://github.com/Khan/perseus/pull/2086) [`bc3d955b5`](https://github.com/Khan/perseus/commit/bc3d955b57e847a379328fcc7cf276f42e0874dd) Thanks [@handeyeco](https://github.com/handeyeco)! - Init perseus-score, move AnswerTypes from perseus to perseus-score, move perseus-types in perseus to data-schema in perseus-core

* Updated dependencies [[`bbf7f3b1b`](https://github.com/Khan/perseus/commit/bbf7f3b1be657c588270a3b47983c0aecbf84418), [`6cf647729`](https://github.com/Khan/perseus/commit/6cf6477291053d85faac48028b8f038fd0c28930), [`5173c2e43`](https://github.com/Khan/perseus/commit/5173c2e43bf939159f420dcd448b90691d52353b), [`bc3d955b5`](https://github.com/Khan/perseus/commit/bc3d955b57e847a379328fcc7cf276f42e0874dd), [`d2797bb2d`](https://github.com/Khan/perseus/commit/d2797bb2dc51bd80cb03f2c1eeb39286e4dfa45c)]:
- @khanacademy/perseus-core@3.1.0
- @khanacademy/pure-markdown@0.3.21
- @khanacademy/kmath@0.2.0
- @khanacademy/kas@0.4.10
- @khanacademy/math-input@22.1.2
- @khanacademy/perseus-linter@1.2.12
- @khanacademy/simple-markdown@0.13.14

## 5.0.11

### Patch Changes

- [#2057](https://github.com/Khan/perseus/pull/2057) [`2dc22def4`](https://github.com/Khan/perseus/commit/2dc22def44b7616ad739d2c5a575b83bd6362949) Thanks [@dependabot](https://github.com/apps/dependabot)! - update wonderblocks dependencies

- Updated dependencies [[`2dc22def4`](https://github.com/Khan/perseus/commit/2dc22def44b7616ad739d2c5a575b83bd6362949)]:
- @khanacademy/math-input@22.1.1

## 5.0.10

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion dev/flipbook-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import {cache} from "./cache";

import type {PerseusRenderer} from "@khanacademy/perseus";
import type {PerseusRenderer} from "@khanacademy/perseus-core";

export type FlipbookModel = {
questions: string;
Expand Down
8 changes: 3 additions & 5 deletions dev/flipbook.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,13 @@ import {
} from "./flipbook-model";
import {Header} from "./header";

import type {APIOptions, PerseusScore} from "../packages/perseus/src";
import type {
APIOptions,
InteractiveGraphWidget,
PerseusRenderer,
PerseusScore,
PerseusWidget,
} from "../packages/perseus/src";
import type {InteractiveGraphWidget} from "../packages/perseus/src/perseus-types";
} from "../packages/perseus-core/src/data-schema";
import type {PropsFor} from "@khanacademy/wonder-blocks-core";

import "../packages/perseus/src/styles/perseus-renderer.less";

const exampleCommands = `
Expand Down
4 changes: 2 additions & 2 deletions dev/gallery.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import * as numberLine from "../packages/perseus/src/widgets/number-line/number-

import {Header} from "./header";

import type {APIOptions, PerseusRenderer} from "../packages/perseus/src";

import type {APIOptions} from "../packages/perseus/src";
import "../packages/perseus/src/styles/perseus-renderer.less";
import type {PerseusRenderer} from "../packages/perseus-core/src/data-schema";

const questions: [PerseusRenderer, number][] = pairWithIndices([
interactiveGraph.segmentQuestion,
Expand Down
30 changes: 15 additions & 15 deletions dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Perseus dev UI",
"author": "Khan Academy",
"license": "MIT",
"version": "5.0.10",
"version": "5.0.12",
"private": true,
"repository": {
"type": "git",
Expand All @@ -14,22 +14,22 @@
"dev": "vite"
},
"dependencies": {
"@khanacademy/kas": "^0.4.9",
"@khanacademy/kmath": "^0.1.24",
"@khanacademy/math-input": "^22.1.0",
"@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.4",
"@khanacademy/wonder-blocks-icon": "5.0.4",
"@khanacademy/wonder-blocks-icon-button": "6.0.4",
"@khanacademy/wonder-blocks-link": "7.0.4",
"@khanacademy/wonder-blocks-search-field": "4.0.4",
"@khanacademy/kas": "^0.4.10",
"@khanacademy/kmath": "^0.2.0",
"@khanacademy/math-input": "^22.1.2",
"@khanacademy/perseus-core": "3.1.0",
"@khanacademy/perseus-linter": "^1.2.12",
"@khanacademy/pure-markdown": "^0.3.21",
"@khanacademy/simple-markdown": "^0.13.14",
"@khanacademy/wonder-blocks-banner": "4.0.5",
"@khanacademy/wonder-blocks-icon": "5.0.5",
"@khanacademy/wonder-blocks-icon-button": "6.0.5",
"@khanacademy/wonder-blocks-link": "7.0.5",
"@khanacademy/wonder-blocks-search-field": "4.0.5",
"@khanacademy/wonder-blocks-timing": "6.0.1",
"@khanacademy/wonder-blocks-tokens": "3.0.1",
"@khanacademy/wonder-blocks-toolbar": "5.0.4",
"@khanacademy/wonder-blocks-tooltip": "4.0.2",
"@khanacademy/wonder-blocks-toolbar": "5.0.5",
"@khanacademy/wonder-blocks-tooltip": "4.0.3",
"@khanacademy/wonder-stuff-core": "1.5.4",
"@phosphor-icons/core": "^2.0.2"
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"@khanacademy/eslint-config": "^5.0.1",
"@khanacademy/eslint-plugin": "^3.1.1",
"@khanacademy/mathjax-renderer": "^2.1.1",
"@khanacademy/wonder-blocks-button": "7.0.4",
"@khanacademy/wonder-blocks-layout": "3.0.4",
"@khanacademy/wonder-blocks-button": "7.0.5",
"@khanacademy/wonder-blocks-layout": "3.0.5",
"@khanacademy/wonder-blocks-spacing": "^4.0.1",
"@popperjs/core": "^2.10.2",
"@rollup/plugin-alias": "^3.1.9",
Expand Down
7 changes: 7 additions & 0 deletions packages/kas/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @khanacademy/kas

## 0.4.10

### Patch Changes

- Updated dependencies [[`bbf7f3b1b`](https://github.com/Khan/perseus/commit/bbf7f3b1be657c588270a3b47983c0aecbf84418), [`6cf647729`](https://github.com/Khan/perseus/commit/6cf6477291053d85faac48028b8f038fd0c28930), [`5173c2e43`](https://github.com/Khan/perseus/commit/5173c2e43bf939159f420dcd448b90691d52353b), [`bc3d955b5`](https://github.com/Khan/perseus/commit/bc3d955b57e847a379328fcc7cf276f42e0874dd), [`d2797bb2d`](https://github.com/Khan/perseus/commit/d2797bb2dc51bd80cb03f2c1eeb39286e4dfa45c)]:
- @khanacademy/perseus-core@3.1.0

## 0.4.9

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/kas/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A lightweight JavaScript CAS for comparing expressions and equations.",
"author": "Khan Academy",
"license": "MIT",
"version": "0.4.9",
"version": "0.4.10",
"publishConfig": {
"access": "public"
},
Expand All @@ -27,7 +27,7 @@
"test": "bash -c 'yarn --silent --cwd \"../..\" test ${@:0} $($([[ ${@: -1} = -* ]] || [[ ${@: -1} = bash ]]) && echo $PWD)'"
},
"dependencies": {
"@khanacademy/perseus-core": "3.0.5"
"@khanacademy/perseus-core": "3.1.0"
},
"devDependencies": {
"jison": "0.4.15",
Expand Down
7 changes: 7 additions & 0 deletions packages/keypad-context/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @khanacademy/keypad-context

## 1.0.13

### Patch Changes

- Updated dependencies [[`bbf7f3b1b`](https://github.com/Khan/perseus/commit/bbf7f3b1be657c588270a3b47983c0aecbf84418), [`6cf647729`](https://github.com/Khan/perseus/commit/6cf6477291053d85faac48028b8f038fd0c28930), [`5173c2e43`](https://github.com/Khan/perseus/commit/5173c2e43bf939159f420dcd448b90691d52353b), [`bc3d955b5`](https://github.com/Khan/perseus/commit/bc3d955b57e847a379328fcc7cf276f42e0874dd), [`d2797bb2d`](https://github.com/Khan/perseus/commit/d2797bb2dc51bd80cb03f2c1eeb39286e4dfa45c)]:
- @khanacademy/perseus-core@3.1.0

## 1.0.12

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/keypad-context/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Perseus keypad context",
"author": "Khan Academy",
"license": "MIT",
"version": "1.0.12",
"version": "1.0.13",
"publishConfig": {
"access": "public"
},
Expand All @@ -26,7 +26,7 @@
"test": "bash -c 'yarn --silent --cwd \"../..\" test ${@:0} $($([[ ${@: -1} = -* ]] || [[ ${@: -1} = bash ]]) && echo $PWD)'"
},
"dependencies": {
"@khanacademy/perseus-core": "3.0.5"
"@khanacademy/perseus-core": "3.1.0"
},
"devDependencies": {
"react": "^18.2.0"
Expand Down
11 changes: 11 additions & 0 deletions packages/kmath/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @khanacademy/kmath

## 0.2.0

### Minor Changes

- [#2086](https://github.com/Khan/perseus/pull/2086) [`bc3d955b5`](https://github.com/Khan/perseus/commit/bc3d955b57e847a379328fcc7cf276f42e0874dd) Thanks [@handeyeco](https://github.com/handeyeco)! - Init perseus-score, move AnswerTypes from perseus to perseus-score, move perseus-types in perseus to data-schema in perseus-core

### Patch Changes

- Updated dependencies [[`bbf7f3b1b`](https://github.com/Khan/perseus/commit/bbf7f3b1be657c588270a3b47983c0aecbf84418), [`6cf647729`](https://github.com/Khan/perseus/commit/6cf6477291053d85faac48028b8f038fd0c28930), [`5173c2e43`](https://github.com/Khan/perseus/commit/5173c2e43bf939159f420dcd448b90691d52353b), [`bc3d955b5`](https://github.com/Khan/perseus/commit/bc3d955b57e847a379328fcc7cf276f42e0874dd), [`d2797bb2d`](https://github.com/Khan/perseus/commit/d2797bb2dc51bd80cb03f2c1eeb39286e4dfa45c)]:
- @khanacademy/perseus-core@3.1.0

## 0.1.24

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/kmath/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Khan Academy's Javascript Numeric Math Utilities",
"author": "Khan Academy",
"license": "MIT",
"version": "0.1.24",
"version": "0.2.0",
"publishConfig": {
"access": "public"
},
Expand All @@ -25,7 +25,7 @@
"test": "bash -c 'yarn --silent --cwd \"../..\" test ${@:0} $($([[ ${@: -1} = -* ]] || [[ ${@: -1} = bash ]]) && echo $PWD)'"
},
"dependencies": {
"@khanacademy/perseus-core": "3.0.5"
"@khanacademy/perseus-core": "3.1.0"
},
"devDependencies": {
"perseus-build-settings": "^0.4.3",
Expand Down
2 changes: 2 additions & 0 deletions packages/kmath/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ export * as vector from "./vector";
export * as point from "./point";
export * as line from "./line";
export * as ray from "./ray";

export {default as KhanMath, sum} from "./math";
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import {number as knumber} from "@khanacademy/kmath";
import $ from "jquery";
import _ from "underscore";

import type {MathFormat} from "../perseus-types";
import {number as knumber} from "@khanacademy/kmath";

import type {MathFormat} from "@khanacademy/perseus-core";

const KhanMath = {
// Simplify formulas before display
Expand Down
14 changes: 14 additions & 0 deletions packages/math-input/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# @khanacademy/math-input

## 22.1.2

### Patch Changes

- Updated dependencies [[`bbf7f3b1b`](https://github.com/Khan/perseus/commit/bbf7f3b1be657c588270a3b47983c0aecbf84418), [`6cf647729`](https://github.com/Khan/perseus/commit/6cf6477291053d85faac48028b8f038fd0c28930), [`5173c2e43`](https://github.com/Khan/perseus/commit/5173c2e43bf939159f420dcd448b90691d52353b), [`bc3d955b5`](https://github.com/Khan/perseus/commit/bc3d955b57e847a379328fcc7cf276f42e0874dd), [`d2797bb2d`](https://github.com/Khan/perseus/commit/d2797bb2dc51bd80cb03f2c1eeb39286e4dfa45c)]:
- @khanacademy/perseus-core@3.1.0
- @khanacademy/keypad-context@1.0.13

## 22.1.1

### Patch Changes

- [#2057](https://github.com/Khan/perseus/pull/2057) [`2dc22def4`](https://github.com/Khan/perseus/commit/2dc22def44b7616ad739d2c5a575b83bd6362949) Thanks [@dependabot](https://github.com/apps/dependabot)! - update wonderblocks dependencies

## 22.1.0

### Minor Changes
Expand Down
18 changes: 9 additions & 9 deletions packages/math-input/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Khan Academy's new expression editor for the mobile web.",
"author": "Khan Academy",
"license": "MIT",
"version": "22.1.0",
"version": "22.1.2",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -40,15 +40,15 @@
"prepublishOnly": "../../utils/package-pre-publish-check.sh"
},
"dependencies": {
"@khanacademy/keypad-context": "^1.0.12",
"@khanacademy/perseus-core": "3.0.5",
"@khanacademy/keypad-context": "^1.0.13",
"@khanacademy/perseus-core": "3.1.0",
"mathquill": "https://github.com/Khan/mathquill/releases/download/v1.0.0/mathquill-v1.0.0.tgz"
},
"devDependencies": {
"@khanacademy/mathjax-renderer": "^2.1.1",
"@khanacademy/wonder-blocks-clickable": "5.0.4",
"@khanacademy/wonder-blocks-core": "11.0.1",
"@khanacademy/wonder-blocks-popover": "5.0.2",
"@khanacademy/wonder-blocks-clickable": "5.0.5",
"@khanacademy/wonder-blocks-core": "11.1.0",
"@khanacademy/wonder-blocks-popover": "5.0.3",
"@khanacademy/wonder-blocks-timing": "6.0.1",
"@khanacademy/wonder-blocks-tokens": "3.0.1",
"@khanacademy/wonder-stuff-core": "1.5.4",
Expand All @@ -64,9 +64,9 @@
},
"peerDependencies": {
"@khanacademy/mathjax-renderer": "^2.1.1",
"@khanacademy/wonder-blocks-clickable": "5.0.4",
"@khanacademy/wonder-blocks-core": "11.0.1",
"@khanacademy/wonder-blocks-popover": "5.0.2",
"@khanacademy/wonder-blocks-clickable": "5.0.5",
"@khanacademy/wonder-blocks-core": "11.1.0",
"@khanacademy/wonder-blocks-popover": "5.0.3",
"@khanacademy/wonder-blocks-timing": "6.0.1",
"@khanacademy/wonder-blocks-tokens": "3.0.1",
"@khanacademy/wonder-stuff-core": "1.5.4",
Expand Down
16 changes: 16 additions & 0 deletions packages/perseus-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# @khanacademy/perseus-core

## 3.1.0

### Minor Changes

- [#2082](https://github.com/Khan/perseus/pull/2082) [`bbf7f3b1b`](https://github.com/Khan/perseus/commit/bbf7f3b1be657c588270a3b47983c0aecbf84418) Thanks [@benchristel](https://github.com/benchristel)! - Enable parsePerseusItem to parse all published content, upgrading old formats to the current one.

* [#2053](https://github.com/Khan/perseus/pull/2053) [`5173c2e43`](https://github.com/Khan/perseus/commit/5173c2e43bf939159f420dcd448b90691d52353b) Thanks [@catandthemachines](https://github.com/catandthemachines)! - Adding new interactive graph marking type, axes.

- [#2086](https://github.com/Khan/perseus/pull/2086) [`bc3d955b5`](https://github.com/Khan/perseus/commit/bc3d955b57e847a379328fcc7cf276f42e0874dd) Thanks [@handeyeco](https://github.com/handeyeco)! - Init perseus-score, move AnswerTypes from perseus to perseus-score, move perseus-types in perseus to data-schema in perseus-core

* [#2088](https://github.com/Khan/perseus/pull/2088) [`d2797bb2d`](https://github.com/Khan/perseus/commit/d2797bb2dc51bd80cb03f2c1eeb39286e4dfa45c) Thanks [@handeyeco](https://github.com/handeyeco)! - Move objective\_ helpers into perseus-core

### Patch Changes

- [#2072](https://github.com/Khan/perseus/pull/2072) [`6cf647729`](https://github.com/Khan/perseus/commit/6cf6477291053d85faac48028b8f038fd0c28930) Thanks [@SonicScrewdriver](https://github.com/SonicScrewdriver)! - The creation of a new Mock Widget for tests.

## 3.0.5

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/perseus-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Shared Perseus infrastructure",
"author": "Khan Academy",
"license": "MIT",
"version": "3.0.5",
"version": "3.1.0",
"publishConfig": {
"access": "public"
},
Expand Down
Loading

0 comments on commit 0ceef0e

Please sign in to comment.