@khanacademy/perseus 0.2.5 → 0.2.8

package/package.json

@@ -3,7 +3,7 @@
     "description": "Core Perseus API (includes renderers and widgets)",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "0.2.5",
+    "version": "0.2.8",
     "publishConfig": {
         "access": "public"
     },
@@ -21,26 +21,29 @@
         "test": "bash -c 'yarn --silent --cwd \"../..\" test ${@:0} $($([[ ${@: -1} = -* ]] || [[ ${@: -1} = bash ]]) && echo $PWD)'"
     },
     "dependencies": {
-        "@khanacademy/kmath": "0.0.5",
-        "@khanacademy/math-input": "^0.5.2",
+        "@khanacademy/kmath": "^0.0.5",
         "@khanacademy/kas": "^0.2.4",
-        "@khanacademy/simple-markdown": "^0.8.2",
+        "@khanacademy/math-input": "^0.5.2",
+        "@khanacademy/perseus-linter": "^0.1.0",
+        "@khanacademy/pure-markdown": "^0.1.0",
+        "@khanacademy/simple-markdown": "^0.8.3",
         "mathquill": "git+https://git@github.com/Khan/mathquill.git#a9ae54e057c5c1acc8244a5627acbff29901d992"
     },
     "devDependencies": {
-        "@khanacademy/wonder-blocks-button": "2.11.5",
+        "@khanacademy/wonder-blocks-button": "^2.11.5",
         "@khanacademy/wonder-blocks-color": "^1.1.20",
         "@khanacademy/wonder-blocks-core": "^4.3.0",
         "@khanacademy/wonder-blocks-data": "^7.0.0",
         "@khanacademy/wonder-blocks-dropdown": "^2.6.7",
         "@khanacademy/wonder-blocks-i18n": "^1.2.3",
-        "@khanacademy/wonder-blocks-layout": "1.4.9",
+        "@khanacademy/wonder-blocks-layout": "^1.4.9",
         "@khanacademy/wonder-blocks-link": "^3.8.5",
+        "@khanacademy/wonder-blocks-modal": "^2.3.1",
         "@khanacademy/wonder-blocks-popover": "^1.1.10",
-        "@khanacademy/wonder-blocks-progress-spinner": "1.1.31",
+        "@khanacademy/wonder-blocks-progress-spinner": "^1.1.31",
         "@khanacademy/wonder-blocks-spacing": "^3.0.5",
         "@khanacademy/wonder-blocks-tooltip": "^1.3.10",
-        "@khanacademy/wonder-blocks-typography": "1.1.31",
+        "@khanacademy/wonder-blocks-typography": "^1.1.31",
         "@khanacademy/wonder-stuff-core": "^0.1.2",
         "aphrodite": "^1.2.5",
         "classnames": "^1.1.4",
@@ -57,19 +60,20 @@
         "underscore": "^1.4.4"
     },
     "peerDependencies": {
-        "@khanacademy/wonder-blocks-button": "2.11.5",
+        "@khanacademy/wonder-blocks-button": "^2.11.5",
         "@khanacademy/wonder-blocks-color": "^1.1.20",
         "@khanacademy/wonder-blocks-core": "^4.3.0",
         "@khanacademy/wonder-blocks-data": "^7.0.0",
         "@khanacademy/wonder-blocks-dropdown": "^2.6.7",
         "@khanacademy/wonder-blocks-i18n": "^1.2.3",
-        "@khanacademy/wonder-blocks-layout": "1.4.9",
+        "@khanacademy/wonder-blocks-layout": "^1.4.9",
         "@khanacademy/wonder-blocks-link": "^3.8.5",
+        "@khanacademy/wonder-blocks-modal": "^2.3.1",
         "@khanacademy/wonder-blocks-popover": "^1.1.10",
-        "@khanacademy/wonder-blocks-progress-spinner": "1.1.31",
+        "@khanacademy/wonder-blocks-progress-spinner": "^1.1.31",
         "@khanacademy/wonder-blocks-spacing": "^3.0.5",
         "@khanacademy/wonder-blocks-tooltip": "^1.3.10",
-        "@khanacademy/wonder-blocks-typography": "1.1.31",
+        "@khanacademy/wonder-blocks-typography": "^1.1.31",
         "@khanacademy/wonder-stuff-core": "^0.1.2",
         "aphrodite": "^1.2.5",
         "classnames": "^1.1.4",

package/src/__tests__/jipt-paragraphs_test.js

@@ -0,0 +1,34 @@
+// @flow
+
+import JiptParagraphs from "../jipt-paragraphs.js";
+
+const {parseToArray} = JiptParagraphs;
+
+describe("jipt-paragraphs", () => {
+    it("should split paragraphs using custom JIPT SimpleMarkdown rules", () => {
+        expect(parseToArray("  \n\nhello\n\n")).toMatchInlineSnapshot(`
+            Array [
+              "  ",
+              "hello",
+            ]
+        `);
+    });
+
+    it("should recognize code fences using custom JIPT SimpleMarkdown rules", () => {
+        expect(
+            parseToArray(
+                "Let's write the canonical Hello World in Javascript\n\n" +
+                    '```js\nconst x = "hello world";\nconsole.log(x);```\n\n' +
+                    "**Congratulations, you are on your way to becoming a " +
+                    "computer programmer!",
+            ),
+        ).toMatchInlineSnapshot(`
+            Array [
+              "Let's write the canonical Hello World in Javascript",
+              "const x = \\"hello world\\";
+            console.log(x);",
+              "**Congratulations, you are on your way to becoming a computer programmer!",
+            ]
+        `);
+    });
+});

package/src/__tests__/perseus-markdown_test.jsx

@@ -1,6 +1,6 @@
 // @flow
-import Gorgon from "../gorgon/gorgon.js"; // The linter engine
-import {linterContextDefault} from "../gorgon/proptypes.js";
+import * as Gorgon from "@khanacademy/perseus-linter";
+
 import PerseusMarkdown from "../perseus-markdown.jsx";
 
 const {parse, basicOutput, characterCount} = PerseusMarkdown;
@@ -565,7 +565,7 @@ describe("perseus markdown", () => {
                 "data 4 | $data 5 | data 6\n" +
                 "data 7 | data 8 | data 9";
             const context = {
-                ...linterContextDefault,
+                ...Gorgon.linterContextDefault,
                 content,
                 widgets: {},
             };
@@ -650,7 +650,7 @@ describe("perseus markdown", () => {
                 "data 4 | $data 5 | data 6\n" +
                 "data 7 | data 8 | data 9";
             const context = {
-                ...linterContextDefault,
+                ...Gorgon.linterContextDefault,
                 content,
                 widgets: {},
             };

package/src/article-renderer.jsx

@@ -5,12 +5,11 @@
  * composed of multiple (Renderer) sections concatenated together.
  */
 
+import * as Gorgon from "@khanacademy/perseus-linter";
 import classNames from "classnames";
 import PropTypes from "prop-types";
 import * as React from "react";
 
-import Gorgon from "./gorgon/gorgon.js";
-import {linterContextProps, linterContextDefault} from "./gorgon/proptypes.js";
 import ProvideKeypad from "./mixins/provide-keypad.jsx";
 import {ClassNames as ApiClassNames, ApiOptions} from "./perseus-api.jsx";
 import Renderer from "./renderer.jsx";
@@ -38,14 +37,14 @@ class ArticleRenderer extends React.Component<$FlowFixMe, $FlowFixMe> {
 
         // Whether to use the new Bibliotron styles for articles
         useNewStyles: PropTypes.bool,
-        linterContext: linterContextProps,
+        linterContext: Gorgon.linterContextProps,
         legacyPerseusLint: PropTypes.arrayOf(PropTypes.string),
     };
 
     static defaultProps: $FlowFixMe = {
         apiOptions: {},
         useNewStyles: false,
-        linterContext: linterContextDefault,
+        linterContext: Gorgon.linterContextDefault,
     };
 
     constructor(props: $FlowFixMe) {

package/src/components/input-with-examples.jsx

@@ -1,11 +1,10 @@
 /* eslint-disable react/sort-comp */
 // @flow
+import * as Gorgon from "@khanacademy/perseus-linter";
 import PropTypes from "prop-types";
 import * as React from "react";
 import _ from "underscore";
 
-import Gorgon from "../gorgon/gorgon.js";
-import {linterContextProps, linterContextDefault} from "../gorgon/proptypes.js";
 import {ClassNames as ApiClassNames} from "../perseus-api.jsx";
 import Renderer from "../renderer.jsx";
 import Util from "../util.js";
@@ -38,7 +37,7 @@ class InputWithExamples extends React.Component<$FlowFixMe, $FlowFixMe> {
 
         // A unique string identifying this InputWithExamples
         id: PropTypes.string.isRequired,
-        linterContext: linterContextProps,
+        linterContext: Gorgon.linterContextProps,
     };
 
     static defaultProps: $FlowFixMe = {
@@ -47,7 +46,7 @@ class InputWithExamples extends React.Component<$FlowFixMe, $FlowFixMe> {
         onFocus: function () {},
         onBlur: function () {},
         disabled: false,
-        linterContext: linterContextDefault,
+        linterContext: Gorgon.linterContextDefault,
     };
 
     state: $FlowFixMe = {

package/src/components/sortable.jsx

@@ -1,5 +1,6 @@
 /* eslint-disable @babel/no-invalid-this, react/forbid-prop-types, react/no-unsafe, react/sort-comp */
 // @flow
+import * as Gorgon from "@khanacademy/perseus-linter";
 import {CircularSpinner} from "@khanacademy/wonder-blocks-progress-spinner";
 import {StyleSheet, css} from "aphrodite";
 import $ from "jquery";
@@ -9,8 +10,6 @@ import ReactDOM from "react-dom";
 import _ from "underscore";
 
 import {getDependencies} from "../dependencies.js";
-import Gorgon from "../gorgon/gorgon.js";
-import {linterContextProps, linterContextDefault} from "../gorgon/proptypes.js";
 import {ClassNames as ApiClassNames} from "../perseus-api.jsx";
 import Renderer from "../renderer.jsx";
 import Util from "../util.js";
@@ -96,13 +95,13 @@ class Draggable extends React.Component<DraggableProps, DraggableState> {
         onMouseUp: PropTypes.func.isRequired,
         onRender: PropTypes.func.isRequired,
         type: PropTypes.oneOf([STATIC, DRAGGING, ANIMATING, DISABLED]),
-        linterContext: linterContextProps,
+        linterContext: Gorgon.linterContextProps,
     };
 
     static defaultProps = {
         includePadding: true,
         type: STATIC,
-        linterContext: linterContextDefault,
+        linterContext: Gorgon.linterContextDefault,
     };
 
     state: DraggableState = {
@@ -423,7 +422,7 @@ class Sortable extends React.Component<SortableProps, SortableState> {
         onMeasure: function () {},
         margin: 5,
         onChange: function () {},
-        linterContext: linterContextDefault,
+        linterContext: Gorgon.linterContextDefault,
         waitForKatexLoad: true,
     };
 

package/src/hint-renderer.jsx

@@ -1,11 +1,10 @@
 // @flow
+import * as Gorgon from "@khanacademy/perseus-linter";
 import * as i18n from "@khanacademy/wonder-blocks-i18n";
 import {StyleSheet, css} from "aphrodite";
 import classnames from "classnames";
 import * as React from "react";
 
-import Gorgon from "./gorgon/gorgon.js";
-import {linterContextDefault} from "./gorgon/proptypes.js";
 import Renderer from "./renderer.jsx";
 import {
     baseUnitPx,
@@ -36,7 +35,7 @@ type DefaultProps = {|
 /* Renders just a hint preview */
 class HintRenderer extends React.Component<Props> {
     static defaultProps: DefaultProps = {
-        linterContext: linterContextDefault,
+        linterContext: Gorgon.linterContextDefault,
     };
 
     getSerializedState: () => void = () => {

package/src/hints-renderer.jsx

@@ -1,4 +1,5 @@
 // @flow
+import * as Gorgon from "@khanacademy/perseus-linter";
 import * as i18n from "@khanacademy/wonder-blocks-i18n";
 import {StyleSheet, css} from "aphrodite";
 import classnames from "classnames";
@@ -6,8 +7,6 @@ import * as React from "react";
 import ReactDOM from "react-dom";
 import _ from "underscore";
 
-import Gorgon from "./gorgon/gorgon.js";
-import {linterContextDefault} from "./gorgon/proptypes.js";
 import HintRenderer from "./hint-renderer.jsx";
 import {ApiOptions} from "./perseus-api.jsx";
 import typeof Renderer from "./renderer.jsx";
@@ -43,7 +42,7 @@ type State = {|
 // eslint-disable-next-line react/no-unsafe
 class HintsRenderer extends React.Component<Props, State> {
     static defaultProps: DefaultProps = {
-        linterContext: linterContextDefault,
+        linterContext: Gorgon.linterContextDefault,
     };
 
     // The isFinalHelpPage property determines if the user has requested help

package/src/item-renderer.jsx

@@ -1,12 +1,11 @@
 /* eslint-disable react/no-unsafe */
 // @flow
+import * as Gorgon from "@khanacademy/perseus-linter";
 import $ from "jquery";
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 import _ from "underscore";
 
-import Gorgon from "./gorgon/gorgon.js";
-import {linterContextDefault} from "./gorgon/proptypes.js";
 import HintsRenderer from "./hints-renderer.jsx";
 import Objective from "./interactive2/objective_.js";
 import ProvideKeypad from "./mixins/provide-keypad.jsx";
@@ -88,7 +87,7 @@ class ItemRenderer extends React.Component<Props, State> {
         initialHintsVisible: 0,
         workAreaSelector: "#workarea",
         reviewMode: false,
-        linterContext: linterContextDefault,
+        linterContext: Gorgon.linterContextDefault,
     };
 
     constructor(props: Props) {

package/src/jipt-paragraphs.js

@@ -11,28 +11,36 @@ const arrayRules: ParserRules = {
     fence: {
         match: SimpleMarkdown.defaultRules.fence.match,
         order: 1,
-        // $FlowFixMe[incompatible-type]
-        parse: (capture, state, parse) => capture[3],
+        parse: (capture, state, parse) => ({
+            type: "codeBlock",
+            lang: capture[2] || undefined,
+            content: capture[3],
+        }),
     },
     paragraph: {
         match: SimpleMarkdown.defaultRules.paragraph.match,
         order: 2,
-        // $FlowFixMe[incompatible-type]
-        parse: (capture, state, parse) => capture[1],
+        parse: (capture, state, parse) => ({
+            content: capture[1],
+        }),
     },
 };
 
-// $FlowFixMe[prop-missing]
-const builtArrayParser = SimpleMarkdown.parserFor(arrayRules);
+const builtArrayParser: $Call<
+    typeof SimpleMarkdown.parserFor,
+    typeof arrayRules,
+> = SimpleMarkdown.parserFor(arrayRules);
 
 // This should just return an array of strings! magick!
-const parseToArray = (source: string): $FlowFixMe => {
+const parseToArray = (source: string): Array<string> => {
     // Remove any leading newlines to avoid splitting weirdness
     // (simple-markdown has the `newline` rule for this, and i have
     // no idea how this will handle leading newlines without that rule),
     // and add \n\n to let it parse at a block/paragraph level
     const paragraphedSource = source.replace(/^\n\s*\n/, "") + "\n\n";
-    return builtArrayParser(paragraphedSource, {inline: false});
+    return builtArrayParser(paragraphedSource, {inline: false}).map((c) => {
+        return c["content"];
+    });
 };
 
 const joinFromArray = (paragraphs: $ReadOnlyArray<string>): string =>

package/src/not-gorgon.js

@@ -1,8 +1,7 @@
 // @flow
+import {Rule} from "@khanacademy/perseus-linter";
 import {debounce} from "underscore";
 
-import Rule from "./gorgon/rule.js";
-
 /**
  * NotGorgon asynchronously calls Khan Academy's poentry linter.
  *

package/src/perseus-markdown.jsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-useless-escape, no-prototype-builtins */
 // @flow
-// TODO(FEI-4465): move this into it's own package called perseus-markdown
+import {pureMarkdownRules} from "@khanacademy/pure-markdown";
 import SimpleMarkdown from "@khanacademy/simple-markdown";
 import * as i18n from "@khanacademy/wonder-blocks-i18n";
 import * as React from "react";
@@ -8,7 +8,6 @@ import _ from "underscore";
 
 import Lint from "./components/lint.jsx";
 import {getDependencies} from "./dependencies.js";
-import {pureMarkdownRules} from "./pure-markdown.js";
 
 const rules = {
     ...pureMarkdownRules,

package/src/renderer.jsx

@@ -1,5 +1,6 @@
 /* eslint-disable react/no-unsafe */
 // @flow
+import * as Gorgon from "@khanacademy/perseus-linter";
 import classNames from "classnames";
 import $ from "jquery";
 import * as React from "react";
@@ -13,8 +14,6 @@ import ZoomableTeX from "./components/zoomable-tex.jsx";
 import Zoomable from "./components/zoomable.jsx";
 import {getDependencies} from "./dependencies.js";
 import ErrorBoundary from "./error-boundary.jsx";
-import Gorgon from "./gorgon/gorgon.js"; // The linter engine
-import {linterContextDefault} from "./gorgon/proptypes.js";
 import InteractionTracker from "./interaction-tracker.js";
 import Objective from "./interactive2/objective_.js";
 import JiptParagraphs from "./jipt-paragraphs.js";
@@ -234,7 +233,7 @@ class Renderer extends React.Component<Props, State> {
         reviewMode: false,
         serializedState: null,
         onSerializedStateUpdated: () => {},
-        linterContext: linterContextDefault,
+        linterContext: Gorgon.linterContextDefault,
     };
 
     constructor(props: Props, context: Context) {

package/src/widget-container.jsx

@@ -1,10 +1,10 @@
 /* eslint-disable react/no-unsafe, react/sort-comp */
 // @flow
+import {linterContextDefault} from "@khanacademy/perseus-linter";
 import classNames from "classnames";
 import * as React from "react";
 import ReactDOM from "react-dom";
 
-import {linterContextDefault} from "./gorgon/proptypes.js";
 import {zIndexInteractiveComponent} from "./styles/constants.js";
 import {containerSizeClass, getClassFromWidth} from "./util/sizing-utils.js";
 import * as Widgets from "./widgets.js";

package/src/widgets/categorizer.jsx

@@ -1,5 +1,6 @@
 /* eslint-disable react/sort-comp */
 // @flow
+import {linterContextDefault} from "@khanacademy/perseus-linter";
 import * as i18n from "@khanacademy/wonder-blocks-i18n";
 import {StyleSheet, css} from "aphrodite";
 import classNames from "classnames";
@@ -7,7 +8,6 @@ import * as React from "react";
 import _ from "underscore";
 
 import InlineIcon from "../components/inline-icon.jsx";
-import {linterContextDefault} from "../gorgon/proptypes.js";
 import {iconCircle, iconCircleThin} from "../icon-paths.js";
 import * as Changeable from "../mixins/changeable.jsx";
 import WidgetJsonifyDeprecated from "../mixins/widget-jsonify-deprecated.jsx";

package/src/widgets/dropdown.jsx

@@ -1,9 +1,7 @@
-/* eslint-disable react/sort-comp */
 // @flow
 import {SingleSelect, OptionItem} from "@khanacademy/wonder-blocks-dropdown";
 import * as React from "react";
 import ReactDOM from "react-dom";
-import _ from "underscore";
 
 import {ApiOptions} from "../perseus-api.jsx";
 
@@ -51,6 +49,33 @@ class Dropdown extends React.Component<Props> {
         };
     }
 
+    focus: () => boolean = () => {
+        // TODO(LP-10797): This focus() call doesn't do anything because our
+        // root element is a <div> and that cannot be focused without a
+        // tabIndex.
+        // $FlowFixMe[incompatible-use]
+        // $FlowFixMe[prop-missing]
+        ReactDOM.findDOMNode(this).focus();
+        return true;
+    };
+
+    _handleChangeEvent: (SyntheticInputEvent<>) => void = (e) => {
+        this._handleChange(parseInt(e.target.value));
+    };
+
+    _handleChange: (number) => void = (selected) => {
+        this.props.trackInteraction();
+        this.props.onChange({selected: selected});
+    };
+
+    getUserInput: () => UserInput = () => {
+        return {value: this.props.selected};
+    };
+
+    simpleValidate: (Rubric) => PerseusScore = (rubric) => {
+        return Dropdown.validate(this.getUserInput(), rubric);
+    };
+
     render(): React.Node {
         const children = [
             <OptionItem
@@ -79,8 +104,8 @@ class Dropdown extends React.Component<Props> {
                     e.stopPropagation();
                 }}
             >
-                {/* $FlowFixMe[prop-missing]: placeholder is missing */}
                 <SingleSelect
+                    placeholder=""
                     onChange={(value) => this._handleChange(parseInt(value))}
                     selectedValue={String(this.props.selected)}
                     disabled={this.props.apiOptions.readOnly}
@@ -90,33 +115,6 @@ class Dropdown extends React.Component<Props> {
             </div>
         );
     }
-
-    focus: () => boolean = () => {
-        // TODO(LP-10797): This focus() call doesn't do anything because our
-        // root element is a <div> and that cannot be focused without a
-        // tabIndex.
-        // $FlowFixMe[incompatible-use]
-        // $FlowFixMe[prop-missing]
-        ReactDOM.findDOMNode(this).focus();
-        return true;
-    };
-
-    _handleChangeEvent: (SyntheticInputEvent<>) => void = (e) => {
-        this._handleChange(parseInt(e.target.value));
-    };
-
-    _handleChange: (number) => void = (selected) => {
-        this.props.trackInteraction();
-        this.props.onChange({selected: selected});
-    };
-
-    getUserInput: () => UserInput = () => {
-        return {value: this.props.selected};
-    };
-
-    simpleValidate: (Rubric) => PerseusScore = (rubric) => {
-        return Dropdown.validate(this.getUserInput(), rubric);
-    };
 }
 
 type RenderProps = {|
@@ -129,7 +127,7 @@ const optionsTransform: (PerseusDropdownWidgetOptions) => RenderProps = (
 ) => {
     return {
         placeholder: widgetOptions.placeholder,
-        choices: _.map(widgetOptions.choices, (choice) => choice.content),
+        choices: widgetOptions.choices.map((choice) => choice.content),
     };
 };
 

package/src/widgets/explanation.jsx

@@ -1,10 +1,10 @@
 /* eslint-disable react/sort-comp */
 // @flow
+import {linterContextDefault} from "@khanacademy/perseus-linter";
 import {StyleSheet, css} from "aphrodite";
 import * as React from "react";
 import _ from "underscore";
 
-import {linterContextDefault} from "../gorgon/proptypes.js";
 import * as Changeable from "../mixins/changeable.jsx";
 import Renderer from "../renderer.jsx";
 import * as styleConstants from "../styles/constants.js";

package/src/widgets/expression.jsx

@@ -2,6 +2,7 @@
 // @flow
 import * as KAS from "@khanacademy/kas";
 import {KeypadInput, KeypadTypes} from "@khanacademy/math-input";
+import {linterContextDefault} from "@khanacademy/perseus-linter";
 import * as i18n from "@khanacademy/wonder-blocks-i18n";
 import classNames from "classnames";
 import * as React from "react";
@@ -11,7 +12,6 @@ import InlineIcon from "../components/inline-icon.jsx";
 import InputWithExamples from "../components/input-with-examples.jsx";
 import MathInput from "../components/math-input.jsx";
 import Tooltip from "../components/tooltip.jsx";
-import {linterContextDefault} from "../gorgon/proptypes.js";
 import {iconExclamationSign} from "../icon-paths.js";
 import {Errors as PerseusErrors, Log} from "../logging/log.js";
 import * as Changeable from "../mixins/changeable.jsx";

package/src/widgets/graded-group-set.jsx

@@ -1,10 +1,10 @@
 // @flow
+import {linterContextDefault} from "@khanacademy/perseus-linter";
 import * as i18n from "@khanacademy/wonder-blocks-i18n";
 import {StyleSheet, css} from "aphrodite";
 import * as React from "react";
 
 import {getDependencies} from "../dependencies.js";
-import {linterContextDefault} from "../gorgon/proptypes.js";
 import * as Changeable from "../mixins/changeable.jsx";
 import {
     grayLight,

package/src/widgets/graded-group.jsx

@@ -1,4 +1,5 @@
 // @flow
+import {linterContextDefault} from "@khanacademy/perseus-linter";
 import Button from "@khanacademy/wonder-blocks-button";
 import * as i18n from "@khanacademy/wonder-blocks-i18n";
 import {StyleSheet, css} from "aphrodite";
@@ -7,7 +8,6 @@ import * as React from "react";
 import _ from "underscore";
 
 import InlineIcon from "../components/inline-icon.jsx";
-import {linterContextDefault} from "../gorgon/proptypes.js";
 import {iconOk, iconRemove} from "../icon-paths.js";
 import * as Changeable from "../mixins/changeable.jsx";
 import {ApiOptions} from "../perseus-api.jsx";

package/src/widgets/group.jsx

@@ -1,10 +1,10 @@
 /* eslint-disable react/sort-comp */
 // @flow
+import {linterContextDefault} from "@khanacademy/perseus-linter";
 import classNames from "classnames";
 import * as React from "react";
 import _ from "underscore";
 
-import {linterContextDefault} from "../gorgon/proptypes.js";
 import * as Changeable from "../mixins/changeable.jsx";
 import {ApiOptions} from "../perseus-api.jsx";
 import Renderer from "../renderer.jsx";

package/src/widgets/image.jsx

@@ -1,13 +1,13 @@
 /* eslint-disable react/prop-types */
 /* eslint-disable react/sort-comp */
 // @flow
+import {linterContextDefault} from "@khanacademy/perseus-linter";
 import {StyleSheet, css} from "aphrodite";
 import classNames from "classnames";
 import * as React from "react";
 import _ from "underscore";
 
 import SvgImage from "../components/svg-image.jsx";
-import {linterContextDefault} from "../gorgon/proptypes.js";
 import * as Changeable from "../mixins/changeable.jsx";
 import Renderer from "../renderer.jsx";
 import {baseUnitPx} from "../styles/constants.js";

package/src/widgets/input-number.jsx

@@ -1,6 +1,7 @@
 /* eslint-disable react/prop-types */
 /* eslint-disable react/sort-comp */
 // @flow
+import {linterContextDefault} from "@khanacademy/perseus-linter";
 import * as i18n from "@khanacademy/wonder-blocks-i18n";
 import classNames from "classnames";
 import * as React from "react";
@@ -9,7 +10,6 @@ import _ from "underscore";
 import InputWithExamples from "../components/input-with-examples.jsx";
 import PossibleAnswers from "../components/possible-answers.jsx";
 import SimpleKeypadInput from "../components/simple-keypad-input.jsx";
-import {linterContextDefault} from "../gorgon/proptypes.js";
 import {ClassNames as ApiClassNames, ApiOptions} from "../perseus-api.jsx";
 import TexWrangler from "../tex-wrangler.js";
 import KhanAnswerTypes from "../util/answer-types.js";

package/src/widgets/matcher.jsx

@@ -1,5 +1,9 @@
 /* eslint-disable react/forbid-prop-types, react/sort-comp */
 // @flow
+import {
+    linterContextProps,
+    linterContextDefault,
+} from "@khanacademy/perseus-linter";
 import {CircularSpinner} from "@khanacademy/wonder-blocks-progress-spinner";
 import {StyleSheet, css} from "aphrodite";
 import PropTypes from "prop-types";
@@ -8,7 +12,6 @@ import _ from "underscore";
 
 import Sortable from "../components/sortable.jsx";
 import {getDependencies} from "../dependencies.js";
-import {linterContextProps, linterContextDefault} from "../gorgon/proptypes.js";
 import {ApiOptions} from "../perseus-api.jsx";
 import Renderer from "../renderer.jsx";
 import Util from "../util.js";