ci: lint for ui

.github/workflows/build.yml

@@ -35,7 +35,9 @@ jobs:
         yarn build
         yarn build:ui:production
     - name: Lint
-      run: yarn lint:ci
+      run: |
+        yarn lint:ci
+        yarn lint:ui:ci
     - name: Publish
       if: ${{ github.event_name == 'push' }}
       run: node build/publish.js

.gitignore

@@ -41,6 +41,7 @@ packages/**/*.js
 packages/ui-default/public
 packages/ui-default/misc/.iconfont
 packages/ui-default/static/locale
+plugins/**
 
 # Data files
 *.mmdb

package.json

@@ -2,7 +2,8 @@
     "name": "hydro-workspace",
     "private": true,
     "workspaces": [
-        "packages/*"
+        "packages/*",
+        "plugins/*"
     ],
     "main": "package.json",
     "scripts": {
@@ -13,22 +14,20 @@
         "build:ui:production": "node packages/ui-default/build --production",
         "lint": "eslint packages --ext ts --fix",
         "lint:ci": "eslint packages --ext ts",
-        "lint:ui": "yarn run --cwd=packages/ui-default eslint . --fix",
+        "lint:ui": "yarn workspace @hydrooj/ui-default eslint --ext .js,.ts,.jsx,.tsx . --fix",
-        "lint:ui:ci": "yarn run --cwd=packages/ui-default eslint .",
+        "lint:ui:ci": "yarn workspace @hydrooj/ui-default eslint --ext .js,.ts,.jsx,.tsx .",
-        "pub": "node build/publish",
         "typedoc": "cross-env NODE_OPTIONS=--max_old_space_size=8192 typedoc",
         "debug:all": "node --trace-warnings --async-stack-traces --trace-deprecation build/start --debug --template",
         "debug": "node --trace-warnings --async-stack-traces --trace-deprecation node_modules/hydrooj/bin/hydrooj --debug --template",
         "start:all": "node build/start",
         "start": "node_modules/.bin/hydrooj",
-        "postinstall": "node build/hack",
+        "postinstall": "node build/hack && node build/prepare.js"
-        "clean": "zsh -c \"rm -rf tsconfig.build.tsbuildinfo ./packages/*/tsconfig.tsbuildinfo ./.coverage\""
     },
     "version": "1.0.0",
     "license": "AGPL-3.0-only",
     "devDependencies": {
         "@types/cross-spawn": "^6.0.2",
-        "@types/node": "^16.11.25",
+        "@types/node": "^16.11.26",
         "@types/semver": "^7.3.9",
         "@typescript-eslint/eslint-plugin": "5.12.0",
         "@typescript-eslint/parser": "5.12.0",
@@ -36,19 +35,18 @@
         "cross-env": "^7.0.3",
         "cross-spawn": "^7.0.3",
         "esbuild": "0.14.3",
-        "eslint": "^8.9.0",
+        "eslint": "^8.10.0",
         "eslint-config-airbnb-typescript": "12.3.1",
         "eslint-import-resolver-typescript": "2.5.0",
         "eslint-plugin-import": "2.25.4",
         "eslint-plugin-simple-import-sort": "7.0.0",
-        "fs-extra": "^10.0.0",
+        "fs-extra": "^10.0.1",
         "globby": "11.1.0",
         "latest-version": "^6.0.0",
         "mongodb": "^3.7.3",
-        "nmls": "^3.0.1",
         "ora": "5.4.1",
         "semver": "^7.3.5",
-        "typedoc": "^0.22.11",
+        "typedoc": "^0.22.12",
         "typescript": "4.4.3"
     }
 }

packages/ui-default/backendlib/markdown-it-media.js

@@ -44,8 +44,7 @@ function extractVideoParameters(url) {
   return parameterMap;
 }
 function videoUrl(service, videoID, url, options) {
-  switch (service) {
+  if (service === 'youtube') {
-    case 'youtube': {
     const parameters = extractVideoParameters(url);
     if (options.youtube.parameters) {
       Object.keys(options.youtube.parameters).forEach((key) => {
@@ -75,20 +74,15 @@ function videoUrl(service, videoID, url, options) {
     if (parameterArray.length > 0) finalUrl += `?${parameterArray.join('&')}`;
     return finalUrl;
   }
-    case 'vimeo':
+  if (service === 'vimeo') return `https://player.vimeo.com/video/${videoID}`;
-      return `https://player.vimeo.com/video/${videoID}`;
+  if (service === 'vine') return `https://vine.co/v/${videoID}/embed/${options.vine.embed}`;
-    case 'vine':
+  if (service === 'prezi') {
-      return `https://vine.co/v/${videoID}/embed/${options.vine.embed}`;
+    return `https://prezi.com/embed/${videoID}/?bgcolor=ffffff&lock_to_path=0&autoplay=0&autohide_ctrls=0&`
-    case 'prezi':
-      return `https://prezi.com/embed/${videoID
-        }/?bgcolor=ffffff&lock_to_path=0&autoplay=0&autohide_ctrls=0&`
       + 'landing_data=bHVZZmNaNDBIWnNjdEVENDRhZDFNZGNIUE43MHdLNWpsdFJLb2ZHanI5N1lQVHkxSHFxazZ0UUNCRHloSXZROHh3PT0&'
       + 'landing_sign=1kD6c0N6aYpMUS0wxnQjxzSqZlEB8qNFdxtdjYhwSuI';
-    case 'osf':
-      return `https://mfr.osf.io/render?url=https://osf.io/${videoID}/?action=download`;
-    default:
-      return videoID;
   }
+  if (service === 'osf') return `https://mfr.osf.io/render?url=https://osf.io/${videoID}/?action=download`;
+  return videoID;
 }
 
 module.exports = function videoPlugin(md) {
@@ -138,10 +132,10 @@ module.exports = function videoPlugin(md) {
     }
     if (options[service]?.width) {
       return `<div class="embed-responsive embed-responsive-16by9">
-      <iframe class="embed-responsive-item ${service}-player" type="text/html" width="${options[service].width || 640
+      <iframe class="embed-responsive-item ${service}-player" type="text/html" width="${options[service].width || 640}"\
-        }" height="${options[service].height || 390
+        height="${options[service].height || 390}"\
-        }" src="${options.url(service, videoID, tokens[idx].url, options)
+        src="${options.url(service, videoID, tokens[idx].url, options)}"
-        }" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe></div>`;
+        frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe></div>`;
     }
     return `<div data-${service}>${escapeHtml(videoID)}</div>`;
   };

packages/ui-default/components/messagepad/reducers/dialogues.js

@@ -8,7 +8,7 @@ export default function reducer(state = {}, action) {
   }
   case 'DIALOGUES_CREATE': {
     const { user } = action.payload;
-    if (state[user._id]) return state
+    if (state[user._id]) return state;
     return {
       ...state,
       [user._id]: {

packages/ui-default/components/monaco/nls.js

@@ -40,10 +40,10 @@ export function setLocaleData(data) {
   CURRENT_LOCALE_DATA = data;
 }
 
-export function loadMessageBundle(file) {
+export function loadMessageBundle() {
   return localize;
 }
 
-export function config(opt) {
+export function config() {
   return loadMessageBundle;
 }

packages/ui-default/components/react/DomComponent.jsx

@@ -1,26 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-export default class DomComponent extends React.PureComponent {
-  componentDidMount() {
-    this.refs.dom.appendChild(this.props.childDom);
-  }
-
-  componentWillUnmount() {
-    $(this.refs.dom).empty();
-  }
-
-  render() {
-    const {
-      childDom,
-      ...rest
-    } = this.props;
-    return (
-      <div {...rest} ref="dom"></div>
-    );
-  }
-}
-
-DomComponent.propTypes = {
-  childDom: PropTypes.instanceOf(HTMLElement).isRequired,
-};

packages/ui-default/components/react/DomComponent.tsx

@@ -0,0 +1,13 @@
+import React from 'react';
+import { omit } from 'lodash';
+
+export default function DomComponent(props: React.HTMLAttributes<HTMLDivElement> & { childDom: HTMLElement }) {
+  const ref = React.useRef<HTMLDivElement>();
+  React.useEffect(() => {
+    ref.current.appendChild(props.childDom);
+    return () => {
+      $(ref.current).empty();
+    };
+  });
+  return <div {...omit(props, 'childDom')} ref={ref}></div>;
+}

packages/ui-default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.33.2",
+  "version": "4.33.3",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",

packages/ui-default/pages/problem_detail.page.jsx

@@ -254,7 +254,7 @@ const page = new NamedPage(['problem_detail', 'contest_detail_problem', 'homewor
     window.onresize = function () {
       statusChart.resize();
       scoreChart.resize();
-    }
+    };
   }
 
   $(document).on('click', '[name="problem-sidebar__open-scratchpad"]', (ev) => {