Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update node version (and matrix-appservice-bridge) dependencies. #343

Merged
merged 9 commits into from
Jan 8, 2024
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
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"import/order": "off",
"jsdoc/check-alignment": "error",
"jsdoc/check-indentation": "error",
"jsdoc/newline-after-description": "error",
"jsdoc/tag-lines": ["error", "any", {"startLines": 1}],
"max-classes-per-file": "warn",
"new-parens": "error",
"no-bitwise": "error",
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,36 @@ name: Tests
on:
push:
branches: [ develop ]
paths-ignore:
- changelog.d/**'
pull_request:
branches: [ develop ]
paths-ignore:
- changelog.d/**'

workflow_dispatch:

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: 16
node-version-file: .node-version
- run: yarn --frozen-lockfile
- run: yarn lint

test:
runs-on: ubuntu-latest
strategy:
matrix:
node_version: [16, 18]
node_version: [20, 21]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node_version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
- uses: actions-rs/toolchain@v1
Expand Down
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
1 change: 1 addition & 0 deletions .nodeversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build node-purple. We need buster for python3.6, which is needed for node-purple
FROM node:16-buster as builder
# Build node-purple. We need debian for python3.6, which is needed for node-purple
FROM node:20-bookworm as builder
COPY ./package.json ./package.json
COPY ./yarn.lock ./yarn.lock
COPY ./src ./src
Expand All @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y libpurple0 libpurple-dev libglib2.0-dev
RUN yarn install --frozen-lockfile --check-files

# App
FROM node:16-buster-slim
FROM node:20-bookworm-slim

RUN mkdir app
WORKDIR /app
Expand Down
1 change: 1 addition & 0 deletions changelog.d/343.removal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Drop support for Node 16, and support Node 20 and 21.
39 changes: 19 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.4.2",
"description": "Multi protocol bridging for Matrix.",
"engines": {
"node": ">=16"
"node": ">=20"
},
"main": "lib/Program.js",
"scripts": {
Expand Down Expand Up @@ -33,45 +33,44 @@
"@xmpp/jid": "^0.12.0",
"@xmpp/reconnect": "^0.12.0",
"@xmpp/xml": "^0.12.0",
"axios": "^0.21.1",
"fast-xml-parser": "^3.17.4",
"html-entities": "^2.3.2",
"html-entities": "^2.4.0",
"htmlparser2": "^6.1.0",
"leven": "^3.1.0",
"marked": "^2.1.3",
"matrix-appservice-bridge": "^6.0.0",
"pg": "8.7.1",
"matrix-appservice-bridge": "^10.1.0",
"pg": "8.11.3",
"prom-client": "^13.1.0",
"quick-lru": "^5.1.1",
"axios": "^0.21.1",
"source-map-support": "^0.5.19",
"source-map-support": "^0.5.21",
"uuid": "^8.3.2"
},
"devDependencies": {
"@istanbuljs/nyc-config-typescript": "^1.0.1",
"@types/chai": "^4.2.21",
"@istanbuljs/nyc-config-typescript": "^1.0.2",
"@types/chai": "^4.3.11",
"@types/marked": "^2.0.4",
"@types/mocha": "^9.0.0",
"@types/nedb": "^1.8.12",
"@types/node": "^12",
"@types/node": "^20",
"@types/pg": "^7.14.5",
"@types/xmpp__jid": "^1.3.1",
"@types/xmpp__jid": "^1.3.5",
"@types/xmpp__xml": "^0.6.1",
"@typescript-eslint/eslint-plugin": "^4.28.5",
"@typescript-eslint/eslint-plugin-tslint": "^4.28.5",
"@typescript-eslint/parser": "^4.28.5",
"@typescript-eslint/eslint-plugin": "^6.18.0",
"@typescript-eslint/eslint-plugin-tslint": "^6.18.0",
"@typescript-eslint/parser": "^6.18.0",
"chai": "^4.3.4",
"eslint": "^7.31.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsdoc": "^39.3.6",
"eslint": "^8.56.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "^48.0.2",
"mocha": "^9.0.3",
"mock-require": "^3.0.3",
"nedb": "^1.8.0",
"nyc": "^15.1.0",
"ts-node": "^10.1.0",
"typescript": "^4.3.5"
"ts-node": "^10.9.2",
"typescript": "^5.3.3"
},
"optionalDependencies": {
"node-purple": "git+https://github.com/matrix-org/node-purple#8ad1572d544d9b5e5add446626a37903b4576c11"
"node-purple": "git+https://github.com/matrix-org/node-purple#b3783de1fc1781653846e189a573f0262074b055"
},
"nyc": {
"check-coverage": true,
Expand Down
2 changes: 1 addition & 1 deletion src/Program.ts
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ class Program {
registration: this.cli.getRegistrationFilePath(),
...storeParams,
});
await this.bridge.initalise();
await this.bridge.initialise();

this.store = await initiateStore(this.config.datastore, this.bridge);
const ignoreIntegrity = process.env.BIFROST_INTEGRITY_WRITE;
Expand Down
Loading
Loading