prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert(web): ⬅️ way back to try to fix 2910

Browse source
This commit is contained in:
Collin M. Barrett 2022-04-23 12:45:21 -05:00
parent 1ae7a23617
commit 6369a9b346
4 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
web/azure-pipelines.yaml
View file

@ -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'))

BIN
web/package-lock.json generated
View file

Binary file not shown.

34
web/package.json
View file

@ -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": {

12
web/src/index.tsx
View file

@ -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(
<React.StrictMode>
<App />
</React.StrictMode>
</React.StrictMode>,
document.getElementById("root")
);
// If you want to start measuring performance in your app, pass a function