Merge branch 'v2' of https://github.com/SoftUni-Internal/OpenJudgeSystem into v2-development

Author: gogo4ds

Servers/UI/OJS.Servers.Ui/ClientApp/package.json

@@ -58,6 +58,7 @@
     "@types/uuid": "^8.3.1",
     "@typescript-eslint/eslint-plugin": "^7.0.2",
     "@typescript-eslint/parser": "^7.0.2",
+    "cross-env": "^7.0.3",
     "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-import-resolver-typescript": "^3.6.1",
@@ -83,8 +84,8 @@
   "scripts": {
     "start": "vite",
     "build": "vite build",
-    "build:unminified": "vite build --mode production --unminified",
-    "build:staging": "vite build --mode staging --unminified",
+    "build:unminified": "cross-env UNMINIFIED=true vite build",
+    "build:staging": "cross-env UNMINIFIED=true vite build --mode staging",
     "build:local": "vite build --mode development.local",
     "eject": "react-scripts eject",
     "lint:eslint": "./node_modules/.bin/eslint ./src --ext .tsx --ext .ts",

Servers/UI/OJS.Servers.Ui/ClientApp/vite.config.js

@@ -23,7 +23,7 @@ const forwardToAdmin = () => {
 }
 
 export default defineConfig(({ mode }) => {
-    const isUnminified = process.argv.includes('--unminified');
+    const isUnminified = process.env.UNMINIFIED === 'true';
 
     return ({
         appType: 'mpa', // Multi Page Application

Servers/UI/OJS.Servers.Ui/ClientApp/yarn.lock

@@ -4576,13 +4576,29 @@ create-emotion@^10.0.14, create-emotion@^10.0.27:
     "@emotion/sheet" "0.9.4"
     "@emotion/utils" "0.11.3"
 
+cross-env@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
+  dependencies:
+    cross-spawn "^7.0.1"
+
 cross-fetch@^3.1.5:
   version "3.1.8"
   resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz"
   integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==
   dependencies:
     node-fetch "^2.6.12"
 
+cross-spawn@^7.0.1:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
@@ -10276,7 +10292,7 @@ react-lite-youtube-embed@^2.4.0:
   resolved "https://registry.npmjs.org/react-lite-youtube-embed/-/react-lite-youtube-embed-2.4.0.tgz"
   integrity sha512-Xo6cM1zPlROvvM97JkqQIoXstlQDaC4+DawmM7BB7Hh1cXrkBHEGq1iJlQxBTUWAUklmpcC7ph7qg7CztXtABQ==
 
-react-markdown@8.0.7:
+react-markdown@^8.0.7:
   version "8.0.7"
   resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.7.tgz#c8dbd1b9ba5f1c5e7e5f2a44de465a3caafdf89b"
   integrity sha512-bvWbzG4MtOU62XqBx3Xx+zB2raaFFsq4mYiAzfjXJMEz2sixgeAfraA3tvzULF02ZdOMUOKTBFFaZJDDrq+BJQ==