Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cursor/rules/sdk_development.mdc
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ This repository uses **Git Flow**. See [docs/gitflow.md](docs/gitflow.md) for de

## Repository Architecture

This is a Lerna monorepo with 40+ packages in the `@sentry/*` namespace.
This is a monorepo with 40+ packages in the `@sentry/*` namespace, managed with Yarn workspaces and Nx.

### Core Packages

Expand Down Expand Up @@ -109,7 +109,7 @@ This is a Lerna monorepo with 40+ packages in the `@sentry/*` namespace.

- Uses Rollup for bundling (`rollup.*.config.mjs`)
- TypeScript with multiple tsconfig files per package
- Lerna manages package dependencies and publishing
- Nx orchestrates task execution across packages with caching
- Vite for testing with `vitest`

### Package Structure Pattern
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ jobs:
# Run `yarn dedupe-deps:fix` locally to resolve any duplicates.
run: yarn dedupe-deps:check
- name: Lint source files
run: yarn lint:lerna
run: yarn lint:eslint
- name: Lint for ES compatibility
run: yarn lint:es-compatibility

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gitflow-sync-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on:
branches:
- master
paths:
# When the version is updated on master (but nothing else)
- 'lerna.json'
# When versions are bumped on master (but no source code changes)
- 'packages/*/package.json'
- '!**/*.js'
- '!**/*.ts'
workflow_dispatch:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ packages/*/sentry-*.tgz
# logs
yarn-error.log
npm-debug.log
lerna-debug.log
local.log

# ide
Expand Down
2 changes: 0 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ dev-packages/browser-integration-tests/fixtures

/.nx/cache
/.nx/workspace-data

lerna.json
4 changes: 2 additions & 2 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ This repository uses **Git Flow**. See [docs/gitflow.md](docs/gitflow.md) for de

## Repository Architecture

This is a Lerna monorepo with 40+ packages in the `@sentry/*` namespace.
This is a monorepo with 40+ packages in the `@sentry/*` namespace, managed with Yarn workspaces and Nx.

### Core Packages

Expand Down Expand Up @@ -100,7 +100,7 @@ This is a Lerna monorepo with 40+ packages in the `@sentry/*` namespace.

- Uses Rollup for bundling (`rollup.*.config.mjs`)
- TypeScript with multiple tsconfig files per package
- Lerna manages package dependencies and publishing
- Nx orchestrates task execution across packages with caching
- Vite for testing with `vitest`

### Package Structure Pattern
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ We use [Volta](https://volta.sh/) to ensure we use consistent versions of node,
Make sure to also enable [pnpm support in Volta](https://docs.volta.sh/advanced/pnpm) if you want to run the E2E tests
locally.

`sentry-javascript` is a monorepo containing several packages, and we use `lerna` to manage them. To get started,
`sentry-javascript` is a monorepo containing several packages, managed with Yarn workspaces and Nx. To get started,
install all dependencies, and then perform an initial build, so TypeScript can read all of the linked type definitions.

```
Expand Down
5 changes: 0 additions & 5 deletions lerna.json

This file was deleted.

3 changes: 3 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"production": ["default", "!{projectRoot}/test/**/*", "!{projectRoot}/**/*.md", "!{projectRoot}/*.tgz"]
},
"targetDefaults": {
"build:dev": {
"dependsOn": ["^build:transpile", "^build:types"]
},
"build:bundle": {
"inputs": ["production", "^production"],
"dependsOn": ["build:transpile"],
Expand Down
51 changes: 25 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
{
"private": true,
"scripts": {
"build": "node ./scripts/verify-packages-versions.js && lerna run build:transpile,build:types,build:bundle",
"build:bundle": "lerna run build:bundle",
"build:dev": "lerna run build:types,build:transpile",
"build:dev:filter": "lerna run build:dev --include-filtered-dependencies --include-filtered-dependents --scope",
"build:transpile": "lerna run build:transpile",
"build:types": "lerna run build:types",
"build:watch": "lerna run build:watch",
"build:dev:watch": "lerna run build:dev:watch",
"build": "node ./scripts/verify-packages-versions.js && nx run-many -t build:transpile build:types build:bundle",
"build:bundle": "nx run-many -t build:bundle",
"build:dev": "nx run-many -t build:types build:transpile",
"build:dev:filter": "nx run-many -t build:dev -p",
"build:transpile": "nx run-many -t build:transpile",
"build:types": "nx run-many -t build:types",
"build:watch": "nx run-many -t build:watch",
"build:dev:watch": "nx run-many -t build:dev:watch",
"build:types:watch": "ts-node scripts/build-types-watch.ts",
"build:tarball": "run-s clean:tarballs build:tarballs",
"build:tarballs": "lerna run build:tarball",
"build:tarballs": "nx run-many -t build:tarball",
"changelog": "ts-node ./scripts/get-commit-list.ts",
"generate-changelog": "ts-node ./scripts/generate-changelog.ts",
"circularDepCheck": "lerna run circularDepCheck",
"circularDepCheck": "nx run-many -t circularDepCheck",
"clean": "run-s clean:build clean:caches",
"clean:build": "lerna run clean",
"clean:build": "nx run-many -t clean",
"clean:caches": "yarn rimraf eslintcache .nxcache .nx",
"clean:deps": "lerna clean --yes && rm -rf node_modules && yarn",
"clean:deps": "rimraf packages/*/node_modules dev-packages/*/node_modules && rm -rf node_modules && yarn",
"clean:tarballs": "rimraf {packages,dev-packages}/*/*.tgz",
"clean:watchman": "watchman watch-del \".\"",
"clean:all": "run-s clean:build clean:tarballs clean:caches clean:deps clean:watchman",
"fix": "run-s fix:prettier fix:lerna",
"fix:lerna": "lerna run fix",
"fix": "run-s fix:prettier fix:eslint",
"fix:eslint": "nx run-many -t fix",
"fix:prettier": "prettier \"**/*.{md,css,yml,yaml,mdc,json,ts,js,mjs,cjs,mts,cts,jsx,tsx,astro,vue}\" --write",
"lint": "run-s lint:prettier lint:lerna",
"lint:lerna": "lerna run lint",
"lint": "run-s lint:prettier lint:eslint",
"lint:eslint": "nx run-many -t lint",
"lint:prettier": "prettier \"**/*.{md,css,yml,yaml,mdc,json,ts,js,mjs,cjs,mts,cts,jsx,tsx,astro,vue}\" --check",
"lint:es-compatibility": "lerna run lint:es-compatibility",
"lint:es-compatibility": "nx run-many -t lint:es-compatibility",
"dedupe-deps:check": "yarn-deduplicate yarn.lock --list --fail",
"dedupe-deps:fix": "yarn-deduplicate yarn.lock",
"postpublish": "lerna run --stream --concurrency 1 postpublish",
"test": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,node-core-integration-tests,cloudflare-integration-tests}\" test",
"test:unit": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,node-core-integration-tests,cloudflare-integration-tests}\" test:unit",
"test:update-snapshots": "lerna run test:update-snapshots",
"postpublish": "nx run-many -t postpublish --parallel=1",
"test": "nx run-many -t test --exclude \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,node-core-integration-tests,cloudflare-integration-tests}\"",
"test:unit": "nx run-many -t test:unit --exclude \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,node-core-integration-tests,cloudflare-integration-tests}\"",
"test:update-snapshots": "nx run-many -t test:update-snapshots",
"test:pr": "nx affected -t test --exclude \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,node-core-integration-tests,cloudflare-integration-tests}\"",
"test:pr:browser": "UNIT_TEST_ENV=browser ts-node ./scripts/ci-unit-tests.ts --affected",
"test:pr:node": "UNIT_TEST_ENV=node ts-node ./scripts/ci-unit-tests.ts --affected",
"test:ci:browser": "UNIT_TEST_ENV=browser ts-node ./scripts/ci-unit-tests.ts",
"test:ci:node": "UNIT_TEST_ENV=node ts-node ./scripts/ci-unit-tests.ts",
"test:ci:bun": "lerna run test --scope @sentry/bun",
"yalc:publish": "lerna run yalc:publish"
"test:ci:bun": "nx run-many -t test -p @sentry/bun",
"yalc:publish": "nx run-many -t yalc:publish"
},
"volta": {
"node": "20.19.2",
Expand Down Expand Up @@ -125,7 +125,7 @@
"es-check": "^7.2.1",
"eslint": "8.57.0",
"jsdom": "^21.1.2",
"lerna": "9.0.3",
"nx": "22.5.0",
"madge": "8.0.0",
"nodemon": "^3.1.10",
"npm-run-all2": "^6.2.0",
Expand All @@ -145,8 +145,7 @@
},
"//_resolutions_comment": [
"Because new versions of strip-ansi, string-width, and wrap-ansi are ESM only packages,",
"we need to resolve them to the CommonJS versions.",
"This is a temporary solution until we can upgrade to a version of lerna that supports ESM packages"
"we need to resolve them to the CommonJS versions."
],
"resolutions": {
"gauge/strip-ansi": "6.0.1",
Expand Down
4 changes: 2 additions & 2 deletions scripts/build-types-watch.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable no-console */
/**
* If `yarn build:types:watch` is run without types files previously having been created, the build will get stuck in an
* errored state. This happens because lerna runs all of the packages' `yarn build:types:watch` statements in parallel,
* errored state. This happens because nx runs all of the packages' `yarn build:types:watch` statements in parallel,
* and so packages like `@sentry/browser` will at first be missing types they import from packages like `@sentry/core`
* and `@sentry/core`, causing errors to be thrown. Normally this is fine, because as the dependencies' types get
* built, file changes will be detected and the dependent packages' types will try again to build themselves. There
Expand Down Expand Up @@ -43,4 +43,4 @@ for (const pkg of packages) {
}

console.log('\nStarting `yarn build:types:watch`.\n');
childProcess.execSync('yarn lerna run --parallel build:types:watch', { stdio: 'inherit' });
childProcess.execSync('npx nx run-many -t build:types:watch --parallel=100', { stdio: 'inherit' });
65 changes: 65 additions & 0 deletions scripts/bump-version.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
const fs = require('fs');
const path = require('path');

const newVersion = process.argv[2];

if (!newVersion) {
console.error('Usage: node scripts/bump-version.js <new-version>');
process.exit(1);
}

const rootPkgPath = path.join(__dirname, '..', 'package.json');
const rootPkg = JSON.parse(fs.readFileSync(rootPkgPath, 'utf-8'));
const workspaces = rootPkg.workspaces;

if (!workspaces || !Array.isArray(workspaces)) {
console.error('Could not find workspaces in root package.json');
process.exit(1);
}

// Collect all workspace package names so we know which deps to update
const workspaceNames = new Set();
for (const workspace of workspaces) {
const pkgPath = path.join(__dirname, '..', workspace, 'package.json');
if (!fs.existsSync(pkgPath)) {
continue;
}
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
workspaceNames.add(pkg.name);
}

let updatedCount = 0;

for (const workspace of workspaces) {
const pkgPath = path.join(__dirname, '..', workspace, 'package.json');
if (!fs.existsSync(pkgPath)) {
continue;
}

const raw = fs.readFileSync(pkgPath, 'utf-8');
const pkg = JSON.parse(raw);
const oldVersion = pkg.version;

// Update the package version
pkg.version = newVersion;

// Update internal workspace dependency versions (exact, no ^)
for (const depType of ['dependencies', 'devDependencies', 'peerDependencies']) {
if (!pkg[depType]) {
continue;
}

for (const [dep, ver] of Object.entries(pkg[depType])) {
// Update any internal workspace dependency pinned to the old version
// This covers dependencies, devDependencies, and peerDependencies
if (workspaceNames.has(dep) && ver === oldVersion) {
pkg[depType][dep] = newVersion;
}
}
}

fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');

Check failure

Code scanning / CodeQL

Potential file system race condition High

The file may have changed since it
was checked
.
updatedCount++;
}

console.log(`Updated ${updatedCount} packages to version ${newVersion}`);
6 changes: 3 additions & 3 deletions scripts/ci-unit-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ function run(cmd: string, options?: childProcess.ExecSyncOptions): void {
* Run tests, ignoring the given packages
*/
function runAllTests(ignorePackages: Set<string>): void {
const ignoreFlags = Array.from(ignorePackages)
.map(dep => `--ignore="${dep}"`)
const excludeFlags = Array.from(ignorePackages)
.map(dep => `--exclude="${dep}"`)
.join(' ');

run(`yarn test ${ignoreFlags}`);
run(`yarn test ${excludeFlags}`);
}

/**
Expand Down
12 changes: 2 additions & 10 deletions scripts/craft-pre-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ cd $SCRIPT_DIR/..
OLD_VERSION="${1}"
NEW_VERSION="${2}"

# Do not tag and commit changes made by "npm version"
export npm_config_git_tag_version=false

yarn install --frozen-lockfile
# --force-publish - force publish all packages, this will skip the lerna changed check for changed packages and forces a package that didn't have a git diff change to be updated.
# --exact - specify updated dependencies in updated packages exactly (with no punctuation), instead of as semver compatible (with a ^).
# --no-git-tag-version - don't commit changes to package.json files and don't tag the release.
# --no-push - don't push committed and tagged changes.
# --include-merged-tags - include tags from merged branches when detecting changed packages.
# --yes - skip all confirmation prompts
yarn lerna version --force-publish --exact --no-git-tag-version --no-push --include-merged-tags --yes "${NEW_VERSION}"
# Bump version in all workspace packages (exact versions, no git tags or commits)
node scripts/bump-version.js "${NEW_VERSION}"
Loading
Loading