Bundle error tracking too

Author: pimterry

package.json

@@ -112,8 +112,7 @@
       "@oclif/command",
       "@oclif/config",
       "@oclif/plugin-help",
-      "@oclif/plugin-update",
-      "@sentry/node"
+      "@oclif/plugin-update"
     ],
     "update": {
       "s3": {

src/commands/start.ts

@@ -1,26 +1,30 @@
-import { initErrorTracking } from '../error-tracking';
-initErrorTracking();
+// Import types only from TS
+import * as ErrorTrackingModule from '../error-tracking';
+import * as IndexTypeModule from '../index';
 
 import { IS_PROD_BUILD } from '../util';
 
-import { Command, flags } from '@oclif/command'
-
-import { runHTK as runHTKFunction } from '../index';
-
-let runHTK: typeof runHTKFunction;
-if (IS_PROD_BUILD || process.env.OCLIF_TS_NODE === '0') {
-    // Full package: try to explicitly load the bundle
-    try {
-        ({ runHTK } = require('../../bundle/index'));
-    } catch (e) {
-        // Fallback (bundle is not yet included in real package)
-        console.log('Could not load bundle, loading raw');
-        ({ runHTK } = require('../index'));
+function maybeBundleImport<T>(moduleName: string): T {
+    if (IS_PROD_BUILD || process.env.OCLIF_TS_NODE === '0') {
+        // Full package: try to explicitly load the bundle
+        try {
+            return require('../../bundle/' + moduleName);
+        } catch (e) {
+            // Fallback (bundle is included in real package)
+            console.log(`Could not load bundle ${moduleName}, loading raw`);
+            return require('../' + moduleName);
+        }
+    } else {
+        // Npm or dev: run the raw code
+        return require('../' + moduleName);
     }
-} else {
-    // Npm or dev: run the raw code
-    ({ runHTK } = require('../index'));
 }
+const { initErrorTracking } = maybeBundleImport<typeof ErrorTrackingModule>('error-tracking');
+initErrorTracking();
+
+import { Command, flags } from '@oclif/command'
+
+const { runHTK } = maybeBundleImport<typeof IndexTypeModule>('index');
 
 class HttpToolkitServer extends Command {
     static description = 'start the HTTP Toolkit server'

webpack.config.js

@@ -3,10 +3,13 @@ const path = require('path');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = {
-    entry: './src/index.ts',
+    entry: {
+        index: './src/index.ts',
+        'error-tracking': './src/error-tracking.ts'
+    },
     output: {
         path: path.resolve(__dirname, 'bundle'),
-        filename: 'index.js',
+        filename: '[name].js',
         libraryTarget: 'commonjs2'
     },
     mode: 'production',