Skip to content

Commit 07eed14

Browse files
authored
Merge branch 'main' into activity_reset
2 parents f6b36c3 + 9089bc6 commit 07eed14

File tree

96 files changed

+5185
-923
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+5185
-923
lines changed

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.12.2",
2+
"version": "1.13.0",
33
"npmClient": "npm",
44
"command": {
55
"publish": {

package-lock.json

Lines changed: 87 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,14 @@
4343
"@temporalio/common": "file:packages/common",
4444
"@temporalio/create": "file:packages/create-project",
4545
"@temporalio/interceptors-opentelemetry": "file:packages/interceptors-opentelemetry",
46+
"@temporalio/nexus": "file:packages/nexus",
4647
"@temporalio/nyc-test-coverage": "file:packages/nyc-test-coverage",
4748
"@temporalio/proto": "file:packages/proto",
4849
"@temporalio/test": "file:packages/test",
4950
"@temporalio/testing": "file:packages/testing",
5051
"@temporalio/worker": "file:packages/worker",
5152
"@temporalio/workflow": "file:packages/workflow",
53+
"nexus-rpc": "^0.0.1",
5254
"temporalio": "file:packages/meta"
5355
},
5456
"devDependencies": {
@@ -86,6 +88,7 @@
8688
"packages/core-bridge",
8789
"packages/create-project",
8890
"packages/interceptors-opentelemetry",
91+
"packages/nexus",
8992
"packages/nyc-test-coverage",
9093
"packages/proto",
9194
"packages/test",

packages/activity/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@temporalio/activity",
3-
"version": "1.12.2",
3+
"version": "1.13.0",
44
"description": "Temporal.io SDK Activity sub-package",
55
"main": "lib/index.js",
66
"types": "./lib/index.d.ts",
@@ -13,6 +13,7 @@
1313
"author": "Temporal Technologies Inc. <[email protected]>",
1414
"license": "MIT",
1515
"dependencies": {
16+
"@temporalio/client": "file:../client",
1617
"@temporalio/common": "file:../common",
1718
"abort-controller": "^3.0.0"
1819
},

0 commit comments

Comments
 (0)