diff --git a/.prettierrc b/.prettierrc index fad510f685..00f0dc88ad 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,5 +3,6 @@ "singleQuote": true, "printWidth": 100, "arrowParens": "avoid", - "trailingComma": "none" + "trailingComma": "none", + "endOfLine": "auto" } diff --git a/eslint.config.mjs b/eslint.config.mjs index d08bbe8adf..ab3cb8ebff 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,10 +1,10 @@ // @ts-check // import eslint from '@eslint/js'; -import { config, configs } from 'typescript-eslint'; import reactPlugin from 'eslint-plugin-react'; import reactHooksPlugin from 'eslint-plugin-react-hooks'; import simpleImportSort from 'eslint-plugin-simple-import-sort'; +import { config, configs } from 'typescript-eslint'; // import reactRefresh from 'eslint-plugin-react-refresh'; export default config( diff --git a/package.json b/package.json index bc70762390..3ab5435e50 100644 --- a/package.json +++ b/package.json @@ -31,17 +31,17 @@ "preview": "rsbuild preview" }, "dependencies": { - "@blueprintjs/core": "^5.10.1", - "@blueprintjs/datetime2": "^2.3.3", + "@blueprintjs/core": "^6.0.0", + "@blueprintjs/datetime": "^6.0.0", "@blueprintjs/icons": "^6.0.0", - "@blueprintjs/select": "^5.1.3", + "@blueprintjs/select": "^6.0.0", "@convergencelabs/ace-collab-ext": "^0.6.0", "@mantine/hooks": "^7.11.2", "@octokit/rest": "^22.0.0", "@reduxjs/toolkit": "^1.9.7", "@sentry/browser": "^8.33.0", "@sourceacademy/c-slang": "^1.0.21", - "@sourceacademy/sharedb-ace": "^2.1.1", + "@sourceacademy/sharedb-ace": "2.1.1", "@sourceacademy/sling-client": "^0.1.0", "@szhsin/react-menu": "^4.0.0", "@tanstack/react-table": "^8.9.3", diff --git a/src/commons/__tests__/__snapshots__/ContentDisplay.test.tsx.snap b/src/commons/__tests__/__snapshots__/ContentDisplay.test.tsx.snap index c1ce322ba0..7e524c0b5f 100644 --- a/src/commons/__tests__/__snapshots__/ContentDisplay.test.tsx.snap +++ b/src/commons/__tests__/__snapshots__/ContentDisplay.test.tsx.snap @@ -8,7 +8,7 @@ exports[`ContentDisplay page renders correctly 1`] = ` className="col-md-10 col-xs-11 contentdisplay-content-parent" >
{ownStatus}