Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/test-library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,11 @@ jobs:
cd dashboard
npm run build
cd ..
- name: Build Devtools
run: |
cd dashboard
npm run devtools
cd ..

developer:
runs-on: ${{ matrix.os }}-latest
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ proxy.py.iml
.vscode/*
!.vscode/settings.json

*.dot
*.pyc
*.egg-info
*.csr
Expand All @@ -31,4 +32,5 @@ htmlcov
dist
build

pyreverse.png
profile.svg
16 changes: 7 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ repos:
args:
- --py36-plus

# - repo: https://github.com/timothycrosley/isort.git
# rev: 5.10.0
# hooks:
# - id: isort
# args:
# - --honor-noqa
- repo: https://github.com/timothycrosley/isort.git
rev: 5.10.0
hooks:
- id: isort
args:
- --honor-noqa

- repo: https://github.com/Lucas-C/pre-commit-hooks.git
rev: v1.1.7
Expand All @@ -24,8 +24,7 @@ repos:
helper/proxy\.pac|
Makefile|
proxy/common/pki\.py|
README\.md|
.+\.(plist|pbxproj)
README\.md
$

- repo: https://github.com/pre-commit/pre-commit-hooks.git
Expand All @@ -36,7 +35,6 @@ repos:
exclude: |
(?x)
^
\.github/workflows/codeql-analysis\.yml|
dashboard/src/core/plugins/inspect_traffic\.json
$
- id: check-merge-conflict
Expand Down
12 changes: 9 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ sign-https-certificates:
python -m proxy.common.pki sign_csr \
--csr-path $(HTTPS_CSR_FILE_PATH) \
--crt-path $(HTTPS_SIGNED_CERT_FILE_PATH) \
--hostname example.com \
--hostname localhost \
--private-key-path $(CA_KEY_FILE_PATH) \
--public-key-path $(CA_CERT_FILE_PATH)

Expand Down Expand Up @@ -169,11 +169,17 @@ lib-speedscope:
--open-file-limit 65536 \
--log-file /dev/null

lib-pyreverse:
rm -f proxy.proxy.Proxy.dot pyreverse.png
pyreverse -ASmy -c proxy.proxy.Proxy proxy
dot -Tpng proxy.proxy.Proxy.dot > pyreverse.png
open pyreverse.png

devtools:
pushd dashboard && npm run devtools && popd
pushd dashboard && npm install && npm run devtools && popd

dashboard:
pushd dashboard && npm run build && popd
pushd dashboard && npm install && npm run build && popd

dashboard-clean:
if [[ -d dashboard/public ]]; then rm -rf dashboard/public; fi
Expand Down
Loading