Support fix-path in non-bundled environments (#14819)

Author: msujew

dev-packages/application-manager/src/generator/backend-generator.ts

@@ -37,12 +37,6 @@ export class BackendGenerator extends AbstractGenerator {
 
 require('@theia/core/shared/reflect-metadata');
 
-// Useful for Electron/NW.js apps as GUI apps on macOS doesn't inherit the \`$PATH\` define
-// in your dotfiles (.bashrc/.bash_profile/.zshrc/etc).
-// https://github.com/electron/electron/issues/550#issuecomment-162037357
-// https://github.com/eclipse-theia/theia/pull/3534#issuecomment-439689082
-require('@theia/core/electron-shared/fix-path').default();
-
 // Workaround for https://github.com/electron/electron/issues/9225. Chrome has an issue where
 // in certain locales (e.g. PL), image metrics are wrongly computed. We explicitly set the
 // LC_NUMERIC to prevent this from happening (selects the numeric formatting category of the
@@ -52,18 +46,24 @@ if (process.env.LC_ALL) {
 }
 process.env.LC_NUMERIC = 'C';
 
-const { resolve } = require('path');
-const theiaAppProjectPath = resolve(__dirname, '..', '..');
-process.env.THEIA_APP_PROJECT_PATH = theiaAppProjectPath;
-const { default: electronMainApplicationModule } = require('@theia/core/lib/electron-main/electron-main-application-module');
-const { ElectronMainApplication, ElectronMainApplicationGlobals } = require('@theia/core/lib/electron-main/electron-main-application');
-const { Container } = require('@theia/core/shared/inversify');
-const { app } = require('electron');
-
-const config = ${this.prettyStringify(this.pck.props.frontend.config)};
-const isSingleInstance = ${this.pck.props.backend.config.singleInstance === true ? 'true' : 'false'};
-
 (async () => {
+    // Useful for Electron/NW.js apps as GUI apps on macOS doesn't inherit the \`$PATH\` define
+    // in your dotfiles (.bashrc/.bash_profile/.zshrc/etc).
+    // https://github.com/electron/electron/issues/550#issuecomment-162037357
+    // https://github.com/eclipse-theia/theia/pull/3534#issuecomment-439689082
+    (await require('@theia/core/electron-shared/fix-path')).default();
+
+    const { resolve } = require('path');
+    const theiaAppProjectPath = resolve(__dirname, '..', '..');
+    process.env.THEIA_APP_PROJECT_PATH = theiaAppProjectPath;
+    const { default: electronMainApplicationModule } = require('@theia/core/lib/electron-main/electron-main-application-module');
+    const { ElectronMainApplication, ElectronMainApplicationGlobals } = require('@theia/core/lib/electron-main/electron-main-application');
+    const { Container } = require('@theia/core/shared/inversify');
+    const { app } = require('electron');
+
+    const config = ${this.prettyStringify(this.pck.props.frontend.config)};
+    const isSingleInstance = ${this.pck.props.backend.config.singleInstance === true ? 'true' : 'false'};
+
     if (isSingleInstance && !app.requestSingleInstanceLock()) {
         // There is another instance running, exit now. The other instance will request focus.
         app.quit();

packages/core/README.md

@@ -74,7 +74,6 @@ export class SomeClass {
   - `native-keymap` (from [`native-keymap@^2.2.1`](https://www.npmjs.com/package/native-keymap))
   - `electron` (from [`[email protected]`](https://www.npmjs.com/package/electron/v/30.1.2))
   - `electron-store` (from [`electron-store@^8.0.0`](https://www.npmjs.com/package/electron-store))
-  - `fix-path` (from [`fix-path@^4.0.0`](https://www.npmjs.com/package/fix-path))
 - `@theia/core/shared/...`
   - `@lumino/algorithm` (from [`@lumino/algorithm@^2.0.2`](https://www.npmjs.com/package/@lumino/algorithm))
   - `@lumino/commands` (from [`@lumino/commands@^2.3.1`](https://www.npmjs.com/package/@lumino/commands))

packages/electron/README.md

@@ -20,7 +20,6 @@ The `@theia/electron` extension bundles all Electron-specific dependencies and c
   - `native-keymap` (from [`native-keymap@^2.2.1`](https://www.npmjs.com/package/native-keymap))
   - `electron` (from [`[email protected]`](https://www.npmjs.com/package/electron/v/30.1.2))
   - `electron-store` (from [`electron-store@^8.0.0`](https://www.npmjs.com/package/electron-store))
-  - `fix-path` (from [`fix-path@^4.0.0`](https://www.npmjs.com/package/fix-path))
 
 ## Additional Information
 

packages/electron/package.json

@@ -21,8 +21,7 @@
       ],
       "export =": [
         "electron as Electron",
-        "electron-store as ElectronStore",
-        "fix-path as fixPath"
+        "electron-store as ElectronStore"
       ]
     }
   },

packages/electron/shared/fix-path/index.js

@@ -1 +1 @@
-module.exports = require('fix-path');
+module.exports = import('fix-path');