diff --git a/packages/ui-default/build/config/webpack.js b/packages/ui-default/build/config/webpack.js index 7c81190f..95ab22f1 100644 --- a/packages/ui-default/build/config/webpack.js +++ b/packages/ui-default/build/config/webpack.js @@ -101,7 +101,11 @@ export default function (env = {}) { resolve: { modules: [root('node_modules'), root('../../node_modules')], extensions: ['.js', '.jsx'], - alias: { vj: root() }, + alias: { + vj: root(), + 'js-yaml': root('utils/yamlCompact'), + 'real-js-yaml': require.resolve('js-yaml'), + }, }, module: { rules: [ diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 826710cd..695d4b01 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.8.31", + "version": "4.8.32", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/pages/problem_detail.page.jsx b/packages/ui-default/pages/problem_detail.page.jsx index c6e53f87..0a43007a 100644 --- a/packages/ui-default/pages/problem_detail.page.jsx +++ b/packages/ui-default/pages/problem_detail.page.jsx @@ -1,4 +1,5 @@ import yaml from 'js-yaml'; +import { getScoreColor } from '@hydrooj/utils/lib/status'; import * as echarts from 'echarts'; import { NamedPage } from 'vj/misc/Page'; import Navigation from 'vj/components/navigation'; @@ -9,7 +10,6 @@ import delay from 'vj/utils/delay'; import i18n from 'vj/utils/i18n'; import request from 'vj/utils/request'; import base64 from 'vj/utils/base64'; -import { getScoreColor } from 'vj/../utils/lib/status'; class ProblemPageExtender { constructor() { diff --git a/packages/ui-default/utils/yamlCompact.js b/packages/ui-default/utils/yamlCompact.js new file mode 100644 index 00000000..2d68eab7 --- /dev/null +++ b/packages/ui-default/utils/yamlCompact.js @@ -0,0 +1,8 @@ +// eslint-disable-next-line import/no-unresolved +import yaml, { Schema } from 'real-js-yaml'; + +Schema.create = (arg1, arg2) => new Schema(arg1, arg2); + +// eslint-disable-next-line import/no-unresolved +export * from 'real-js-yaml'; +export default yaml;