add central build dir to @sentry/wasm

adjust postbuild.ts to take optional CL arg to not tmp copy CDN bundles

Author: Lms24

packages/wasm/.npmignore

@@ -1,4 +1,9 @@
+# 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
+# postbuild script `sentry-javascript/scripts/postbuild.ts`.
+
 *
+
 !/dist/**/*
 !/esm/**/*
-!/build/types/**/*
+!/types/**/*

packages/wasm/package.json

@@ -9,9 +9,9 @@
   "engines": {
     "node": ">=6"
   },
-  "main": "dist/index.js",
-  "module": "esm/index.js",
-  "types": "build/types/index.d.ts",
+  "main": "build/npm/dist/index.js",
+  "module": "build/npm/esm/index.js",
+  "types": "build/npm/types/index.d.ts",
   "publishConfig": {
     "access": "public"
   },
@@ -29,7 +29,7 @@
     "puppeteer": "^5.5.0"
   },
   "scripts": {
-    "build": "run-p build:cjs build:esm build:bundle build:types",
+    "build": "run-p build:cjs build:esm build:bundle build:types && ts-node ../../scripts/postbuild.ts -skipBundleCopy",
     "build:bundle": "rollup --config",
     "build:cjs": "tsc -p tsconfig.cjs.json",
     "build:dev": "run-p build:cjs build:esm build:types",
@@ -43,9 +43,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": "npm pack ./build/npm",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm coverage *.js.map *.d.ts",
+    "clean": "rimraf dist esm build coverage *.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/wasm/rollup.config.js

@@ -5,7 +5,7 @@ const baseBundleConfig = makeBaseBundleConfig({
   isAddOn: true,
   jsVersion: 'es5',
   licenseTitle: '@sentry/wasm',
-  outputFileBase: 'wasm',
+  outputFileBase: 'bundles/wasm',
 });
 
 export default makeConfigVariants(baseBundleConfig);

packages/wasm/test/server.js

@@ -6,7 +6,7 @@ const app = express();
 // Wasm Integration Tests Artifacts
 app.use(express.static(path.resolve(__dirname, 'public')));
 // Wasm Integration Bundle
-app.use(express.static(path.resolve(__dirname, '../build')));
+app.use(express.static(path.resolve(__dirname, '../build/bundles')));
 // Browser SDK Bundle
 app.use(express.static(path.resolve(__dirname, '../../browser/build/bundles')));
 app.listen(process.env.PORT);

packages/wasm/tsconfig.cjs.json

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

packages/wasm/tsconfig.esm.json

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

packages/wasm/tsconfig.types.json

@@ -5,6 +5,6 @@
     "declaration": true,
     "declarationMap": true,
     "emitDeclarationOnly": true,
-    "outDir": "build/types"
+    "outDir": "build/npm/types"
   }
 }

scripts/postbuild.ts

@@ -43,18 +43,20 @@ ASSETS.forEach(asset => {
 // TODO remove in v7! Until then:
 // copy CDN bundles into npm dir to temporarily keep bundles in npm tarball
 // inside the tarball, they are located in `build/`
-const npmTmpBundlesPath = path.resolve(NPM_BUILD_DIR, 'build');
-const cdnBundlesPaht = path.resolve('build', 'bundles');
-try {
-  if (!fs.existsSync(npmTmpBundlesPath)) {
-    fs.mkdirSync(npmTmpBundlesPath);
+// for now, copy it by default, unless explicitly forbidden via an command line arg
+const tmpCopyBundles = !process.argv.includes('-skipBundleCopy');
+if (tmpCopyBundles) {
+  const npmTmpBundlesPath = path.resolve(NPM_BUILD_DIR, 'build');
+  const cdnBundlesPaht = path.resolve('build', 'bundles');
+  try {
+    if (!fs.existsSync(npmTmpBundlesPath)) {
+      fs.mkdirSync(npmTmpBundlesPath);
+    }
+    fse.copy(cdnBundlesPaht, npmTmpBundlesPath);
+  } catch (error) {
+    console.error(`Error while tmp copying CDN bundles to ${NPM_BUILD_DIR}`);
   }
-  fse.copy(cdnBundlesPaht, npmTmpBundlesPath);
-} catch (error) {
-  console.error(`Error while tmp copying CDN bundles to ${NPM_BUILD_DIR}`);
 }
-// end remove
-
 // package.json modifications
 const packageJsonPath = path.resolve(NPM_BUILD_DIR, 'package.json');
 const pkgJson: { [key: string]: unknown } = require(packageJsonPath);