diff --git a/packages/core/src/common/certificate-authorities/request-system-cas.injectable.win32.ts b/packages/core/src/common/certificate-authorities/request-system-cas.injectable.win32.ts index 4940aa2a7b..b4bcb51733 100644 --- a/packages/core/src/common/certificate-authorities/request-system-cas.injectable.win32.ts +++ b/packages/core/src/common/certificate-authorities/request-system-cas.injectable.win32.ts @@ -3,6 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; +import * as path from "path"; import execFileInjectable from "../fs/exec-file.injectable"; import loggerInjectable from "../logger.injectable"; import { requestSystemCAsInjectionToken } from "./request-system-cas-token"; @@ -23,7 +24,7 @@ const pemEncoding = (hexEncodedCert: String) => { const requestSystemCAsInjectable = getInjectable({ id: "request-system-cas", instantiate: (di) => { - const wincaRootsExePath: string = __non_webpack_require__.resolve("win-ca/lib/roots.exe"); + const wincaRootsExePath: string = path.resolve(require.resolve("win-ca"), "..", "roots.exe"); const execFile = di.inject(execFileInjectable); const logger = di.inject(loggerInjectable); diff --git a/packages/core/webpack/library-bundle.ts b/packages/core/webpack/library-bundle.ts index 9de09a2a9c..445e60705b 100644 --- a/packages/core/webpack/library-bundle.ts +++ b/packages/core/webpack/library-bundle.ts @@ -93,10 +93,12 @@ const config = [ optimization: { minimize: false, }, - externals: { - ...(rendererConfig.externals as any), - "monaco-editor": "commonjs monaco-editor", - }, + externals: [ + ...(rendererConfig.externals as any).filter(Boolean), + { + "monaco-editor": "commonjs monaco-editor", + }, + ], plugins: [ new DefinePlugin({ CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable(\\.${platform})?\\.tsx?$/`, diff --git a/packages/core/webpack/renderer.ts b/packages/core/webpack/renderer.ts index b39fbfa656..2a29acb1f1 100755 --- a/packages/core/webpack/renderer.ts +++ b/packages/core/webpack/renderer.ts @@ -66,6 +66,7 @@ export function webpackLensRenderer({ showVars = true } = {}): webpack.Configura externals: [ { "node-fetch": "commonjs node-fetch", + "win-ca": "commonjs win-ca", }, ...additionalExternals, ],