mirror
/
meshastic.web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix docker nginx config (#786) 

* Fix docker-nginx-config sub directory issue

* Fix docker-nginx-config sub directory issue

* Update packages/web/infra/default.conf

Co-authored-by: Copilot <[email protected]>

* Update packages/web/infra/default.conf

Co-authored-by: Copilot <[email protected]>

* adding lock file

---------

Co-authored-by: Copilot <[email protected]>
pull/792/head
Dan Ditomaso 10 months ago
committed by GitHub
parent
2ca3eb5685
commit
65a53388bb
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 128 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 89
      packages/web/infra/default.conf
  2. 1
      packages/web/package.json
  3. 156
      pnpm-lock.yaml

89
packages/web/infra/default.conf
View File

@ -1,42 +1,51 @@
server {
listen 8080;
server_name localhost;
root /usr/share/nginx/html;
index index.html index.htm;
location / {
try_files $uri $uri/ /index.html;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
internal;
}
location ~ /\.ht {
deny all;
}
gzip on;
gzip_disable "msie6";
gzip_vary on;
gzip_proxied any;
gzip_comp_level 6;
gzip_buffers 16 8k;
gzip_http_version 1.1;
gzip_types
text/plain
text/css
text/xml
text/javascript
application/javascript
application/x-javascript
application/json
application/xml
application/xml+rss
font/ttf
font/otf
image/svg+xml;
listen 8080;
server_name localhost;
root /usr/share/nginx/html;
index index.html;
location ~* \.(?:js|jsx|mjs|ts|tsx|css|png|jpg|jpeg|gif|ico|webp|avif|svg|ttf|otf|woff|woff2|map)$ {
access_log off;
etag on;
expires 3M;
add_header Cache-Control "public, immutable";
try_files $uri =404;
}
location = /index.html {
etag on;
add_header Cache-Control "no-cache";
}
location / {
try_files $uri $uri/ /index.html;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html { internal; }
location ~ /\.ht { deny all; }
gzip on;
gzip_disable "msie6";
gzip_vary on;
gzip_proxied any;
gzip_comp_level 6;
gzip_buffers 16 8k;
gzip_http_version 1.1;
gzip_types
text/plain
text/css
text/xml
text/javascript
application/javascript
application/x-javascript
application/json
application/xml
application/xml+rss
font/ttf
font/otf
image/svg+xml;
}

1
packages/web/package.json
View File

@ -22,6 +22,7 @@
"test": "vitest",
"ts:check": "bun run tsc --noEmit",
"preview": "vite preview",
"docker:build": "docker build -t meshtastic-web:latest -f ./infra/Containerfile .",
"generate:routes": "bun @tanstack/router-cli generate --outDir src/ routes --rootRoutePath /",
"package": "gzipper c -i html,js,css,png,ico,svg,json,webmanifest,txt dist dist/output && tar -cvf dist/build.tar -C ./dist/output/ ."
},

156
pnpm-lock.yaml
View File

@ -821,12 +821,12 @@ packages:
resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
engines: {node: '>= 8'}
'@oxc-project/[email protected]0.0':
resolution: {integrity: sha512-3rzy1bJAZ4s7zV9TKT60x119RwJDCDqEtCwK/Zc2qlm7wGhiIUxLLYUhE/mN91yB0u1kxm5sh4NjU12sPqQTpg==}
'@oxc-project/[email protected]1.0':
resolution: {integrity: sha512-zm/LDVOq9FEmHiuM8zO4DWirv0VP2Tv2VsgaiHby9nvpq+FVrcqNYgv+TysLKOITQXWZj/roluTxFvpkHP0Iuw==}
engines: {node: '>=6.9.0'}
'@oxc-project/[email protected]0.0':
resolution: {integrity: sha512-xxHQm8wfCv2e8EmtaDwpMeAHOWqgQDAYg+BJouLXSQt5oTKu9TIXrgNMGSrM2fLvKmECsRd9uUFAAD+hPyootA==}
'@oxc-project/[email protected]1.0':
resolution: {integrity: sha512-CnOqkybZK8z6Gx7Wb1qF7AEnSzbol1WwcIzxYOr8e91LytGOjo0wCpgoYWZo8sdbpqX+X+TJayIzo4Pv0R/KjA==}
'@quansync/[email protected]':
resolution: {integrity: sha512-vy/41FCdnIalPTQCb2Wl0ic1caMdzGus4ktDp+gpZesQNydXcx8nhh8qB3qMPbGkictOTaXgXEUUfQEm8DQYoA==}
@ -1343,81 +1343,81 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==}
'@rolldown/[email protected]1':
resolution: {integrity: sha512-0mFtKwOG7smn0HkvQ6h8j0m/ohkR7Fp5eMTJ2Pns/HSbePHuDpxMaQ4TjZ6arlVXxpeWZlAHeT5BeNsOA3iWTg==}
'@rolldown/[email protected]2':
resolution: {integrity: sha512-Gs+313LfR4Ka3hvifdag9r44WrdKQaohya7ZXUXzARF7yx0atzFlVZjsvxtKAw1Vmtr4hB/RjUD1jf73SW7zDw==}
cpu: [arm64]
os: [android]
'@rolldown/[email protected]1':
resolution: {integrity: sha512-BHfHJ8Nb5G7ZKJl6pimJacupONT4F7w6gmQHw41rouAnJF51ORDwGefWeb6OMLzGmJwzxlIVPERfnJf1EsMM7A==}
'@rolldown/[email protected]2':
resolution: {integrity: sha512-W8oMqzGcI7wKPXUtS3WJNXzbghHfNiuM1UBAGpVb+XlUCgYRQJd2PRGP7D3WGql3rR3QEhUvSyAuCBAftPQw6Q==}
cpu: [arm64]
os: [darwin]
'@rolldown/[email protected]1':
resolution: {integrity: sha512-4MiuRtExC08jHbSU/diIL+IuQP+3Ck1FbWAplK+ysQJ7fxT3DMxy5FmnIGfmhaqow8oTjb2GEwZJKgTRjZL1Vw==}
'@rolldown/[email protected]2':
resolution: {integrity: sha512-pM4c4sKUk37noJrnnDkJknLhCsfZu7aWyfe67bD0GQHfzAPjV16wPeD9CmQg4/0vv+5IfHYaa4VE536xbA+W0Q==}
cpu: [x64]
os: [darwin]
'@rolldown/[email protected]1':
resolution: {integrity: sha512-nffC1u7ccm12qlAea8ExY3AvqlaHy/o/3L4p5Es8JFJ3zJSs6e3DyuxGZZVdl9EVwsLxPPTvioIl4tEm2afwyw==}
'@rolldown/[email protected]2':
resolution: {integrity: sha512-M8SUgFlYb5kJJWcFC8gUMRiX4WLFxPKMed3SJ2YrxontgIrEcpizPU8nLNVsRYEStoSfKHKExpQw3OP6fm+5bw==}
cpu: [x64]
os: [freebsd]
'@rolldown/[email protected]1':
resolution: {integrity: sha512-LHmAaB3rB1GOJuHscKcL2Ts/LKLcb3YWTh2uQ/876rg/J9WE9kQ0kZ+3lRSYbth/YL8ln54j4JZmHpqQY3xptQ==}
'@rolldown/[email protected]2':
resolution: {integrity: sha512-FuQpbNC/hE//bvv29PFnk0AtpJzdPdYl5CMhlWPovd9g3Kc3lw9TrEPIbL7gRPUdhKAiq6rVaaGvOnXxsa0eww==}
cpu: [arm]
os: [linux]
'@rolldown/[email protected]1':
resolution: {integrity: sha512-oTDZVfqIAjLB2I1yTiLyyhfPPO6dky33sTblxTCpe+ZT55WizN3KDoBKJ4yXG8shI6I4bRShVu29Xg0yAjyQYw==}
'@rolldown/[email protected]2':
resolution: {integrity: sha512-hRZygRlaGCjcNTNY9GV7dDI18sG1dK3cc7ujHq72LoDad23zFDUGMQjiSxHWK+/r92iMV+j2MiHbvzayxqynsg==}
cpu: [arm64]
os: [linux]
'@rolldown/[email protected]1':
resolution: {integrity: sha512-duJ3IkEBj9Xe9NYW1n8Y3483VXHGi8zQ0ZsLbK8464EJUXLF7CXM8Ry+jkkUw+ZvA+Zu1E/+C6p2Y6T9el0C9g==}
'@rolldown/[email protected]2':
resolution: {integrity: sha512-HzgT6h+CXLs+GKAU0Wvkt3rvcv0CmDBsDjlPhh4GHysOKbG9NjpKYX2zvjx671E9pGbTvcPpwy7gGsy7xpu+8g==}
cpu: [arm64]
os: [linux]
'@rolldown/[email protected]':
resolution: {integrity: sha512-qdbmU5QSZ0uoLZBYMxiHsMQmizqtzFGTVPU5oyU1n0jU0Mo+mkSzqZuL8VBnjHOHzhVxZsoAGH9JjiRzCnoGVA==}
cpu: [arm64]
os: [openharmony]
'@rolldown/[email protected]':
resolution: {integrity: sha512-H7+r34TSV8udB2gAsebFM/YuEeNCkPGEAGJ1JE7SgI9XML6FflqcdKfrRSneQFsPaom/gCEc1g0WW5MZ0O3blw==}
'@rolldown/[email protected]':
resolution: {integrity: sha512-Ab/wbf6gdzphDbsg51UaxsC93foQ7wxhtg0SVCXd25BrV4MAJ1HoDtKN/f4h0maFmJobkqYub2DlmoasUzkvBg==}
cpu: [x64]
os: [linux]
'@rolldown/[email protected]1':
resolution: {integrity: sha512-zRm2YmzFVqbsmUsyyZnHfJrOlQUcWS/FJ5ZWL8Q1kZh5PnLBrTVZNpakIWwAxpN5gNEi9MmFd5YHocVJp8ps1Q==}
'@rolldown/[email protected]':
resolution: {integrity: sha512-VoxqGEfh5A1Yx+zBp/FR5QwAbtzbuvky2SVc+ii4g1gLD4zww6mt/hPi5zG+b88zYPFBKHpxMtsz9cWqXU5V5Q==}
cpu: [x64]
os: [linux]
'@rolldown/[email protected]':
resolution: {integrity: sha512-fM1eUIuHLsNJXRlWOuIIex1oBJ89I0skFWo5r/D3KSJ5gD9MBd3g4Hp+v1JGohvyFE+7ylnwRxSUyMEeYpA69A==}
'@rolldown/[email protected]':
resolution: {integrity: sha512-qZ1ViyOUDGbiZrSAJ/FIAhYUElDfVxxFW6DLT/w4KeoZN3HsF4jmRP95mXtl51/oGrqzU9l9Q2f7/P4O/o2ZZA==}
cpu: [arm64]
os: [openharmony]
'@rolldown/[email protected]':
resolution: {integrity: sha512-hEkG3wD+f3wytV0lqwb/uCrXc4r4Ny/DWJFJPfQR3VeMWplhWGgSHNwZc2Q7k86Yi36f9NNzzWmrIuvHI9lCVw==}
engines: {node: '>=14.0.0'}
cpu: [wasm32]
'@rolldown/[email protected]':
resolution: {integrity: sha512-4nftR9V2KHH3zjBwf6leuZZJQZ7v0d70ogjHIqB3SDsbDLvVEZiGSsSn2X6blSZRZeJSFzK0pp4kZ67zdZXwSw==}
'@rolldown/[email protected]2':
resolution: {integrity: sha512-k3MvDf8SiA7uP2ikP0unNouJ2YCrnwi7xcVW+RDgMp5YXVr3Xu6svmT3HGn0tkCKUuPmf+uy8I5uiHt5qWQbew==}
cpu: [arm64]
os: [win32]
'@rolldown/[email protected]1':
resolution: {integrity: sha512-0TQcKu9xZVHYALit+WJsSuADGlTFfOXhnZoIHWWQhTk3OgbwwbYcSoZUXjRdFmR6Wswn4csHtJGN1oYKeQ6/2g==}
'@rolldown/[email protected]2':
resolution: {integrity: sha512-wAi/FxGh7arDOUG45UmnXE1sZUa0hY4cXAO2qWAjFa3f7bTgz/BqwJ7XN5SUezvAJPNkME4fEpInfnBvM25a0w==}
cpu: [ia32]
os: [win32]
'@rolldown/[email protected]1':
resolution: {integrity: sha512-3zMICWwpZh1jrkkKDYIUCx/2wY3PXLICAS0AnbeLlhzfWPhCcpNK9eKhiTlLAZyTp+3kyipoi/ZSVIh+WDnBpQ==}
'@rolldown/[email protected]2':
resolution: {integrity: sha512-Ej0i4PZk8ltblZtzVK8ouaGUacUtxRmTm5S9794mdyU/tYxXjAJNseOfxrnHpMWKjMDrOKbqkPqJ52T9NR4LQQ==}
cpu: [x64]
os: [win32]
'@rolldown/[email protected]':
resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==}
'@rolldown/[email protected]1':
resolution: {integrity: sha512-IaDZ9NhjOIOkYtm+hH0GX33h3iVZ2OeSUnFF0+7Z4+1GuKs4Kj5wK3+I2zNV9IPLfqV4XlwWif8SXrZNutxciQ==}
'@rolldown/[email protected]2':
resolution: {integrity: sha512-QReCdvxiUZAPkvp1xpAg62IeNzykOFA6syH2CnClif4YmALN1XKpB39XneL80008UbtMShthSVDKmrx05N1q/g==}
'@rollup/[email protected]':
resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==}
@ -3572,8 +3572,8 @@ packages:
vue-tsc:
optional: true
[email protected]1:
resolution: {integrity: sha512-M2Q+RfG0FMJeSW3RSFTbvtjGVTcQpTQvN247D0EMSsPkpZFoinopR9oAnQiwgogQyzDuvKNnbyCbQQlmNAzSoQ==}
[email protected]2:
resolution: {integrity: sha512-vxI2sPN07MMaoYKlFrVva5qZ1Y7DAZkgp7MQwTnyHt4FUMz9Sh+YeCzNFV9JYHI6ZNwoGWLCfCViE3XVsRC1cg==}
hasBin: true
[email protected]:
@ -4613,9 +4613,9 @@ snapshots:
'@nodelib/fs.scandir': 2.1.5
fastq: 1.19.1
'@oxc-project/[email protected]0.0': {}
'@oxc-project/[email protected]1.0': {}
'@oxc-project/[email protected]0.0': {}
'@oxc-project/[email protected]1.0': {}
'@quansync/[email protected]':
dependencies:
@ -5170,53 +5170,53 @@ snapshots:
'@radix-ui/[email protected]': {}
'@rolldown/[email protected]1':
'@rolldown/[email protected]2':
optional: true
'@rolldown/[email protected]1':
'@rolldown/[email protected]2':
optional: true
'@rolldown/[email protected]1':
'@rolldown/[email protected]2':
optional: true
'@rolldown/[email protected]1':
'@rolldown/[email protected]2':
optional: true
'@rolldown/[email protected]1':
'@rolldown/[email protected]2':
optional: true
'@rolldown/[email protected]1':
'@rolldown/[email protected]2':
optional: true
'@rolldown/[email protected]1':
'@rolldown/[email protected]2':
optional: true
'@rolldown/binding-linux-[email protected]':
'@rolldown/binding-linux-[email protected]':
optional: true
'@rolldown/binding-linux-x64-[email protected]':
'@rolldown/binding-linux-x64-[email protected]':
optional: true
'@rolldown/binding-[email protected]':
'@rolldown/binding-[email protected]':
optional: true
'@rolldown/[email protected]1':
'@rolldown/[email protected]2':
dependencies:
'@napi-rs/wasm-runtime': 1.0.3
optional: true
'@rolldown/[email protected]1':
'@rolldown/[email protected]2':
optional: true
'@rolldown/[email protected]1':
'@rolldown/[email protected]2':
optional: true
'@rolldown/[email protected]1':
'@rolldown/[email protected]2':
optional: true
'@rolldown/[email protected]': {}
'@rolldown/[email protected]1': {}
'@rolldown/[email protected]2': {}
'@rollup/[email protected]':
dependencies:
@ -8065,7 +8065,7 @@ snapshots:
[email protected]: {}
[email protected]([email protected]1)([email protected]):
[email protected]([email protected]2)([email protected]):
dependencies:
'@babel/generator': 7.28.0
'@babel/parser': 7.28.0
@ -8075,34 +8075,34 @@ snapshots:
debug: 4.4.1
dts-resolver: 2.1.1
get-tsconfig: 4.10.1
rolldown: 1.0.0-beta.31
rolldown: 1.0.0-beta.32
optionalDependencies:
typescript: 5.9.2
transitivePeerDependencies:
- oxc-resolver
- supports-color
[email protected]1:
[email protected]2:
dependencies:
'@oxc-project/runtime': 0.80.0
'@oxc-project/types': 0.80.0
'@rolldown/pluginutils': 1.0.0-beta.31
'@oxc-project/runtime': 0.81.0
'@oxc-project/types': 0.81.0
'@rolldown/pluginutils': 1.0.0-beta.32
ansis: 4.1.0
optionalDependencies:
'@rolldown/binding-android-arm64': 1.0.0-beta.31
'@rolldown/binding-darwin-arm64': 1.0.0-beta.31
'@rolldown/binding-darwin-x64': 1.0.0-beta.31
'@rolldown/binding-freebsd-x64': 1.0.0-beta.31
'@rolldown/binding-linux-arm-gnueabihf': 1.0.0-beta.31
'@rolldown/binding-linux-arm64-gnu': 1.0.0-beta.31
'@rolldown/binding-linux-arm64-musl': 1.0.0-beta.31
'@rolldown/binding-linux-arm64-ohos': 1.0.0-beta.31
'@rolldown/binding-linux-x64-gnu': 1.0.0-beta.31
'@rolldown/binding-linux-x64-musl': 1.0.0-beta.31
'@rolldown/binding-wasm32-wasi': 1.0.0-beta.31
'@rolldown/binding-win32-arm64-msvc': 1.0.0-beta.31
'@rolldown/binding-win32-ia32-msvc': 1.0.0-beta.31
'@rolldown/binding-win32-x64-msvc': 1.0.0-beta.31
'@rolldown/binding-android-arm64': 1.0.0-beta.32
'@rolldown/binding-darwin-arm64': 1.0.0-beta.32
'@rolldown/binding-darwin-x64': 1.0.0-beta.32
'@rolldown/binding-freebsd-x64': 1.0.0-beta.32
'@rolldown/binding-linux-arm-gnueabihf': 1.0.0-beta.32
'@rolldown/binding-linux-arm64-gnu': 1.0.0-beta.32
'@rolldown/binding-linux-arm64-musl': 1.0.0-beta.32
'@rolldown/binding-linux-x64-gnu': 1.0.0-beta.32
'@rolldown/binding-linux-x64-musl': 1.0.0-beta.32
'@rolldown/binding-openharmony-arm64': 1.0.0-beta.32
'@rolldown/binding-wasm32-wasi': 1.0.0-beta.32
'@rolldown/binding-win32-arm64-msvc': 1.0.0-beta.32
'@rolldown/binding-win32-ia32-msvc': 1.0.0-beta.32
'@rolldown/binding-win32-x64-msvc': 1.0.0-beta.32
[email protected]:
dependencies:
@ -8396,8 +8396,8 @@ snapshots:
diff: 8.0.2
empathic: 2.0.0
hookable: 5.5.3
rolldown: 1.0.0-beta.31
rolldown-plugin-dts: 0.15.6([email protected]1)([email protected])
rolldown: 1.0.0-beta.32
rolldown-plugin-dts: 0.15.6([email protected]2)([email protected])
semver: 7.7.2
tinyexec: 1.0.1
tinyglobby: 0.2.14

Write Preview
Loading…
Cancel
Save