ref(build): Add central build directory to packages without CDN bundles (Part 2)

.npmignore

@@ -0,0 +1,11 @@
+# The paths in this file are specified so that they align with the file structure in `./build` after this file is copied
+# into it by the prepack script `scripts/prepack.ts`.
+
+*
+
+# TODO remove bundles (which in the tarball are inside `build`) in v7
+!/build/**/*
+
+!/dist/**/*
+!/esm/**/*
+!/types/**/*

.size-limit.js

@@ -39,14 +39,14 @@ module.exports = [
   },
   {
     name: '@sentry/react - Webpack (gzipped + minified)',
-    path: 'packages/react/esm/index.js',
+    path: 'packages/react/build/esm/index.js',
     import: '{ init }',
     gzip: true,
     limit: '100 KB',
   },
   {
     name: '@sentry/nextjs Client - Webpack (gzipped + minified)',
-    path: 'packages/nextjs/esm/index.client.js',
+    path: 'packages/nextjs/build/esm/index.client.js',
     import: '{ init }',
     gzip: true,
     limit: '100 KB',

packages/browser/package.json

@@ -58,7 +58,7 @@
     "build:dev:watch": "run-p build:cjs:watch build:esm:watch build:types:watch",
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
-    "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build/npm",
+    "build:npm": "ts-node ../../scripts/prepack.ts --bundles && npm pack ./build/npm",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf build coverage .rpt2_cache",
     "fix": "run-s fix:eslint fix:prettier",

packages/core/package.json

@@ -35,7 +35,7 @@
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
-    "build:npm": "ts-node ../../scripts/prepack.ts -noBundles && npm pack ./build",
+    "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage",
     "fix": "run-s fix:eslint fix:prettier",

packages/gatsby/.npmignore

@@ -1,6 +1,5 @@
-# Info: the paths in this file are specified so that they align with the file
-# structure in `./build` where this file is copied to. This is done by the
-# prepack script `sentry-javascript/scripts/prepack.ts`.
+# The paths in this file are specified so that they align with the file structure in `./build` after this file is copied
+# into it by the prepack script `scripts/prepack.ts`.
 
 *
 

packages/gatsby/package.json

@@ -46,7 +46,7 @@
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
-    "build:npm": "ts-node ../../scripts/prepack.ts -noBundles && npm pack ./build",
+    "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage",
     "fix": "run-s fix:eslint fix:prettier",

packages/hub/package.json

@@ -33,7 +33,7 @@
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
-    "build:npm": "ts-node ../../scripts/prepack.ts -noBundles && npm pack ./build",
+    "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm coverage",
     "fix": "run-s fix:eslint fix:prettier",

packages/integrations/package.json

@@ -38,7 +38,7 @@
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
-    "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build/npm",
+    "build:npm": "ts-node ../../scripts/prepack.ts --bundles && npm pack ./build/npm",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage .rpt2_cache",
     "fix": "run-s fix:eslint fix:prettier",

packages/minimal/package.json

@@ -33,7 +33,7 @@
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
-    "build:npm": "ts-node ../../scripts/prepack.ts -noBundles && npm pack ./build",
+    "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage",
     "fix": "run-s fix:eslint fix:prettier",

packages/nextjs/package.json

@@ -9,10 +9,10 @@
   "engines": {
     "node": ">=6"
   },
-  "main": "./dist/index.server.js",
-  "module": "./esm/index.server.js",
-  "browser": "./esm/index.client.js",
-  "types": "./build/types/index.server.d.ts",
+  "main": "build/dist/index.server.js",
+  "module": "build/esm/index.server.js",
+  "browser": "build/esm/index.client.js",
+  "types": "build/types/index.server.d.ts",
   "publishConfig": {
     "access": "public"
   },
@@ -55,9 +55,9 @@
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
-    "build:npm": "npm pack",
+    "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.client.ts && madge --circular --exclude 'config/types\\.ts' src/index.server.ts # see https://github.com/pahen/madge/issues/306",
-    "clean": "rimraf dist esm coverage *.js *.js.map *.d.ts",
+    "clean": "rimraf dist esm build coverage *.js *.js.map *.d.ts",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",

packages/nextjs/tsconfig.cjs.json

@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "dist"
+    "outDir": "build/dist"
   }
 }

packages/nextjs/tsconfig.esm.json

@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "es6",
-    "outDir": "esm"
+    "outDir": "build/esm"
   }
 }

packages/node/package.json

@@ -9,8 +9,8 @@
   "engines": {
     "node": ">=6"
   },
-  "main": "dist/index.js",
-  "module": "esm/index.js",
+  "main": "build/dist/index.js",
+  "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
     "access": "public"
@@ -46,9 +46,9 @@
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
-    "build:npm": "npm pack",
+    "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm coverage",
+    "clean": "rimraf dist esm build coverage",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",

packages/node/test/manual/apm-transaction/main.js

@@ -1,7 +1,7 @@
 const http = require('http');
 const express = require('express');
 const app = express();
-const Sentry = require('../../../dist');
+const Sentry = require('../../../build/dist');
 
 Sentry.init({
   debug: true,

packages/node/test/manual/express-scope-separation/start.js

@@ -1,7 +1,7 @@
 const http = require('http');
 const express = require('express');
 const app = express();
-const Sentry = require('../../../dist');
+const Sentry = require('../../../build/dist');
 
 function assertTags(actual, expected) {
   if (JSON.stringify(actual) !== JSON.stringify(expected)) {

packages/node/test/manual/memory-leak/context-memory.js

@@ -1,4 +1,4 @@
-const Sentry = require('../../../dist');
+const Sentry = require('../../../build/dist');
 
 Sentry.init({ dsn: 'https://[email protected]/12345' });
 

packages/node/test/manual/memory-leak/express-patient.js

@@ -1,4 +1,4 @@
-const Sentry = require('../../../dist');
+const Sentry = require('../../../build/dist');
 
 Sentry.init({ dsn: 'https://[email protected]/12345' });
 

packages/node/test/manual/release-health/session-aggregates/aggregates-disable-single-session.js

@@ -1,7 +1,7 @@
 const http = require('http');
 const express = require('express');
 const app = express();
-const Sentry = require('../../../../dist');
+const Sentry = require('../../../../build/dist');
 const { assertSessions, BaseDummyTransport } = require('../test-utils');
 
 function cleanUpAndExitSuccessfully() {

packages/node/test/manual/release-health/single-session/caught-exception-errored-session.js

@@ -1,4 +1,4 @@
-const Sentry = require('../../../../dist');
+const Sentry = require('../../../../build/dist');
 const {
   assertSessions,
   constructStrippedSessionObject,

packages/node/test/manual/release-health/single-session/errors-in-session-capped-to-one.js

@@ -1,4 +1,4 @@
-const Sentry = require('../../../../dist');
+const Sentry = require('../../../../build/dist');
 const {
   assertSessions,
   constructStrippedSessionObject,

packages/node/test/manual/release-health/single-session/healthy-session.js

@@ -1,4 +1,4 @@
-const Sentry = require('../../../../dist');
+const Sentry = require('../../../../build/dist');
 const {
   assertSessions,
   constructStrippedSessionObject,

packages/node/test/manual/release-health/single-session/terminal-state-sessions-sent-once.js

@@ -1,4 +1,4 @@
-const Sentry = require('../../../../dist');
+const Sentry = require('../../../../build/dist');
 const {
   assertSessions,
   constructStrippedSessionObject,

packages/node/test/manual/release-health/single-session/uncaught-exception-crashed-session.js

@@ -1,4 +1,4 @@
-const Sentry = require('../../../../dist');
+const Sentry = require('../../../../build/dist');
 const { assertSessions, constructStrippedSessionObject, BaseDummyTransport } = require('../test-utils');
 
 class DummyTransport extends BaseDummyTransport {

packages/node/test/manual/release-health/single-session/unhandled-rejection-crashed-session.js

@@ -1,4 +1,4 @@
-const Sentry = require('../../../../dist');
+const Sentry = require('../../../../build/dist');
 const {
   assertSessions,
   constructStrippedSessionObject,

packages/node/test/manual/webpack-domain/index.js

@@ -1,4 +1,4 @@
-const Sentry = require('../../../dist');
+const Sentry = require('../../../build/dist');
 
 let remaining = 2;
 

packages/node/tsconfig.cjs.json

@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "dist"
+    "outDir": "build/dist"
   }
 }

packages/node/tsconfig.esm.json

@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "es6",
-    "outDir": "esm"
+    "outDir": "build/esm"
   }
 }

packages/react/package.json

@@ -9,8 +9,8 @@
   "engines": {
     "node": ">=6"
   },
-  "main": "dist/index.js",
-  "module": "esm/index.js",
+  "main": "build/dist/index.js",
+  "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
     "access": "public"
@@ -61,7 +61,7 @@
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
-    "build:npm": "npm pack",
+    "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage",
     "fix": "run-s fix:eslint fix:prettier",

packages/react/tsconfig.cjs.json

@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "dist"
+    "outDir": "build/dist"
   }
 }

packages/react/tsconfig.esm.json

@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "es6",
-    "outDir": "esm"
+    "outDir": "build/esm"
   }
 }

packages/serverless/package.json

@@ -9,8 +9,8 @@
   "engines": {
     "node": ">=10"
   },
-  "main": "dist/index.js",
-  "module": "esm/index.js",
+  "main": "build/dist/index.js",
+  "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
     "access": "public"
@@ -52,7 +52,7 @@
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
-    "build:npm": "npm pack",
+    "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build dist-awslambda-layer coverage",
     "fix": "run-s fix:eslint fix:prettier",

packages/serverless/scripts/build-awslambda-layer.js

@@ -69,7 +69,7 @@ async function collectPackages(cwd, packages = {}) {
 
 async function main() {
   const workDir = path.resolve(__dirname, '..'); // packages/serverless directory
-  const distRequirements = path.resolve(workDir, 'dist');
+  const distRequirements = path.resolve(workDir, 'build', 'dist');
   if (!fs.existsSync(distRequirements)) {
     console.log(`The path ${distRequirements} must exist.`);
     return;