feat: Node compatible ESM build

examples/electron-react-boilerplate/package.json

@@ -2,8 +2,8 @@
   "name": "electron-react-boilerplate",
   "scripts": {
     "build": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
-    "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
-    "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts"
+    "build:main": "cross-env NODE_ENV=production TS_NODE_PROJECT=tsconfig.json TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
+    "build:renderer": "cross-env NODE_ENV=production TS_NODE_PROJECT=tsconfig.json TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts"
   },
   "devDependencies": {
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",

package.json

@@ -21,7 +21,10 @@
       "require": "./renderer/index.js",
       "import": "./esm/renderer/index.js"
     },
-    "./preload": "./preload/index.js"
+    "./preload": {
+      "require": "./preload/index.js",
+      "import": "./esm/preload/index.js"
+    }
   },
   "repository": "https://github.com/getsentry/sentry-electron.git",
   "author": "Sentry",
@@ -35,27 +38,21 @@
   },
   "scripts": {
     "prebuild": "yarn clean && node scripts/update-version.js",
-    "build": "run-p build:es6 build:esm build:preload",
-    "build:es6": "tsc -p tsconfig.build.json",
-    "build:esm": "tsc -p tsconfig.esm.json",
-    "build:preload": "node scripts/build-preload.js",
-    "build:watch": "run-p build:watch:es6 build:watch:esm",
-    "build:watch:es6": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
-    "build:watch:esm": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
+    "build": "rollup --config rollup.config.js",
     "clean": "rimraf coverage esm main preload renderer index.* integrations.* ipc.* sentry-electron*.tgz",
     "prelint": "node scripts/update-version.js",
-    "update-electron-versions": "electron-latest-versions --start 2 > ./test/e2e/versions.json",
-    "update-sdk-versions": "node ./scripts/update-sdk-versions.mjs",
     "lint": "run-s lint:prettier lint:eslint",
     "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"",
     "lint:eslint": "eslint . --cache --format stylish",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"",
     "fix:eslint": "eslint . --format stylish --fix",
+    "update-electron-versions": "electron-latest-versions --start 2 > ./test/e2e/versions.json",
+    "update-sdk-versions": "node ./scripts/update-sdk-versions.mjs",
     "pretest": "yarn build",
-    "test": "cross-env TS_NODE_PROJECT=tsconfig.json xvfb-maybe electron-mocha --require ts-node/register/transpile-only --timeout 120000 ./test/unit/**/*.ts",
+    "test": "cross-env TS_NODE_PROJECT=tsconfig.test.json xvfb-maybe electron-mocha --require ts-node/register/transpile-only --timeout 120000 ./test/unit/**/*.ts",
     "pree2e": "rimraf test/e2e/dist/**/node_modules/@sentry/** test/e2e/dist/**/yarn.lock test/e2e/dist/**/package-lock.json && node scripts/clean-cache.js && yarn build && npm pack",
-    "e2e": "cross-env TS_NODE_PROJECT=tsconfig.json xvfb-maybe mocha --require ts-node/register/transpile-only --retries 3 ./test/e2e/*.ts"
+    "e2e": "cross-env TS_NODE_PROJECT=tsconfig.test.json xvfb-maybe mocha --require ts-node/register/transpile-only --retries 3 ./test/e2e/*.ts"
   },
   "dependencies": {
     "@sentry/browser": "7.68.0",
@@ -68,6 +65,8 @@
     "tslib": "^2.5.0"
   },
   "devDependencies": {
+    "@rollup/plugin-node-resolve": "^15.2.1",
+    "@rollup/plugin-typescript": "^11.1.4",
     "@sentry-internal/eslint-config-sdk": "7.68.0",
     "@sentry-internal/typescript": "7.68.0",
     "@types/busboy": "^0.2.3",
@@ -97,6 +96,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.4",
     "rimraf": "^3.0.2",
+    "rollup": "^3.29.4",
     "tmp": "^0.2.1",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5",

rollup.config.js

@@ -0,0 +1,77 @@
+const { builtinModules } = require('module');
+const { resolve } = require('path');
+
+const typescript = require('@rollup/plugin-typescript');
+
+const dependencies = Object.keys(require(resolve(process.cwd(), 'package.json')).dependencies || {});
+const external = [...builtinModules, 'electron', ...dependencies];
+
+const outputOptions = {
+  sourcemap: true,
+  strict: false,
+  freeze: false,
+  externalLiveBindings: false,
+  generatedCode: {
+    preset: 'es2015',
+    symbols: false,
+  },
+};
+
+// a simple plugin that adds a package.json file with type: module
+const modulePackageJson = {
+  name: 'package-json-module-type',
+  generateBundle(_, __) {
+    this.emitFile({
+      type: 'asset',
+      fileName: 'package.json',
+      source: '{"type": "module"}',
+    });
+  },
+};
+
+function transpileFiles(format, input, outDir) {
+  return {
+    input,
+    output: {
+      ...outputOptions,
+      format,
+      dir: outDir,
+      preserveModules: true,
+    },
+    treeshake: { moduleSideEffects: false },
+    plugins: [
+      typescript({
+        outDir,
+        tsconfig: './tsconfig.build.json',
+      }),
+      format === 'esm' ? modulePackageJson : {},
+    ],
+    external,
+  };
+}
+
+function bundlePreload(format, input, output) {
+  return {
+    input,
+    output: {
+      ...outputOptions,
+      format,
+      file: output,
+    },
+    plugins: [
+      typescript({
+        tsconfig: './tsconfig.preload.json',
+      }),
+    ],
+    external,
+  };
+}
+
+module.exports = [
+  transpileFiles('cjs', ['src/index.ts', 'src/main/index.ts', 'src/renderer/index.ts'], '.'),
+  transpileFiles('esm', ['src/index.ts', 'src/main/index.ts', 'src/renderer/index.ts'], './esm'),
+  bundlePreload('cjs', 'src/preload/index.ts', './preload/index.js'),
+  bundlePreload('cjs', 'src/preload/legacy.ts', './preload/legacy.js'),
+  bundlePreload('esm', 'src/preload/index.ts', './esm/preload/index.js'),
+  bundlePreload('esm', 'src/preload/legacy.ts', './esm/preload/legacy.js'),
+];

src/main/electron-normalize.ts

@@ -20,13 +20,17 @@ export const isPackaged = (() => {
 
 /** A promise that is resolved when the app is ready */
 export const whenAppReady: Promise<void> = (() => {
-  return app.isReady()
-    ? Promise.resolve()
-    : new Promise<void>((resolve) => {
-        app.once('ready', () => {
-          resolve();
+  if (app) {
+    return app.isReady()
+      ? Promise.resolve()
+      : new Promise<void>((resolve) => {
+          app.once('ready', () => {
+            resolve();
+          });
         });
-      });
+  } else {
+    return Promise.resolve();
+  }
 })();
 
 /**

src/main/fs.ts

@@ -1,17 +1,16 @@
 import { app } from 'electron';
-import { mkdir, readdir, readFile, rename, stat, statSync, unlink, writeFile } from 'fs';
+import { mkdir, readdir, readFile, stat, statSync, unlink, writeFile } from 'fs';
 import { dirname, join, resolve } from 'path';
 import { promisify } from 'util';
 
-export const sentryCachePath = join(app.getPath('userData'), 'sentry');
+export const sentryCachePath = join(app ? app.getPath('userData') : '', 'sentry');
 
 export const writeFileAsync = promisify(writeFile);
 export const readFileAsync = promisify(readFile);
 export const mkdirAsync = promisify(mkdir);
 export const statAsync = promisify(stat);
 export const unlinkAsync = promisify(unlink);
 export const readDirAsync = promisify(readdir);
-export const renameAsync = promisify(rename);
 
 // mkdir with recursive was only added in Node 10+
 

src/main/integrations/preload-injection.ts

@@ -4,12 +4,34 @@ import { Integration } from '@sentry/types';
 import { logger } from '@sentry/utils';
 import { app } from 'electron';
 import { existsSync } from 'fs';
-import { isAbsolute } from 'path';
+import { isAbsolute, resolve } from 'path';
+import { fileURLToPath } from 'url';
 
 import { IPCMode } from '../../common';
 import { rendererRequiresCrashReporterStart } from '../electron-normalize';
 import { ElectronMainOptionsInternal } from '../sdk';
 
+// After bundling with webpack, require.resolve can return number so we include that in the types
+// to ensure we check for that!
+function getPreloadPath(): string | number | undefined {
+  try {
+    return rendererRequiresCrashReporterStart()
+      ? require.resolve('../../preload/legacy.js')
+      : require.resolve('../../preload/index.js');
+  } catch (_) {
+    try {
+      // This could be ESM
+      const currentDir = fileURLToPath(import.meta.url);
+      // Use the CJS preload
+      return resolve(currentDir, '..', '..', '..', '..', 'preload', 'index.js');
+    } catch (_) {
+      //
+    }
+  }
+
+  return undefined;
+}
+
 /**
  * Injects the preload script into the provided sessions.
  *
@@ -45,14 +67,7 @@ export class PreloadInjection implements Integration {
    * Attempts to add the preload script the the provided sessions
    */
   private _addPreloadToSessions(options: ElectronMainOptionsInternal): void {
-    let path = undefined;
-    try {
-      path = rendererRequiresCrashReporterStart()
-        ? require.resolve('../../preload/legacy.js')
-        : require.resolve('../../preload/index.js');
-    } catch (_) {
-      //
-    }
+    const path = getPreloadPath();
 
     if (path && typeof path === 'string' && isAbsolute(path) && existsSync(path)) {
       for (const sesh of options.getSessions()) {

src/preload/index.ts

@@ -1,7 +1,5 @@
 /**
  * This preload script may be used with sandbox mode enabled which means regular require is not available.
- *
- * npm script `build:preload` calls `node ./scripts/build-preload.js` which inlines ipc and transpiles to JavaScript
  */
 
 import { contextBridge, ipcRenderer } from 'electron';

src/preload/legacy.ts

@@ -1,7 +1,5 @@
 /**
  * This preload script may be used with sandbox mode enabled which means regular require is not available.
- *
- * npm script `build:preload` calls `node ./scripts/build-preload.js` which inlines ipc and transpiles to JavaScript
  */
 
 import { contextBridge, crashReporter, ipcRenderer } from 'electron';

tsconfig.build.json

@@ -1,23 +1,15 @@
 {
   "extends": "./node_modules/@sentry-internal/typescript/tsconfig.json",
-  "include": [
-    "src/**/*.ts"
-  ],
-  "exclude": [
-    "node_modules",
-    "src/preload/*.ts"
-  ],
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules", "src/preload/**/*.ts"],
   "compilerOptions": {
     "skipLibCheck": true,
     "baseUrl": ".",
-    "lib": [
-      "es7",
-      "dom"
-    ],
-    "module": "commonjs",
+    "lib": ["ES7", "DOM"],
+    "module": "ESNext",
     "outDir": ".",
     "rootDir": "src",
-    "target": "es6",
-    "esModuleInterop": true,
+    "target": "ES6",
+    "esModuleInterop": true
   }
 }

tsconfig.json

@@ -1,13 +1,5 @@
 {
   "extends": "./tsconfig.build.json",
-  "include": [
-    "src/**/*.ts",
-    "test/**/*.ts"
-  ],
-  "exclude": [
-    "dist"
-  ],
-  "compilerOptions": {
-    "rootDir": ".",
-  }
+  "include": ["src/**/*.ts", "test/**/*.ts"],
+  "exclude": ["node_modules"]
 }

tsconfig.preload.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.build.json",
+  "include": ["src/preload/**/*.ts"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "declaration": false,
+    "declarationMap": false
+  }
+}

tsconfig.test.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.build.json",
+  "include": ["src/**/*.ts", "test/**/*.ts"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "module": "CommonJS",
+    "rootDir": "."
+  }
+}