From b399e653b2df47d752a3bbdcfb79e46de389fdde Mon Sep 17 00:00:00 2001 From: Aditya <38064122+bettercallav@users.noreply.github.com> Date: Wed, 27 Sep 2023 13:16:17 +1000 Subject: [PATCH 1/3] revert: package.json --- package.json | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 03921f1..f9303d9 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,20 @@ { - "name": "js-rpc", - "version": "0.1.0", + "name": "@matrixai/rpc", + "version": "0.0.1", "author": "Matrix AI", "contributors": [ - "Aditya V", - "Roger Qiu" + { + "name": "Aditya V" + }, + { + "name": "Roger Qiu" + } ], "description": "RPC for TypeScript/JavaScript Applications", "license": "Apache-2.0", "repository": { "type": "git", - "url": "git+https://github.com/MatrixAI/js-rpc.git" + "url": "https://github.com/MatrixAI/js-rpc.git" }, "main": "dist/index.js", "types": "dist/index.d.ts", @@ -27,7 +31,6 @@ "bench": "shx rm -rf ./benches/results && ts-node ./benches" }, "devDependencies": { - "@fast-check/jest": "^1.1.0", "@swc/core": "^1.3.62", "@swc/jest": "^0.2.26", "@types/jest": "^28.1.3", @@ -50,27 +53,16 @@ "ts-node": "^10.9.1", "tsconfig-paths": "^3.9.0", "typedoc": "^0.23.21", - "typescript": "^4.9.3" + "typescript": "^4.9.3", + "@fast-check/jest": "^1.1.0" }, "dependencies": { "@matrixai/async-init": "^1.9.4", "@matrixai/contexts": "^1.2.0", + "@matrixai/logger": "^3.1.0", "@matrixai/errors": "^1.2.0", "@matrixai/events": "^3.2.0", - "@matrixai/logger": "^3.1.0", "@streamparser/json": "^0.0.17", - "ix": "^5.0.0", - "my-package": "^0.0.0" - }, - "bugs": { - "url": "https://github.com/MatrixAI/js-rpc/issues" - }, - "homepage": "https://github.com/MatrixAI/js-rpc#readme", - "directories": { - "doc": "docs", - "test": "tests" - }, - "keywords": [ - "rpc" - ] + "ix": "^5.0.0" + } } From 43172dd9a7ceee210498be151eeff5f00f843f09 Mon Sep 17 00:00:00 2001 From: Aditya <38064122+bettercallav@users.noreply.github.com> Date: Wed, 27 Sep 2023 13:31:02 +1000 Subject: [PATCH 2/3] fix: windows pipeline fix --- .gitlab-ci.yml | 2 ++ scripts/choco-install.ps1 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d450e97..75b28bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,6 +165,8 @@ build:windows: - windows before_script: - mkdir -Force "$CI_PROJECT_DIR/tmp" + - Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1 # Added line + script: - .\scripts\choco-install.ps1 - refreshenv diff --git a/scripts/choco-install.ps1 b/scripts/choco-install.ps1 index afe9ba4..68a7cbe 100755 --- a/scripts/choco-install.ps1 +++ b/scripts/choco-install.ps1 @@ -22,7 +22,7 @@ New-Item -Path "${PSScriptRoot}\..\tmp\chocolatey" -ItemType "directory" -ErrorA choco source add --name="cache" --source="${PSScriptRoot}\..\tmp\chocolatey" --priority=1 # Install nodejs v20.5.1 (will use cache if exists) -$nodejs = "nodejs.install" +$nodejs = "nodejs" 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.20.5.1.nupkg" -PathType Leaf) ) { From a27731fb4f411f3509470e9087863b832060488f Mon Sep 17 00:00:00 2001 From: Aditya <38064122+bettercallav@users.noreply.github.com> Date: Wed, 27 Sep 2023 13:51:36 +1000 Subject: [PATCH 3/3] chore: version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f9303d9..1bd8c5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@matrixai/rpc", - "version": "0.0.1", + "version": "0.1.1", "author": "Matrix AI", "contributors": [ {