Skip to content

Commit

Permalink
add standalone test for web uploading - emsesp#1564
Browse files Browse the repository at this point in the history
  • Loading branch information
proddy committed Apr 7, 2024
1 parent 85c8b66 commit bfbc77c
Show file tree
Hide file tree
Showing 15 changed files with 293 additions and 3,127 deletions.
22 changes: 12 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ stats.html
*.sln
*.sw?
.pnp.*
.yarn/*
*/.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
Expand All @@ -39,25 +39,27 @@ stats.html
yarn.lock
analyse.html
interface/vite.config.ts.timestamp*

# scripts
test.sh
scripts/run.sh
scripts/__pycache__
scripts/stackdmp.txt

*.local
# i18n generated files
interface/src/i18n/i18n-react.tsx
interface/src/i18n/i18n-types.ts
interface/src/i18n/i18n-util.ts
interface/src/i18n/i18n-util.sync.ts
interface/src/i18n/i18n-util.async.ts
# mock-api uploads
*/uploads/*
!uploads/README.md

# scripts
test.sh
scripts/run.sh
scripts/__pycache__
scripts/stackdmp.txt

# sonar
.scannerwork/
sonar/
bw-output/

# testing
# standalone executable for testing
emsesp

7 changes: 0 additions & 7 deletions interface/.gitignore

This file was deleted.

23 changes: 12 additions & 11 deletions interface/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
"preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"npm:mock-api\" \"vite preview\"",
"mock-api": "bun --watch ../mock-api/rest_server.ts",
"mock-es": "bun --watch ../mock-api/es_server.ts",
"mock-upload": "bun --watch ../mock-api/upload_server.ts",
"old_mock-api": "bun --watch ../mock-api/server.js",
"standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"npm:mock-api\" \"npm:mock-es\" \"vite\"",
"standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"npm:mock-api\" \"npm:mock-es\" \"npm:mock-upload\" \"vite\"",
"old_standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"npm:old_mock-api\" \"vite\"",
"typesafe-i18n": "typesafe-i18n --no-watch",
"webUI": "node progmem-generator.js",
Expand All @@ -24,19 +25,19 @@
},
"dependencies": {
"@alova/adapter-xhr": "^1.0.3",
"@babel/core": "^7.24.3",
"@babel/core": "^7.24.4",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.15.14",
"@mui/material": "^5.15.14",
"@mui/icons-material": "^5.15.15",
"@mui/material": "^5.15.15",
"@table-library/react-table-library": "4.1.7",
"@types/imagemin": "^8.0.5",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.12.2",
"@types/node": "^20.12.5",
"@types/react": "^18.2.74",
"@types/react-dom": "^18.2.23",
"@types/react-dom": "^18.2.24",
"@types/react-router-dom": "^5.3.3",
"alova": "^2.18.2",
"alova": "^2.18.3",
"async-validator": "^4.2.5",
"eslint-plugin-prettier": "^5.1.3",
"history": "^5.3.0",
Expand All @@ -50,15 +51,15 @@
"react-router-dom": "^6.22.3",
"react-toastify": "^10.0.5",
"typesafe-i18n": "^5.26.2",
"typescript": "^5.4.3"
"typescript": "^5.4.4"
},
"devDependencies": {
"@preact/compat": "^17.1.2",
"@preact/preset-vite": "^2.8.2",
"@typescript-eslint/eslint-plugin": "^7.5.0",
"@typescript-eslint/parser": "^7.5.0",
"concurrently": "^8.2.2",
"eslint": "^8.57.0",
"eslint": "^9.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-autofix": "^1.1.0",
Expand All @@ -68,8 +69,8 @@
"preact": "^10.20.1",
"prettier": "^3.2.5",
"rollup-plugin-visualizer": "^5.12.0",
"terser": "^5.30.2",
"vite": "^5.2.7",
"terser": "^5.30.3",
"vite": "^5.2.8",
"vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^4.3.2"
},
Expand Down
5 changes: 3 additions & 2 deletions interface/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export default defineConfig(({ command, mode }) => {
open: true,
port: mode == 'production' ? 4173 : 3000,
proxy: {
'/rest': 'http://localhost:3080',
'/api': {
target: 'http://localhost:3080',
changeOrigin: true,
Expand All @@ -23,7 +22,9 @@ export default defineConfig(({ command, mode }) => {
target: 'http://localhost:3081',
changeOrigin: true,
secure: false
}
},
'/rest/uploadFile': 'http://localhost:3082', // this must come first to work!
'/rest': 'http://localhost:3080'
}
}
};
Expand Down

0 comments on commit bfbc77c

Please sign in to comment.