@theia/native-webpack-plugin 1.53.0-next.55 → 1.53.0-next.64

package/README.md

@@ -1,29 +1,29 @@
-<div align='center'>
-
-<br />
-
-<img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
-
-<h2>ECLIPSE THEIA - NATIVE-WEBPACK-PLUGIN</h2>
-
-<hr />
-
-</div>
-
-## Description
-
-The `@theia/native-webpack-plugin` package contains a webpack plugin that is used to handle native dependencies for bundling Theia based application backends.
-
-## Additional Information
-
-- [Theia - GitHub](https://github.com/eclipse-theia/theia)
-- [Theia - Website](https://theia-ide.org/)
-
-## License
-
-- [Eclipse Public License 2.0](http://www.eclipse.org/legal/epl-2.0/)
-- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
-
-## Trademark
-"Theia" is a trademark of the Eclipse Foundation
-https://www.eclipse.org/theia
+<div align='center'>
+
+<br />
+
+<img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
+
+<h2>ECLIPSE THEIA - NATIVE-WEBPACK-PLUGIN</h2>
+
+<hr />
+
+</div>
+
+## Description
+
+The `@theia/native-webpack-plugin` package contains a webpack plugin that is used to handle native dependencies for bundling Theia based application backends.
+
+## Additional Information
+
+- [Theia - GitHub](https://github.com/eclipse-theia/theia)
+- [Theia - Website](https://theia-ide.org/)
+
+## License
+
+- [Eclipse Public License 2.0](http://www.eclipse.org/legal/epl-2.0/)
+- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
+
+## Trademark
+"Theia" is a trademark of the Eclipse Foundation
+https://www.eclipse.org/theia

package/lib/native-webpack-plugin.js

@@ -140,22 +140,22 @@ async function buildFile(root, name, content) {
     await fs.promises.writeFile(tmpFile, content);
     return tmpFile;
 }
-const ripgrepReplacement = (nativePath = '.') => `
-const path = require('path');
-
-exports.rgPath = path.join(__dirname, \`./${nativePath}/rg\${process.platform === 'win32' ? '.exe' : ''}\`);
+const ripgrepReplacement = (nativePath = '.') => `
+const path = require('path');
+
+exports.rgPath = path.join(__dirname, \`./${nativePath}/rg\${process.platform === 'win32' ? '.exe' : ''}\`);
 `;
 const bindingsReplacement = (entries) => {
     const cases = [];
     for (const [module, node] of entries) {
         cases.push(`${' '.repeat(8)}case '${module}': return require('${node}');`);
     }
-    return `
-module.exports = function (jsModule) {
-    switch (jsModule) {
-${cases.join(os.EOL)}
-    }
-    throw new Error(\`unhandled module: "\${jsModule}"\`);
+    return `
+module.exports = function (jsModule) {
+    switch (jsModule) {
+${cases.join(os.EOL)}
+    }
+    throw new Error(\`unhandled module: "\${jsModule}"\`);
 }`.trim();
 };
 //# sourceMappingURL=native-webpack-plugin.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/native-webpack-plugin",
-  "version": "1.53.0-next.55+d1a989a68c",
+  "version": "1.53.0-next.64+23b351d26",
   "description": "Webpack Plugin for native dependencies of Theia.",
   "publishConfig": {
     "access": "public"
@@ -32,5 +32,5 @@
     "tslib": "^2.6.2",
     "webpack": "^5.76.0"
   },
-  "gitHead": "d1a989a68c1b5ec1f9098e9126653c6346844769"
+  "gitHead": "23b351d26346a2b5d6aca3ee81fba59c056132f7"
 }

package/src/index.ts

@@ -1,18 +1,18 @@
-// *****************************************************************************
-// Copyright (C) 2023 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { NativeWebpackPlugin } from './native-webpack-plugin';
-export = NativeWebpackPlugin;
+// *****************************************************************************
+// Copyright (C) 2023 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { NativeWebpackPlugin } from './native-webpack-plugin';
+export = NativeWebpackPlugin;

package/src/native-webpack-plugin.ts

@@ -1,183 +1,183 @@
-// *****************************************************************************
-// Copyright (C) 2023 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as path from 'path';
-import * as fs from 'fs';
-import * as os from 'os';
-
-import type { Compiler } from 'webpack';
-
-const REQUIRE_RIPGREP = '@vscode/ripgrep';
-const REQUIRE_VSCODE_WINDOWS_CA_CERTS = '@vscode/windows-ca-certs';
-const REQUIRE_BINDINGS = 'bindings';
-const REQUIRE_KEYMAPPING = './build/Release/keymapping';
-
-export interface NativeWebpackPluginOptions {
-    out: string;
-    trash: boolean;
-    ripgrep: boolean;
-    pty: boolean;
-    replacements?: Record<string, string>;
-    nativeBindings?: Record<string, string>;
-}
-
-export class NativeWebpackPlugin {
-
-    private bindings = new Map<string, string>();
-    private options: NativeWebpackPluginOptions;
-
-    constructor(options: NativeWebpackPluginOptions) {
-        this.options = options;
-        for (const [name, value] of Object.entries(options.nativeBindings ?? {})) {
-            this.nativeBinding(name, value);
-        }
-    }
-
-    nativeBinding(dependency: string, nodePath: string): void {
-        this.bindings.set(dependency, nodePath);
-    }
-
-    apply(compiler: Compiler): void {
-        let replacements: Record<string, string> = {};
-        compiler.hooks.initialize.tap(NativeWebpackPlugin.name, async () => {
-            const directory = path.resolve(compiler.outputPath, 'native-webpack-plugin');
-            if (fs.existsSync(directory)) {
-                await fs.promises.rm(directory, {
-                    force: true,
-                    recursive: true
-                });
-            }
-            await fs.promises.mkdir(directory, {
-                recursive: true
-            });
-            const bindingsFile = await buildFile(directory, 'bindings.js', bindingsReplacement(Array.from(this.bindings.entries())));
-            const ripgrepFile = await buildFile(directory, 'ripgrep.js', ripgrepReplacement(this.options.out));
-            const keymappingFile = './build/Release/keymapping.node';
-            const windowsCaCertsFile = '@vscode/windows-ca-certs/build/Release/crypt32.node';
-            replacements = {
-                ...(this.options.replacements ?? {}),
-                [REQUIRE_RIPGREP]: ripgrepFile,
-                [REQUIRE_BINDINGS]: bindingsFile,
-                [REQUIRE_KEYMAPPING]: keymappingFile,
-                [REQUIRE_VSCODE_WINDOWS_CA_CERTS]: windowsCaCertsFile
-            };
-        });
-        compiler.hooks.normalModuleFactory.tap(
-            NativeWebpackPlugin.name,
-            nmf => {
-                nmf.hooks.beforeResolve.tap(NativeWebpackPlugin.name, result => {
-                    for (const [file, replacement] of Object.entries(replacements)) {
-                        if (result.request === file) {
-                            result.request = replacement;
-                        }
-                    }
-                });
-                nmf.hooks.afterResolve.tap(NativeWebpackPlugin.name, result => {
-                    const createData = result.createData;
-                    for (const [file, replacement] of Object.entries(replacements)) {
-                        if (createData.resource === file) {
-                            createData.resource = replacement;
-                        }
-                    }
-                });
-            }
-        );
-        compiler.hooks.afterEmit.tapPromise(NativeWebpackPlugin.name, async () => {
-            if (this.options.trash) {
-                await this.copyTrashHelper(compiler);
-            }
-            if (this.options.ripgrep) {
-                await this.copyRipgrep(compiler);
-            }
-            if (this.options.pty) {
-                await this.copyNodePtySpawnHelper(compiler);
-            }
-        });
-    }
-
-    protected async copyRipgrep(compiler: Compiler): Promise<void> {
-        const suffix = process.platform === 'win32' ? '.exe' : '';
-        const sourceFile = require.resolve(`@vscode/ripgrep/bin/rg${suffix}`);
-        const targetFile = path.join(compiler.outputPath, this.options.out, `rg${suffix}`);
-        await this.copyExecutable(sourceFile, targetFile);
-    }
-
-    protected async copyNodePtySpawnHelper(compiler: Compiler): Promise<void> {
-        const targetDirectory = path.resolve(compiler.outputPath, '..', 'build', 'Release');
-        if (process.platform === 'win32') {
-            const agentFile = require.resolve('node-pty/build/Release/winpty-agent.exe');
-            const targetAgentFile = path.join(targetDirectory, 'winpty-agent.exe');
-            await this.copyExecutable(agentFile, targetAgentFile);
-            const dllFile = require.resolve('node-pty/build/Release/winpty.dll');
-            const targetDllFile = path.join(targetDirectory, 'winpty.dll');
-            await this.copyExecutable(dllFile, targetDllFile);
-        } else {
-            const sourceFile = require.resolve('node-pty/build/Release/spawn-helper');
-            const targetFile = path.join(targetDirectory, 'spawn-helper');
-            await this.copyExecutable(sourceFile, targetFile);
-        }
-    }
-
-    protected async copyTrashHelper(compiler: Compiler): Promise<void> {
-        let sourceFile: string | undefined;
-        let targetFile: string | undefined;
-        if (process.platform === 'win32') {
-            sourceFile = require.resolve('trash/lib/windows-trash.exe');
-            targetFile = path.join(compiler.outputPath, 'windows-trash.exe');
-        } else if (process.platform === 'darwin') {
-            sourceFile = require.resolve('trash/lib/macos-trash');
-            targetFile = path.join(compiler.outputPath, 'macos-trash');
-        }
-        if (sourceFile && targetFile) {
-            await this.copyExecutable(sourceFile, targetFile);
-        }
-    }
-
-    protected async copyExecutable(source: string, target: string): Promise<void> {
-        const targetDirectory = path.dirname(target);
-        await fs.promises.mkdir(targetDirectory, { recursive: true });
-        await fs.promises.copyFile(source, target);
-        await fs.promises.chmod(target, 0o777);
-    }
-}
-
-async function buildFile(root: string, name: string, content: string): Promise<string> {
-    const tmpFile = path.join(root, name);
-    await fs.promises.writeFile(tmpFile, content);
-    return tmpFile;
-}
-
-const ripgrepReplacement = (nativePath: string = '.'): string => `
-const path = require('path');
-
-exports.rgPath = path.join(__dirname, \`./${nativePath}/rg\${process.platform === 'win32' ? '.exe' : ''}\`);
-`;
-
-const bindingsReplacement = (entries: [string, string][]): string => {
-    const cases: string[] = [];
-
-    for (const [module, node] of entries) {
-        cases.push(`${' '.repeat(8)}case '${module}': return require('${node}');`);
-    }
-
-    return `
-module.exports = function (jsModule) {
-    switch (jsModule) {
-${cases.join(os.EOL)}
-    }
-    throw new Error(\`unhandled module: "\${jsModule}"\`);
-}`.trim();
-};
+// *****************************************************************************
+// Copyright (C) 2023 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as path from 'path';
+import * as fs from 'fs';
+import * as os from 'os';
+
+import type { Compiler } from 'webpack';
+
+const REQUIRE_RIPGREP = '@vscode/ripgrep';
+const REQUIRE_VSCODE_WINDOWS_CA_CERTS = '@vscode/windows-ca-certs';
+const REQUIRE_BINDINGS = 'bindings';
+const REQUIRE_KEYMAPPING = './build/Release/keymapping';
+
+export interface NativeWebpackPluginOptions {
+    out: string;
+    trash: boolean;
+    ripgrep: boolean;
+    pty: boolean;
+    replacements?: Record<string, string>;
+    nativeBindings?: Record<string, string>;
+}
+
+export class NativeWebpackPlugin {
+
+    private bindings = new Map<string, string>();
+    private options: NativeWebpackPluginOptions;
+
+    constructor(options: NativeWebpackPluginOptions) {
+        this.options = options;
+        for (const [name, value] of Object.entries(options.nativeBindings ?? {})) {
+            this.nativeBinding(name, value);
+        }
+    }
+
+    nativeBinding(dependency: string, nodePath: string): void {
+        this.bindings.set(dependency, nodePath);
+    }
+
+    apply(compiler: Compiler): void {
+        let replacements: Record<string, string> = {};
+        compiler.hooks.initialize.tap(NativeWebpackPlugin.name, async () => {
+            const directory = path.resolve(compiler.outputPath, 'native-webpack-plugin');
+            if (fs.existsSync(directory)) {
+                await fs.promises.rm(directory, {
+                    force: true,
+                    recursive: true
+                });
+            }
+            await fs.promises.mkdir(directory, {
+                recursive: true
+            });
+            const bindingsFile = await buildFile(directory, 'bindings.js', bindingsReplacement(Array.from(this.bindings.entries())));
+            const ripgrepFile = await buildFile(directory, 'ripgrep.js', ripgrepReplacement(this.options.out));
+            const keymappingFile = './build/Release/keymapping.node';
+            const windowsCaCertsFile = '@vscode/windows-ca-certs/build/Release/crypt32.node';
+            replacements = {
+                ...(this.options.replacements ?? {}),
+                [REQUIRE_RIPGREP]: ripgrepFile,
+                [REQUIRE_BINDINGS]: bindingsFile,
+                [REQUIRE_KEYMAPPING]: keymappingFile,
+                [REQUIRE_VSCODE_WINDOWS_CA_CERTS]: windowsCaCertsFile
+            };
+        });
+        compiler.hooks.normalModuleFactory.tap(
+            NativeWebpackPlugin.name,
+            nmf => {
+                nmf.hooks.beforeResolve.tap(NativeWebpackPlugin.name, result => {
+                    for (const [file, replacement] of Object.entries(replacements)) {
+                        if (result.request === file) {
+                            result.request = replacement;
+                        }
+                    }
+                });
+                nmf.hooks.afterResolve.tap(NativeWebpackPlugin.name, result => {
+                    const createData = result.createData;
+                    for (const [file, replacement] of Object.entries(replacements)) {
+                        if (createData.resource === file) {
+                            createData.resource = replacement;
+                        }
+                    }
+                });
+            }
+        );
+        compiler.hooks.afterEmit.tapPromise(NativeWebpackPlugin.name, async () => {
+            if (this.options.trash) {
+                await this.copyTrashHelper(compiler);
+            }
+            if (this.options.ripgrep) {
+                await this.copyRipgrep(compiler);
+            }
+            if (this.options.pty) {
+                await this.copyNodePtySpawnHelper(compiler);
+            }
+        });
+    }
+
+    protected async copyRipgrep(compiler: Compiler): Promise<void> {
+        const suffix = process.platform === 'win32' ? '.exe' : '';
+        const sourceFile = require.resolve(`@vscode/ripgrep/bin/rg${suffix}`);
+        const targetFile = path.join(compiler.outputPath, this.options.out, `rg${suffix}`);
+        await this.copyExecutable(sourceFile, targetFile);
+    }
+
+    protected async copyNodePtySpawnHelper(compiler: Compiler): Promise<void> {
+        const targetDirectory = path.resolve(compiler.outputPath, '..', 'build', 'Release');
+        if (process.platform === 'win32') {
+            const agentFile = require.resolve('node-pty/build/Release/winpty-agent.exe');
+            const targetAgentFile = path.join(targetDirectory, 'winpty-agent.exe');
+            await this.copyExecutable(agentFile, targetAgentFile);
+            const dllFile = require.resolve('node-pty/build/Release/winpty.dll');
+            const targetDllFile = path.join(targetDirectory, 'winpty.dll');
+            await this.copyExecutable(dllFile, targetDllFile);
+        } else {
+            const sourceFile = require.resolve('node-pty/build/Release/spawn-helper');
+            const targetFile = path.join(targetDirectory, 'spawn-helper');
+            await this.copyExecutable(sourceFile, targetFile);
+        }
+    }
+
+    protected async copyTrashHelper(compiler: Compiler): Promise<void> {
+        let sourceFile: string | undefined;
+        let targetFile: string | undefined;
+        if (process.platform === 'win32') {
+            sourceFile = require.resolve('trash/lib/windows-trash.exe');
+            targetFile = path.join(compiler.outputPath, 'windows-trash.exe');
+        } else if (process.platform === 'darwin') {
+            sourceFile = require.resolve('trash/lib/macos-trash');
+            targetFile = path.join(compiler.outputPath, 'macos-trash');
+        }
+        if (sourceFile && targetFile) {
+            await this.copyExecutable(sourceFile, targetFile);
+        }
+    }
+
+    protected async copyExecutable(source: string, target: string): Promise<void> {
+        const targetDirectory = path.dirname(target);
+        await fs.promises.mkdir(targetDirectory, { recursive: true });
+        await fs.promises.copyFile(source, target);
+        await fs.promises.chmod(target, 0o777);
+    }
+}
+
+async function buildFile(root: string, name: string, content: string): Promise<string> {
+    const tmpFile = path.join(root, name);
+    await fs.promises.writeFile(tmpFile, content);
+    return tmpFile;
+}
+
+const ripgrepReplacement = (nativePath: string = '.'): string => `
+const path = require('path');
+
+exports.rgPath = path.join(__dirname, \`./${nativePath}/rg\${process.platform === 'win32' ? '.exe' : ''}\`);
+`;
+
+const bindingsReplacement = (entries: [string, string][]): string => {
+    const cases: string[] = [];
+
+    for (const [module, node] of entries) {
+        cases.push(`${' '.repeat(8)}case '${module}': return require('${node}');`);
+    }
+
+    return `
+module.exports = function (jsModule) {
+    switch (jsModule) {
+${cases.join(os.EOL)}
+    }
+    throw new Error(\`unhandled module: "\${jsModule}"\`);
+}`.trim();
+};

package/src/package.spec.ts

@@ -1,28 +1,28 @@
-// *****************************************************************************
-// Copyright (C) 2023 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-/* note: this bogus test file is required so that
-   we are able to run mocha unit tests on this
-   package, without having any actual unit tests in it.
-   This way a coverage report will be generated,
-   showing 0% coverage, instead of no report.
-   This file can be removed once we have real unit
-   tests in place. */
-
-describe('request package', () => {
-
-    it('should support code coverage statistics', () => true);
-});
+// *****************************************************************************
+// Copyright (C) 2023 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+/* note: this bogus test file is required so that
+   we are able to run mocha unit tests on this
+   package, without having any actual unit tests in it.
+   This way a coverage report will be generated,
+   showing 0% coverage, instead of no report.
+   This file can be removed once we have real unit
+   tests in place. */
+
+describe('request package', () => {
+
+    it('should support code coverage statistics', () => true);
+});