Skip to content

Commit

Permalink
1.5.x (#636)
Browse files Browse the repository at this point in the history
  • Loading branch information
louislam authored Oct 14, 2024
2 parents b2c8fda + 28337c5 commit 0190620
Show file tree
Hide file tree
Showing 8 changed files with 4,442 additions and 3,570 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
ci:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest, ARM64]
node: [18.17.1] # Can be changed
os: [ubuntu-latest, windows-latest, macos-latest, ARM, ARM64]
node: [22] # Can be changed
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Code
Expand Down
3 changes: 1 addition & 2 deletions docker/Base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Due to the bug of #145, Node.js's version cannot be changed, unless upstream is fixed.
FROM node:18.17.1-bookworm-slim
FROM node:22-bookworm-slim
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN apt update && apt install --yes --no-install-recommends \
Expand Down
7 changes: 7 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ COPY --from=build /app/node_modules /app/node_modules
COPY --chown=node:node . .
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
EXPOSE 5001
HEALTHCHECK --interval=60s --timeout=30s --start-period=60s --retries=5 CMD extra/healthcheck
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Terminal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ export default {

<style lang="scss">
.terminal {
padding: 10px 15px;
background-color: black !important;
height: 100%;
}
</style>
2 changes: 1 addition & 1 deletion frontend/src/pages/Compose.vue
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
:endpoint="endpoint"
:rows="combinedTerminalRows"
:cols="combinedTerminalCols"
style="height: 350px;"
style="height: 315px;"
></Terminal>
</div>
</div>
Expand Down
7 changes: 0 additions & 7 deletions frontend/src/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -656,13 +656,6 @@ $shadow-box-padding: 20px;
}
}

.main-terminal {
.xterm-viewport {
border-radius: 10px;
background-color: $dark-bg !important;
}
}

code {
padding: .2em .4em;
margin: 0;
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,39 +27,39 @@
"reset-password": "tsx ./extra/reset-password.ts"
},
"dependencies": {
"@homebridge/node-pty-prebuilt-multiarch": "~0.11.12",
"@homebridge/node-pty-prebuilt-multiarch": "0.11.14",
"@inventage/envsubst": "^0.16.0",
"@louislam/sqlite3": "~15.1.6",
"bcryptjs": "~2.4.3",
"check-password-strength": "~2.0.7",
"check-password-strength": "~2.0.10",
"command-exists": "~1.2.9",
"compare-versions": "~6.1.0",
"compare-versions": "~6.1.1",
"composerize": "~1.4.1",
"croner": "~7.0.5",
"dayjs": "~1.11.10",
"dotenv": "~16.3.1",
"express": "~4.18.2",
"express-static-gzip": "~2.1.7",
"croner": "~8.1.2",
"dayjs": "~1.11.13",
"dotenv": "~16.3.2",
"express": "~4.21.1",
"express-static-gzip": "~2.1.8",
"http-graceful-shutdown": "~3.1.13",
"jsonwebtoken": "~9.0.2",
"jwt-decode": "~3.1.2",
"knex": "~2.5.1",
"limiter-es6-compat": "~2.1.2",
"mysql2": "~3.6.5",
"mysql2": "~3.11.3",
"promisify-child-process": "~4.1.2",
"redbean-node": "~0.3.3",
"semver": "^7.5.4",
"socket.io": "~4.7.2",
"socket.io-client": "~4.7.2",
"timezones-list": "~3.0.2",
"semver": "^7.6.3",
"socket.io": "~4.8.0",
"socket.io-client": "~4.8.0",
"timezones-list": "~3.0.3",
"ts-command-line-args": "~2.5.1",
"tsx": "~4.6.2",
"type-fest": "~4.3.3",
"yaml": "~2.3.4"
},
"devDependencies": {
"@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/free-regular-svg-icons": "6.4.2",
"@fortawesome/free-solid-svg-icons": "6.4.2",
Expand All @@ -68,8 +68,8 @@
"@types/bootstrap": "~5.2.10",
"@types/command-exists": "~1.2.3",
"@types/express": "~4.17.21",
"@types/jsonwebtoken": "~9.0.5",
"@types/semver": "^7.5.6",
"@types/jsonwebtoken": "~9.0.7",
"@types/semver": "^7.5.8",
"@typescript-eslint/eslint-plugin": "~6.8.0",
"@typescript-eslint/parser": "~6.8.0",
"@vitejs/plugin-vue": "~4.5.2",
Expand All @@ -86,13 +86,13 @@
"sass": "~1.68.0",
"typescript": "~5.2.2",
"unplugin-vue-components": "~0.25.2",
"vite": "~5.0.10",
"vite": "~5.4.8",
"vite-plugin-compression": "~0.5.1",
"vue": "~3.3.13",
"vue": "~3.5.12",
"vue-eslint-parser": "~9.3.2",
"vue-i18n": "~9.5.0",
"vue-prism-editor": "2.0.0-alpha.2",
"vue-qrcode": "~2.2.0",
"vue-qrcode": "~2.2.2",
"vue-router": "~4.2.5",
"vue-toastification": "2.0.0-rc.5",
"wait-on": "^7.2.0",
Expand Down
Loading

0 comments on commit 0190620

Please sign in to comment.