Skip to content

Commit 6f8ee0b

Browse files
committed
Merge branch 'main' into feat/server-api
# Conflicts: # .github/workflows/publish-npm.yml
2 parents 613720e + 2e54830 commit 6f8ee0b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.github/workflows/publish-npm.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ jobs:
4747
- name: Bump version to prerelease
4848
if: github.ref != 'refs/heads/main'
4949
run: |
50+
COMMIT_TIMESTAMP=$(git log -1 --pretty=format:%ct HEAD)
51+
COMMIT_DATE=$(date -d @$COMMIT_TIMESTAMP +%Y%m%d-%H%M%S)
52+
GIT_HASH=$(git rev-parse --short HEAD)
5053
PRERELEASE_TAG=nightly-$(echo "${{ github.ref_name }}" | sed -r 's/[^a-z0-9]+/-/gi')
5154
npm version prerelease --preid $PRERELEASE_TAG-$COMMIT_DATE-$GIT_HASH
5255

v1/typescript-definitions/src/definitions/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export type ActionInvokeParams = {
4545
skipAnimation?: boolean;
4646
} & VendorExtend;
4747

48-
export type PlayActionReturnPayload = (ReturnPayload | {}) & {
48+
export type PlayActionReturnPayload = ReturnPayload & {
4949
/** The resulting step from a PlayAction */
5050
currentStep: number;
5151
};

0 commit comments

Comments
 (0)