mirror of
https://github.com/chatmail/core.git
synced 2026-05-07 08:56:30 +03:00
fix set_core_version.py script to also update version in deltachat-jsonrpc/typescript/package.json
This commit is contained in:
@@ -22,6 +22,7 @@
|
|||||||
- Show attached .eml files correctly #3561
|
- Show attached .eml files correctly #3561
|
||||||
- Auto accept contact requests if `Config::Bot` is set for a client #3567
|
- Auto accept contact requests if `Config::Bot` is set for a client #3567
|
||||||
- Don't prepend the subject to chat messages in mailinglists
|
- Don't prepend the subject to chat messages in mailinglists
|
||||||
|
- fix `set_core_version.py` script to also update version in `deltachat-jsonrpc/typescript/package.json`
|
||||||
|
|
||||||
|
|
||||||
## 1.93.0
|
## 1.93.0
|
||||||
|
|||||||
@@ -1,29 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "deltachat-jsonrpc-client",
|
|
||||||
"version": "0.1.0",
|
|
||||||
"main": "dist/deltachat.js",
|
|
||||||
"types": "dist/deltachat.d.ts",
|
|
||||||
"type": "module",
|
|
||||||
"author": "Delta Chat Developers (ML) <delta@codespeak.net>",
|
"author": "Delta Chat Developers (ML) <delta@codespeak.net>",
|
||||||
"license": "MPL-2.0",
|
|
||||||
"scripts": {
|
|
||||||
"prettier:check": "prettier --check **.ts",
|
|
||||||
"prettier:fix": "prettier --write **.ts",
|
|
||||||
"generate-bindings": "cargo test",
|
|
||||||
"build": "run-s generate-bindings build:tsc build:bundle",
|
|
||||||
"build:tsc": "tsc",
|
|
||||||
"build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
|
|
||||||
"example": "run-s build example:build example:start",
|
|
||||||
"example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
|
|
||||||
"example:start": "http-server .",
|
|
||||||
"example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
|
|
||||||
"test": "run-s test:prepare test:run-coverage test:report-coverage",
|
|
||||||
"test:prepare": "cargo build --features webserver --bin deltachat-jsonrpc-server",
|
|
||||||
"test:run": "mocha dist/test",
|
|
||||||
"test:run-coverage": "COVERAGE=1 NODE_OPTIONS=--enable-source-maps c8 --include 'dist/*' -r text -r html -r json mocha dist/test",
|
|
||||||
"test:report-coverage": "node report_api_coverage.mjs",
|
|
||||||
"docs": "typedoc --out docs deltachat.ts"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"isomorphic-ws": "^4.0.1",
|
"isomorphic-ws": "^4.0.1",
|
||||||
"tiny-emitter": "git+https://github.com/Simon-Laux/tiny-emitter.git",
|
"tiny-emitter": "git+https://github.com/Simon-Laux/tiny-emitter.git",
|
||||||
@@ -47,5 +23,29 @@
|
|||||||
"typedoc": "^0.23.2",
|
"typedoc": "^0.23.2",
|
||||||
"typescript": "^4.5.5",
|
"typescript": "^4.5.5",
|
||||||
"ws": "^8.5.0"
|
"ws": "^8.5.0"
|
||||||
}
|
},
|
||||||
}
|
"license": "MPL-2.0",
|
||||||
|
"main": "dist/deltachat.js",
|
||||||
|
"name": "deltachat-jsonrpc-client",
|
||||||
|
"scripts": {
|
||||||
|
"build": "run-s generate-bindings build:tsc build:bundle",
|
||||||
|
"build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
|
||||||
|
"build:tsc": "tsc",
|
||||||
|
"docs": "typedoc --out docs deltachat.ts",
|
||||||
|
"example": "run-s build example:build example:start",
|
||||||
|
"example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
|
||||||
|
"example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
|
||||||
|
"example:start": "http-server .",
|
||||||
|
"generate-bindings": "cargo test",
|
||||||
|
"prettier:check": "prettier --check **.ts",
|
||||||
|
"prettier:fix": "prettier --write **.ts",
|
||||||
|
"test": "run-s test:prepare test:run-coverage test:report-coverage",
|
||||||
|
"test:prepare": "cargo build --features webserver --bin deltachat-jsonrpc-server",
|
||||||
|
"test:report-coverage": "node report_api_coverage.mjs",
|
||||||
|
"test:run": "mocha dist/test",
|
||||||
|
"test:run-coverage": "COVERAGE=1 NODE_OPTIONS=--enable-source-maps c8 --include 'dist/*' -r text -r html -r json mocha dist/test"
|
||||||
|
},
|
||||||
|
"type": "module",
|
||||||
|
"types": "dist/deltachat.d.ts",
|
||||||
|
"version": "1.93.0"
|
||||||
|
}
|
||||||
@@ -42,15 +42,15 @@ def replace_toml_version(relpath, newversion):
|
|||||||
|
|
||||||
|
|
||||||
def read_json_version(relpath):
|
def read_json_version(relpath):
|
||||||
p = pathlib.Path("package.json")
|
p = pathlib.Path(relpath)
|
||||||
assert p.exists()
|
assert p.exists()
|
||||||
with open(p, "r") as f:
|
with open(p, "r") as f:
|
||||||
json_data = json.loads(f.read())
|
json_data = json.loads(f.read())
|
||||||
return json_data["version"]
|
return json_data["version"]
|
||||||
|
|
||||||
|
|
||||||
def update_package_json(newversion):
|
def update_package_json(relpath, newversion):
|
||||||
p = pathlib.Path("package.json")
|
p = pathlib.Path(relpath)
|
||||||
assert p.exists()
|
assert p.exists()
|
||||||
with open(p, "r") as f:
|
with open(p, "r") as f:
|
||||||
json_data = json.loads(f.read())
|
json_data = json.loads(f.read())
|
||||||
@@ -64,13 +64,15 @@ def main():
|
|||||||
parser.add_argument("newversion")
|
parser.add_argument("newversion")
|
||||||
|
|
||||||
toml_list = ["Cargo.toml", "deltachat-ffi/Cargo.toml", "deltachat-jsonrpc/Cargo.toml"]
|
toml_list = ["Cargo.toml", "deltachat-ffi/Cargo.toml", "deltachat-jsonrpc/Cargo.toml"]
|
||||||
|
json_list = ["package.json", "deltachat-jsonrpc/typescript/package.json"]
|
||||||
try:
|
try:
|
||||||
opts = parser.parse_args()
|
opts = parser.parse_args()
|
||||||
except SystemExit:
|
except SystemExit:
|
||||||
print()
|
print()
|
||||||
for x in toml_list:
|
for x in toml_list:
|
||||||
print("{}: {}".format(x, read_toml_version(x)))
|
print("{}: {}".format(x, read_toml_version(x)))
|
||||||
print("package.json:", str(read_json_version("package.json")))
|
for x in json_list:
|
||||||
|
print("{}: {}".format(x, read_json_version(x)))
|
||||||
print()
|
print()
|
||||||
raise SystemExit("need argument: new version, example: 1.25.0")
|
raise SystemExit("need argument: new version, example: 1.25.0")
|
||||||
|
|
||||||
@@ -93,7 +95,10 @@ def main():
|
|||||||
|
|
||||||
for toml_filename in toml_list:
|
for toml_filename in toml_list:
|
||||||
replace_toml_version(toml_filename, newversion)
|
replace_toml_version(toml_filename, newversion)
|
||||||
update_package_json(newversion)
|
|
||||||
|
for json_filename in json_list:
|
||||||
|
update_package_json(json_filename, newversion)
|
||||||
|
|
||||||
|
|
||||||
print("running cargo check")
|
print("running cargo check")
|
||||||
subprocess.call(["cargo", "check"])
|
subprocess.call(["cargo", "check"])
|
||||||
|
|||||||
Reference in New Issue
Block a user