@theia/application-manager 1.39.0-next.9 → 1.40.0

package/src/generator/frontend-generator.ts

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 /* eslint-disable @typescript-eslint/indent */
@@ -27,7 +27,6 @@ export class FrontendGenerator extends AbstractGenerator {
         await this.write(this.pck.frontend('secondary-window.html'), this.compileSecondaryWindowHtml());
         await this.write(this.pck.frontend('secondary-index.js'), this.compileSecondaryIndexJs(this.pck.secondaryWindowModules));
         if (this.pck.isElectron()) {
-            await this.write(this.pck.frontend('electron-main.js'), this.compileElectronMain(this.pck.targetElectronMainModules));
             await this.write(this.pck.frontend('preload.js'), this.compilePreloadJs());
         }
     }
@@ -127,73 +126,6 @@ module.exports = preloader.preload().then(() => {
 `;
     }
 
-    protected compileElectronMain(electronMainModules?: Map<string, string>): string {
-        return `// @ts-check
-
-require('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('fix-path')();
-
-// 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
-// C locale, http://en.cppreference.com/w/cpp/locale/LC_categories).
-if (process.env.LC_ALL) {
-    process.env.LC_ALL = 'C';
-}
-process.env.LC_NUMERIC = 'C';
-
-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('inversify');
-const { resolve } = require('path');
-const { app } = require('electron');
-
-// Fix the window reloading issue, see: https://github.com/electron/electron/issues/22119
-app.allowRendererProcessReuse = false;
-
-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();
-    return;
-}
-
-const container = new Container();
-container.load(electronMainApplicationModule);
-container.bind(ElectronMainApplicationGlobals).toConstantValue({
-    THEIA_APP_PROJECT_PATH: resolve(__dirname, '..', '..'),
-    THEIA_BACKEND_MAIN_PATH: resolve(__dirname, '..', 'backend', 'main.js'),
-    THEIA_FRONTEND_HTML_PATH: resolve(__dirname, '..', '..', 'lib', 'index.html'),
-});
-
-function load(raw) {
-    return Promise.resolve(raw.default).then(module =>
-        container.load(module)
-    );
-}
-
-async function start() {
-    const application = container.get(ElectronMainApplication);
-    await application.start(config);
-}
-
-module.exports = Promise.resolve()${this.compileElectronMainModuleImports(electronMainModules)}
-    .then(start).catch(reason => {
-        console.error('Failed to start the electron application.');
-        if (reason) {
-            console.error(reason);
-        }
-    });
-`;
-    }
-
     /** HTML for secondary windows that contain an extracted widget. */
     protected compileSecondaryWindowHtml(): string {
         return `<!DOCTYPE html>

package/src/generator/index.ts

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 export * from './webpack-generator';

package/src/generator/webpack-generator.ts

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import * as paths from 'path';
@@ -22,6 +22,7 @@ export class WebpackGenerator extends AbstractGenerator {
 
     async generate(): Promise<void> {
         await this.write(this.genConfigPath, this.compileWebpackConfig());
+        await this.write(this.genNodeConfigPath, this.compileNodeWebpackConfig());
         if (await this.shouldGenerateUserWebpackConfig()) {
             await this.write(this.configPath, this.compileUserWebpackConfig());
         }
@@ -43,6 +44,10 @@ export class WebpackGenerator extends AbstractGenerator {
         return this.pck.path('gen-webpack.config.js');
     }
 
+    get genNodeConfigPath(): string {
+        return this.pck.path('gen-webpack.node.config.js');
+    }
+
     protected resolve(moduleName: string, path: string): string {
         return this.pck.resolveModulePath(moduleName, path).split(paths.sep).join('/');
     }
@@ -56,11 +61,12 @@ export class WebpackGenerator extends AbstractGenerator {
 const path = require('path');
 const webpack = require('webpack');
 const yargs = require('yargs');
+const resolvePackagePath = require('resolve-package-path');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const CompressionPlugin = require('compression-webpack-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 
-const outputPath = path.resolve(__dirname, 'lib');
+const outputPath = path.resolve(__dirname, 'lib', 'frontend');
 const { mode, staticCompression }  = yargs.option('mode', {
     description: "Mode to use",
     choices: ["development", "production"],
@@ -74,10 +80,17 @@ const development = mode === 'development';
 
 const plugins = [
     new CopyWebpackPlugin({
-        patterns: [{
-            // copy secondary window html file to lib folder
-            from: path.resolve(__dirname, 'src-gen/frontend/secondary-window.html')
-        }]
+        patterns: [
+            {
+                // copy secondary window html file to lib folder
+                from: path.resolve(__dirname, 'src-gen/frontend/secondary-window.html')
+            }${this.ifPackage('@theia/plugin-ext', `,
+            {
+                // copy webview files to lib folder
+                from: path.join(resolvePackagePath('@theia/plugin-ext', __dirname), '..', 'src', 'main', 'browser', 'webview', 'pre'),
+                to: path.resolve(__dirname, 'lib', 'webview', 'pre')
+            }`)}
+        ]
     }),
     new webpack.ProvidePlugin({
         // the Buffer class doesn't exist in the browser but some dependencies rely on it
@@ -305,18 +318,159 @@ module.exports = [{
  * To reset delete this file and rerun theia build again.
  */
 // @ts-check
-const config = require('./${paths.basename(this.genConfigPath)}');
+const configs = require('./${paths.basename(this.genConfigPath)}');
+const nodeConfig = require('./${paths.basename(this.genNodeConfigPath)}');
 
 /**
  * Expose bundled modules on window.theia.moduleName namespace, e.g.
  * window['theia']['@theia/core/lib/common/uri'].
  * Such syntax can be used by external code, for instance, for testing.
-config.module.rules.push({
+configs[0].module.rules.push({
     test: /\\.js$/,
     loader: require.resolve('@theia/application-manager/lib/expose-loader')
 }); */
 
-module.exports = config;`;
+module.exports = [
+    ...configs,
+    nodeConfig.config
+];`;
+    }
+
+    protected compileNodeWebpackConfig(): string {
+        return `/**
+ * Don't touch this file. It will be regenerated by theia build.
+ * To customize webpack configuration change ${this.configPath}
+ */
+// @ts-check
+const path = require('path');
+const yargs = require('yargs');
+const webpack = require('webpack');
+const TerserPlugin = require('terser-webpack-plugin');
+const NativeWebpackPlugin = require('@theia/native-webpack-plugin');
+
+const { mode } = yargs.option('mode', {
+    description: "Mode to use",
+    choices: ["development", "production"],
+    default: "production"
+}).argv;
+
+const production = mode === 'production';
+
+/** @type {import('webpack').EntryObject} */
+const commonJsLibraries = {};
+for (const [entryPointName, entryPointPath] of Object.entries({
+    ${this.ifPackage('@theia/plugin-ext', "'backend-init-theia': '@theia/plugin-ext/lib/hosted/node/scanners/backend-init-theia',")}
+    ${this.ifPackage('@theia/filesystem', "'nsfw-watcher': '@theia/filesystem/lib/node/nsfw-watcher',")}
+    ${this.ifPackage('@theia/plugin-ext-vscode', "'plugin-vscode-init': '@theia/plugin-ext-vscode/lib/node/plugin-vscode-init',")}
+})) {
+    commonJsLibraries[entryPointName] = {
+        import: require.resolve(entryPointPath),
+        library: {
+            type: 'commonjs2',
+        },
+    };
+}
+
+const ignoredResources = new Set();
+
+if (process.platform !== 'win32') {
+    ignoredResources.add('@vscode/windows-ca-certs');
+    ignoredResources.add('@vscode/windows-ca-certs/build/Release/crypt32.node');
+}
+
+const nativePlugin = new NativeWebpackPlugin({
+    out: 'native',
+    ripgrep: ${this.ifPackage(['@theia/search-in-workspace', '@theia/file-search'], 'true', 'false')},
+    pty: ${this.ifPackage('@theia/process', 'true', 'false')},
+    nativeBindings: {
+        drivelist: 'drivelist/build/Release/drivelist.node'
+    }
+});
+
+/** @type {import('webpack').Configuration} */
+const config = {
+    mode,
+    devtool: mode === 'development' ? 'source-map' : false,
+    target: 'node',
+    node: {
+        global: false,
+        __filename: false,
+        __dirname: false
+    },
+    output: {
+        filename: '[name].js',
+        path: path.resolve(__dirname, 'lib', 'backend'),
+        devtoolModuleFilenameTemplate: 'webpack:///[absolute-resource-path]?[loaders]',
+    },${this.ifElectron(`
+    externals: {
+        electron: 'require("electron")'
+    },`)}
+    entry: {
+        // Main entry point of the Theia application backend:
+        'main': require.resolve('./src-gen/backend/main'),
+        // Theia's IPC mechanism:
+        'ipc-bootstrap': require.resolve('@theia/core/lib/node/messaging/ipc-bootstrap'),
+        ${this.ifPackage('@theia/plugin-ext', () => `// VS Code extension support:
+        'plugin-host': require.resolve('@theia/plugin-ext/lib/hosted/node/plugin-host'),`)}
+        ${this.ifPackage('@theia/process', () => `// Make sure the node-pty thread worker can be executed:
+        'worker/conoutSocketWorker': require.resolve('node-pty/lib/worker/conoutSocketWorker'),`)}
+        ${this.ifPackage('@theia/git', () => `// Ensure the git locator process can the started
+        'git-locator-host': require.resolve('@theia/git/lib/node/git-locator/git-locator-host'),`)}
+        ${this.ifElectron("'electron-main': require.resolve('./src-gen/backend/electron-main'),")}
+        ...commonJsLibraries
+    },
+    module: {
+        rules: [
+            // Make sure we can still find and load our native addons.
+            {
+                test: /\\.node$/,
+                loader: 'node-loader',
+                options: {
+                    name: 'native/[name].[ext]'
+                }
+            },
+            {
+                test: /\\.js$/,
+                enforce: 'pre',
+                loader: 'source-map-loader'
+            },
+            // jsonc-parser exposes its UMD implementation by default, which
+            // confuses Webpack leading to missing js in the bundles.
+            {
+                test: /node_modules[\\/](jsonc-parser)/,
+                loader: 'umd-compat-loader'
+            }
+        ]
+    },
+    plugins: [
+        // Some native dependencies (bindings, @vscode/ripgrep) need special code replacements
+        nativePlugin,
+        // Optional node dependencies can be safely ignored
+        new webpack.IgnorePlugin({
+            checkResource: resource => ignoredResources.has(resource)
+        })
+    ],
+    optimization: {
+        // Split and reuse code across the various entry points
+        splitChunks: {
+            chunks: 'all'
+        },
+        // Only minimize if we run webpack in production mode
+        minimize: production,
+        minimizer: [
+            new TerserPlugin({
+                exclude: /^(lib|builtins)\\//
+            })
+        ]
+    },
+};
+
+module.exports = {
+    config,
+    nativePlugin,
+    ignoredResources
+};
+`;
     }
 
 }

package/src/index.ts

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 export * from './rebuild';

package/src/package.spec.ts

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 /* note: this bogus test file is required so that

package/src/rebuild.ts

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import cp = require('child_process');
@@ -36,6 +36,9 @@ export const DEFAULT_MODULES = [
     'native-keymap',
     'find-git-repositories',
     'drivelist',
+    'keytar',
+    'ssh2',
+    'cpu-features'
 ];
 
 export interface RebuildOptions {