Publish

.github/workflows/deploy-staging.yml

@@ -0,0 +1,48 @@
+name: Staging Deployment
+
+on:
+  workflow_dispatch:
+    inputs:
+      confirm_deploy:
+        description: 'Type "yes" to confirm deployment'
+        required: true
+        default: 'no'
+
+jobs:
+  deploy-staging:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Export BUILD_MODE
+        run: export BUILD_MODE=release
+
+      - name: Get version
+        run: |
+          FULL_VERSION=$(node -p -e "require('./lerna.json').version")
+          MAJOR_VERSION=$(echo $FULL_VERSION | cut -d. -f1)
+          echo "VERSION=$MAJOR_VERSION" >> $GITHUB_ENV
+          echo "version=$MAJOR_VERSION" >> $GITHUB_OUTPUT
+        env:
+          BUILD_MODE: release
+
+      - name: Build bundle
+        run: yarn build:bundle
+
+      - name: Deploy to staging
+        run: node ./scripts/deploy/deploy-oss.js staging v${VERSION}
+        env:
+          OSS_ENDPOINT: ${{ secrets.OSS_ENDPOINT }}
+          OSS_REGION: ${{ secrets.OSS_REGION }}
+          OSS_ACCESS_KEY: ${{ secrets.OSS_ACCESS_KEY }}
+          OSS_BUCKET: ${{ secrets.OSS_BUCKET }}
+          OSS_SECRET_KEY: ${{ secrets.OSS_SECRET_KEY }}

CHANGELOG.md

@@ -18,6 +18,25 @@
 
 ---
 
+## v0.0.4-alpha.2
+
+**Internal Changes:**
+
+- Modified "Feat/session replay ([#8](https://github.com/DataDog/browser-sdk/pull/8))" ([#10](https://github.com/DataDog/browser-sdk/pull/10)) [RUM]
+
+## v0.0.4-alpha.1
+
+**Internal Changes:**
+
+- chore: publish bugfix ([#9](https://github.com/DataDog/browser-sdk/pull/9))
+- Feat/session replay ([#8](https://github.com/DataDog/browser-sdk/pull/8)) [RUM]
+
+## v0.0.3-beta.2
+
+**Internal Changes:**
+
+- update v6.8.0
+
 ## v0.0.2
 
 **Internal Changes:**

developer-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashcatcloud/browser-sdk-developer-extension",
-  "version": "0.0.2",
+  "version": "0.0.4-alpha.2",
   "private": true,
   "scripts": {
     "build": "rm -rf dist && webpack --mode production",

lerna.json

@@ -1,4 +1,4 @@
 {
   "npmClient": "yarn",
-  "version": "0.0.2"
+  "version": "0.0.4-alpha.2"
 }

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashcatcloud/browser-core",
-  "version": "0.0.2",
+  "version": "0.0.4-alpha.2",
   "license": "Apache-2.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",

packages/flagging/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashcatcloud/browser-flagging",
-  "version": "0.0.2",
+  "version": "0.0.4-alpha.2",
   "license": "Apache-2.0",
   "private": true,
   "main": "cjs/entries/main.js",
@@ -18,7 +18,7 @@
     "@flashcatcloud/browser-core": "workspace:*"
   },
   "peerDependencies": {
-    "@flashcatcloud/browser-rum": "workspace:*"
+    "@flashcatcloud/browser-rum": "0.0.4-alpha.2"
   },
   "peerDependenciesMeta": {
     "@flashcatcloud/browser-rum": {

packages/flagging/src/entries/main.ts

@@ -1,9 +1,9 @@
 import { defineGlobal, getGlobalObject } from '@flashcatcloud/browser-core'
 import { flagging as importedFlagging } from '../hello'
 
-export const datadogFlagging = importedFlagging
+export const flashcatFlagging = importedFlagging
 
 interface BrowserWindow extends Window {
-  DD_FLAGGING?: typeof datadogFlagging
+  FC_FLAGGING?: typeof flashcatFlagging
 }
-defineGlobal(getGlobalObject<BrowserWindow>(), 'DD_FLAGGING', datadogFlagging)
+defineGlobal(getGlobalObject<BrowserWindow>(), 'FC_FLAGGING', flashcatFlagging)

packages/logs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashcatcloud/browser-logs",
-  "version": "0.0.2",
+  "version": "0.0.4-alpha.2",
   "license": "Apache-2.0",
   "main": "cjs/entries/main.js",
   "module": "esm/entries/main.js",
@@ -14,10 +14,10 @@
     "replace-build-env": "node ../../scripts/build/replace-build-env.js"
   },
   "dependencies": {
-    "@flashcatcloud/browser-core": "0.0.2"
+    "@flashcatcloud/browser-core": "workspace:*"
   },
   "peerDependencies": {
-    "@flashcatcloud/browser-rum": "0.0.2"
+    "@flashcatcloud/browser-rum": "0.0.4-alpha.2"
   },
   "peerDependenciesMeta": {
     "@flashcatcloud/browser-rum": {

packages/logs/src/domain/assembly.ts

@@ -49,6 +49,7 @@ export function startLogsAssembly(
       }
 
       if (session && session.anonymousId && !commonContext.user.anonymous_id) {
+        commonContext.user.id = isEmptyObject(commonContext.user) ? session.anonymousId : commonContext.user.id
         commonContext.user.anonymous_id = session.anonymousId
       }
 

packages/rum-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashcatcloud/browser-rum-core",
-  "version": "0.0.2",
+  "version": "0.0.4-alpha.2",
   "license": "Apache-2.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",

packages/rum-core/src/domain/contexts/userContext.ts

@@ -22,8 +22,8 @@ export function startUserContext(hooks: Hooks, configuration: RumConfiguration,
     const session = sessionManager.findTrackedSession(startTime)
 
     if (session && session.anonymousId && !user.anonymous_id && !!configuration.trackAnonymousUser) {
+      user.id = isEmptyObject(user) ? session.anonymousId : user.id
       user.anonymous_id = session.anonymousId
-      user.id = user.id ?? session.anonymousId
     }
 
     if (isEmptyObject(user)) {

packages/rum-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashcatcloud/browser-rum-react",
-  "version": "0.0.2",
+  "version": "0.0.4-alpha.2",
   "license": "Apache-2.0",
   "main": "cjs/entries/main.js",
   "module": "esm/entries/main.js",

packages/rum-slim/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashcatcloud/browser-rum-slim",
-  "version": "0.0.2",
+  "version": "0.0.4-alpha.2",
   "license": "Apache-2.0",
   "main": "cjs/entries/main.js",
   "module": "esm/entries/main.js",
@@ -17,7 +17,7 @@
     "@flashcatcloud/browser-rum-core": "workspace:*"
   },
   "peerDependencies": {
-    "@flashcatcloud/browser-logs": "0.0.2"
+    "@flashcatcloud/browser-logs": "0.0.4-alpha.2"
   },
   "peerDependenciesMeta": {
     "@flashcatcloud/browser-logs": {

packages/rum/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashcatcloud/browser-rum",
-  "version": "0.0.2",
+  "version": "0.0.4-alpha.2",
   "license": "Apache-2.0",
   "main": "cjs/entries/main.js",
   "module": "esm/entries/main.js",
@@ -18,7 +18,7 @@
     "@flashcatcloud/browser-rum-core": "workspace:*"
   },
   "peerDependencies": {
-    "@flashcatcloud/browser-logs": "0.0.2"
+    "@flashcatcloud/browser-logs": "0.0.4-alpha.2"
   },
   "peerDependenciesMeta": {
     "@flashcatcloud/browser-logs": {

packages/worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashcatcloud/browser-worker",
-  "version": "0.0.2",
+  "version": "0.0.4-alpha.2",
   "license": "Apache-2.0",
   "main": "bundle/worker.js",
   "scripts": {

performances/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "performances",
-  "version": "0.0.2",
+  "version": "0.0.4-alpha.2",
   "scripts": {
     "start": "ts-node ./src/main.ts"
   },

sandbox/index.html

@@ -7,29 +7,24 @@
     <script src="http://localhost:8080/flashcat-logs.js"></script>
     <script>
       FC_RUM.init({
-        applicationId: 'eWbr4xk3ZRnLabRa6unqwD',
-        clientToken: 'ce8d1be90fc6534f89ce36ebf526765e131',
-        sessionPersistence: 'local-storage',
-        service: 'test',
-        env: 'local',
-        proxy: ({ path, parameters }) => {
-          // 区分线下环境
-          return `https://jira.flashcat.cloud${path}?${parameters}`
-        },
-        // Specify a version number to identify the deployed version of your application in Datadog
-        version: '1.0.0',
-        sessionSampleRate: 100,
-        sessionReplaySampleRate: 0,
-        defaultPrivacyLevel: 'mask-user-input',
-        compressIntakeRequests: false,
-        allowedTracingUrls: ['http://10.99.1.110', /https?:\/\/.*\.console\.flashcat\.cloud/],
+        clientToken: 'xxx',
+        applicationId: 'xxx',
+        sessionReplaySampleRate: 100,
+        trackResources: true,
+        trackLongTasks: true,
+        telemetrySampleRate: 100,
+        telemetryConfigurationSampleRate: 100,
+        telemetryUsageSampleRate: 100,
+        enableExperimentalFeatures: [],
       })
-
-      FC_RUM.setUser({
-        id: '123',
-        email: 'test@flashcat.cloud',
-        name: 'test',
+      FC_LOGS.init({
+        clientToken: 'xxx',
+        telemetrySampleRate: 100,
+        telemetryConfigurationSampleRate: 100,
+        telemetryUsageSampleRate: 100,
+        enableExperimentalFeatures: [],
       })
+      FC_FLAGGING.init()
     </script>
   </head>
 

scripts/deploy/deploy-oss.js

@@ -1,11 +1,8 @@
-const { printLog, printError, runMain } = require('../lib/executionUtils')
-const { forEachFile } = require('../lib/filesUtils')
 const OSS = require('ali-oss')
-const dotenv = require('dotenv')
 const CDN = require('@alicloud/cdn20180510')
 const OpenApi = require('@alicloud/openapi-client')
-
-dotenv.config()
+const { printLog, printError, runMain } = require('../lib/executionUtils')
+const { forEachFile } = require('../lib/filesUtils')
 
 const { buildBundleFolder, packages } = require('./lib/deploymentUtils')
 
@@ -40,6 +37,10 @@ const client = new OSS({
 if (require.main === module) {
   const env = process.argv[2]
   const version = process.argv[3]
+  if (env === 'prod' && (version.includes('beta') || version.includes('alpha'))) {
+    printError('❌❌❌❌检测到非正式版本，跳过CDN发布，当前版本为：', version)
+    process.exit(1)
+  }
   runMain(async () => {
     await main(env, version)
   })
@@ -53,7 +54,7 @@ async function main(env, version) {
     const pathsToInvalidate = await uploadPackage(awsConfig, packageName, version)
     cloudfrontPathsToInvalidate.push(...pathsToInvalidate)
   }
-  refreshCdnCache(cloudfrontPathsToInvalidate)
+  await refreshCdnCache(cloudfrontPathsToInvalidate)
 }
 
 // 读取bundle文件夹，上传到ali oss，并刷新cdn缓存

scripts/release/generate-changelog/lib/getAffectedPackages.js

@@ -61,9 +61,11 @@ function getDepenciesRecursively(packageDirectoryName) {
   if (packageDirectoryNameJson.dependencies) {
     for (const dependencyPackageName of Object.keys(packageDirectoryNameJson.dependencies)) {
       const packageDirectoryName = getPackageDirectoryNameFromPackageName(dependencyPackageName)
-      dependencies.add(packageDirectoryName)
-      for (let transitiveDependency of getDepenciesRecursively(packageDirectoryName)) {
-        dependencies.add(transitiveDependency)
+      if (packageDirectoryName) {
+        dependencies.add(packageDirectoryName)
+        for (let transitiveDependency of getDepenciesRecursively(packageDirectoryName)) {
+          dependencies.add(transitiveDependency)
+        }
       }
     }
   }