From 86c5999ca5f9104ec94fd26fa35c7d252187de9b Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Mon, 14 Mar 2022 12:31:18 -0600 Subject: [PATCH] Properly support Node 16 (#119) --- .github/README.md | 4 ++-- .github/workflows/ts-build.yml | 4 ++-- Dockerfile | 4 ++-- package-lock.json | 22 +++++++++++----------- package.json | 6 +++--- tsconfig.json | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/README.md b/.github/README.md index f2c05d3..eec4137 100644 --- a/.github/README.md +++ b/.github/README.md @@ -192,7 +192,7 @@ docker-compose up --force-recreate --build -d && docker image prune -f # && dock Expand for local installation steps
-1. You should have **Node.js 14.17** & **npm 8 or later** installed. +1. You should have **Node.js 16** & **npm 8 or later** installed. 2. Clone this repo using `git clone https://github.com/tycrek/ass.git && cd ass/` 3. Run `npm i -g typescript` to install TypeScript globally 4. Run `npm i --save-dev` to install the required dependencies (`--save-dev` is **required** for compilation) @@ -403,7 +403,7 @@ ass has a number of pre-made npm scripts for you to use. **All** of these script | `docker-resetup` | Alias for `docker-compose exec ass npm run setup && docker-compose restart` | [tlog Socket plugin]: https://github.com/tycrek/tlog#socket -[`FORCE_COLOR`]: https://nodejs.org/dist/latest-v14.x/docs/api/cli.html#cli_force_color_1_2_3 +[`FORCE_COLOR`]: https://nodejs.org/dist/latest-v16.x/docs/api/cli.html#cli_force_color_1_2_3 ## Flameshot users (Linux) diff --git a/.github/workflows/ts-build.yml b/.github/workflows/ts-build.yml index 7abb43a..6aa8ce4 100644 --- a/.github/workflows/ts-build.yml +++ b/.github/workflows/ts-build.yml @@ -12,11 +12,11 @@ jobs: # Checkout repo - uses: actions/checkout@v2 - # Set up Node 14 + # Set up Node 16 - name: Setup Node.js environment uses: actions/setup-node@v2.4.1 with: - node-version: 14.17.5 + node-version: 16.14.0 # Install npm 8 & TypeScript - name: Install global packages diff --git a/Dockerfile b/Dockerfile index b9e3e40..ca73b36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ # - tycrek (https://tycrek.com/) # - Zusier (https://github.com/Zusier) -# Node 14 image -FROM node:14.17.5 +# Node 16 image +FROM node:16.14.0 # Set working directory WORKDIR /opt/ass/ diff --git a/package-lock.json b/package-lock.json index fe75069..d605556 100755 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "dependencies": { "@skynetlabs/skynet-nodejs": "^2.3.0", - "@tsconfig/node14": "^1.0.1", + "@tsconfig/node16": "^1.0.1", "@tycrek/express-nofavicon": "^1.0.3", "@tycrek/isprod": "^2.0.2", "@tycrek/log": "^0.5.9", @@ -55,8 +55,8 @@ "@types/ws": "^7.4.7" }, "engines": { - "node": ">=14.7.x <16", - "npm": ">=8.1.x" + "node": ">=16.14.x", + "npm": ">=8.3.x" }, "funding": { "type": "patreon", @@ -600,10 +600,10 @@ "node": ">=4.0.0" } }, - "node_modules/@tsconfig/node14": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", - "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==" + "node_modules/@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==" }, "node_modules/@tycrek/express-nofavicon": { "version": "1.0.3", @@ -4399,10 +4399,10 @@ } } }, - "@tsconfig/node14": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", - "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==" + "@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==" }, "@tycrek/express-nofavicon": { "version": "1.0.3", diff --git a/package.json b/package.json index d2a3881..9e1e0e6 100755 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "The superior self-hosted ShareX server", "main": "ass.js", "engines": { - "node": ">=14.7.x <16", - "npm": ">=8.1.x" + "node": ">=16.14.x", + "npm": ">=8.3.x" }, "scripts": { "dev": "npm run build && npm start", @@ -38,7 +38,7 @@ }, "dependencies": { "@skynetlabs/skynet-nodejs": "^2.3.0", - "@tsconfig/node14": "^1.0.1", + "@tsconfig/node16": "^1.0.1", "@tycrek/express-nofavicon": "^1.0.3", "@tycrek/isprod": "^2.0.2", "@tycrek/log": "^0.5.9", diff --git a/tsconfig.json b/tsconfig.json index aac1aca..52fa7f8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@tsconfig/node14/tsconfig.json", + "extends": "@tsconfig/node16/tsconfig.json", "compilerOptions": { "outDir": "./dist", "lib": [