zen plus zoning

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

@@ -126,6 +126,50 @@ jobs:
         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
 
+      # Update test packages to use exact versions of their dependencies
+      - name: Update test package dependencies
+        run: |
+          echo "Updating test package dependencies..."
+
+          # Get the new version of analytics-browser
+          BROWSER_VERSION=$(node -p "require('./packages/analytics-browser/package.json').version")
+          echo "Current @amplitude/analytics-browser version: $BROWSER_VERSION"
+
+          # Get the current dependency version in analytics-browser-test
+          CURRENT_DEP=$(node -p "require('./packages/analytics-browser-test/package.json').dependencies['@amplitude/analytics-browser']")
+          echo "Current dependency in analytics-browser-test: $CURRENT_DEP"
+
+          # Update if versions differ
+          if [ "$BROWSER_VERSION" != "$CURRENT_DEP" ]; then
+            echo "Updating analytics-browser-test to use @amplitude/analytics-browser@$BROWSER_VERSION"
+            cd packages/analytics-browser-test
+            npm pkg set dependencies.@amplitude/analytics-browser="$BROWSER_VERSION"
+            cd ../..
+
+            # Get all tags pointing to the current HEAD before amending
+            TAGS=$(git tag --points-at HEAD)
+
+            # Add and amend to the version commit
+            git add packages/analytics-browser-test/package.json
+            git commit --amend --no-edit --no-verify
+
+            # Re-apply all tags to the new HEAD (after amend)
+            for TAG in $TAGS; do
+              echo "Moving tag $TAG to amended commit"
+              git tag -f "$TAG"
+            done
+
+            # Push the amended commit if this is a real prerelease (not dry-run)
+            if [ "${{ github.event.inputs.releaseType }}" == "prerelease" ]; then
+              git push origin ${{ steps.branch-name.outputs.current_branch }} --follow-tags --force
+              echo "✅ Updated and pushed analytics-browser-test dependency"
+            else
+              echo "✅ Updated analytics-browser-test dependency (dry-run, not pushed)"
+            fi
+          else
+            echo "✅ analytics-browser-test already uses the correct version"
+          fi
+
       # Use 'from git' option if `lerna version` has already been run
       - name: Publish Release to NPM
         if: ${{ github.event.inputs.releaseType == 'prerelease' }}

.github/workflows/publish-v2.yml

@@ -110,6 +110,45 @@ jobs:
 
           echo "✅ Successfully created release version"
 
+      # Update test packages to use exact versions of their dependencies
+      - name: Update test package dependencies
+        if: ${{ env.PUBLISH_FROM != 'from-package' }}
+        run: |
+          echo "Updating test package dependencies..."
+
+          # Get the new version of analytics-browser
+          BROWSER_VERSION=$(node -p "require('./packages/analytics-browser/package.json').version")
+          echo "Current @amplitude/analytics-browser version: $BROWSER_VERSION"
+
+          # Get the current dependency version in analytics-browser-test
+          CURRENT_DEP=$(node -p "require('./packages/analytics-browser-test/package.json').dependencies['@amplitude/analytics-browser']")
+          echo "Current dependency in analytics-browser-test: $CURRENT_DEP"
+
+          # Update if versions differ
+          if [ "$BROWSER_VERSION" != "$CURRENT_DEP" ]; then
+            echo "Updating analytics-browser-test to use @amplitude/analytics-browser@$BROWSER_VERSION"
+            cd packages/analytics-browser-test
+            npm pkg set dependencies.@amplitude/analytics-browser="$BROWSER_VERSION"
+            cd ../..
+
+            # Get all tags pointing to the current HEAD before amending
+            TAGS=$(git tag --points-at HEAD)
+
+            # Add and amend to the version commit
+            git add packages/analytics-browser-test/package.json
+            git commit --amend --no-edit --no-verify
+
+            # Re-apply all tags to the new HEAD (after amend)
+            for TAG in $TAGS; do
+              echo "Moving tag $TAG to amended commit"
+              git tag -f "$TAG"
+            done
+
+            echo "✅ Updated analytics-browser-test dependency"
+          else
+            echo "✅ analytics-browser-test already uses the correct version"
+          fi
+
       # Publish to NPM using from-git or from-package:
       # - from-git: Publishes packages tagged by 'lerna version' in the current commit (requires prior versioning)
       # - from-package: Compares package.json versions with NPM registry, publishes any versions not present in registry

nx.json

@@ -8,7 +8,7 @@
       "cache": true
     },
     "test": {
-      "dependsOn": ["build"],
+      "dependsOn": ["^build", "build"],
       "cache": true
     },
     "test:playwright": {

packages/analytics-browser-test/package.json

@@ -16,7 +16,7 @@
     "url": "https://github.com/amplitude/Amplitude-TypeScript/issues"
   },
   "dependencies": {
-    "@amplitude/analytics-browser": "^2.6.3-beta.0"
+    "@amplitude/analytics-browser": "2.31.0-zen-plus-zoning.2"
   },
   "devDependencies": {
     "nock": "^13.2.4"

packages/analytics-browser-test/test/helpers.ts

@@ -174,6 +174,7 @@ const generatePageViewEventProps = (
     '[Amplitude] Page Path': url.pathname,
     '[Amplitude] Page Title': '',
     '[Amplitude] Page URL': url.href.split('?')[0],
+    '[Amplitude] Page View ID': uuid,
     ...(options?.withPageURLEnrichmentProperties
       ? addPageUrlEnrichmentPreviousPageProperties(url.href, previousUrl.href || '')
       : {}),

packages/analytics-browser-test/test/index.test.ts

@@ -1928,119 +1928,125 @@ describe('integration', () => {
 
       return new Promise<void>((resolve) => {
         setTimeout(() => {
-          expect(payload).toEqual({
-            api_key: apiKey,
-            client_upload_time: event_upload_time,
-            events: [
-              {
-                device_id: uuid,
-                event_id: 0,
-                event_properties: {
-                  '[Amplitude] Page Domain': 'www.example.com',
-                  '[Amplitude] Page Location': 'https://www.example.com/about',
-                  '[Amplitude] Page Path': '/about',
-                  '[Amplitude] Page Title': '',
-                  '[Amplitude] Page URL': 'https://www.example.com/about',
-                  '[Amplitude] Page Counter': 1,
-                  '[Amplitude] Previous Page Location': '',
-                  '[Amplitude] Previous Page Type': 'direct',
+          try {
+            expect(payload).toEqual({
+              api_key: apiKey,
+              client_upload_time: event_upload_time,
+              events: [
+                {
+                  device_id: uuid,
+                  event_id: 0,
+                  event_properties: {
+                    '[Amplitude] Page Domain': 'www.example.com',
+                    '[Amplitude] Page Location': 'https://www.example.com/about',
+                    '[Amplitude] Page Path': '/about',
+                    '[Amplitude] Page Title': '',
+                    '[Amplitude] Page URL': 'https://www.example.com/about',
+                    '[Amplitude] Page View ID': uuid,
+                    '[Amplitude] Page Counter': 1,
+                    '[Amplitude] Previous Page Location': '',
+                    '[Amplitude] Previous Page Type': 'direct',
+                  },
+                  event_type: '[Amplitude] Page Viewed',
+                  insert_id: uuid,
+                  ip: '$remote',
+                  language: 'en-US',
+                  library,
+                  partner_id: undefined,
+                  plan: undefined,
+                  platform: 'Web',
+                  session_id: number,
+                  time: number,
+                  user_agent: userAgent,
+                  user_id: '[email protected]',
                 },
-                event_type: '[Amplitude] Page Viewed',
-                insert_id: uuid,
-                ip: '$remote',
-                language: 'en-US',
-                library,
-                partner_id: undefined,
-                plan: undefined,
-                platform: 'Web',
-                session_id: number,
-                time: number,
-                user_agent: userAgent,
-                user_id: '[email protected]',
-              },
-              {
-                device_id: uuid,
-                event_id: 1,
-                event_type: 'Event in first session',
-                event_properties: {
-                  '[Amplitude] Page Domain': 'www.example.com',
-                  '[Amplitude] Page Location': 'https://www.example.com/about',
-                  '[Amplitude] Page Path': '/about',
-                  '[Amplitude] Page Title': '',
-                  '[Amplitude] Page URL': 'https://www.example.com/about',
-                  '[Amplitude] Previous Page Location': '',
-                  '[Amplitude] Previous Page Type': 'direct',
+                {
+                  device_id: uuid,
+                  event_id: 1,
+                  event_type: 'Event in first session',
+                  event_properties: {
+                    '[Amplitude] Page Domain': 'www.example.com',
+                    '[Amplitude] Page Location': 'https://www.example.com/about',
+                    '[Amplitude] Page Path': '/about',
+                    '[Amplitude] Page Title': '',
+                    '[Amplitude] Page URL': 'https://www.example.com/about',
+                    '[Amplitude] Previous Page Location': '',
+                    '[Amplitude] Previous Page Type': 'direct',
+                  },
+                  insert_id: uuid,
+                  ip: '$remote',
+                  language: 'en-US',
+                  library,
+                  partner_id: undefined,
+                  plan: undefined,
+                  platform: 'Web',
+                  session_id: number,
+                  time: number,
+                  user_agent: userAgent,
+                  user_id: '[email protected]',
                 },
-                insert_id: uuid,
-                ip: '$remote',
-                language: 'en-US',
-                library,
-                partner_id: undefined,
-                plan: undefined,
-                platform: 'Web',
-                session_id: number,
-                time: number,
-                user_agent: userAgent,
-                user_id: '[email protected]',
-              },
-              {
-                device_id: uuid,
-                event_id: 2,
-                event_properties: {
-                  '[Amplitude] Page Domain': 'www.example.com',
-                  '[Amplitude] Page Location': 'https://www.example.com/contact',
-                  '[Amplitude] Page Path': '/contact',
-                  '[Amplitude] Page Title': '',
-                  '[Amplitude] Page URL': 'https://www.example.com/contact',
-                  '[Amplitude] Previous Page Location': 'https://www.example.com/about',
-                  '[Amplitude] Previous Page Type': 'internal',
-                  '[Amplitude] Page Counter': 2,
+                {
+                  device_id: uuid,
+                  event_id: 2,
+                  event_properties: {
+                    '[Amplitude] Page Domain': 'www.example.com',
+                    '[Amplitude] Page Location': 'https://www.example.com/contact',
+                    '[Amplitude] Page Path': '/contact',
+                    '[Amplitude] Page Title': '',
+                    '[Amplitude] Page URL': 'https://www.example.com/contact',
+                    '[Amplitude] Page View ID': uuid,
+                    '[Amplitude] Previous Page Location': 'https://www.example.com/about',
+                    '[Amplitude] Previous Page Type': 'internal',
+                    '[Amplitude] Page Counter': 2,
+                  },
+                  event_type: '[Amplitude] Page Viewed',
+                  insert_id: uuid,
+                  ip: '$remote',
+                  language: 'en-US',
+                  library,
+                  partner_id: undefined,
+                  plan: undefined,
+                  platform: 'Web',
+                  session_id: number,
+                  time: number,
+                  user_agent: userAgent,
+                  user_id: '[email protected]',
                 },
-                event_type: '[Amplitude] Page Viewed',
-                insert_id: uuid,
-                ip: '$remote',
-                language: 'en-US',
-                library,
-                partner_id: undefined,
-                plan: undefined,
-                platform: 'Web',
-                session_id: number,
-                time: number,
-                user_agent: userAgent,
-                user_id: '[email protected]',
-              },
-              {
-                device_id: uuid,
-                event_id: 3,
-                event_properties: {
-                  '[Amplitude] Page Domain': 'www.example.com',
-                  '[Amplitude] Page Location': 'https://www.example.com/more',
-                  '[Amplitude] Page Path': '/more',
-                  '[Amplitude] Page Title': '',
-                  '[Amplitude] Page URL': 'https://www.example.com/more',
-                  '[Amplitude] Page Counter': 1,
-                  '[Amplitude] Previous Page Location': 'https://www.example.com/contact',
-                  '[Amplitude] Previous Page Type': 'internal',
+                {
+                  device_id: uuid,
+                  event_id: 3,
+                  event_properties: {
+                    '[Amplitude] Page Domain': 'www.example.com',
+                    '[Amplitude] Page Location': 'https://www.example.com/more',
+                    '[Amplitude] Page Path': '/more',
+                    '[Amplitude] Page Title': '',
+                    '[Amplitude] Page URL': 'https://www.example.com/more',
+                    '[Amplitude] Page Counter': 1,
+                    '[Amplitude] Page View ID': uuid,
+                    '[Amplitude] Previous Page Location': 'https://www.example.com/contact',
+                    '[Amplitude] Previous Page Type': 'internal',
+                  },
+                  event_type: '[Amplitude] Page Viewed',
+                  insert_id: uuid,
+                  ip: '$remote',
+                  language: 'en-US',
+                  library,
+                  partner_id: undefined,
+                  plan: undefined,
+                  platform: 'Web',
+                  session_id: number,
+                  time: number,
+                  user_agent: userAgent,
+                  user_id: '[email protected]',
                 },
-                event_type: '[Amplitude] Page Viewed',
-                insert_id: uuid,
-                ip: '$remote',
-                language: 'en-US',
-                library,
-                partner_id: undefined,
-                plan: undefined,
-                platform: 'Web',
-                session_id: number,
-                time: number,
-                user_agent: userAgent,
-                user_id: '[email protected]',
+              ],
+              options: {
+                min_id_length: undefined,
               },
-            ],
-            options: {
-              min_id_length: undefined,
-            },
-          });
-          scope.done();
+            });
+          } finally {
+            scope.done();
+          }
           resolve();
         }, 4000);
       });
@@ -2076,6 +2082,7 @@ describe('integration', () => {
                   '[Amplitude] Page Path': '',
                   '[Amplitude] Page Title': '',
                   '[Amplitude] Page URL': '',
+                  '[Amplitude] Page View ID': uuid,
                   '[Amplitude] Page Counter': 1,
                   '[Amplitude] Previous Page Location': '',
                   '[Amplitude] Previous Page Type': 'direct',