diff --git a/web/azure-pipelines.yaml b/web/azure-pipelines.yaml index fbc78f85b..eed420f34 100644 --- a/web/azure-pipelines.yaml +++ b/web/azure-pipelines.yaml @@ -1,7 +1,7 @@ trigger: batch: false branches: - include: [main] + include: [master] paths: include: [ @@ -13,7 +13,7 @@ trigger: pr: autoCancel: false branches: - include: [main] + include: [master] paths: include: [ @@ -54,7 +54,7 @@ steps: $(Build.BuildId) env: DOCKER_BUILDKIT: 1 - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) - task: CopyFiles@2 displayName: stage docker-compose files @@ -64,7 +64,7 @@ steps: docker-compose.yml docker-compose.prod.yml TargetFolder: $(Build.ArtifactStagingDirectory) - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) - task: PublishBuildArtifacts@1 displayName: publish docker-compose files @@ -72,4 +72,4 @@ steps: PathtoPublish: $(Build.ArtifactStagingDirectory) ArtifactName: drop publishLocation: Container - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) diff --git a/web/package-lock.json b/web/package-lock.json index 0b8d3f0e4..35fbfa6ea 100644 Binary files a/web/package-lock.json and b/web/package-lock.json differ diff --git a/web/package.json b/web/package.json index 4331f4ea9..8f21afb0c 100644 --- a/web/package.json +++ b/web/package.json @@ -3,30 +3,30 @@ "version": "0.1.0", "private": true, "dependencies": { - "@testing-library/jest-dom": "^5.16.4", - "@testing-library/react": "^13.1.1", - "@testing-library/user-event": "^14.1.1", - "@types/jest": "^27.4.1", - "@types/node": "^17.0.25", - "@types/react": "^17.0.43", - "@types/react-dom": "^18.0.2", + "@testing-library/jest-dom": "^5.16.1", + "@testing-library/react": "^12.1.2", + "@testing-library/user-event": "^13.5.0", + "@types/jest": "^27.4.0", + "@types/node": "^17.0.10", + "@types/react": "^17.0.38", + "@types/react-dom": "^17.0.11", "@types/react-router-dom": "^5.3.3", - "antd": "^4.19.5", - "babel-plugin-import": "^1.13.5", + "antd": "^4.18.4", + "babel-plugin-import": "^1.13.3", "customize-cra": "^1.0.0", - "eslint-config-prettier": "^8.5.0", + "eslint-config-prettier": "^8.3.0", "eslint-plugin-prettier": "^4.0.0", - "http-proxy-middleware": "^2.0.6", + "http-proxy-middleware": "^2.0.1", "less": "^4.1.2", "less-loader": "^7.3.0", - "prettier": "^2.6.2", - "react": "^18.0.0", - "react-app-rewired": "^2.2.1", - "react-dom": "^18.0.0", + "prettier": "^2.5.1", + "react": "^17.0.2", + "react-app-rewired": "^2.1.11", + "react-dom": "^17.0.2", "react-router-dom": "^5.3.0", - "react-scripts": "^5.0.1", + "react-scripts": "^5.0.0", "slugify": "^1.6.5", - "typescript": "^4.6.3", + "typescript": "^4.5.5", "web-vitals": "^2.1.4" }, "scripts": { diff --git a/web/src/index.tsx b/web/src/index.tsx index 079f7c698..dcc257fe2 100644 --- a/web/src/index.tsx +++ b/web/src/index.tsx @@ -1,16 +1,14 @@ import React from "react"; -import ReactDOM from "react-dom/client"; -import "./index.css"; +import ReactDOM from "react-dom"; import { App } from "./App"; +import "./index.css"; import reportWebVitals from "./reportWebVitals"; -const root = ReactDOM.createRoot( - document.getElementById("root") as HTMLElement -); -root.render( +ReactDOM.render( - + , + document.getElementById("root") ); // If you want to start measuring performance in your app, pass a function