diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7a5e61d9..cf413d82 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -97,7 +97,7 @@ jobs: feature-tests-ts: uses: ./.github/workflows/typescript.yaml with: - version: 1.5.2 + version: 1.9.0 version-is-repo-ref: false features-repo-ref: ${{ github.head_ref }} features-repo-path: ${{ github.event.pull_request.head.repo.full_name }} @@ -142,7 +142,7 @@ jobs: with: do-push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} go-repo-ref: '77626eee301574bc4cfd756dbf0641c61e9e6907' - ts-ver: 'v1.5.2' + ts-ver: 'v1.9.0' java-ver: 'v1.22.0' py-ver: 'v1.4.0' cs-ver: 'v0.1.0-beta2' diff --git a/package.json b/package.json index 19eff42e..c2a92f6b 100644 --- a/package.json +++ b/package.json @@ -9,11 +9,11 @@ }, "dependencies": { "@protobuf-ts/protoc": "^2.8.1", - "@temporalio/activity": "^1.5.2", - "@temporalio/client": "^1.5.2", - "@temporalio/common": "^1.5.2", - "@temporalio/worker": "^1.5.2", - "@temporalio/workflow": "^1.5.2", + "@temporalio/activity": "^1.9.0", + "@temporalio/client": "^1.9.0", + "@temporalio/common": "^1.9.0", + "@temporalio/worker": "^1.9.0", + "@temporalio/workflow": "^1.9.0", "commander": "^8.3.0", "proto3-json-serializer": "^1.1.1" }, diff --git a/sdkbuild/typescript.go b/sdkbuild/typescript.go index de41f8a8..c40176c8 100644 --- a/sdkbuild/typescript.go +++ b/sdkbuild/typescript.go @@ -105,15 +105,19 @@ func BuildTypeScriptProgram(ctx context.Context, options BuildTypeScriptProgramO if err != nil { return nil, fmt.Errorf("cannot get absolute path from version path: %w", err) } - pkgs := []string{"activity", "client", "common", "internal-workflow-common", - "internal-non-workflow-common", "proto", "worker", "workflow"} + pkgs := []string{"activity", "client", "common", "proto", "worker", "workflow"} for _, pkg := range pkgs { pkgPath := "file:" + filepath.Join(localPath, "packages", pkg) packageJSONDepStr += fmt.Sprintf(`"@temporalio/%v": %q,`, pkg, pkgPath) packageJSONDepStr += "\n " } } else { - packageJSONDepStr = `"temporalio": "` + strings.TrimPrefix(options.Version, "v") + "\",\n " + pkgs := []string{"activity", "client", "common", "proto", "worker", "workflow"} + pkgVersion := strings.TrimPrefix(options.Version, "v") + for _, pkg := range pkgs { + packageJSONDepStr += fmt.Sprintf(`"@temporalio/%v": %q,`, pkg, pkgVersion) + packageJSONDepStr += "\n " + } } moreDeps := "" for dep, version := range options.MoreDependencies {