Skip to content

Commit 3855d2c

Browse files
committed
fix: add node 18 + 20 compatibility
1 parent d75fc76 commit 3855d2c

File tree

10 files changed

+197
-16
lines changed

10 files changed

+197
-16
lines changed

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v12.16.3
1+
v18.17.1

dev/build-arm/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# =========================
22
# --- BUILD NPM MODULES ---
33
# =========================
4-
FROM node:16-alpine AS build
4+
FROM node:18-alpine AS build
55

66
RUN apk add yarn g++ make cmake python3 --no-cache
77

@@ -14,7 +14,7 @@ RUN yarn --production --frozen-lockfile --non-interactive --network-timeout 1000
1414
# ===============
1515
# --- Release ---
1616
# ===============
17-
FROM node:16-alpine
17+
FROM node:18-alpine
1818
LABEL maintainer="requarks.io"
1919

2020
RUN apk add bash curl git openssh gnupg sqlite --no-cache && \

dev/build/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ====================
22
# --- Build Assets ---
33
# ====================
4-
FROM node:16-alpine AS assets
4+
FROM node:18-alpine AS assets
55

66
RUN apk add yarn g++ make cmake python3 --no-cache
77

@@ -23,7 +23,7 @@ RUN yarn --production --frozen-lockfile --non-interactive
2323
# ===============
2424
# --- Release ---
2525
# ===============
26-
FROM node:16-alpine
26+
FROM node:18-alpine
2727
LABEL maintainer="requarks.io"
2828

2929
RUN apk add bash curl git openssh gnupg sqlite --no-cache && \

dev/containers/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -- DEV DOCKERFILE --
22
# -- DO NOT USE IN PRODUCTION! --
33

4-
FROM node:14
4+
FROM node:18
55
LABEL maintainer "requarks.io"
66

77
RUN apt-get update && \

dev/containers/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version: "3"
55
services:
66
db:
77
container_name: wiki-db
8-
image: postgres:9-alpine
8+
image: postgres:15-alpine
99
environment:
1010
POSTGRES_DB: wiki
1111
POSTGRES_PASSWORD: wikijsrocks

dev/examples/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3"
22
services:
33

44
db:
5-
image: postgres:11-alpine
5+
image: postgres:15-alpine
66
environment:
77
POSTGRES_DB: wiki
88
POSTGRES_PASSWORD: wikijsrocks

package.json

+8-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
"dev": true,
88
"scripts": {
99
"start": "node server",
10-
"dev": "node dev",
11-
"build": "webpack --profile --config dev/webpack/webpack.prod.js",
12-
"watch": "webpack --config dev/webpack/webpack.dev.js",
10+
"dev": "NODE_OPTIONS=--openssl-legacy-provider node dev",
11+
"build": "NODE_OPTIONS=--openssl-legacy-provider webpack --profile --config dev/webpack/webpack.prod.js",
12+
"watch": "NODE_OPTIONS=--openssl-legacy-provider webpack --config dev/webpack/webpack.dev.js",
1313
"test": "eslint --format codeframe --ext .js,.vue . && pug-lint server/views && jest",
14-
"cypress:open": "cypress open"
14+
"cypress:open": "cypress open",
15+
"postinstall": "patch-package"
1516
},
1617
"repository": {
1718
"type": "git",
@@ -116,10 +117,10 @@
116117
"markdown-it-mark": "3.0.1",
117118
"markdown-it-mathjax": "2.0.0",
118119
"markdown-it-multimd-table": "4.0.3",
120+
"markdown-it-pivot-table": "1.0.1",
119121
"markdown-it-sub": "1.0.0",
120122
"markdown-it-sup": "1.0.0",
121123
"markdown-it-task-lists": "2.1.1",
122-
"markdown-it-pivot-table": "1.0.1",
123124
"mathjax": "3.2.2",
124125
"mime-types": "2.1.35",
125126
"moment": "2.29.4",
@@ -154,12 +155,14 @@
154155
"passport-saml": "3.2.4",
155156
"passport-slack-oauth2": "1.1.1",
156157
"passport-twitch-strategy": "2.2.0",
158+
"patch-package": "8.0.0",
157159
"pem-jwk": "2.0.0",
158160
"pg": "8.9.0",
159161
"pg-hstore": "2.3.4",
160162
"pg-pubsub": "0.5.0",
161163
"pg-query-stream": "4.3.0",
162164
"pg-tsquery": "8.4.1",
165+
"postinstall-postinstall": "2.1.0",
163166
"pug": "3.0.2",
164167
"punycode": "2.3.0",
165168
"qr-image": "3.2.0",

patches/extract-files+9.0.0.patch

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/node_modules/extract-files/package.json b/node_modules/extract-files/package.json
2+
index 636fa03..1b75f79 100644
3+
--- a/node_modules/extract-files/package.json
4+
+++ b/node_modules/extract-files/package.json
5+
@@ -34,6 +34,9 @@
6+
"import": "./public/index.mjs",
7+
"require": "./public/index.js"
8+
},
9+
+ "./public/extractFiles": "./public/extractFiles.js",
10+
+ "./public/isExtractableFile": "./public/isExtractableFile.js",
11+
+ "./public/ReactNativeFile": "./public/ReactNativeFile.js",
12+
"./public/": "./public/",
13+
"./package": "./package.json",
14+
"./package.json": "./package.json"

server/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const { gte } = require('semver')
1111
// ----------------------------------------
1212
// Check Node.js version
1313
// ----------------------------------------
14-
if (gte(process.version, '18.0.0')) {
14+
if (gte(process.version, '21.0.0')) {
1515
console.error('You\'re using an unsupported Node.js version. Please read the requirements.')
1616
process.exit(1)
1717
}

0 commit comments

Comments
 (0)