Release 160601 (#1438)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Fadi George <fadii925@gmail.com>

ci(turbine): close existing PRs before creating new ones

Author: github-actions[bot]

.github/workflows/cd.yml

@@ -1,4 +1,4 @@
-name: Build SDK Files & GCS Upload
+name: Build, Deploy & Create GitHub Release
 
 on:
   push:
@@ -8,6 +8,9 @@ on:
       - '**.md'
   workflow_dispatch:
 
+permissions:
+  contents: write
+
 jobs:
   check_release:
     runs-on: ubuntu-latest
@@ -23,52 +26,70 @@ jobs:
                              /Release \d{6}/.test(context.payload.head_commit.message);
             core.setOutput('should_run', shouldRun);
 
-  test_build_deploy:
+  build_deploy:
+    name: Build & Deploy
     runs-on: ubuntu-latest
     needs: check_release
     if: needs.check_release.outputs.should_run == 'true'
+    outputs:
+      version: ${{ steps.get_version.outputs.version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Bun Setup
+      - name: Setup Bun
         uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
 
-      - name: 'Install'
-        run: bun install
+      - name: Install
+        run: bun install --frozen-lockfile
 
-      - name: 'Build for Staging'
+      - name: Build for Staging
         run: bun run build:staging
 
-      - name: 'Build for Production'
+      - name: Build for Production
         run: bun run build:prod
 
-      - name: 'Authenticate to Google Cloud'
-        uses: 'google-github-actions/auth@v1'
+      - name: Authenticate to Google Cloud
+        uses: google-github-actions/auth@v1
         with:
           credentials_json: '${{ secrets.GOOGLE_CREDENTIALS }}'
 
-      - name: 'Upload SDK Files to GCS'
-        uses: 'google-github-actions/upload-cloud-storage@v1'
+      - name: Upload SDK Files to GCS
+        uses: google-github-actions/upload-cloud-storage@v1
         with:
           path: 'build/releases'
           destination: 'sdk-builds-persistence-onesignal/web-sdk/${{ github.sha }}'
           parent: false
 
-      - name: 'Get SDK Version'
+      - name: Get version
         id: get_version
-        run: echo "SDK_VERSION=$(bun -e "console.log(require('./package.json').config.sdkVersion)")" >> $GITHUB_OUTPUT
+        run: |
+          SDK_VERSION=$(bun -e "console.log(require('./package.json').config.sdkVersion)")
+          if git rev-parse "$SDK_VERSION" >/dev/null 2>&1; then
+            echo "Tag $SDK_VERSION already exists, skipping release"
+          else
+            echo "version=$SDK_VERSION" >> $GITHUB_OUTPUT
+          fi
 
-      - name: 'Create turbine pr'
+      - name: Create turbine PR
+        if: steps.get_version.outputs.version != ''
         run: ./build/scripts/turbine.sh
         env:
           GH_TURBINE_TOKEN: ${{ secrets.GH_TURBINE_TOKEN }}
           GITHUB_SHA: ${{ github.sha }}
           GITHUB_RUN_ID: ${{ github.run_id }}
-          SDK_VERSION: ${{ steps.get_version.outputs.SDK_VERSION }}
+          SDK_VERSION: ${{ steps.get_version.outputs.version }}
 
-  create_release:
-    needs: test_build_deploy
-    uses: ./.github/workflows/create-release-on-github.yml
+  create_github_release:
+    needs: build_deploy
+    if: needs.build_deploy.outputs.version != ''
+    uses: OneSignal/sdk-shared/.github/workflows/github-release.yml@main
+    secrets:
+      GH_PUSH_TOKEN: ${{ secrets.GH_PUSH_TOKEN }}
+    with:
+      version: ${{ needs.build_deploy.outputs.version }}

.github/workflows/create-release-on-github.yml

@@ -11,16 +11,18 @@ git config user.email "github-actions[bot]@users.noreply.github.com"
 # Create new branch
 BRANCH_NAME="web-sdk-${SDK_VERSION}-release"
 
-# Check if PR already exists
-EXISTING_PR=$(curl -s \
+# Close any existing PRs for this branch
+curl -s \
   -H "Authorization: Bearer $GH_TURBINE_TOKEN" \
   "https://api.github.com/repos/OneSignal/turbine/pulls?head=OneSignal:$BRANCH_NAME&state=open" |
-  jq length)
-
-if [ "$EXISTING_PR" -gt 0 ]; then
-  echo "PR already exists for branch $BRANCH_NAME"
-  exit 0
-fi
+  jq -r '.[].number' | while read PR_NUM; do
+    echo "Closing existing PR #$PR_NUM"
+    curl -sS -X PATCH \
+      -H "Authorization: Bearer $GH_TURBINE_TOKEN" \
+      -H "Content-Type: application/json" \
+      -d '{"state": "closed"}' \
+      "https://api.github.com/repos/OneSignal/turbine/pulls/$PR_NUM"
+  done
 
 git checkout -B "$BRANCH_NAME"
 

build/scripts/turbine.sh

@@ -14,29 +14,29 @@
     "build:sdk": "LIB=sdk vite build",
     "build:page": "LIB=page vite build",
     "build:sw": "LIB=worker vite build",
-    "build": "npm run build:sdk && npm run build:page && npm run build:sw",
+    "build": "bun run build:sdk && bun run build:page && bun run build:sw",
     "build:watch": "LIB=sdk vite build --watch",
-    "build:dev": "ENV=development npm run build",
+    "build:dev": "ENV=development bun run build",
     "build:dev:watch": "ENV=development concurrently \"LIB=sdk vite build --watch\" \"LIB=page vite build --watch\" \"LIB=worker vite build --watch\"",
-    "build:staging": "ENV=staging BUILD_ORIGIN=staging.onesignal.com API=staging API_ORIGIN=staging.onesignal.com npm run build",
-    "build:staging:watch": "ENV=staging BUILD_ORIGIN=staging.onesignal.com API=staging API_ORIGIN=staging.onesignal.com npm run build:watch",
-    "build:prod": "ENV=production API=production npm run build && size-limit",
-    "build:prod:watch": "ENV=production API=production npm run build:watch",
-    "postbuild:prod": "npm run validate:build",
-    "build:dev-dev": "API=development npm run build:dev",
-    "build:dev-dev:watch": "API=development npm run build:dev:watch",
-    "build:dev-prod": "API=production API_ORIGIN=onesignal.com npm run build:dev",
-    "build:dev-prod:watch": "API=production API_ORIGIN=onesignal.com npm run build:dev:watch",
-    "build:dev-stag": "API=staging API_ORIGIN=onesignal.com npm run build:dev",
-    "build:dev-stag:watch": "API=staging API_ORIGIN=onesignal.com npm run build:dev:watch",
+    "build:staging": "ENV=staging BUILD_ORIGIN=staging.onesignal.com API=staging API_ORIGIN=staging.onesignal.com bun run build",
+    "build:staging:watch": "ENV=staging BUILD_ORIGIN=staging.onesignal.com API=staging API_ORIGIN=staging.onesignal.com bun run build:watch",
+    "build:prod": "ENV=production API=production bun run build && size-limit",
+    "build:prod:watch": "ENV=production API=production bun run build:watch",
+    "postbuild:prod": "bun run validate:build",
+    "build:dev-dev": "API=development bun run build:dev",
+    "build:dev-dev:watch": "API=development bun run build:dev:watch",
+    "build:dev-prod": "API=production API_ORIGIN=onesignal.com bun run build:dev",
+    "build:dev-prod:watch": "API=production API_ORIGIN=onesignal.com bun run build:dev:watch",
+    "build:dev-stag": "API=staging API_ORIGIN=onesignal.com bun run build:dev",
+    "build:dev-stag:watch": "API=staging API_ORIGIN=onesignal.com bun run build:dev:watch",
     "test": "vitest run --coverage",
     "test:watch": "vitest watch --coverage",
     "validate:build": "node build/scripts/validate.js",
     "lint": "oxlint src; prettier --check 'src/**/*' '__test__/**/*'",
     "lint:fix": "oxlint src --fix; prettier --write 'src/**/*' '__test__/**/*'"
   },
   "config": {
-    "sdkVersion": "160600"
+    "sdkVersion": "160601"
   },
   "repository": {
     "type": "git",
@@ -77,7 +77,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "43.701 kB",
+      "limit": "43.69 kB",
       "gzip": true
     },
     {

package.json

@@ -553,7 +553,6 @@ describe('SubscriptionOperationExecutor', () => {
         identity: {
           onesignal_id: ONESIGNAL_ID,
         },
-        retain_previous_owner: false,
       });
     });
 

src/core/executors/SubscriptionOperationExecutor.test.ts

@@ -275,7 +275,6 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
       { appId: op._appId },
       op._subscriptionId,
       { onesignal_id: op._onesignalId },
-      false,
     );
 
     if (response.ok) {

src/core/executors/SubscriptionOperationExecutor.ts

@@ -252,14 +252,12 @@ export async function transferSubscriptionById(
   requestMetadata: RequestMetadata,
   subscriptionId: string,
   identity: IUserIdentity,
-  retainPreviousOwner: boolean,
 ) {
   const { appId } = requestMetadata;
   return OneSignalApiBase.patch<{ identity: IUserIdentity }>(
     `apps/${appId}/subscriptions/${subscriptionId}/owner`,
     {
       identity: { ...identity },
-      retain_previous_owner: retainPreviousOwner,
     },
     requestMetadata.jwtHeader,
   );