Skip to content

Commit

Permalink
Merge pull request #69 from MatrixAI/feature-node20
Browse files Browse the repository at this point in the history
updating to node 20
  • Loading branch information
tegefaulkes committed Sep 12, 2023
2 parents 2f5fa40 + 9ee4b28 commit 1af93de
Show file tree
Hide file tree
Showing 8 changed files with 4,290 additions and 2,584 deletions.
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"message": "Use `globalThis` instead"
}
],
"prefer-rest-params": 0,
"require-yield": 0,
"eqeqeq": ["error", "smart"],
"spaced-comment": [
Expand Down
6,818 changes: 4,261 additions & 2,557 deletions package-lock.json

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,47 +28,47 @@
"bench": "shx rm -rf ./benches/results && ts-node ./benches"
},
"dependencies": {
"@matrixai/async-init": "^1.8.4",
"@matrixai/async-init": "^1.9.1",
"@matrixai/async-locks": "^4.0.0",
"@matrixai/errors": "^1.1.7",
"@matrixai/errors": "^1.2.0",
"@matrixai/logger": "^3.1.0",
"@matrixai/resources": "^1.1.5",
"@matrixai/workers": "^1.3.7",
"node-gyp-build": "4.4.0",
"threads": "^1.6.5"
},
"devDependencies": {
"@swc/core": "^1.3.62",
"@swc/jest": "^0.2.26",
"@types/jest": "^28.1.3",
"@types/node": "^18.15.0",
"@typescript-eslint/eslint-plugin": "^5.45.1",
"@typescript-eslint/parser": "^5.45.1",
"@swc/core": "1.3.82",
"@swc/jest": "^0.2.29",
"@types/jest": "^29.5.2",
"@types/node": "^20.5.7",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"benny": "^3.7.1",
"common-tags": "^1.8.2",
"eslint": "^8.15.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^4.0.0",
"jest": "^28.1.1",
"jest-extended": "^3.0.1",
"jest-junit": "^14.0.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-prettier": "^5.0.0-alpha.2",
"jest": "^29.6.2",
"jest-extended": "^4.0.0",
"jest-junit": "^16.0.0",
"lexicographic-integer": "^1.1.0",
"napi-macros": "^2.0.0",
"node-forge": "^1.3.1",
"node-gyp": "9.0.0",
"prettier": "^2.6.2",
"prettier": "^3.0.0",
"semver": "^7.3.7",
"shx": "^0.3.4",
"systeminformation": "^5.18.5",
"ts-jest": "^28.0.5",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"tsconfig-paths": "^3.9.0",
"typedoc": "^0.23.21",
"typescript": "^4.9.3"
"typedoc": "^0.24.8",
"typescript": "^5.1.6"
},
"engines": {
"node": "^18.15.0",
"node": "^20.5.1",
"msvs": "2019"
}
}
2 changes: 1 addition & 1 deletion pkgs.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import (
let rev = "f294325aed382b66c7a188482101b0f336d1d7db"; in
let rev = "ea5234e7073d5f44728c499192544a84244bf35a"; in
builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz"
)
4 changes: 2 additions & 2 deletions scripts/brew-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
export HOMEBREW_NO_AUTO_UPDATE=1
export HOMEBREW_NO_ANALYTICS=1

brew install node@18
brew link --overwrite node@18
brew reinstall node@20
brew link --overwrite node@20
brew install python@3.9
brew link --overwrite python@3.9
6 changes: 3 additions & 3 deletions scripts/choco-install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ if ( $null -eq $env:ChocolateyInstall ) {
New-Item -Path "${PSScriptRoot}\..\tmp\chocolatey" -ItemType "directory" -ErrorAction:SilentlyContinue
choco source add --name="cache" --source="${PSScriptRoot}\..\tmp\chocolatey" --priority=1

# Install nodejs v18.15.0 (will use cache if exists)
# Install nodejs v20.5.1 (will use cache if exists)
$nodejs = "nodejs.install"
choco install "$nodejs" --version="18.15.0" --require-checksums -y
choco install "$nodejs" --version="20.5.1" --require-checksums -y
# Internalise nodejs to cache if doesn't exist
if ( -not (Test-Path -Path "${PSScriptRoot}\..\tmp\chocolatey\$nodejs\$nodejs.18.15.0.nupkg" -PathType Leaf) ) {
if ( -not (Test-Path -Path "${PSScriptRoot}\..\tmp\chocolatey\$nodejs\$nodejs.20.5.1.nupkg" -PathType Leaf) ) {
Save-ChocoPackage -PackageName $nodejs
}

Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with pkgs;
mkShell {
nativeBuildInputs = [
nodejs
nodejs_20
nodejs.python
clang-tools
shellcheck
Expand Down
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"moduleResolution": "node",
"module": "CommonJS",
"target": "ES2022",
Expand Down

0 comments on commit 1af93de

Please sign in to comment.