bundle built-in modules together

app/package.json

@@ -14,15 +14,7 @@
     "watch": "webpack --progress --color --watch"
   },
   "dependencies": {
-    "@angular/animations": "^12.0.0",
-    "@angular/common": "^12.0.0",
-    "@angular/compiler": "^12.0.0",
-    "@angular/core": "^12.0.0",
-    "@angular/forms": "^12.0.0",
-    "@angular/platform-browser": "^12.0.0",
-    "@angular/platform-browser-dynamic": "^12.0.0",
     "@electron/remote": "1.2.0",
-    "@ng-bootstrap/ng-bootstrap": "^10.0.0",
     "any-promise": "^1.3.0",
     "electron-config": "2.0.0",
     "electron-debug": "^3.2.0",
@@ -33,12 +25,9 @@
     "keytar": "^7.7.0",
     "mz": "^2.7.0",
     "native-process-working-directory": "^1.0.2",
-    "ngx-toastr": "^14.0.0",
     "node-pty": "^0.10.1",
     "npm": "6",
-    "rxjs": "^7.2.0",
-    "yargs": "^17.0.1",
-    "zone.js": "^0.11.4"
+    "yargs": "^17.0.1"
   },
   "optionalDependencies": {
     "macos-native-processlist": "^2.0.0",

app/src/entry.ts

@@ -5,13 +5,15 @@ import 'rxjs'
 import './global.scss'
 import './toastr.scss'
 
+// Importing before @angular/*
+import { findPlugins, initModuleLookup, loadPlugins } from './plugins'
+
 import { enableProdMode, NgModuleRef, ApplicationRef } from '@angular/core'
 import { enableDebugTools } from '@angular/platform-browser'
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
 import { ipcRenderer } from 'electron'
 
 import { getRootModule } from './app.module'
-import { findPlugins, initModuleLookup, loadPlugins } from './plugins'
 import { BootstrapData, BOOTSTRAP_DATA, PluginInfo } from '../../tabby-core/src/api/mainProcess'
 
 // Always land on the start view

app/src/plugins.ts

@@ -18,28 +18,47 @@ function normalizePath (p: string): string {
 
 const builtinPluginsPath = process.env.TABBY_DEV ? path.dirname(remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
 
+const cachedBuiltinModules = {
+    '@angular/animations': require('@angular/animations'),
+    '@angular/common': require('@angular/common'),
+    '@angular/compiler': require('@angular/compiler'),
+    '@angular/core': require('@angular/core'),
+    '@angular/forms': require('@angular/forms'),
+    '@angular/platform-browser': require('@angular/platform-browser'),
+    '@angular/platform-browser/animations': require('@angular/platform-browser/animations'),
+    '@angular/platform-browser-dynamic': require('@angular/platform-browser-dynamic'),
+    '@ng-bootstrap/ng-bootstrap': require('@ng-bootstrap/ng-bootstrap'),
+    'ngx-toastr': require('ngx-toastr'),
+    rxjs: require('rxjs'),
+    'rxjs/operators': require('rxjs/operators'),
+    'zone.js/dist/zone.js': require('zone.js/dist/zone.js'),
+}
+
 const builtinModules = [
-    '@angular/animations',
-    '@angular/common',
-    '@angular/compiler',
-    '@angular/core',
-    '@angular/forms',
-    '@angular/platform-browser',
-    '@angular/platform-browser-dynamic',
-    '@ng-bootstrap/ng-bootstrap',
-    'ngx-toastr',
-    'rxjs',
-    'rxjs/operators',
+    ...Object.keys(cachedBuiltinModules),
     'tabby-core',
     'tabby-local',
     'tabby-settings',
     'tabby-terminal',
-    'zone.js/dist/zone.js',
 ]
 
-export type ProgressCallback = (current: number, total: number) => void // eslint-disable-line @typescript-eslint/no-type-alias
+const originalRequire = (global as any).require
+;(global as any).require = function (query: string) {
+    if (cachedBuiltinModules[query]) {
+        return cachedBuiltinModules[query]
+    }
+    return originalRequire.apply(this, [query])
+}
 
-const cachedBuiltinModules = {}
+const originalModuleRequire = nodeModule.prototype.require
+nodeModule.prototype.require = function (query: string) {
+    if (cachedBuiltinModules[query]) {
+        return cachedBuiltinModules[query]
+    }
+    return originalModuleRequire.call(this, query)
+}
+
+export type ProgressCallback = (current: number, total: number) => void // eslint-disable-line @typescript-eslint/no-type-alias
 
 export function initModuleLookup (userPluginsPath: string): void {
     global['module'].paths.map((x: string) => nodeModule.globalPaths.push(normalizePath(x)))
@@ -57,24 +76,10 @@ export function initModuleLookup (userPluginsPath: string): void {
     }
 
     builtinModules.forEach(m => {
-        cachedBuiltinModules[m] = nodeRequire(m)
+        if (!cachedBuiltinModules[m]) {
+            cachedBuiltinModules[m] = nodeRequire(m)
+        }
     })
-
-    const originalRequire = (global as any).require
-    ;(global as any).require = function (query: string) {
-        if (cachedBuiltinModules[query]) {
-            return cachedBuiltinModules[query]
-        }
-        return originalRequire.apply(this, [query])
-    }
-
-    const originalModuleRequire = nodeModule.prototype.require
-    nodeModule.prototype.require = function (query: string) {
-        if (cachedBuiltinModules[query]) {
-            return cachedBuiltinModules[query]
-        }
-        return originalModuleRequire.call(this, query)
-    }
 }
 
 export async function findPlugins (): Promise<PluginInfo[]> {

app/webpack.config.js

@@ -60,23 +60,13 @@ module.exports = {
         ],
     },
     externals: {
-        '@angular/core': 'commonjs @angular/core',
-        '@angular/compiler': 'commonjs @angular/compiler',
-        '@angular/platform-browser': 'commonjs @angular/platform-browser',
-        '@angular/platform-browser-dynamic': 'commonjs @angular/platform-browser-dynamic',
-        '@angular/forms': 'commonjs @angular/forms',
-        '@angular/common': 'commonjs @angular/common',
-        '@ng-bootstrap/ng-bootstrap': 'commonjs @ng-bootstrap/ng-bootstrap',
         '@electron/remote': 'commonjs @electron/remote',
         child_process: 'commonjs child_process',
         electron: 'commonjs electron',
         fs: 'commonjs fs',
-        'ngx-toastr': 'commonjs ngx-toastr',
         module: 'commonjs module',
         mz: 'commonjs mz',
         path: 'commonjs path',
-        rxjs: 'commonjs rxjs',
-        'zone.js': 'commonjs zone.js/dist/zone.js',
     },
     plugins: [
         new webpack.optimize.ModuleConcatenationPlugin(),