From 649a04dd914df814ad38f0d20b9eaea980641b43 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Wed, 11 May 2022 18:19:00 -0700 Subject: [PATCH 1/5] don't build types for tracing bundle index file --- packages/tracing/tsconfig.types.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/tracing/tsconfig.types.json b/packages/tracing/tsconfig.types.json index 374fd9bc9364..1df465fa6534 100644 --- a/packages/tracing/tsconfig.types.json +++ b/packages/tracing/tsconfig.types.json @@ -1,6 +1,12 @@ { "extends": "./tsconfig.json", + // We don't need types for this because we don't ship it in our npm bundle. Skipping it here also lets us get around + // the fact that it introduces a dependency on `@sentry/browser` which doesn't exist anywhere else in the SDK, which + // then prevents us from building that and this at the same time when doing a parallellized build from the repo root + // level. + "exclude": ["src/index.bundle.ts"], + "compilerOptions": { "declaration": true, "declarationMap": true, From 384eef54abfe06ad0469df156469feb31a1b417c Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Wed, 11 May 2022 22:24:59 -0700 Subject: [PATCH 2/5] remove `build:dev:filter` --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 9d6710419d65..d2f4e608db8b 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "build": "node ./scripts/verify-packages-versions.js && lerna run --stream --concurrency 1 --sort build", "build:bundle": "lerna run --parallel build:bundle", "build:dev": "lerna run --stream --concurrency 1 --sort build:dev", - "build:dev:filter": "lerna run --stream --concurrency 1 --sort build:dev --include-filtered-dependencies --include-filtered-dependents --scope", "build:rollup": "lerna run --stream --concurrency 1 --sort build:rollup", "build:types": "lerna run --stream --concurrency 1 --sort build:types", "build:watch": "lerna run --parallel build:watch", From 81e8599b6d2f2cb2a1be224590bcd0c238ddec16 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Wed, 11 May 2022 22:26:11 -0700 Subject: [PATCH 3/5] parallelize top-level rollup and types builds --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d2f4e608db8b..25005030c1e4 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "build": "node ./scripts/verify-packages-versions.js && lerna run --stream --concurrency 1 --sort build", "build:bundle": "lerna run --parallel build:bundle", "build:dev": "lerna run --stream --concurrency 1 --sort build:dev", - "build:rollup": "lerna run --stream --concurrency 1 --sort build:rollup", - "build:types": "lerna run --stream --concurrency 1 --sort build:types", + "build:rollup": "lerna run --parallel build:rollup", + "build:types": "lerna run --stream build:types", "build:watch": "lerna run --parallel build:watch", "build:dev:watch": "lerna run --parallel build:dev:watch", "build:types:watch": "ts-node scripts/build-types-watch.ts", From 0196e5467b7e80fff0c6c6ae51e4a202290616b9 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Wed, 11 May 2022 22:24:10 -0700 Subject: [PATCH 4/5] add `build:extras` script to packages with extra build processes --- package.json | 1 + packages/angular/package.json | 1 + packages/ember/package.json | 1 + packages/gatsby/package.json | 3 ++- packages/serverless/package.json | 3 ++- packages/tracing/package.json | 4 +++- 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 25005030c1e4..a1973721379e 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "build": "node ./scripts/verify-packages-versions.js && lerna run --stream --concurrency 1 --sort build", "build:bundle": "lerna run --parallel build:bundle", "build:dev": "lerna run --stream --concurrency 1 --sort build:dev", + "build:extras": "lerna run --parallel build:extras", "build:rollup": "lerna run --parallel build:rollup", "build:types": "lerna run --stream build:types", "build:watch": "lerna run --parallel build:watch", diff --git a/packages/angular/package.json b/packages/angular/package.json index 9899b961a323..09537d336ce1 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -41,6 +41,7 @@ "build": "yarn build:ngc", "build:ngc": "ng build --prod", "build:dev": "run-s build", + "build:extras": "yarn build", "build:watch": "run-p build:ngc:watch", "build:ngc:watch": "ng build --prod --watch", "build:npm": "npm pack ./build", diff --git a/packages/ember/package.json b/packages/ember/package.json index bb65fcbfc880..3936a1e0c126 100644 --- a/packages/ember/package.json +++ b/packages/ember/package.json @@ -18,6 +18,7 @@ }, "scripts": { "build": "ember build --environment=production", + "build:extras": "yarn build", "build:npm": "ember ts:precompile && npm pack && ember ts:clean", "clean": "yarn rimraf sentry-ember-*.tgz", "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*", diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index b8bb4758d42a..1e373c3870e8 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -35,8 +35,9 @@ "react": "^18.0.0" }, "scripts": { - "build": "run-p build:rollup build:types build:plugin", + "build": "run-p build:rollup build:types && yarn build:extras", "build:dev": "run-s build", + "build:extras": "yarn build:plugin", "build:plugin": "tsc -p tsconfig.plugin.json", "build:rollup": "rollup -c rollup.npm.config.js", "build:types": "tsc -p tsconfig.types.json", diff --git a/packages/serverless/package.json b/packages/serverless/package.json index 6fe8c659780c..53a882966fd8 100644 --- a/packages/serverless/package.json +++ b/packages/serverless/package.json @@ -38,9 +38,10 @@ "read-pkg": "^5.2.0" }, "scripts": { - "build": "run-p build:rollup build:types && yarn build:awslambda-layer", + "build": "run-p build:rollup build:types && yarn build:extras", "build:awslambda-layer": "node scripts/build-awslambda-layer.js", "build:dev": "run-p build:rollup build:types", + "build:extras": "yarn build:awslambda-layer", "build:rollup": "rollup -c rollup.npm.config.js", "build:types": "tsc -p tsconfig.types.json", "build:watch": "run-p build:rollup:watch build:types:watch", diff --git a/packages/tracing/package.json b/packages/tracing/package.json index 840a55aa6326..b550f4fa653a 100644 --- a/packages/tracing/package.json +++ b/packages/tracing/package.json @@ -26,9 +26,11 @@ "@types/express": "^4.17.1" }, "scripts": { - "build": "run-p build:rollup build:types build:bundle && ts-node ../../scripts/prepack.ts --bundles #necessary for integration tests", + "build": "run-p build:rollup build:types build:bundle && yarn build:extras #necessary for integration tests", "build:bundle": "rollup --config rollup.bundle.config.js", "build:dev": "run-p build:rollup build:types", + "build:extras": "yarn build:prepack", + "build:prepack": "ts-node ../../scripts/prepack.ts --bundles", "build:rollup": "rollup -c rollup.npm.config.js", "build:types": "tsc -p tsconfig.types.json", "build:watch": "run-p build:rollup:watch build:bundle:watch build:types:watch", From 4970daec5e513665316ed274db9cc1eac62c2477 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Wed, 11 May 2022 22:27:11 -0700 Subject: [PATCH 5/5] split up and parallelize top-level `build` and `build:dev` scripts --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a1973721379e..37a546b16e04 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "private": true, "scripts": { - "build": "node ./scripts/verify-packages-versions.js && lerna run --stream --concurrency 1 --sort build", + "build": "node ./scripts/verify-packages-versions.js && yarn run-p build:rollup build:types build:bundle && yarn build:extras", "build:bundle": "lerna run --parallel build:bundle", - "build:dev": "lerna run --stream --concurrency 1 --sort build:dev", + "build:dev": "run-p build:types build:rollup", "build:extras": "lerna run --parallel build:extras", "build:rollup": "lerna run --parallel build:rollup", "build:types": "lerna run --stream build:types",