@theia/native-webpack-plugin 1.70.0-next.71 → 1.70.0-next.81
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -14,7 +14,7 @@ export declare class NativeWebpackPlugin {
|
|
|
14
14
|
nativeBinding(dependency: string, nodePath: string): void;
|
|
15
15
|
apply(compiler: Compiler): void;
|
|
16
16
|
protected copyRipgrep(issuer: string, compiler: Compiler): Promise<void>;
|
|
17
|
-
protected
|
|
17
|
+
protected copyNodePtyNativeDeps(issuer: string, compiler: Compiler): Promise<void>;
|
|
18
18
|
protected copyTrashHelper(issuer: string, compiler: Compiler): Promise<void>;
|
|
19
19
|
protected copyExecutable(source: string, target: string): Promise<void>;
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-webpack-plugin.d.ts","sourceRoot":"","sources":["../src/native-webpack-plugin.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"native-webpack-plugin.d.ts","sourceRoot":"","sources":["../src/native-webpack-plugin.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAMxC,MAAM,WAAW,0BAA0B;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3C;AAED,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,OAAO,CAA6B;gBAEhC,OAAO,EAAE,0BAA0B;IAO/C,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIzD,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;cAiDf,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cAO9D,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cAyBxE,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cAelE,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAMhF"}
|
|
@@ -22,7 +22,6 @@ const os = require("os");
|
|
|
22
22
|
const REQUIRE_RIPGREP = '@vscode/ripgrep';
|
|
23
23
|
const REQUIRE_BINDINGS = 'bindings';
|
|
24
24
|
const REQUIRE_PARCEL_WATCHER = './build/Release/watcher.node';
|
|
25
|
-
const REQUIRE_NODE_PTY_CONPTY = '../build/Release/conpty.node';
|
|
26
25
|
class NativeWebpackPlugin {
|
|
27
26
|
constructor(options) {
|
|
28
27
|
this.bindings = new Map();
|
|
@@ -50,11 +49,6 @@ class NativeWebpackPlugin {
|
|
|
50
49
|
[REQUIRE_BINDINGS]: bindingsFile,
|
|
51
50
|
[REQUIRE_PARCEL_WATCHER]: issuer => Promise.resolve(findNativeWatcherFile(issuer))
|
|
52
51
|
};
|
|
53
|
-
if (process.platform !== 'win32') {
|
|
54
|
-
// The expected conpty.node file is not available on non-windows platforms during build.
|
|
55
|
-
// We need to provide a stub that will be replaced by the real file at runtime.
|
|
56
|
-
replacements[REQUIRE_NODE_PTY_CONPTY] = () => buildFile(directory, 'conpty.js', conhostWindowsReplacement());
|
|
57
|
-
}
|
|
58
52
|
});
|
|
59
53
|
compiler.hooks.normalModuleFactory.tap(NativeWebpackPlugin.name, nmf => {
|
|
60
54
|
nmf.hooks.beforeResolve.tapPromise(NativeWebpackPlugin.name, async (result) => {
|
|
@@ -82,7 +76,7 @@ class NativeWebpackPlugin {
|
|
|
82
76
|
await this.copyRipgrep(ripgrepIssuer, compiler);
|
|
83
77
|
}
|
|
84
78
|
if (this.options.pty && nodePtyIssuer) {
|
|
85
|
-
await this.
|
|
79
|
+
await this.copyNodePtyNativeDeps(nodePtyIssuer, compiler);
|
|
86
80
|
}
|
|
87
81
|
});
|
|
88
82
|
}
|
|
@@ -92,20 +86,27 @@ class NativeWebpackPlugin {
|
|
|
92
86
|
const targetFile = path.join(compiler.outputPath, this.options.out, `rg${suffix}`);
|
|
93
87
|
await this.copyExecutable(sourceFile, targetFile);
|
|
94
88
|
}
|
|
95
|
-
async
|
|
96
|
-
const
|
|
89
|
+
async copyNodePtyNativeDeps(issuer, compiler) {
|
|
90
|
+
const dist = `${process.platform}-${process.arch}`;
|
|
91
|
+
const src = `node-pty/prebuilds/${dist}`;
|
|
92
|
+
const targetDirectory = path.resolve(compiler.outputPath, '..', 'prebuilds', dist);
|
|
93
|
+
const copyFile = async (source) => {
|
|
94
|
+
const file = require.resolve(`${src}/${source}`, { paths: [issuer] });
|
|
95
|
+
const targetFile = path.join(targetDirectory, source);
|
|
96
|
+
await this.copyExecutable(file, targetFile);
|
|
97
|
+
};
|
|
97
98
|
if (process.platform === 'win32') {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
await
|
|
101
|
-
|
|
102
|
-
const targetDllFile = path.join(targetDirectory, 'winpty.dll');
|
|
103
|
-
await this.copyExecutable(dllFile, targetDllFile);
|
|
99
|
+
await copyFile('conpty.node');
|
|
100
|
+
await copyFile('conpty_console_list.node');
|
|
101
|
+
await copyFile('conpty/conpty.dll');
|
|
102
|
+
await copyFile('conpty/OpenConsole.exe');
|
|
104
103
|
}
|
|
105
104
|
else if (process.platform === 'darwin') {
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
105
|
+
await copyFile('spawn-helper');
|
|
106
|
+
}
|
|
107
|
+
// On non-windows platforms
|
|
108
|
+
if (process.platform !== 'win32') {
|
|
109
|
+
await copyFile('pty.node');
|
|
109
110
|
}
|
|
110
111
|
}
|
|
111
112
|
async copyTrashHelper(issuer, compiler) {
|
|
@@ -186,7 +187,4 @@ ${cases.join(os.EOL)}
|
|
|
186
187
|
throw new Error(\`unhandled module: "\${jsModule}"\`);
|
|
187
188
|
}`.trim();
|
|
188
189
|
};
|
|
189
|
-
const conhostWindowsReplacement = (nativePath = '.') => `
|
|
190
|
-
module.exports = __non_webpack_require__('${nativePath}/native/conpty.node');
|
|
191
|
-
`;
|
|
192
190
|
//# sourceMappingURL=native-webpack-plugin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-webpack-plugin.js","sourceRoot":"","sources":["../src/native-webpack-plugin.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,6BAA6B;AAC7B,yBAAyB;AACzB,yBAAyB;AAIzB,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAC1C,MAAM,gBAAgB,GAAG,UAAU,CAAC;AACpC,MAAM,sBAAsB,GAAG,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"native-webpack-plugin.js","sourceRoot":"","sources":["../src/native-webpack-plugin.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/native-webpack-plugin",
|
|
3
|
-
"version": "1.70.0-next.
|
|
3
|
+
"version": "1.70.0-next.81+463fd57c3",
|
|
4
4
|
"description": "Webpack Plugin for native dependencies of Theia.",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"tslib": "^2.6.2",
|
|
34
34
|
"webpack": "^5.76.0"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "463fd57c374c371bbe48ade992af724cf143fb6a"
|
|
37
37
|
}
|
|
@@ -23,7 +23,6 @@ import type { Compiler } from 'webpack';
|
|
|
23
23
|
const REQUIRE_RIPGREP = '@vscode/ripgrep';
|
|
24
24
|
const REQUIRE_BINDINGS = 'bindings';
|
|
25
25
|
const REQUIRE_PARCEL_WATCHER = './build/Release/watcher.node';
|
|
26
|
-
const REQUIRE_NODE_PTY_CONPTY = '../build/Release/conpty.node';
|
|
27
26
|
|
|
28
27
|
export interface NativeWebpackPluginOptions {
|
|
29
28
|
out: string;
|
|
@@ -66,11 +65,6 @@ export class NativeWebpackPlugin {
|
|
|
66
65
|
[REQUIRE_BINDINGS]: bindingsFile,
|
|
67
66
|
[REQUIRE_PARCEL_WATCHER]: issuer => Promise.resolve(findNativeWatcherFile(issuer))
|
|
68
67
|
};
|
|
69
|
-
if (process.platform !== 'win32') {
|
|
70
|
-
// The expected conpty.node file is not available on non-windows platforms during build.
|
|
71
|
-
// We need to provide a stub that will be replaced by the real file at runtime.
|
|
72
|
-
replacements[REQUIRE_NODE_PTY_CONPTY] = () => buildFile(directory, 'conpty.js', conhostWindowsReplacement());
|
|
73
|
-
}
|
|
74
68
|
});
|
|
75
69
|
compiler.hooks.normalModuleFactory.tap(
|
|
76
70
|
NativeWebpackPlugin.name,
|
|
@@ -99,7 +93,7 @@ export class NativeWebpackPlugin {
|
|
|
99
93
|
await this.copyRipgrep(ripgrepIssuer, compiler);
|
|
100
94
|
}
|
|
101
95
|
if (this.options.pty && nodePtyIssuer) {
|
|
102
|
-
await this.
|
|
96
|
+
await this.copyNodePtyNativeDeps(nodePtyIssuer, compiler);
|
|
103
97
|
}
|
|
104
98
|
});
|
|
105
99
|
}
|
|
@@ -111,19 +105,28 @@ export class NativeWebpackPlugin {
|
|
|
111
105
|
await this.copyExecutable(sourceFile, targetFile);
|
|
112
106
|
}
|
|
113
107
|
|
|
114
|
-
protected async
|
|
115
|
-
const
|
|
108
|
+
protected async copyNodePtyNativeDeps(issuer: string, compiler: Compiler): Promise<void> {
|
|
109
|
+
const dist = `${process.platform}-${process.arch}`;
|
|
110
|
+
const src = `node-pty/prebuilds/${dist}`;
|
|
111
|
+
const targetDirectory = path.resolve(compiler.outputPath, '..', 'prebuilds', dist);
|
|
112
|
+
|
|
113
|
+
const copyFile = async (source: string): Promise<void> => {
|
|
114
|
+
const file = require.resolve(`${src}/${source}`, { paths: [issuer] });
|
|
115
|
+
const targetFile = path.join(targetDirectory, source);
|
|
116
|
+
await this.copyExecutable(file, targetFile);
|
|
117
|
+
};
|
|
118
|
+
|
|
116
119
|
if (process.platform === 'win32') {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
await
|
|
120
|
-
|
|
121
|
-
const targetDllFile = path.join(targetDirectory, 'winpty.dll');
|
|
122
|
-
await this.copyExecutable(dllFile, targetDllFile);
|
|
120
|
+
await copyFile('conpty.node');
|
|
121
|
+
await copyFile('conpty_console_list.node');
|
|
122
|
+
await copyFile('conpty/conpty.dll');
|
|
123
|
+
await copyFile('conpty/OpenConsole.exe');
|
|
123
124
|
} else if (process.platform === 'darwin') {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
125
|
+
await copyFile('spawn-helper');
|
|
126
|
+
}
|
|
127
|
+
// On non-windows platforms
|
|
128
|
+
if (process.platform !== 'win32') {
|
|
129
|
+
await copyFile('pty.node');
|
|
127
130
|
}
|
|
128
131
|
}
|
|
129
132
|
|
|
@@ -208,7 +211,3 @@ ${cases.join(os.EOL)}
|
|
|
208
211
|
throw new Error(\`unhandled module: "\${jsModule}"\`);
|
|
209
212
|
}`.trim();
|
|
210
213
|
};
|
|
211
|
-
|
|
212
|
-
const conhostWindowsReplacement = (nativePath: string = '.'): string => `
|
|
213
|
-
module.exports = __non_webpack_require__('${nativePath}/native/conpty.node');
|
|
214
|
-
`;
|