diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml index f74eb4b469..79fe5c19de 100644 --- a/.github/workflows/release-package.yml +++ b/.github/workflows/release-package.yml @@ -24,16 +24,7 @@ env: GITHUB_READ_PACKAGES_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: '25.3.0' - - run: yarn install --frozen-lockfile - - run: yarn format - - run: yarn lint + test: runs-on: ubuntu-latest @@ -45,25 +36,11 @@ jobs: - run: yarn install --frozen-lockfile - run: yarn test:unit - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: '25.3.0' - - run: yarn install --frozen-lockfile - - run: yarn build:bundle publish: needs: - - lint - - test - - build - if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') + - test runs-on: ubuntu-latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} permissions: packages: write contents: write @@ -87,15 +64,12 @@ jobs: run: | cd packages/rum # Update package name to scoped version - node -e "const pkg=require('./package.json'); pkg.name='@multiverse-io/browser-rum'; pkg.publishConfig={registry:'https://npm.pkg.github.com', access:'public'}; require('fs').writeFileSync('package.json', JSON.stringify(pkg, null, 2));" + node -e "const pkg=require('./package.json'); pkg.name='@multiverse-io/browser-rum'; pkg.private=false; pkg.publishConfig={registry:'https://npm.pkg.github.com', access:'public'}; require('fs').writeFileSync('package.json', JSON.stringify(pkg, null, 2));" - name: Publish to GitHub Packages run: | cd packages/rum - # Create .npmrc with auth token - echo "@multiverse-io:registry=https://npm.pkg.github.com" > .npmrc - echo "//npm.pkg.github.com/:_authToken=$NODE_AUTH_TOKEN" >> .npmrc - npm publish --access public + npm publish --tag multiverse env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000000..1c76523367 --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +@multiverse-io:registry=https://npm.pkg.github.com +//npm.pkg.github.com/:_authToken=${GITHUB_TOKEN} diff --git a/developer-extension/package.json b/developer-extension/package.json index 2ad0810128..e5bcb727bb 100644 --- a/developer-extension/package.json +++ b/developer-extension/package.json @@ -16,9 +16,9 @@ "dependencies": { "@datadog/browser-core": "workspace:*", "@datadog/browser-logs": "workspace:*", - "@datadog/browser-rum": "workspace:*", "@mantine/core": "8.3.12", "@mantine/hooks": "8.3.12", + "@multiverse-io/browser-rum": "workspace:*", "@tabler/icons-react": "3.36.1", "clsx": "2.1.1", "react": "19.2.3", diff --git a/packages/logs/src/domain/contexts/rumInternalContext.spec.ts b/packages/logs/src/domain/contexts/rumInternalContext.spec.ts index fed73c423d..538c921ef1 100644 --- a/packages/logs/src/domain/contexts/rumInternalContext.spec.ts +++ b/packages/logs/src/domain/contexts/rumInternalContext.spec.ts @@ -14,7 +14,7 @@ describe('startRUMInternalContext', () => { }) afterEach(() => { - delete window.DD_RUM + delete window.ATLAS_SDK_DD_RUM delete window.MV_SDK_ATLAS_SDK_DD_RUM_SYNTHETICS }) diff --git a/packages/rum/package.json b/packages/rum/package.json index 463e9e1626..fda9519c3e 100644 --- a/packages/rum/package.json +++ b/packages/rum/package.json @@ -1,6 +1,6 @@ { - "name": "@datadog/browser-rum", - "version": "6.25.3", + "name": "@multiverse-io/browser-rum", + "version": "6.25.3-multiverse.2", "license": "Apache-2.0", "main": "cjs/entries/main.js", "module": "esm/entries/main.js", @@ -23,7 +23,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/DataDog/browser-sdk.git", + "url": "https://github.com/multiverse-io/browser-sdk.git", "directory": "packages/rum" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index d0422cd74a..c80a79432a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -368,31 +368,15 @@ __metadata: languageName: unknown linkType: soft -"@datadog/browser-rum@workspace:*, @datadog/browser-rum@workspace:packages/rum": - version: 0.0.0-use.local - resolution: "@datadog/browser-rum@workspace:packages/rum" - dependencies: - "@datadog/browser-core": "npm:6.25.3" - "@datadog/browser-rum-core": "npm:6.25.3" - "@types/pako": "npm:2.0.4" - pako: "npm:2.1.0" - peerDependencies: - "@datadog/browser-logs": 6.25.3 - peerDependenciesMeta: - "@datadog/browser-logs": - optional: true - languageName: unknown - linkType: soft - "@datadog/browser-sdk-developer-extension@workspace:developer-extension": version: 0.0.0-use.local resolution: "@datadog/browser-sdk-developer-extension@workspace:developer-extension" dependencies: "@datadog/browser-core": "workspace:*" "@datadog/browser-logs": "workspace:*" - "@datadog/browser-rum": "workspace:*" "@mantine/core": "npm:8.3.12" "@mantine/hooks": "npm:8.3.12" + "@multiverse-io/browser-rum": "workspace:*" "@tabler/icons-react": "npm:3.36.1" "@types/chrome": "npm:0.1.33" "@types/react": "npm:19.2.8" @@ -1442,6 +1426,22 @@ __metadata: languageName: node linkType: hard +"@multiverse-io/browser-rum@workspace:*, @multiverse-io/browser-rum@workspace:packages/rum": + version: 0.0.0-use.local + resolution: "@multiverse-io/browser-rum@workspace:packages/rum" + dependencies: + "@datadog/browser-core": "npm:6.25.3" + "@datadog/browser-rum-core": "npm:6.25.3" + "@types/pako": "npm:2.0.4" + pako: "npm:2.1.0" + peerDependencies: + "@datadog/browser-logs": 6.25.3 + peerDependenciesMeta: + "@datadog/browser-logs": + optional: true + languageName: unknown + linkType: soft + "@napi-rs/wasm-runtime@npm:0.2.4": version: 0.2.4 resolution: "@napi-rs/wasm-runtime@npm:0.2.4"