Kwallach/trc

.github/workflows/feature-branch-prerelease.yml

@@ -68,41 +68,33 @@ jobs:
         run: |
           yarn test
 
-      - name: Lint all packages
-        run: |
-          yarn lint
-
       - name: Configure Git User
         run: |
           git config --global user.name amplitude-sdk-bot
           git config --global user.email [email protected]
 
       - name: Configure NPM User
         run: |
-          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_PUBLISH_TOKEN }}" > ~/.npmrc
+          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
           npm whoami
 
       # Converted to all lowercase and stripped of non-letter characters
       - name: Transform feature branch name
         run: |
           echo "PREID=$(echo '${{ steps.branch-name.outputs.current_branch }}' | tr -cd '[:lower:]')" >> $GITHUB_ENV
 
-      # Use --no-push to prevent pushing to remote
-      # Example:
-      #   - feature-branch-name -> featurebranchname
-      #   - minor: 1.0.0 -> 1.1.0-featurebranchname.0
-      - name: Dry run pre-release version
-        if: ${{ github.event.inputs.releaseType == 'dry-run' }}
-        run: |
-          GH_TOKEN=${{ secrets.GH_PUBLISH_TOKEN }} npm run deploy:version -- -y --no-private --conventional-prerelease --preid ${{ env.PREID }} --allow-branch ${{ steps.branch-name.outputs.current_branch }} --no-changelog --no-push
-
-      - name: Pre-release version
-        if: ${{ github.event.inputs.releaseType == 'prerelease' }}
-        run: |
-          GH_TOKEN=${{ secrets.GH_PUBLISH_TOKEN }} npm run deploy:version -- -y --no-private --conventional-prerelease --preid ${{ env.PREID }} --allow-branch ${{ steps.branch-name.outputs.current_branch }} --create-release github
+      - name: Conventional Changelog Action
+        id: changelog
+        uses: TriPSs/conventional-changelog-action@v5
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          version-file: './package.json,./package-lock.json'
+          pre-release: 'true'
+          pre-release-identifier: ${{ env.PREID }}
 
       # Use 'from git' option if `lerna version` has already been run
       - name: Publish Release to NPM
         if: ${{ github.event.inputs.releaseType == 'prerelease' }}
-        run: |
-          GH_TOKEN=${{ secrets.GH_PUBLISH_TOKEN }} npm run deploy:publish -- from-git -y --ignore-scripts --pre-dist-tag ${{ env.PREID }}
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package.json

@@ -9,7 +9,7 @@
   "author": "Amplitude Inc",
   "license": "MIT",
   "dependencies": {
-    "@amplitude/session-replay-browser": "1.9.4",
+    "@amplitude/session-replay-browser": "1.14.0-srtargeting.0",
     "@segment/analytics-next": "^1.70.0",
     "js-cookie": "^3.0.5",
     "tslib": "^2.4.1"

src/actions.ts

@@ -28,6 +28,14 @@ export const updateSessionIdAndAddProperties = async (ctx: Context) => {
     await sessionReplay.setSessionId(nextSessionId, deviceId).promise;
   }
 
+  await sessionReplay.evaluateTargetingAndCapture({
+    event: {
+      event_type: ctx.event.event || '',
+      event_properties: ctx.event.properties,
+      time: ctx.event.timestamp instanceof Date ? ctx.event.timestamp.getTime() : undefined,
+    },
+    userProperties: ctx.event.traits,
+  });
   const sessionReplayProperties = sessionReplay.getSessionReplayProperties();
   const properties = {
     ...ctx.event.properties,
@@ -57,6 +65,7 @@ export const createSegmentActionsPlugin = async ({
         ...sessionReplayOptions,
         sessionId: storedSessionId,
         deviceId: deviceId || undefined,
+        userProperties: user.traits(),
       }).promise;
     },
 
@@ -76,6 +85,8 @@ export const createSegmentActionsPlugin = async ({
       const sessionId = sessionReplay.getSessionId();
       sessionId && (await sessionReplay.setSessionId(sessionId, deviceId).promise);
 
+      await sessionReplay.evaluateTargetingAndCapture({ userProperties: ctx.event.traits });
+
       return ctx;
     },
   };

yarn.lock

@@ -25,10 +25,10 @@
     "@amplitude/analytics-types" "^2.6.0"
     tslib "^2.4.1"
 
-"@amplitude/analytics-remote-config@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@amplitude/analytics-remote-config/-/analytics-remote-config-0.3.1.tgz#d81d21135a6959385071f465d62da94edc0ef05e"
-  integrity sha512-7flIkme7YYjyOC1l0ZeJkRPMc2SFl+b2e3k54v58noWmque2l3by2hftBeNM1l5Ao5i7IPkACORp6PvK+abXww==
+"@amplitude/analytics-remote-config@^0.3.4":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@amplitude/analytics-remote-config/-/analytics-remote-config-0.3.4.tgz#a9a3fd8db9585dd45e4ebd75da8cd31408606dc1"
+  integrity sha512-IdGJTJiHzkpUJtIOK3zmPtmMQ6p2z1U7Yxc4oC3kFK5+7MMZKDY1eFjszRzk/wQhCumPEp9MyGVd/SiN3LoBUQ==
   dependencies:
     "@amplitude/analytics-client-common" ">=1 <3"
     "@amplitude/analytics-core" ">=1 <3"
@@ -41,49 +41,69 @@
   resolved "https://registry.yarnpkg.com/@amplitude/analytics-types/-/analytics-types-2.6.0.tgz#00d1957d3f5eecb85e00ef4a1b2f65c497967d46"
   integrity sha512-7MSENvLCTGjec7K45JT+RcOuoPTCvq1MMq/HRLiQK/BMR4taX7f/uXldEc8b//o+ZZP45IBqFroR7Bl8LwJQrQ==
 
-"@amplitude/rrdom@^2.0.0-alpha.17":
-  version "2.0.0-alpha.17"
-  resolved "https://registry.yarnpkg.com/@amplitude/rrdom/-/rrdom-2.0.0-alpha.17.tgz#71bd4f34df1f13991df42d7744ec703209250a66"
-  integrity sha512-/U2rd5GWR08+Sv3xTocf+7BBqxwXrt3q355EVyRJBeMtkqZQ/BiXBzg3lPdrQh5jId5hxMIYgSkfDGbWnMMvdQ==
+"@amplitude/[email protected]":
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/@amplitude/experiment-core/-/experiment-core-0.7.2.tgz#f94219d68d86322e8d580c8fbe0672dcd29f86bb"
+  integrity sha512-Wc2NWvgQ+bLJLeF0A9wBSPIaw0XuqqgkPKsoNFQrmS7r5Djd56um75In05tqmVntPJZRvGKU46pAp8o5tdf4mA==
   dependencies:
-    "@amplitude/rrweb-snapshot" "^2.0.0-alpha.17"
+    js-base64 "^3.7.5"
 
-"@amplitude/rrweb-snapshot@^2.0.0-alpha.17":
-  version "2.0.0-alpha.17"
-  resolved "https://registry.yarnpkg.com/@amplitude/rrweb-snapshot/-/rrweb-snapshot-2.0.0-alpha.17.tgz#d1688915817264f8ac4218abbb656a52cc3d81d0"
-  integrity sha512-58XTamtFvvO9ENecBYIh4S/+QHcliFbM2aW/vCDzPcvmZjKRqhXKFuUshDEb/3M232hELVbB+YSMuUkDF4uLew==
+"@amplitude/rrdom@^2.0.0-alpha.19":
+  version "2.0.0-alpha.19"
+  resolved "https://registry.yarnpkg.com/@amplitude/rrdom/-/rrdom-2.0.0-alpha.19.tgz#b2f3de23862d7ba6989351e4a08144f90413fa38"
+  integrity sha512-zqPnAjwlUEPGHq2JpTnPjpI9LRdJeN0koaJ7dbQeQI5eJcNFtOjsLWpYgkBHjyQKKOh5FhBG0KVdX4L7y1Rmfg==
+  dependencies:
+    "@amplitude/rrweb-snapshot" "^2.0.0-alpha.19"
+
+"@amplitude/rrweb-snapshot@^2.0.0-alpha.19":
+  version "2.0.0-alpha.19"
+  resolved "https://registry.yarnpkg.com/@amplitude/rrweb-snapshot/-/rrweb-snapshot-2.0.0-alpha.19.tgz#a5c03ec52968a768827c20a8cc001dca6daae074"
+  integrity sha512-v+X3Ymdn0O4TBf4UFLJzNOWYxJqSu3fF+/FuXjORf74xc+5L6Tme/eY6mNZHigHJOGyIyFhlQXUUKm+CBiJcDw==
 
-"@amplitude/rrweb-types@^2.0.0-alpha.17":
-  version "2.0.0-alpha.17"
-  resolved "https://registry.yarnpkg.com/@amplitude/rrweb-types/-/rrweb-types-2.0.0-alpha.17.tgz#c20a5b10bd451dd4813626bd99e32508c7865daf"
-  integrity sha512-9/azn1zAWe8QAb405szKwvUd2YCAc6l+aOxckYs/osyTGWA+kDQHZLoxvwng0C9LRDKeyXPap7ZZ879jV+Tebw==
+"@amplitude/rrweb-types@^2.0.0-alpha.19":
+  version "2.0.0-alpha.19"
+  resolved "https://registry.yarnpkg.com/@amplitude/rrweb-types/-/rrweb-types-2.0.0-alpha.19.tgz#96a4d12341e4130f652959e708e2ced37c672220"
+  integrity sha512-Po0/Gp24Guvye/jr3aYPAVSqijQr1CETWSCK4DEriE8h03PcMs41JDeEjlJpHL/yHj76S6L7t3VCbiPOWT/OIg==
   dependencies:
-    "@amplitude/rrweb-snapshot" "^2.0.0-alpha.17"
+    "@amplitude/rrweb-snapshot" "^2.0.0-alpha.19"
 
-"@amplitude/rrweb@^2.0.0-alpha.14":
-  version "2.0.0-alpha.17"
-  resolved "https://registry.yarnpkg.com/@amplitude/rrweb/-/rrweb-2.0.0-alpha.17.tgz#5b59918524a53b89392e84d9d85fba0c4173732e"
-  integrity sha512-Kd1y+s/Ild9RChgC5MSbkqj7KaWh5XUPaJQH6Xmg1LpT+dMh+KiYj83IMk4S2ejOAK1ZbbgPt6Zwxtkk/X/Jcw==
+"@amplitude/[email protected].19":
+  version "2.0.0-alpha.19"
+  resolved "https://registry.yarnpkg.com/@amplitude/rrweb/-/rrweb-2.0.0-alpha.19.tgz#b1292862f65bc777128715497c9719476e47908b"
+  integrity sha512-bemevshhw7gVYFT5fMCfRQZgQPV0rsY0zAb91NmRVrOivGXOQtSyPZ5othnGn2it4x5kFZyGAIAlMPtWCqhM8A==
   dependencies:
-    "@amplitude/rrdom" "^2.0.0-alpha.17"
-    "@amplitude/rrweb-snapshot" "^2.0.0-alpha.17"
-    "@amplitude/rrweb-types" "^2.0.0-alpha.17"
+    "@amplitude/rrdom" "^2.0.0-alpha.19"
+    "@amplitude/rrweb-snapshot" "^2.0.0-alpha.19"
+    "@amplitude/rrweb-types" "^2.0.0-alpha.19"
     "@types/css-font-loading-module" "0.0.7"
     "@xstate/fsm" "^1.4.0"
     base64-arraybuffer "^1.0.1"
     fflate "^0.4.4"
     mitt "^3.0.0"
 
-"@amplitude/session-replay-browser@1.9.4":
-  version "1.9.4"
-  resolved "https://registry.yarnpkg.com/@amplitude/session-replay-browser/-/session-replay-browser-1.9.4.tgz#1064e020513ef4bc3927943a2dcf3cef5f05394b"
-  integrity sha512-4pVem47rLmVhC4f3eb4byJdZ53kypC/cIPwsGRsvQ8vHbR+dGormpcBfCxMNrTXc64bjTKqbdSRagMy/5JoBlA==
+"@amplitude/session-replay-browser@1.14.0-srtargeting.0":
+  version "1.14.0-srtargeting.0"
+  resolved "https://registry.yarnpkg.com/@amplitude/session-replay-browser/-/session-replay-browser-1.14.0-srtargeting.0.tgz#88e0dba66c7ffd7d84d8adc2ed0b174028ffe751"
+  integrity sha512-624kU28EN9uQG+P2ysZPRmaiLqrSFzWoI7tNzvmNCMBZ/FUxT1L2DarvwVZMsKtYt0eGQNgzbSRizherrU3V0A==
   dependencies:
     "@amplitude/analytics-client-common" ">=1 <3"
     "@amplitude/analytics-core" ">=1 <3"
-    "@amplitude/analytics-remote-config" "^0.3.1"
+    "@amplitude/analytics-remote-config" "^0.3.4"
     "@amplitude/analytics-types" ">=1 <3"
-    "@amplitude/rrweb" "^2.0.0-alpha.14"
+    "@amplitude/rrweb" "2.0.0-alpha.19"
+    "@amplitude/targeting" "0.2.0"
+    idb "^8.0.0"
+    tslib "^2.4.1"
+
+"@amplitude/[email protected]":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@amplitude/targeting/-/targeting-0.2.0.tgz#b0c8342fae929c85333190a71a5bc0b7f369010f"
+  integrity sha512-/50ywTrC4hfcfJVBbh5DFbqMPPfaIOivZeb5Gb+OGM03QrA+lsUqdvtnKLNuWtceD4H6QQ2KFzPJ5aAJLyzVDA==
+  dependencies:
+    "@amplitude/analytics-client-common" ">=1 <3"
+    "@amplitude/analytics-core" ">=1 <3"
+    "@amplitude/analytics-types" ">=1 <3"
+    "@amplitude/experiment-core" "0.7.2"
     idb "^8.0.0"
     tslib "^2.4.1"
 
@@ -3516,6 +3536,11 @@ [email protected]:
     import-local "^3.0.2"
     jest-cli "^29.7.0"
 
+js-base64@^3.7.5:
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.7.tgz#e51b84bf78fbf5702b9541e2cb7bfcb893b43e79"
+  integrity sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==
+
 [email protected]:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"