Skip to content

Commit

Permalink
Merge pull request #169 from openstax/K12-86/dependency-updates
Browse files Browse the repository at this point in the history
Update dependency versions
  • Loading branch information
rnathuji authored Jul 24, 2024
2 parents 33f4a73 + 0b0f73e commit 89a5b5a
Show file tree
Hide file tree
Showing 8 changed files with 1,109 additions and 1,071 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "20.12.2"
node-version: "20.15.1"
- name: Setup
run: |
npm install
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.12.2
v20.15.1
4 changes: 4 additions & 0 deletions eslint.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ module.exports = [
}
],
'@typescript-eslint/ban-tslint-comment': 'off',
'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/max-params': 'off',
'@typescript-eslint/init-declarations': 'off',
}
},
{
Expand Down
2,084 changes: 1,059 additions & 1,025 deletions package-lock.json

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,41 +16,41 @@
"build:authoring": "tsc && vite build -m authoring"
},
"dependencies": {
"@khanacademy/kas": "github:openstax/raise-kas#7f1de183d58ff9b241a51062c307ea5e9ef0c3fe",
"@khanacademy/kas": "github:openstax/raise-kas#aef758cbf426d1c9eba2d859b0813a943ceecf56",
"bootstrap": "^5.3.3",
"formik": "^2.4.6",
"mathlive": "^0.98.6",
"mathlive": "^0.101.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"uuid": "^9.0.1",
"uuid": "^10.0.0",
"yup": "^1.4.0"
},
"devDependencies": {
"@playwright/test": "^1.43.1",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^15.0.6",
"@playwright/test": "^1.45.3",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/react": "^16.0.0",
"@types/bootstrap": "^5.2.10",
"@types/desmos": "^1.6.3",
"@types/hoist-non-react-statics": "^3.3.5",
"@types/jest": "^29.5.12",
"@types/mathjax": "^0.0.40",
"@types/react": "^18.3.1",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/uuid": "^9.0.8",
"@vitejs/plugin-react": "^4.3.0",
"@vitest/coverage-v8": "^1.6.0",
"@types/uuid": "^10.0.0",
"@vitejs/plugin-react": "^4.3.1",
"@vitest/coverage-v8": "^2.0.4",
"eslint": "^8.57.0",
"eslint-config-love": "^52.0.0",
"jsdom": "^24.1.0",
"msw": "^2.3.1",
"sass": "^1.76.0",
"stylelint": "^16.5.0",
"stylelint-config-standard": "^36.0.0",
"eslint-config-love": "^59.0.0",
"jsdom": "^24.1.1",
"msw": "^2.3.3",
"sass": "^1.77.8",
"stylelint": "^16.7.0",
"stylelint-config-standard": "^36.0.1",
"stylelint-config-standard-scss": "^13.1.0",
"ts-node": "^10.9.2",
"typescript": "^5.4.5",
"vite": "^5.2.11",
"vitest": "^1.6.0",
"typescript": "^5.5.4",
"vite": "^5.3.4",
"vitest": "^2.0.4",
"whatwg-fetch": "^3.6.20"
}
}
2 changes: 1 addition & 1 deletion src/components/InputProblem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as Yup from 'yup'
import { AttemptsCounter } from './AttemptsCounter'
import { CorrectAnswerIcon, WrongAnswerIcon } from './Icons'
import { Mathfield } from './Mathfield'
import { type MathfieldElement } from 'mathlive'
import type { MathfieldElement } from 'mathlive'
import { parse, compare } from '@khanacademy/kas'
export const MAX_CHARACTER_INPUT_PROBLEM_LENGTH = 500

Expand Down
4 changes: 2 additions & 2 deletions src/global.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type MathfieldElementAttributes, type MathfieldElement } from 'mathlive'
import { type DOMAttributes } from 'react'
import type { MathfieldElementAttributes, MathfieldElement } from 'mathlive'
import type { DOMAttributes } from 'react'

declare global {
interface Window {
Expand Down
44 changes: 22 additions & 22 deletions src/styles/bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,6 @@
// NOTE: This approach may result in some unexpected issues that we'll have
// to address as they arise

/* stylelint-disable no-invalid-position-at-import-rule */

// Required styles
@import "bootstrap/scss/functions";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/variables-dark";
@import "bootstrap/scss/mixins";
@import "bootstrap/scss/maps";
@import "bootstrap/scss/root";
@import "bootstrap/scss/reboot";

// Additional styles
@import "bootstrap/scss/helpers";
@import "bootstrap/scss/buttons";
@import "bootstrap/scss/forms";
@import "bootstrap/scss/tooltip";
@import "bootstrap/scss/utilities";
@import "bootstrap/scss/utilities/api";
@import "bootstrap/scss/spinners";
@import "bootstrap/scss/accordion";
@import "bootstrap/scss/transitions";

// The following are copied from bootstrap.css where the definitions under
// :root are otherwise not applied when namespaced so manually defined here
--bs-blue: #0d6efd;
Expand Down Expand Up @@ -145,6 +123,28 @@
--bs-form-invalid-color: #dc3545;
--bs-form-invalid-border-color: #dc3545;

/* stylelint-disable no-invalid-position-at-import-rule */

// Required styles
@import "bootstrap/scss/functions";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/variables-dark";
@import "bootstrap/scss/mixins";
@import "bootstrap/scss/maps";
@import "bootstrap/scss/root";
@import "bootstrap/scss/reboot";

// Additional styles
@import "bootstrap/scss/helpers";
@import "bootstrap/scss/buttons";
@import "bootstrap/scss/forms";
@import "bootstrap/scss/tooltip";
@import "bootstrap/scss/utilities";
@import "bootstrap/scss/utilities/api";
@import "bootstrap/scss/spinners";
@import "bootstrap/scss/accordion";
@import "bootstrap/scss/transitions";

// Variables
$os-default-answer-border-color: #424242;
$os-medium-gray: #626262;
Expand Down

0 comments on commit 89a5b5a

Please sign in to comment.