Skip to content

Commit

Permalink
Merge branch 'main' into start-coords-linear
Browse files Browse the repository at this point in the history
  • Loading branch information
nishasy committed Jul 15, 2024
2 parents ff136ad + a8a1a0f commit a741a28
Show file tree
Hide file tree
Showing 105 changed files with 1,137 additions and 1,122 deletions.
5 changes: 0 additions & 5 deletions .changeset/new-eyes-repeat.md

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This repo is a constellation of sub-repos for showing exercise content. Please s

To install Perseus, you need to run the following commands:

#### `yarn install`
#### `yarn`

Installs project dependencies and tooling

Expand Down
13 changes: 13 additions & 0 deletions dev/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @khanacademy/perseus-dev-ui

## 1.6.2

### Patch Changes

- Updated dependencies [[`be7f14153`](https://github.com/Khan/perseus/commit/be7f141536b6ed69bba8a4378a1ddae51fd5307e), [`b0df85a80`](https://github.com/Khan/perseus/commit/b0df85a803444a5de1f74672c5f0f5ccc3aa5617), [`24a72177e`](https://github.com/Khan/perseus/commit/24a72177edfc3471192f0f040918d998c2c6897d)]:
- @khanacademy/kas@0.3.10
- @khanacademy/kmath@0.1.13
- @khanacademy/math-input@19.2.1
- @khanacademy/perseus-linter@1.0.0
- @khanacademy/pure-markdown@0.3.6
- @khanacademy/simple-markdown@0.12.1
- @khanacademy/perseus-core@1.5.0

## 1.6.1

### Patch Changes
Expand Down
16 changes: 8 additions & 8 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": "1.6.1",
"version": "1.6.2",
"private": true,
"repository": {
"type": "git",
Expand All @@ -14,13 +14,13 @@
"dev": "vite"
},
"dependencies": {
"@khanacademy/kas": "^0.3.9",
"@khanacademy/kmath": "^0.1.12",
"@khanacademy/math-input": "^19.2.0",
"@khanacademy/perseus-core": "1.4.2",
"@khanacademy/perseus-linter": "^0.4.0",
"@khanacademy/pure-markdown": "^0.3.5",
"@khanacademy/simple-markdown": "^0.12.0",
"@khanacademy/kas": "^0.3.10",
"@khanacademy/kmath": "^0.1.13",
"@khanacademy/math-input": "^19.2.1",
"@khanacademy/perseus-core": "1.5.0",
"@khanacademy/perseus-linter": "^1.0.0",
"@khanacademy/pure-markdown": "^0.3.6",
"@khanacademy/simple-markdown": "^0.12.1",
"@khanacademy/wonder-blocks-banner": "3.0.42",
"@khanacademy/wonder-blocks-icon": "4.1.0",
"@khanacademy/wonder-blocks-icon-button": "5.2.1",
Expand Down
9 changes: 9 additions & 0 deletions packages/kas/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @khanacademy/kas

## 0.3.10

### Patch Changes

- [#1407](https://github.com/Khan/perseus/pull/1407) [`be7f14153`](https://github.com/Khan/perseus/commit/be7f141536b6ed69bba8a4378a1ddae51fd5307e) Thanks [@handeyeco](https://github.com/handeyeco)! - Updates to README files

- Updated dependencies [[`b0df85a80`](https://github.com/Khan/perseus/commit/b0df85a803444a5de1f74672c5f0f5ccc3aa5617)]:
- @khanacademy/perseus-core@1.5.0

## 0.3.9

### Patch Changes
Expand Down
23 changes: 9 additions & 14 deletions packages/kas/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
KAS
===
# @khanacademy/kas

A lightweight JavaScript CAS (Computer Algebra System) for comparing expressions and equations.
It is used throughout [Khan Academy](https://khanacademy.org)'s interactive exercises.

What can it do?
---------------
## What can it do?

It can parse plain text math, LaTeX, or a mix of both:

Expand Down Expand Up @@ -77,18 +75,15 @@ expr.simplify().print();
// "(-1+3*p)^(-1)*(3*n+-1*m+2*p)"
```

How to build the library
------------------------
npm install
npm run build
## How to build the library
yarn
yarn build

How to build the parser
-----------------------
## How to build the parser
First, make any changes in `src/parser-generator.js`

npm install
npm run build:parser
yarn
yarn build:parser

License
-------
## License
[MIT License](http://opensource.org/licenses/MIT)
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.3.9",
"version": "0.3.10",
"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": "1.4.2"
"@khanacademy/perseus-core": "1.5.0"
},
"devDependencies": {
"jison": "0.4.15",
Expand Down
9 changes: 9 additions & 0 deletions packages/kmath/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @khanacademy/kmath

## 0.1.13

### Patch Changes

- [#1407](https://github.com/Khan/perseus/pull/1407) [`be7f14153`](https://github.com/Khan/perseus/commit/be7f141536b6ed69bba8a4378a1ddae51fd5307e) Thanks [@handeyeco](https://github.com/handeyeco)! - Updates to README files

- Updated dependencies [[`b0df85a80`](https://github.com/Khan/perseus/commit/b0df85a803444a5de1f74672c5f0f5ccc3aa5617)]:
- @khanacademy/perseus-core@1.5.0

## 0.1.12

### Patch Changes
Expand Down
9 changes: 4 additions & 5 deletions packages/kmath/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<h1 align="center">
<img alt="kmath" src="logo.svg" width="50" /> <br />
kmath - Javascript Numeric Math Utilities
</h1>
# @khanacademy/kmath

Javascript Numeric Math Utilities

## Overview

Expand Down Expand Up @@ -34,7 +33,7 @@ pure and allocates a new array for the return value.
## Getting started

After cloning or downloading kmath, you can install it by running
`npm install` or `make install`.
`yarn` or `make install`.

To play around with the available interfaces, you can load kmath
into a Node repl:
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.12",
"version": "0.1.13",
"publishConfig": {
"access": "public"
},
Expand All @@ -24,7 +24,7 @@
"test": "bash -c 'yarn --silent --cwd \"../..\" test ${@:0} $($([[ ${@: -1} = -* ]] || [[ ${@: -1} = bash ]]) && echo $PWD)'"
},
"dependencies": {
"@khanacademy/perseus-core": "1.4.2"
"@khanacademy/perseus-core": "1.5.0"
},
"devDependencies": {
"perseus-build-settings": "^0.4.1",
Expand Down
9 changes: 9 additions & 0 deletions packages/math-input/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @khanacademy/math-input

## 19.2.1

### Patch Changes

- [#1407](https://github.com/Khan/perseus/pull/1407) [`be7f14153`](https://github.com/Khan/perseus/commit/be7f141536b6ed69bba8a4378a1ddae51fd5307e) Thanks [@handeyeco](https://github.com/handeyeco)! - Updates to README files

- Updated dependencies [[`b0df85a80`](https://github.com/Khan/perseus/commit/b0df85a803444a5de1f74672c5f0f5ccc3aa5617)]:
- @khanacademy/perseus-core@1.5.0

## 19.2.0

### Minor Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/math-input/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# math-input
# @khanacademy/math-input

Khan Academy's expression editor for the mobile web. Used in the [Perseus](https://github.com/khan/perseus) exercise framework to power math input and expression editing on small screens.
Khan Academy's expression editor for the web. Used in the [Perseus](https://github.com/khan/perseus) exercise framework to power math input and expression editing on all screens.

Built with [React](https://github.com/facebook/react), [MathQuill](https://github.com/mathquill/mathquill), [Aphrodite](https://github.com/khan/aphrodite), and more.

Expand All @@ -11,7 +11,7 @@ Try it yourself on [Khan Academy](https://www.khanacademy.org/math/algebra-basic
## Getting started

- Clone the project: `git clone [email protected]:Khan/math-input.git`
- Install dependencies: `yarn install`
- Install dependencies: `yarn`
- Start the development server: `yarn start`

When you start the project you'll need to be on a device that supports touch or touch emulation to see the keyboard. The easiest way to get started is open the developer tools on Google Chrome.
Expand Down
4 changes: 2 additions & 2 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": "19.2.0",
"version": "19.2.1",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -37,7 +37,7 @@
],
"scripts": {},
"dependencies": {
"@khanacademy/perseus-core": "1.4.2",
"@khanacademy/perseus-core": "1.5.0",
"mathquill": "https://github.com/Khan/mathquill/releases/download/v1.0.0/mathquill-v1.0.0.tgz"
},
"devDependencies": {
Expand Down
6 changes: 6 additions & 0 deletions packages/perseus-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @khanacademy/perseus-core

## 1.5.0

### Minor Changes

- [#1411](https://github.com/Khan/perseus/pull/1411) [`b0df85a80`](https://github.com/Khan/perseus/commit/b0df85a803444a5de1f74672c5f0f5ccc3aa5617) Thanks [@handeyeco](https://github.com/handeyeco)! - Consolidate PerseusError code and move it into perseus-core (deletes the perseus-error package)

## 1.4.2

### 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": "1.4.2",
"version": "1.5.0",
"publishConfig": {
"access": "public"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
import type {Metadata} from "@khanacademy/wonder-stuff-core";

export {libVersion} from "./version";

/**
* @typedef {Object} Errors utility for referencing the Perseus error taxonomy.
*/
Expand Down Expand Up @@ -44,21 +40,3 @@ export const Errors = Object.freeze({
* @type {ErrorKind} The kind of error being reported
*/
export type ErrorKind = (typeof Errors)[keyof typeof Errors];

/**
* Optional extra information passed to the `PerseusError` constructor.
*/
type Options = {
metadata?: Metadata | null | undefined;
};

export class PerseusError extends Error {
kind: ErrorKind;
metadata: Metadata | null | undefined;

constructor(message: string, kind: ErrorKind, options?: Options) {
super(message);
this.kind = kind;
this.metadata = options?.metadata;
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type {ErrorKind} from "./logging/log";
import type {ErrorKind} from "./errors";
import type {Metadata} from "@khanacademy/wonder-stuff-core";

type Options = {
Expand Down
4 changes: 4 additions & 0 deletions packages/perseus-core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ export type {
KeypadContextRendererInterface,
RendererInterface,
} from "./types";
export type {ErrorKind} from "./error/errors";

// Careful, `version.ts` uses this function so it _must_ be imported above it
export {addLibraryVersionToPerseusDebug} from "./utils/add-library-version-to-perseus-debug";

export {libVersion} from "./version";

export {Errors} from "./error/errors";
export {PerseusError} from "./error/perseus-error";
17 changes: 17 additions & 0 deletions packages/perseus-editor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# @khanacademy/perseus-editor

## 8.0.0

### Major Changes

- [#1411](https://github.com/Khan/perseus/pull/1411) [`b0df85a80`](https://github.com/Khan/perseus/commit/b0df85a803444a5de1f74672c5f0f5ccc3aa5617) Thanks [@handeyeco](https://github.com/handeyeco)! - Consolidate PerseusError code and move it into perseus-core (deletes the perseus-error package)

### Patch Changes

- [#1405](https://github.com/Khan/perseus/pull/1405) [`a430de4c1`](https://github.com/Khan/perseus/commit/a430de4c1727afc9a71ff5a6f976579e8b17b754) Thanks [@benchristel](https://github.com/benchristel)! - Internal: Fix console errors and warnings printed in tests

- Updated dependencies [[`a430de4c1`](https://github.com/Khan/perseus/commit/a430de4c1727afc9a71ff5a6f976579e8b17b754), [`fa19dbc97`](https://github.com/Khan/perseus/commit/fa19dbc9791e95143f6c7c784bc78332ab5cd5b0), [`be7f14153`](https://github.com/Khan/perseus/commit/be7f141536b6ed69bba8a4378a1ddae51fd5307e), [`147ab0442`](https://github.com/Khan/perseus/commit/147ab0442cc31a86553edc8535e228b5893a0acc), [`8ae3d18f1`](https://github.com/Khan/perseus/commit/8ae3d18f102c0bfc13c41c77c1ca4083e00f1dc7), [`b0df85a80`](https://github.com/Khan/perseus/commit/b0df85a803444a5de1f74672c5f0f5ccc3aa5617), [`f5711a331`](https://github.com/Khan/perseus/commit/f5711a331f6fce02d8c5f753e752fd8665b90344), [`3108f933e`](https://github.com/Khan/perseus/commit/3108f933eb527b37dc4d02f3cab189c047548a11), [`e6424d5e7`](https://github.com/Khan/perseus/commit/e6424d5e72c37a9c4c3b595855071a2d0af43d35)]:
- @khanacademy/perseus@25.0.0
- @khanacademy/kas@0.3.10
- @khanacademy/kmath@0.1.13
- @khanacademy/math-input@19.2.1
- @khanacademy/perseus-core@1.5.0

## 7.0.3

### Patch Changes
Expand Down
12 changes: 6 additions & 6 deletions packages/perseus-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Perseus editors",
"author": "Khan Academy",
"license": "MIT",
"version": "7.0.3",
"version": "8.0.0",
"publishConfig": {
"access": "public"
},
Expand All @@ -25,11 +25,11 @@
"test": "bash -c 'yarn --silent --cwd \"../..\" test ${@:0} $($([[ ${@: -1} = -* ]] || [[ ${@: -1} = bash ]]) && echo $PWD)'"
},
"dependencies": {
"@khanacademy/kas": "^0.3.9",
"@khanacademy/kmath": "^0.1.12",
"@khanacademy/math-input": "^19.2.0",
"@khanacademy/perseus": "^24.3.0",
"@khanacademy/perseus-core": "1.4.2"
"@khanacademy/kas": "^0.3.10",
"@khanacademy/kmath": "^0.1.13",
"@khanacademy/math-input": "^19.2.1",
"@khanacademy/perseus": "^25.0.0",
"@khanacademy/perseus-core": "1.5.0"
},
"devDependencies": {
"@khanacademy/wonder-blocks-accordion": "1.3.1",
Expand Down
Loading

0 comments on commit a741a28

Please sign in to comment.