Skip to content

Commit a001e3f

Browse files
davechridavechri
authored
Merge pull request #685 from allproxy/v3-28-0
V3 28 0: react-scripts 5.0.1
2 parents ea47312 + 5505a33 commit a001e3f

61 files changed

Lines changed: 20973 additions & 41753 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.json‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
"browser": true,
44
"es2021": true
55
},
6-
"extends": [
7-
"plugin:react/recommended",
8-
"standard"
9-
],
106
"parser": "@typescript-eslint/parser",
117
"parserOptions": {
128
"ecmaFeatures": {
@@ -16,10 +12,12 @@
1612
"sourceType": "module"
1713
},
1814
"plugins": [
19-
"react",
2015
"@typescript-eslint"
2116
],
2217
"rules": {
23-
"semi": [ 2, "always" ]
18+
"semi": [
19+
2,
20+
"always"
21+
]
2422
}
25-
}
23+
}

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ MITM debugging proxy with a web GUI to view and modify all of the HTTP and HTTPS
88

99
### Install
1010

11-
> Mac: **[allproxy.dmg](https://github.com/allproxy/allproxy/releases/download/v3.27.0/allproxy-3.27.0-x64.dmg)**
11+
> Mac: **[allproxy.dmg](https://github.com/allproxy/allproxy/releases/download/v3.28.0/allproxy-3.28.0-x64.dmg)**
1212
13-
> RedHat: **[allproxy.rpm](https://github.com/allproxy/allproxy/releases/download/v3.27.0/allproxy-3.27.0-1.x86_64.rpm)**
13+
> RedHat: **[allproxy.rpm](https://github.com/allproxy/allproxy/releases/download/v3.28.0/allproxy-3.28.0-1.x86_64.rpm)**
1414
15-
> Ubuntu: **[allproxy.deb](https://github.com/allproxy/allproxy/releases/download/v3.27.0/allproxy_3.27.0_amd64.deb)**
15+
> Ubuntu: **[allproxy.deb](https://github.com/allproxy/allproxy/releases/download/v3.28.0/allproxy_3.28.0_amd64.deb)**
1616
17-
> Windows: **[Setup.exe](https://github.com/allproxy/allproxy/releases/download/v3.27.0/allproxy-3.27.0.Setup.exe)**
17+
> Windows: **[Setup.exe](https://github.com/allproxy/allproxy/releases/download/v3.28.0/allproxy-3.28.0.Setup.exe)**
1818
1919
> Other install options:
2020
> 1. Install NPM package: **npm install -g allproxy**

‎client/package-lock.json‎

Lines changed: 14764 additions & 31103 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"mobx-react-lite": "^3.2.0",
2525
"react-bootstrap": "^1.5.2",
2626
"react-json-view": "^1.21.3",
27-
"react-scripts": "4.0.3",
27+
"react-scripts": "^5.0.1",
2828
"react-tagsinput": "^3.19.0",
2929
"socket.io-client": "^4.0.1",
3030
"typescript": "^4.4.3",
@@ -37,12 +37,6 @@
3737
"test": "react-scripts test",
3838
"eject": "react-scripts eject"
3939
},
40-
"eslintConfig": {
41-
"extends": [
42-
"react-app",
43-
"react-app/jest"
44-
]
45-
},
4640
"browserslist": {
4741
"production": [
4842
">0.2%",
@@ -56,16 +50,16 @@
5650
]
5751
},
5852
"devDependencies": {
53+
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
5954
"@testing-library/jest-dom": "^5.11.4",
6055
"@testing-library/react": "^11.1.0",
6156
"@testing-library/user-event": "^12.1.10",
62-
"@typescript-eslint/eslint-plugin": "^4.31.2",
63-
"@typescript-eslint/parser": "^4.31.2",
64-
"eslint": "^7.32.0",
57+
"@typescript-eslint/eslint-plugin": "^6.6.0",
58+
"@typescript-eslint/parser": "^6.6.0",
6559
"eslint-config-standard": "^16.0.3",
6660
"eslint-plugin-import": "^2.24.2",
6761
"eslint-plugin-node": "^11.1.0",
6862
"eslint-plugin-promise": "^5.1.0",
69-
"eslint-plugin-react": "^7.26.0"
63+
"eslint-plugin-react": "^7.33.2"
7064
}
71-
}
65+
}

‎client/src/App.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { observer } from 'mobx-react-lite';
1717
import { themeStore } from './store/ThemeStore';
1818

1919
const theme = localStorage.getItem('allproxy-theme');
20-
let defaultTheme: 'dark' | 'light' = 'dark'
20+
let defaultTheme: 'dark' | 'light' = 'dark';
2121
if (theme === 'dark' || theme === 'light') {
2222
defaultTheme = theme;
2323
}
@@ -89,7 +89,7 @@ function App() {
8989
}
9090

9191
const Updating = observer(() => {
92-
return <StatusBox show={snapshotStore.isUpdating()}>Updating...</StatusBox>
93-
})
92+
return <StatusBox show={snapshotStore.isUpdating()}>Updating...</StatusBox>;
93+
});
9494

9595
export default App;

‎client/src/ImportJSONFile.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ export function importJSONFile(fileName: string, jsonContent: string, primaryJso
3838
}
3939
}
4040

41-
let json: { [key: string]: any } | undefined
41+
let json: { [key: string]: any } | undefined;
4242
try {
43-
json = JSON.parse(record)
43+
json = JSON.parse(record);
4444
} catch (e) {
4545
try {
4646
json = JSON.parse(untruncateJson(record));

‎client/src/PickButtonStyle.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ const colorStyles = [
3030
];
3131

3232
let index = 0;
33-
const styleMap: { [key: string]: { background: string, color: string, lightColor: string, filter: string } } = {}
33+
const styleMap: { [key: string]: { background: string, color: string, lightColor: string, filter: string } } = {};
3434

3535
export function pickLabelStyle(name: string): { background: string, color: string, filter: string } {
3636
let style = styleMap[name];
3737
if (style === undefined) {
3838
//console.log(index, name)
39-
style = { background: '', color: '', lightColor: '', filter: '' }
39+
style = { background: '', color: '', lightColor: '', filter: '' };
4040
const s = colorStyles[index];
4141
style.background = s.background;
4242
style.lightColor = s.color;

‎client/src/UntruncateJSON.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export function untruncateJson(json: string): string {
5454

5555
// Field doesn't start with expected "?
5656
if (!field.startsWith('"')) {
57-
json += '"' + field + '": "..."'
57+
json += '"' + field + '": "..."';
5858
//console.log("Doesn't start with quote")
5959
} else {
6060
// Colon is missing?

‎client/src/components/BreakpointModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IconButton, List, ListItem, Modal } from '@material-ui/core'
1+
import { IconButton, List, ListItem, Modal } from '@material-ui/core';
22
import BreakpointStore from '../store/BreakpointStore';
33
import { observer } from 'mobx-react-lite';
44
import { useEffect } from 'react';
@@ -13,7 +13,7 @@ type Props = {
1313
const BreakpointModal = observer(({ open, onClose, store }: Props) => {
1414
useEffect(() => {
1515
store.editing(open);
16-
})
16+
});
1717

1818
function close() {
1919
onClose();

‎client/src/components/BreakpointResponseModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { observer } from 'mobx-react-lite';
2-
import { Modal } from '@material-ui/core'
2+
import { Modal } from '@material-ui/core';
33
import MessageStore from '../store/MessageStore';
44
import ReactJson, { InteractionProps } from 'react-json-view';
55
import React from 'react';
@@ -136,6 +136,6 @@ const BreakpointResponseModal = observer(({ open, onClose, store }: Props) => {
136136
setResponseBody(props.updated_src);
137137
return true;
138138
}
139-
})
139+
});
140140

141141
export default BreakpointResponseModal;

0 commit comments

Comments
 (0)