This commit is contained in:
Louis Lam 2024-10-14 14:20:34 +08:00 committed by GitHub
commit 01906205f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 4554 additions and 3682 deletions

View file

@ -14,8 +14,8 @@ jobs:
ci: ci:
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, windows-latest, macos-latest, ARM64] os: [ubuntu-latest, windows-latest, macos-latest, ARM, ARM64]
node: [18.17.1] # Can be changed node: [22] # Can be changed
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- name: Checkout Code - name: Checkout Code

View file

@ -1,5 +1,4 @@
# Due to the bug of #145, Node.js's version cannot be changed, unless upstream is fixed. FROM node:22-bookworm-slim
FROM node:18.17.1-bookworm-slim
ENV PNPM_HOME="/pnpm" ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH" ENV PATH="$PNPM_HOME:$PATH"
RUN apt update && apt install --yes --no-install-recommends \ RUN apt update && apt install --yes --no-install-recommends \

View file

@ -22,6 +22,13 @@ COPY --from=build /app/node_modules /app/node_modules
COPY --chown=node:node . . COPY --chown=node:node . .
RUN mkdir ./data RUN mkdir ./data
# It is just for safe, as by default, it is disabled in the latest Node.js now.
# Read more:
# - https://github.com/sagemathinc/cocalc/issues/6963
# - https://github.com/microsoft/node-pty/issues/630#issuecomment-1987212447
ENV UV_USE_IO_URING=0
VOLUME /app/data VOLUME /app/data
EXPOSE 5001 EXPOSE 5001
HEALTHCHECK --interval=60s --timeout=30s --start-period=60s --retries=5 CMD extra/healthcheck HEALTHCHECK --interval=60s --timeout=30s --start-period=60s --retries=5 CMD extra/healthcheck

View file

@ -253,7 +253,7 @@ export default {
<style lang="scss"> <style lang="scss">
.terminal { .terminal {
padding: 10px 15px; background-color: black !important;
height: 100%; height: 100%;
} }
</style> </style>

View file

@ -158,7 +158,7 @@
:endpoint="endpoint" :endpoint="endpoint"
:rows="combinedTerminalRows" :rows="combinedTerminalRows"
:cols="combinedTerminalCols" :cols="combinedTerminalCols"
style="height: 350px;" style="height: 315px;"
></Terminal> ></Terminal>
</div> </div>
</div> </div>

View file

@ -656,13 +656,6 @@ $shadow-box-padding: 20px;
} }
} }
.main-terminal {
.xterm-viewport {
border-radius: 10px;
background-color: $dark-bg !important;
}
}
code { code {
padding: .2em .4em; padding: .2em .4em;
margin: 0; margin: 0;

View file

@ -27,31 +27,31 @@
"reset-password": "tsx ./extra/reset-password.ts" "reset-password": "tsx ./extra/reset-password.ts"
}, },
"dependencies": { "dependencies": {
"@homebridge/node-pty-prebuilt-multiarch": "~0.11.12", "@homebridge/node-pty-prebuilt-multiarch": "0.11.14",
"@inventage/envsubst": "^0.16.0", "@inventage/envsubst": "^0.16.0",
"@louislam/sqlite3": "~15.1.6", "@louislam/sqlite3": "~15.1.6",
"bcryptjs": "~2.4.3", "bcryptjs": "~2.4.3",
"check-password-strength": "~2.0.7", "check-password-strength": "~2.0.10",
"command-exists": "~1.2.9", "command-exists": "~1.2.9",
"compare-versions": "~6.1.0", "compare-versions": "~6.1.1",
"composerize": "~1.4.1", "composerize": "~1.4.1",
"croner": "~7.0.5", "croner": "~8.1.2",
"dayjs": "~1.11.10", "dayjs": "~1.11.13",
"dotenv": "~16.3.1", "dotenv": "~16.3.2",
"express": "~4.18.2", "express": "~4.21.1",
"express-static-gzip": "~2.1.7", "express-static-gzip": "~2.1.8",
"http-graceful-shutdown": "~3.1.13", "http-graceful-shutdown": "~3.1.13",
"jsonwebtoken": "~9.0.2", "jsonwebtoken": "~9.0.2",
"jwt-decode": "~3.1.2", "jwt-decode": "~3.1.2",
"knex": "~2.5.1", "knex": "~2.5.1",
"limiter-es6-compat": "~2.1.2", "limiter-es6-compat": "~2.1.2",
"mysql2": "~3.6.5", "mysql2": "~3.11.3",
"promisify-child-process": "~4.1.2", "promisify-child-process": "~4.1.2",
"redbean-node": "~0.3.3", "redbean-node": "~0.3.3",
"semver": "^7.5.4", "semver": "^7.6.3",
"socket.io": "~4.7.2", "socket.io": "~4.8.0",
"socket.io-client": "~4.7.2", "socket.io-client": "~4.8.0",
"timezones-list": "~3.0.2", "timezones-list": "~3.0.3",
"ts-command-line-args": "~2.5.1", "ts-command-line-args": "~2.5.1",
"tsx": "~4.6.2", "tsx": "~4.6.2",
"type-fest": "~4.3.3", "type-fest": "~4.3.3",
@ -59,7 +59,7 @@
}, },
"devDependencies": { "devDependencies": {
"@actions/github": "^6.0.0", "@actions/github": "^6.0.0",
"@fontsource/jetbrains-mono": "^5.0.18", "@fontsource/jetbrains-mono": "^5.1.1",
"@fortawesome/fontawesome-svg-core": "6.4.2", "@fortawesome/fontawesome-svg-core": "6.4.2",
"@fortawesome/free-regular-svg-icons": "6.4.2", "@fortawesome/free-regular-svg-icons": "6.4.2",
"@fortawesome/free-solid-svg-icons": "6.4.2", "@fortawesome/free-solid-svg-icons": "6.4.2",
@ -68,8 +68,8 @@
"@types/bootstrap": "~5.2.10", "@types/bootstrap": "~5.2.10",
"@types/command-exists": "~1.2.3", "@types/command-exists": "~1.2.3",
"@types/express": "~4.17.21", "@types/express": "~4.17.21",
"@types/jsonwebtoken": "~9.0.5", "@types/jsonwebtoken": "~9.0.7",
"@types/semver": "^7.5.6", "@types/semver": "^7.5.8",
"@typescript-eslint/eslint-plugin": "~6.8.0", "@typescript-eslint/eslint-plugin": "~6.8.0",
"@typescript-eslint/parser": "~6.8.0", "@typescript-eslint/parser": "~6.8.0",
"@vitejs/plugin-vue": "~4.5.2", "@vitejs/plugin-vue": "~4.5.2",
@ -86,13 +86,13 @@
"sass": "~1.68.0", "sass": "~1.68.0",
"typescript": "~5.2.2", "typescript": "~5.2.2",
"unplugin-vue-components": "~0.25.2", "unplugin-vue-components": "~0.25.2",
"vite": "~5.0.10", "vite": "~5.4.8",
"vite-plugin-compression": "~0.5.1", "vite-plugin-compression": "~0.5.1",
"vue": "~3.3.13", "vue": "~3.5.12",
"vue-eslint-parser": "~9.3.2", "vue-eslint-parser": "~9.3.2",
"vue-i18n": "~9.5.0", "vue-i18n": "~9.5.0",
"vue-prism-editor": "2.0.0-alpha.2", "vue-prism-editor": "2.0.0-alpha.2",
"vue-qrcode": "~2.2.0", "vue-qrcode": "~2.2.2",
"vue-router": "~4.2.5", "vue-router": "~4.2.5",
"vue-toastification": "2.0.0-rc.5", "vue-toastification": "2.0.0-rc.5",
"wait-on": "^7.2.0", "wait-on": "^7.2.0",

File diff suppressed because it is too large Load diff