From 860614758594d1f61aa1af44458df44748c359e7 Mon Sep 17 00:00:00 2001 From: Korobeinikov Evgeny Date: Tue, 28 Jan 2025 12:19:11 +0300 Subject: [PATCH 1/2] Release 1.4.2 --- VERSION | 1 + arkoala/arkui-common/package.json | 18 ++- arkoala/arkui/package.json | 26 ++-- arkoala/ets-plugin/package.json | 122 ++++++++--------- incremental/build-common/package.json | 12 +- incremental/common/package.json | 4 +- incremental/compat/package.json | 2 +- incremental/compiler-plugin/package.json | 6 +- incremental/runtime/package.json | 109 ++++++++-------- interop/package.json | 4 +- package.json | 2 + tools/release.mjs | 159 +++++++++++++++++++++++ 12 files changed, 314 insertions(+), 151 deletions(-) create mode 100644 VERSION create mode 100644 tools/release.mjs diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..c9929e36a --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.4.2 \ No newline at end of file diff --git a/arkoala/arkui-common/package.json b/arkoala/arkui-common/package.json index 2c785c5ef..33abd1d65 100644 --- a/arkoala/arkui-common/package.json +++ b/arkoala/arkui-common/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/arkui-common", - "version": "1.4.1+devel", + "version": "1.4.2", "description": "", "main": "build/lib/src/index.js", "exports": { @@ -16,8 +16,12 @@ "types": "./index.d.ts", "typesVersions": { "*": { - "config/tsconfig.base.json": ["config/tsconfig.base.json"], - "*": ["./build/lib/src/*"] + "config/tsconfig.base.json": [ + "config/tsconfig.base.json" + ], + "*": [ + "./build/lib/src/*" + ] } }, "files": [ @@ -49,10 +53,10 @@ }, "keywords": [], "dependencies": { - "@koalaui/common": "2.0.13+devel", - "@koalaui/compat": "2.0.13+devel", - "@koalaui/runtime": "1.4.1+devel", + "@koalaui/common": "1.4.2+devel", + "@koalaui/compat": "1.4.2+devel", + "@koalaui/runtime": "1.4.2+devel", "@koalaui/ets-tsc": "4.9.5-r4", "@koalaui/fast-arktsc": "next" } -} +} \ No newline at end of file diff --git a/arkoala/arkui/package.json b/arkoala/arkui/package.json index bad5e659f..f53993f0a 100644 --- a/arkoala/arkui/package.json +++ b/arkoala/arkui/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/arkoala-arkui", - "version": "1.4.1+devel", + "version": "1.4.2", "description": "", "main": "build/lib/src/index.js", "exports": { @@ -12,10 +12,18 @@ "types": "./index.d.ts", "typesVersions": { "*": { - "ohos.*": ["./build/lib/src/shared/ohos.*"], - "system.*": ["./build/lib/src/shared/system.*"], - "types/*": ["./types/*"], - "*": ["./build/lib/src/*"] + "ohos.*": [ + "./build/lib/src/shared/ohos.*" + ], + "system.*": [ + "./build/lib/src/shared/system.*" + ], + "types/*": [ + "./types/*" + ], + "*": [ + "./build/lib/src/*" + ] } }, "files": [ @@ -37,10 +45,10 @@ }, "keywords": [], "dependencies": { - "@koalaui/common": "2.0.13+devel", - "@koalaui/runtime": "1.4.1+devel", + "@koalaui/common": "1.4.2+devel", + "@koalaui/runtime": "1.4.2+devel", "@koalaui/arkoala": "1.4.1+devel", - "@koalaui/arkui-common": "1.4.1+devel", + "@koalaui/arkui-common": "1.4.2+devel", "@koalaui/ets-tsc": "4.9.5-r4", "media-query-parser": "^2.0.2", "commander": "10.0.1" @@ -56,4 +64,4 @@ "mocha": "^9.2.2", "source-map-support": "^0.5.21" } -} +} \ No newline at end of file diff --git a/arkoala/ets-plugin/package.json b/arkoala/ets-plugin/package.json index 7a0e2081d..f37e313d8 100644 --- a/arkoala/ets-plugin/package.json +++ b/arkoala/ets-plugin/package.json @@ -1,67 +1,57 @@ { - "name": "@koalaui/ets-plugin", - "version": "1.4.1+devel", - "description": "", - "main": "build/lib/src/index.js", - "types": "build/lib/src/index.d.ts", - "files": [ - "build/lib/**/*.js", - "build/lib/**/*.d.ts" - ], - "scripts": { - "compile": "ets-tsc -b .", - "test": "npm run compile && npm run test:ets", - - "compile:arkoala:ets": "cd test/ets && ets-tsc -p tsconfig.arkoala.json", - "compile:arkts:ets": "cd test/ets && ets-tsc -p tsconfig.arkts.json", - "compile:koala:ets": "cd test/ets && ets-tsc -p tsconfig.koala.json", - - "compile:arkoala:spec": "cd test/spec && ets-tsc -p ../../test/specification/tsconfig.arkoala.json || true", - "compile:arkts:spec": "cd test/spec && ets-tsc -p ../../test/specification/tsconfig.arkts.json || true", - "compile:koala:spec": "cd test/spec && ets-tsc -p ../../test/specification/tsconfig.koala.json || true", - - "canonize:arkoala:ets": "npm run compile:arkoala:ets && cp -r build/ts/arkoala/ets test/golden/arkoala", - "canonize:arkts:ets": "npm run compile:arkts:ets && cp -r build/ts/arkts/ets test/golden/arkts", - "canonize:koala:ets": "npm run compile:koala:ets && cp -r build/ts/koala/ets test/golden/koala", - "canonize:ets": "npm run canonize:arkoala:ets && npm run canonize:arkts:ets && npm run canonize:koala:ets", - - "canonize:arkoala:spec": "npm run compile:arkoala:spec && cp -r build/ts/arkoala/spec test/golden/arkoala", - "canonize:arkts:spec": "npm run compile:arkts:spec && cp -r build/ts/arkts/spec test/golden/arkts", - "canonize:koala:spec": "npm run compile:koala:spec && cp -r build/ts/koala/spec test/golden/koala", - "canonize:spec": "npm run canonize:arkoala:spec && npm run canonize:arkts:spec && npm run canonize:koala:spec", - - "canonize:all": "npm run compile && npm run canonize:ets && npm run sync:spec && npm run canonize:spec", - - "test:arkoala:ets": "npm run compile:arkoala:ets && mocha --config mocharc.arkoala.ets.json", - "test:arkts:ets": "npm run compile:arkts:ets && mocha --config mocharc.arkts.ets.json", - "test:koala:ets": "npm run compile:koala:ets && mocha --config mocharc.koala.ets.json", - "test:ets": "npm run test:arkoala:ets && npm run test:arkts:ets && npm run test:koala:ets", - - "test:arkoala:spec": "npm run compile:arkoala:spec && mocha --config mocharc.arkoala.spec.json", - "test:arkts:spec": "npm run compile:arkts:spec && mocha --config mocharc.arkts.spec.json", - "test:koala:spec": "npm run compile:koala:spec && mocha --config mocharc.koala.spec.json", - "test:spec": "npm run test:arkoala:spec && npm run test:arkts:spec && npm run test:koala:spec", - - "test:all": "npm run compile && npm run test:ets && npm run sync:spec && npm run test:spec", - - "compile:sync:spec": "cd test/scripts && memo-tsc -p tsconfig-sync-specification.json", - "sync:spec": "npm run compile:sync:spec && cd build/test/scripts && node sync-specification.js", - - "clean": "rimraf build test/spec test/specification/ets2bundle" - }, - "keywords": [], - "dependencies": {}, - "devDependencies": { - "@koalaui/ets-tsc": "4.9.5-r4", - "@koalaui/memo-tsc": "4.9.5", - "@types/chai": "^4.3.1", - "@types/mocha": "^9.1.0", - "@typescript-eslint/eslint-plugin": "^5.20.0", - "@typescript-eslint/parser": "^5.20.0", - "chai": "^4.3.6", - "eslint": "^8.13.0", - "eslint-plugin-unused-imports": "^2.0.0", - "mocha": "^9.2.2", - "source-map-support": "^0.5.21" - } -} + "name": "@koalaui/ets-plugin", + "version": "1.4.2", + "description": "", + "main": "build/lib/src/index.js", + "types": "build/lib/src/index.d.ts", + "files": [ + "build/lib/**/*.js", + "build/lib/**/*.d.ts" + ], + "scripts": { + "compile": "ets-tsc -b .", + "test": "npm run compile && npm run test:ets", + "compile:arkoala:ets": "cd test/ets && ets-tsc -p tsconfig.arkoala.json", + "compile:arkts:ets": "cd test/ets && ets-tsc -p tsconfig.arkts.json", + "compile:koala:ets": "cd test/ets && ets-tsc -p tsconfig.koala.json", + "compile:arkoala:spec": "cd test/spec && ets-tsc -p ../../test/specification/tsconfig.arkoala.json || true", + "compile:arkts:spec": "cd test/spec && ets-tsc -p ../../test/specification/tsconfig.arkts.json || true", + "compile:koala:spec": "cd test/spec && ets-tsc -p ../../test/specification/tsconfig.koala.json || true", + "canonize:arkoala:ets": "npm run compile:arkoala:ets && cp -r build/ts/arkoala/ets test/golden/arkoala", + "canonize:arkts:ets": "npm run compile:arkts:ets && cp -r build/ts/arkts/ets test/golden/arkts", + "canonize:koala:ets": "npm run compile:koala:ets && cp -r build/ts/koala/ets test/golden/koala", + "canonize:ets": "npm run canonize:arkoala:ets && npm run canonize:arkts:ets && npm run canonize:koala:ets", + "canonize:arkoala:spec": "npm run compile:arkoala:spec && cp -r build/ts/arkoala/spec test/golden/arkoala", + "canonize:arkts:spec": "npm run compile:arkts:spec && cp -r build/ts/arkts/spec test/golden/arkts", + "canonize:koala:spec": "npm run compile:koala:spec && cp -r build/ts/koala/spec test/golden/koala", + "canonize:spec": "npm run canonize:arkoala:spec && npm run canonize:arkts:spec && npm run canonize:koala:spec", + "canonize:all": "npm run compile && npm run canonize:ets && npm run sync:spec && npm run canonize:spec", + "test:arkoala:ets": "npm run compile:arkoala:ets && mocha --config mocharc.arkoala.ets.json", + "test:arkts:ets": "npm run compile:arkts:ets && mocha --config mocharc.arkts.ets.json", + "test:koala:ets": "npm run compile:koala:ets && mocha --config mocharc.koala.ets.json", + "test:ets": "npm run test:arkoala:ets && npm run test:arkts:ets && npm run test:koala:ets", + "test:arkoala:spec": "npm run compile:arkoala:spec && mocha --config mocharc.arkoala.spec.json", + "test:arkts:spec": "npm run compile:arkts:spec && mocha --config mocharc.arkts.spec.json", + "test:koala:spec": "npm run compile:koala:spec && mocha --config mocharc.koala.spec.json", + "test:spec": "npm run test:arkoala:spec && npm run test:arkts:spec && npm run test:koala:spec", + "test:all": "npm run compile && npm run test:ets && npm run sync:spec && npm run test:spec", + "compile:sync:spec": "cd test/scripts && memo-tsc -p tsconfig-sync-specification.json", + "sync:spec": "npm run compile:sync:spec && cd build/test/scripts && node sync-specification.js", + "clean": "rimraf build test/spec test/specification/ets2bundle" + }, + "keywords": [], + "dependencies": {}, + "devDependencies": { + "@koalaui/ets-tsc": "4.9.5-r4", + "@koalaui/memo-tsc": "4.9.5", + "@types/chai": "^4.3.1", + "@types/mocha": "^9.1.0", + "@typescript-eslint/eslint-plugin": "^5.20.0", + "@typescript-eslint/parser": "^5.20.0", + "chai": "^4.3.6", + "eslint": "^8.13.0", + "eslint-plugin-unused-imports": "^2.0.0", + "mocha": "^9.2.2", + "source-map-support": "^0.5.21" + } +} \ No newline at end of file diff --git a/incremental/build-common/package.json b/incremental/build-common/package.json index f2a02d1e5..a7ac16b1a 100644 --- a/incremental/build-common/package.json +++ b/incremental/build-common/package.json @@ -1,8 +1,8 @@ { - "name": "@koalaui/build-common", - "version": "1.4.1+devel", - "description": "", - "files": [ - "tsconfig.json" - ] + "name": "@koalaui/build-common", + "version": "1.4.2", + "description": "", + "files": [ + "tsconfig.json" + ] } \ No newline at end of file diff --git a/incremental/common/package.json b/incremental/common/package.json index 7868056b1..027ea1b8a 100644 --- a/incremental/common/package.json +++ b/incremental/common/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/common", - "version": "2.0.13+devel", + "version": "1.4.2", "description": "", "main": "build/lib/src/index.js", "types": "./index.d.ts", @@ -41,7 +41,7 @@ }, "keywords": [], "dependencies": { - "@koalaui/compat": "2.0.13+devel" + "@koalaui/compat": "1.4.2+devel" }, "devDependencies": { "@ohos/hypium": "1.0.6", diff --git a/incremental/compat/package.json b/incremental/compat/package.json index 098462ed4..349cf9100 100644 --- a/incremental/compat/package.json +++ b/incremental/compat/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/compat", - "version": "2.0.13+devel", + "version": "1.4.2", "description": "", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/incremental/compiler-plugin/package.json b/incremental/compiler-plugin/package.json index 18de28564..7f34971c2 100644 --- a/incremental/compiler-plugin/package.json +++ b/incremental/compiler-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/compiler-plugin", - "version": "1.4.1+devel", + "version": "1.4.2", "description": "", "main": "build/lib/src/index.js", "types": "build/lib/src/index.d.ts", @@ -10,7 +10,7 @@ ], "keywords": [], "dependencies": { - "@koalaui/common": "2.0.13+devel" + "@koalaui/common": "1.4.2+devel" }, "devDependencies": { "@types/chai": "^4.3.1", @@ -31,4 +31,4 @@ "test:coverage": "nyc mocha", "canonize": "npm run unmemoize:tests && cp -r ./test/unmemoized/examples ./test/golden/" } -} +} \ No newline at end of file diff --git a/incremental/runtime/package.json b/incremental/runtime/package.json index 6124910bd..9ef8651f6 100644 --- a/incremental/runtime/package.json +++ b/incremental/runtime/package.json @@ -1,57 +1,56 @@ { - "name": "@koalaui/runtime", - "version": "1.4.1+devel", - "description": "", - "main": "./build/lib/src/index.js", - "types": "./build/lib/src/index.d.ts", - "files": [ - "build/lib/**/*.js", - "build/lib/**/*.d.ts", - "oh-package.json5" - ], - "scripts": { - "compile": "memo-tsc -p .", - "compile:unmemoize": "memo-tsc -p tsconfig-unmemoize.json", - "compile:test": "memo-tsc -b tsconfig-test.json", - "clean": "rimraf build", - "test": "mocha", - "test:coverage": "nyc mocha", - "panda:sdk:install": "cd ../tools/panda && npm run panda:sdk:install", - "arkts:compile:test:lib": "bash ../tools/panda/arkts/arktsc --arktsconfig arktsconfig-test-lib.json --ets-module", - "arkts:compile:test:app": "find build/unmemoized/test-arkts -name '*.test.ts' -exec mkdir -p build/test/app/{} \\; -exec bash ../tools/panda/arkts/arktsc --arktsconfig arktsconfig-test-app.json --output build/test/app/{}/test.abc {} \\;", - "arkts:run:test:harness": "find build/test/app -name test.abc -exec bash ../tools/panda/arkts/ark --ark-boot-files $(find ../compat/build/abc ../common/build/abc ./build/test/lib -name '*.abc' | paste -sd ':' -) {} \\;", - "arkts:compile:test": "npm run compile:arkts && npm run arkts:compile:test:lib && npm run arkts:compile:test:app", - "arkts:run:test": "npm run clean && npm run panda:sdk:install && npm run arkts:compile:test && npm run arkts:run:test:harness", - "unmemoize": "memo-tsc -b arktsconfig-unmemoize.json", - "compile:arkts": "npm run unmemoize && ../tools/panda/arkts/arktsc --arktsconfig arktsconfig-run-unmemoized.json --ets-module", - "build:compat": "npm run build:compat --prefix ../compat", - "build:compat:inc": "npm run build:compat:inc --prefix ../compat", - "build:common": "npm run build:common --prefix ../common", - "build:common:inc": "npm run build:common:inc --prefix ../common", - "build:runtime": "npm run build:runtime:inc", - "build:runtime:inc": "npm run unmemoize && fast-arktsc --input-files ./arktsconfig-run-unmemoized.json --output-dir ./build --compiler ../tools/panda/arkts/arktsc --link-name runtime && ninja ${NINJA_OPTIONS} -f build/build.ninja", - "build:incremental:components": "npm run build:compat && npm run build:common && npm run build:runtime", - "build:incremental:components:inc": "npm run build:compat:inc && npm run build:common:inc && npm run build:runtime:inc", - "link:incremental": "../tools/panda/arkts/arklink --output build/incremental.abc -- ../compat/build/compat.abc ../common/build/common.abc build/runtime.abc", - "build:incremental": "npm run build:incremental:components && npm run link:incremental", - "build:incremental:inc": "npm run build:incremental:components:inc && npm run link:incremental", - "clean:incremental": "npm run clean" - }, - "keywords": [], - "dependencies": { - "@koalaui/common": "2.0.13+devel", - "@koalaui/compat": "2.0.13+devel" - }, - "devDependencies": { - "@types/chai": "^4.3.1", - "@types/mocha": "^9.1.0", - "@typescript-eslint/eslint-plugin": "^5.20.0", - "@typescript-eslint/parser": "^5.20.0", - "chai": "^4.3.6", - "eslint": "^8.13.0", - "eslint-plugin-unused-imports": "^2.0.0", - "mocha": "^9.2.2", - "source-map-support": "^0.5.21" - } + "name": "@koalaui/runtime", + "version": "1.4.2", + "description": "", + "main": "./build/lib/src/index.js", + "types": "./build/lib/src/index.d.ts", + "files": [ + "build/lib/**/*.js", + "build/lib/**/*.d.ts", + "oh-package.json5" + ], + "scripts": { + "compile": "memo-tsc -p .", + "compile:unmemoize": "memo-tsc -p tsconfig-unmemoize.json", + "compile:test": "memo-tsc -b tsconfig-test.json", + "clean": "rimraf build", + "test": "mocha", + "test:coverage": "nyc mocha", + "panda:sdk:install": "cd ../tools/panda && npm run panda:sdk:install", + "arkts:compile:test:lib": "bash ../tools/panda/arkts/arktsc --arktsconfig arktsconfig-test-lib.json --ets-module", + "arkts:compile:test:app": "find build/unmemoized/test-arkts -name '*.test.ts' -exec mkdir -p build/test/app/{} \\; -exec bash ../tools/panda/arkts/arktsc --arktsconfig arktsconfig-test-app.json --output build/test/app/{}/test.abc {} \\;", + "arkts:run:test:harness": "find build/test/app -name test.abc -exec bash ../tools/panda/arkts/ark --ark-boot-files $(find ../compat/build/abc ../common/build/abc ./build/test/lib -name '*.abc' | paste -sd ':' -) {} \\;", + "arkts:compile:test": "npm run compile:arkts && npm run arkts:compile:test:lib && npm run arkts:compile:test:app", + "arkts:run:test": "npm run clean && npm run panda:sdk:install && npm run arkts:compile:test && npm run arkts:run:test:harness", + "unmemoize": "memo-tsc -b arktsconfig-unmemoize.json", + "compile:arkts": "npm run unmemoize && ../tools/panda/arkts/arktsc --arktsconfig arktsconfig-run-unmemoized.json --ets-module", + "build:compat": "npm run build:compat --prefix ../compat", + "build:compat:inc": "npm run build:compat:inc --prefix ../compat", + "build:common": "npm run build:common --prefix ../common", + "build:common:inc": "npm run build:common:inc --prefix ../common", + "build:runtime": "npm run build:runtime:inc", + "build:runtime:inc": "npm run unmemoize && fast-arktsc --input-files ./arktsconfig-run-unmemoized.json --output-dir ./build --compiler ../tools/panda/arkts/arktsc --link-name runtime && ninja ${NINJA_OPTIONS} -f build/build.ninja", + "build:incremental:components": "npm run build:compat && npm run build:common && npm run build:runtime", + "build:incremental:components:inc": "npm run build:compat:inc && npm run build:common:inc && npm run build:runtime:inc", + "link:incremental": "../tools/panda/arkts/arklink --output build/incremental.abc -- ../compat/build/compat.abc ../common/build/common.abc build/runtime.abc", + "build:incremental": "npm run build:incremental:components && npm run link:incremental", + "build:incremental:inc": "npm run build:incremental:components:inc && npm run link:incremental", + "clean:incremental": "npm run clean" + }, + "keywords": [], + "dependencies": { + "@koalaui/common": "1.4.2+devel", + "@koalaui/compat": "1.4.2+devel" + }, + "devDependencies": { + "@types/chai": "^4.3.1", + "@types/mocha": "^9.1.0", + "@typescript-eslint/eslint-plugin": "^5.20.0", + "@typescript-eslint/parser": "^5.20.0", + "chai": "^4.3.6", + "eslint": "^8.13.0", + "eslint-plugin-unused-imports": "^2.0.0", + "mocha": "^9.2.2", + "source-map-support": "^0.5.21" } - +} \ No newline at end of file diff --git a/interop/package.json b/interop/package.json index 7196885cd..85f48c5ac 100644 --- a/interop/package.json +++ b/interop/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/interop", - "version": "2.0.13+devel", + "version": "1.4.2", "description": "", "workspaces": [ "../incremental/build-common", @@ -57,7 +57,7 @@ "keywords": [], "dependencies": { "@types/node": "^18.0.0", - "@koalaui/common": "2.0.13+devel" + "@koalaui/common": "1.4.2+devel" }, "devDependencies": { "@ohos/hypium": "1.0.6", diff --git a/package.json b/package.json index 135cd691a..3b2822739 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,8 @@ "//": "DO NOT ADD dependencies or devDependencies clauses to this level! Keep subfolders autonomous.", "scripts": { "prepare": "cd incremental && npm i && cd .. && cd interop && npm i && cd .. && cd arkoala && npm i && cd .. && cd arkoala-arkts && npm i", + "compile": "npm run compile --prefix incremental && npm run compile --prefix interop", + "release": "npm run compile && node tools/release.mjs", "ohos-sdk": "npm run ohos-sdk --prefix arkoala/arkui-common", "ohos-sdk:full": "npm run download --prefix arkoala/ohos-sdk", "ohos-sdk:prebuilt": "npm run download:prebuilt --prefix arkoala/ohos-sdk", diff --git a/tools/release.mjs b/tools/release.mjs new file mode 100644 index 000000000..909f1775c --- /dev/null +++ b/tools/release.mjs @@ -0,0 +1,159 @@ +import fs from "fs" +import path from "path" +import { fileURLToPath } from 'url' +import { execSync } from "child_process" + +const __filename = fileURLToPath(import.meta.url) +const __dirname = path.dirname(__filename) +const EXTERNAL_HOME = path.resolve(path.join(__dirname, "..")) + +class Package { + constructor(path) { + this.path = path + } + + name() { + return this.read("name") + } + + package() { + return path.join(this.path, "package.json") + } + + write(key, value, updater) { + const json = JSON.parse(fs.readFileSync(this.package(), "utf-8")) + json[key] = value + if (updater) updater(json) + fs.writeFileSync(this.package(), JSON.stringify(json, null, 2), "utf-8") + } + + read(key) { + const json = JSON.parse(fs.readFileSync(this.package(), "utf-8")) + return json[key] + } + + publish() { + process.chdir(this.path) + publishToOpenlab("latest") + } + + externalDependencies = [ + "@koalaui/build-common", + "@koalaui/compat", + "@koalaui/common", + "@koalaui/runtime", + "@koalaui/compiler-plugin", + "@koalaui/ets-plugin", + "@koalaui/arkui-common", + "@koalaui/arkoala-arkui", + "@koalaui/arkui", + "@koalaui/interop", + ] +} + +const all_packages = [ + new Package(path.join(EXTERNAL_HOME, "incremental/build-common")), + new Package(path.join(EXTERNAL_HOME, "incremental/compat")), + new Package(path.join(EXTERNAL_HOME, "incremental/common")), + new Package(path.join(EXTERNAL_HOME, "incremental/runtime")), + new Package(path.join(EXTERNAL_HOME, "incremental/compiler-plugin")), + new Package(path.join(EXTERNAL_HOME, "arkoala/ets-plugin")), + new Package(path.join(EXTERNAL_HOME, "arkoala/arkui-common")), + new Package(path.join(EXTERNAL_HOME, "arkoala/arkui")), + new Package(path.join(EXTERNAL_HOME, "interop")) +] + +const exclude_packages = [ + "@koalaui/arkui-common", + "@koalaui/arkoala-arkui", +] + +class Version { + constructor(version) { + let [major, minor, patch] = version.split(/\./).map(x => +x); + this.major = major; + this.minor = minor; + this.patch = patch; + } + + up() { + ++this.patch + return new Version(`${this.major}.${this.minor}.${this.patch}`) + } + + down() { + --this.patch + return new Version(`${this.major}.${this.minor}.${this.patch}`) + } + + toString() { + return `${this.major}.${this.minor}.${this.patch}` + } +} + +const CURRENT_VERSION = readVersion() + +function writeVersion(version) { + fs.writeFileSync(path.join(EXTERNAL_HOME, "VERSION"), version.toString(), "utf-8") +} + +function readVersion() { + const version = fs.readFileSync(path.join(EXTERNAL_HOME, "VERSION"), "utf-8") + return new Version(version) +} + +function publishToOpenlab(tag, dryRun = false) { + if (dryRun) { + execSync(`npm publish --dry-run --tag ${tag}`) + } else { + execSync(`npm publish --tag ${tag}`) + } +} + +function main() { + const version = CURRENT_VERSION.toString() + + console.log(`> Updating idlize version to ${version}`) + + all_packages.forEach(module => { + module.write(`version`, `${version}`, (json) => { + module.externalDependencies.forEach(dep => { + if (json.dependencies && json.dependencies[dep]) { + json.dependencies[dep] = `${version}` + } + }) + }) + }) + + try { + + all_packages.filter(module => !exclude_packages.includes(module.name())) + .map(module => module.publish()) + + all_packages.forEach(module => { + module.write(`version`, `${version}`, (json) => { + module.externalDependencies.forEach(dep => { + if (json.dependencies && json.dependencies[dep]) { + json.dependencies[dep] = `${version}+devel` + } + }) + }) + }) + } catch (e) { + + console.log("Error:", e) + all_packages.forEach(module => { + module.write(`version`, `${version}`, (json) => { + module.externalDependencies.forEach(dep => { + if (json.dependencies && json.dependencies[dep]) { + json.dependencies[dep] = `${version}` + } + }) + }) + }) + + } + +} + +main() \ No newline at end of file -- Gitee From b2e5d1bce273f2bb013efe9149750f2928503c6b Mon Sep 17 00:00:00 2001 From: Korobeinikov Evgeny Date: Tue, 28 Jan 2025 12:30:41 +0300 Subject: [PATCH 2/2] +devel --- arkoala/arkui-common/package.json | 2 +- arkoala/arkui/package.json | 2 +- arkoala/ets-plugin/package.json | 2 +- incremental/build-common/package.json | 2 +- incremental/common/package.json | 2 +- incremental/compat/package.json | 2 +- incremental/compiler-plugin/package.json | 2 +- incremental/runtime/package.json | 2 +- interop/package.json | 2 +- tools/release.mjs | 6 +++--- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arkoala/arkui-common/package.json b/arkoala/arkui-common/package.json index 33abd1d65..7539bbebf 100644 --- a/arkoala/arkui-common/package.json +++ b/arkoala/arkui-common/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/arkui-common", - "version": "1.4.2", + "version": "1.4.2+devel", "description": "", "main": "build/lib/src/index.js", "exports": { diff --git a/arkoala/arkui/package.json b/arkoala/arkui/package.json index f53993f0a..dfc99b2eb 100644 --- a/arkoala/arkui/package.json +++ b/arkoala/arkui/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/arkoala-arkui", - "version": "1.4.2", + "version": "1.4.2+devel", "description": "", "main": "build/lib/src/index.js", "exports": { diff --git a/arkoala/ets-plugin/package.json b/arkoala/ets-plugin/package.json index f37e313d8..5c2f0f9f7 100644 --- a/arkoala/ets-plugin/package.json +++ b/arkoala/ets-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/ets-plugin", - "version": "1.4.2", + "version": "1.4.2+devel", "description": "", "main": "build/lib/src/index.js", "types": "build/lib/src/index.d.ts", diff --git a/incremental/build-common/package.json b/incremental/build-common/package.json index a7ac16b1a..9427ea7bd 100644 --- a/incremental/build-common/package.json +++ b/incremental/build-common/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/build-common", - "version": "1.4.2", + "version": "1.4.2+devel", "description": "", "files": [ "tsconfig.json" diff --git a/incremental/common/package.json b/incremental/common/package.json index 027ea1b8a..cc33dda9b 100644 --- a/incremental/common/package.json +++ b/incremental/common/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/common", - "version": "1.4.2", + "version": "1.4.2+devel", "description": "", "main": "build/lib/src/index.js", "types": "./index.d.ts", diff --git a/incremental/compat/package.json b/incremental/compat/package.json index 349cf9100..56f60597e 100644 --- a/incremental/compat/package.json +++ b/incremental/compat/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/compat", - "version": "1.4.2", + "version": "1.4.2+devel", "description": "", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/incremental/compiler-plugin/package.json b/incremental/compiler-plugin/package.json index 7f34971c2..efb61e3af 100644 --- a/incremental/compiler-plugin/package.json +++ b/incremental/compiler-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/compiler-plugin", - "version": "1.4.2", + "version": "1.4.2+devel", "description": "", "main": "build/lib/src/index.js", "types": "build/lib/src/index.d.ts", diff --git a/incremental/runtime/package.json b/incremental/runtime/package.json index 9ef8651f6..5a8d3f8aa 100644 --- a/incremental/runtime/package.json +++ b/incremental/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/runtime", - "version": "1.4.2", + "version": "1.4.2+devel", "description": "", "main": "./build/lib/src/index.js", "types": "./build/lib/src/index.d.ts", diff --git a/interop/package.json b/interop/package.json index 85f48c5ac..da3733148 100644 --- a/interop/package.json +++ b/interop/package.json @@ -1,6 +1,6 @@ { "name": "@koalaui/interop", - "version": "1.4.2", + "version": "1.4.2+devel", "description": "", "workspaces": [ "../incremental/build-common", diff --git a/tools/release.mjs b/tools/release.mjs index 909f1775c..90118ac00 100644 --- a/tools/release.mjs +++ b/tools/release.mjs @@ -131,7 +131,7 @@ function main() { .map(module => module.publish()) all_packages.forEach(module => { - module.write(`version`, `${version}`, (json) => { + module.write(`version`, `${version}+devel`, (json) => { module.externalDependencies.forEach(dep => { if (json.dependencies && json.dependencies[dep]) { json.dependencies[dep] = `${version}+devel` @@ -143,10 +143,10 @@ function main() { console.log("Error:", e) all_packages.forEach(module => { - module.write(`version`, `${version}`, (json) => { + module.write(`version`, `${version}+devel`, (json) => { module.externalDependencies.forEach(dep => { if (json.dependencies && json.dependencies[dep]) { - json.dependencies[dep] = `${version}` + json.dependencies[dep] = `${version}+devel` } }) }) -- Gitee