@pinnacle0/webpack-util 0.5.2 → 0.5.4
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.
- package/package.json +3 -1
- package/src/SystemProxySettingsUtil.d.ts +13 -0
- package/src/SystemProxySettingsUtil.js +53 -0
- package/src/SystemProxySettingsUtil.js.map +1 -0
- package/src/WebpackConfigGenerator/Rule/ts.rule.js +3 -0
- package/src/WebpackConfigGenerator/Rule/ts.rule.js.map +1 -1
- package/src/WebpackConfigGenerator/WebpackConfigSerializationUtil.d.ts +1 -1
- package/src/WebpackConfigGenerator/WebpackConfigSerializationUtil.js +47 -36
- package/src/WebpackConfigGenerator/WebpackConfigSerializationUtil.js.map +1 -1
- package/src/WebpackConfigGenerator/index.d.ts +1 -1
- package/src/WebpackConfigGenerator/index.js +2 -2
- package/src/WebpackConfigGenerator/index.js.map +1 -1
- package/src/WebpackServerStarter.d.ts +6 -0
- package/src/WebpackServerStarter.js +18 -0
- package/src/WebpackServerStarter.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pinnacle0/webpack-util",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.4",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"dependencies": {
|
|
@@ -20,8 +20,10 @@
|
|
|
20
20
|
"mini-css-extract-plugin": "2.7.6",
|
|
21
21
|
"pretty-format": "29.6.1",
|
|
22
22
|
"react-refresh": "0.14.0",
|
|
23
|
+
"socks-proxy-agent": "8.0.1",
|
|
23
24
|
"style-loader": "3.3.3",
|
|
24
25
|
"swc-loader": "0.2.3",
|
|
26
|
+
"swc-plugin-core-fe-hmr": "1.0.3",
|
|
25
27
|
"terser-webpack-plugin": "5.3.9",
|
|
26
28
|
"webpack": "5.88.1",
|
|
27
29
|
"webpack-dev-server": "4.15.1",
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
interface ProxySettings {
|
|
2
|
+
server: string;
|
|
3
|
+
port: number;
|
|
4
|
+
}
|
|
5
|
+
/**
|
|
6
|
+
* Create a socks proxy agent.
|
|
7
|
+
* getSocketsProxySettings only work on Mac, (sorry for windows and linux user)
|
|
8
|
+
*/
|
|
9
|
+
export declare class SystemProxySettingsUtil {
|
|
10
|
+
static get(): ProxySettings | null;
|
|
11
|
+
private static parseRawWebProxySettings;
|
|
12
|
+
}
|
|
13
|
+
export {};
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.SystemProxySettingsUtil = void 0;
|
|
7
|
+
const os_1 = __importDefault(require("os"));
|
|
8
|
+
const child_process_1 = require("child_process");
|
|
9
|
+
/**
|
|
10
|
+
* Create a socks proxy agent.
|
|
11
|
+
* getSocketsProxySettings only work on Mac, (sorry for windows and linux user)
|
|
12
|
+
*/
|
|
13
|
+
class SystemProxySettingsUtil {
|
|
14
|
+
static get() {
|
|
15
|
+
if (os_1.default.platform() !== "darwin")
|
|
16
|
+
return null;
|
|
17
|
+
const which = (0, child_process_1.spawnSync)("which", ["networksetup"]);
|
|
18
|
+
if (which.status !== 0)
|
|
19
|
+
return null;
|
|
20
|
+
const bin = which.stdout.toString().trim();
|
|
21
|
+
const listDevices = (0, child_process_1.spawnSync)(bin, ["-listallnetworkservices"]);
|
|
22
|
+
if (listDevices.status !== 0)
|
|
23
|
+
return null;
|
|
24
|
+
const devices = listDevices.stdout.toString().trim().split("\n").slice(1);
|
|
25
|
+
for (const device of devices) {
|
|
26
|
+
const getSettings = (0, child_process_1.spawnSync)(bin, ["-getwebproxy", device]);
|
|
27
|
+
if (getSettings.status !== 0)
|
|
28
|
+
continue;
|
|
29
|
+
const settings = this.parseRawWebProxySettings(getSettings.stdout.toString().trim());
|
|
30
|
+
if (settings)
|
|
31
|
+
return settings;
|
|
32
|
+
}
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
static parseRawWebProxySettings(raw) {
|
|
36
|
+
const setting = raw.split("\n").reduce((settings, line) => {
|
|
37
|
+
const [key, value] = line.split(":").map(s => s.trim());
|
|
38
|
+
if (key === "Enabled") {
|
|
39
|
+
settings.enabled = value === "Yes";
|
|
40
|
+
}
|
|
41
|
+
else if (key === "Server") {
|
|
42
|
+
settings.server = value;
|
|
43
|
+
}
|
|
44
|
+
else if (key === "Port") {
|
|
45
|
+
settings.port = Number(value);
|
|
46
|
+
}
|
|
47
|
+
return settings;
|
|
48
|
+
}, {});
|
|
49
|
+
return setting.enabled ? { server: setting.server, port: setting.port } : null;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
exports.SystemProxySettingsUtil = SystemProxySettingsUtil;
|
|
53
|
+
//# sourceMappingURL=SystemProxySettingsUtil.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SystemProxySettingsUtil.js","sourceRoot":"","sources":["../../src/SystemProxySettingsUtil.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,iDAAwC;AAOxC;;;GAGG;AACH,MAAa,uBAAuB;IAChC,MAAM,CAAC,GAAG;QACN,IAAI,YAAE,CAAC,QAAQ,EAAE,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE5C,MAAM,KAAK,GAAG,IAAA,yBAAS,EAAC,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;QACnD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACpC,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAE3C,MAAM,WAAW,GAAG,IAAA,yBAAS,EAAC,GAAG,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAChE,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAC1C,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAE1E,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC1B,MAAM,WAAW,GAAG,IAAA,yBAAS,EAAC,GAAG,EAAE,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;YAC7D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;gBAAE,SAAS;YACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YACrF,IAAI,QAAQ;gBAAE,OAAO,QAAQ,CAAC;SACjC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,MAAM,CAAC,wBAAwB,CAAC,GAAW;QAC/C,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAClC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE;YACf,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACxD,IAAI,GAAG,KAAK,SAAS,EAAE;gBACnB,QAAQ,CAAC,OAAO,GAAG,KAAK,KAAK,KAAK,CAAC;aACtC;iBAAM,IAAI,GAAG,KAAK,QAAQ,EAAE;gBACzB,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC;aAC3B;iBAAM,IAAI,GAAG,KAAK,MAAM,EAAE;gBACvB,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;aACjC;YACD,OAAO,QAAQ,CAAC;QACpB,CAAC,EACD,EAAwC,CAC3C,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACjF,CAAC;CACJ;AAvCD,0DAuCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts.rule.js","sourceRoot":"","sources":["../../../../src/WebpackConfigGenerator/Rule/ts.rule.ts"],"names":[],"mappings":";;;AACA,6CAAwC;AAMxC,6EAA6E;AAC7E,SAAgB,MAAM,CAAC,EAAC,WAAW,GAAG,KAAK,KAAU,EAAE;IACnD,MAAM,SAAS,GAA2B;QACtC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;QACrC,OAAO,EAAE;YACL,GAAG,EAAE;gBACD,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE;oBACJ,MAAM,EAAE,YAAY;oBACpB,UAAU,EAAE,IAAI;iBACnB;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE;wBACH,OAAO,EAAE,SAAS;wBAClB,OAAO,EAAE,WAAW;qBACvB;oBACD,gBAAgB,EAAE,SAAS;iBAC9B;aACJ;SACJ;KACJ,CAAC;IAEF,OAAO;QACH,IAAI,EAAE,uBAAU,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;QACpE,GAAG,EAAE,CAAC,SAAS,CAAC;QAChB,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;KAC7C,CAAC;AACN,CAAC;
|
|
1
|
+
{"version":3,"file":"ts.rule.js","sourceRoot":"","sources":["../../../../src/WebpackConfigGenerator/Rule/ts.rule.ts"],"names":[],"mappings":";;;AACA,6CAAwC;AAMxC,6EAA6E;AAC7E,SAAgB,MAAM,CAAC,EAAC,WAAW,GAAG,KAAK,KAAU,EAAE;IACnD,MAAM,SAAS,GAA2B;QACtC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;QACrC,OAAO,EAAE;YACL,GAAG,EAAE;gBACD,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE;oBACJ,MAAM,EAAE,YAAY;oBACpB,UAAU,EAAE,IAAI;iBACnB;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE;wBACH,OAAO,EAAE,SAAS;wBAClB,OAAO,EAAE,WAAW;qBACvB;oBACD,gBAAgB,EAAE,SAAS;iBAC9B;gBACD,YAAY,EAAE;oBACV,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;iBACvF;aACJ;SACJ;KACJ,CAAC;IAEF,OAAO;QACH,IAAI,EAAE,uBAAU,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;QACpE,GAAG,EAAE,CAAC,SAAS,CAAC;QAChB,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;KAC7C,CAAC;AACN,CAAC;AA7BD,wBA6BC"}
|
|
@@ -5,6 +5,6 @@ type WebpackPluginConstructor<T> = new (options: T) => {
|
|
|
5
5
|
export declare class WebpackConfigSerializationUtil {
|
|
6
6
|
static serializablePlugin(name: string, PluginConstructor: WebpackPluginConstructor<never>): webpack.WebpackPluginInstance;
|
|
7
7
|
static serializablePlugin<OptType>(name: string, PluginConstructor: WebpackPluginConstructor<OptType>, options: OptType): webpack.WebpackPluginInstance;
|
|
8
|
-
static configToString(config: webpack.Configuration): string
|
|
8
|
+
static configToString(config: webpack.Configuration): Promise<string>;
|
|
9
9
|
}
|
|
10
10
|
export {};
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
13
|
};
|
|
@@ -19,44 +28,46 @@ class WebpackConfigSerializationUtil {
|
|
|
19
28
|
});
|
|
20
29
|
}
|
|
21
30
|
static configToString(config) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
31
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
32
|
+
const configString = (0, pretty_format_1.default)(config, {
|
|
33
|
+
callToJSON: true,
|
|
34
|
+
escapeRegex: false,
|
|
35
|
+
escapeString: false,
|
|
36
|
+
min: true,
|
|
37
|
+
printFunctionName: false,
|
|
38
|
+
plugins: [
|
|
39
|
+
{
|
|
40
|
+
test(val) {
|
|
41
|
+
try {
|
|
42
|
+
return typeof val.toWebpackConfigSerializableType === "function";
|
|
43
|
+
}
|
|
44
|
+
catch (_a) {
|
|
45
|
+
return false;
|
|
46
|
+
}
|
|
47
|
+
},
|
|
48
|
+
serialize(val, config, indentation, depth, refs, printer) {
|
|
49
|
+
const _ = val.toWebpackConfigSerializableType();
|
|
50
|
+
return `new ${_.pluginName}(${printer(_.pluginOptions, config, indentation, depth, refs)})`;
|
|
51
|
+
},
|
|
41
52
|
},
|
|
42
|
-
|
|
43
|
-
],
|
|
44
|
-
});
|
|
45
|
-
try {
|
|
46
|
-
const { format } = require("prettier");
|
|
47
|
-
return format("module.exports = " + configString, {
|
|
48
|
-
arrowParens: "avoid",
|
|
49
|
-
bracketSpacing: false,
|
|
50
|
-
printWidth: 120,
|
|
51
|
-
tabWidth: 1,
|
|
52
|
-
useTabs: false,
|
|
53
|
-
filepath: "webpack.config.js",
|
|
53
|
+
],
|
|
54
54
|
});
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
55
|
+
try {
|
|
56
|
+
const { format } = require("prettier");
|
|
57
|
+
return format("module.exports = " + configString, {
|
|
58
|
+
arrowParens: "avoid",
|
|
59
|
+
bracketSpacing: false,
|
|
60
|
+
printWidth: 120,
|
|
61
|
+
tabWidth: 1,
|
|
62
|
+
useTabs: false,
|
|
63
|
+
filepath: "webpack.config.js",
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
catch (_a) {
|
|
67
|
+
// Either prettier cannot be loaded, or formatting failed, return the unformatted config as a fallback.
|
|
68
|
+
return configString;
|
|
69
|
+
}
|
|
70
|
+
});
|
|
60
71
|
}
|
|
61
72
|
}
|
|
62
73
|
exports.WebpackConfigSerializationUtil = WebpackConfigSerializationUtil;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebpackConfigSerializationUtil.js","sourceRoot":"","sources":["../../../src/WebpackConfigGenerator/WebpackConfigSerializationUtil.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"WebpackConfigSerializationUtil.js","sourceRoot":"","sources":["../../../src/WebpackConfigGenerator/WebpackConfigSerializationUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kEAAyC;AAWzC,MAAa,8BAA8B;IAGvC,MAAM,CAAC,kBAAkB,CAAU,IAAY,EAAE,iBAAgE,EAAE,OAAiB;QAChI,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC9C,OAAO,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,iCAAiC,EAAE;YACpE,KAAK;gBACD,OAAO;oBACH,sBAAsB,EAAE,8BAA8B;oBACtD,UAAU,EAAE,IAAI;oBAChB,aAAa,EAAE,OAAO;iBACzB,CAAC;YACN,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAO,cAAc,CAAC,MAA6B;;YACrD,MAAM,YAAY,GAAG,IAAA,uBAAY,EAAC,MAAM,EAAE;gBACtC,UAAU,EAAE,IAAI;gBAChB,WAAW,EAAE,KAAK;gBAClB,YAAY,EAAE,KAAK;gBACnB,GAAG,EAAE,IAAI;gBACT,iBAAiB,EAAE,KAAK;gBACxB,OAAO,EAAE;oBACL;wBACI,IAAI,CAAC,GAAQ;4BACT,IAAI;gCACA,OAAO,OAAO,GAAG,CAAC,+BAA+B,KAAK,UAAU,CAAC;6BACpE;4BAAC,WAAM;gCACJ,OAAO,KAAK,CAAC;6BAChB;wBACL,CAAC;wBACD,SAAS,CAAC,GAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO;4BACzD,MAAM,CAAC,GAAG,GAAG,CAAC,+BAA+B,EAAyC,CAAC;4BACvF,OAAO,OAAO,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC;wBAChG,CAAC;qBACJ;iBACJ;aACJ,CAAC,CAAC;YACH,IAAI;gBACA,MAAM,EAAC,MAAM,EAAC,GAAG,OAAO,CAAC,UAAU,CAA8B,CAAC;gBAClE,OAAO,MAAM,CAAC,mBAAmB,GAAG,YAAY,EAAE;oBAC9C,WAAW,EAAE,OAAO;oBACpB,cAAc,EAAE,KAAK;oBACrB,UAAU,EAAE,GAAG;oBACf,QAAQ,EAAE,CAAC;oBACX,OAAO,EAAE,KAAK;oBACd,QAAQ,EAAE,mBAAmB;iBAChC,CAAC,CAAC;aACN;YAAC,WAAM;gBACJ,uGAAuG;gBACvG,OAAO,YAAY,CAAC;aACvB;QACL,CAAC;KAAA;CACJ;AAtDD,wEAsDC"}
|
|
@@ -4,7 +4,7 @@ import type { WebpackConfigGeneratorOptions } from "../type";
|
|
|
4
4
|
* Generates a webpack config with sane defaults.
|
|
5
5
|
*/
|
|
6
6
|
export declare class WebpackConfigGenerator {
|
|
7
|
-
|
|
7
|
+
readonly options: WebpackConfigGeneratorOptions;
|
|
8
8
|
private readonly env;
|
|
9
9
|
private readonly projectDirectory;
|
|
10
10
|
private readonly projectSrcDirectory;
|
|
@@ -122,7 +122,7 @@ class WebpackConfigGenerator {
|
|
|
122
122
|
};
|
|
123
123
|
if (this.verbose || CoreUtil_1.CoreUtil.verbose()) {
|
|
124
124
|
this.logger.info("Full webpack config:");
|
|
125
|
-
|
|
125
|
+
WebpackConfigSerializationUtil_1.WebpackConfigSerializationUtil.configToString(config).then(console.info);
|
|
126
126
|
}
|
|
127
127
|
return config;
|
|
128
128
|
}
|
|
@@ -181,7 +181,7 @@ class WebpackConfigGenerator {
|
|
|
181
181
|
};
|
|
182
182
|
if (this.verbose || CoreUtil_1.CoreUtil.verbose()) {
|
|
183
183
|
this.logger.info("Full webpack config:");
|
|
184
|
-
|
|
184
|
+
WebpackConfigSerializationUtil_1.WebpackConfigSerializationUtil.configToString(config).then(console.info);
|
|
185
185
|
}
|
|
186
186
|
return config;
|
|
187
187
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/WebpackConfigGenerator/index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgD;AAChD,gDAAwB;AAExB,0CAAqC;AACrC,0CAAqC;AAErC,mFAA8E;AAC9E,2EAAsE;AACtE,qFAAgF;AAChF,+DAA0D;AAC1D,mFAA8E;AAC9E,6EAAwE;AACxE,uFAAkF;AAClF,iFAA4E;AAC5E,qCAAgC;AAChC,iCAA4B;AAE5B;;GAEG;AACH,MAAa,sBAAsB;IAuB/B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/WebpackConfigGenerator/index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgD;AAChD,gDAAwB;AAExB,0CAAqC;AACrC,0CAAqC;AAErC,mFAA8E;AAC9E,2EAAsE;AACtE,qFAAgF;AAChF,+DAA0D;AAC1D,mFAA8E;AAC9E,6EAAwE;AACxE,uFAAkF;AAClF,iFAA4E;AAC5E,qCAAgC;AAChC,iCAA4B;AAE5B;;GAEG;AACH,MAAa,sBAAsB;IAuB/B,YAAqB,OAAsC;;QAAtC,YAAO,GAAP,OAAO,CAA+B;QAF1C,WAAM,GAAG,sBAAO,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,CAAC;QAG5E,IAAI,CAAC,GAAG,GAAG,mBAAQ,CAAC,UAAU,EAAE,CAAC;QACjC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QACjD,IAAI,CAAC,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACtE,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,MAAA,OAAO,CAAC,gBAAgB,mCAAI,eAAe,CAAC,CAAC;QAE/J,IAAI,CAAC,eAAe,GAAG,mBAAQ,CAAC,gBAAgB,EAAE,CAAC;QACnD,IAAI,CAAC,UAAU,GAAG,mBAAQ,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,qBAAqB,GAAG,MAAA,OAAO,CAAC,qBAAqB,mCAAI,mBAAQ,CAAC,qBAAqB,CAAC;QAC7F,IAAI,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAQ,CAAC,gBAAgB,CAAC;QAC9E,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,2BAA2B,GAAG,OAAO,CAAC,2BAA2B,IAAI,EAAE,CAAC;QAE7E,IAAI,CAAC,sBAAsB,GAAG,6DAA6B,CAAC,QAAQ,CAAC;YACjE,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,OAAO;YACvC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;SAC3C,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,yCAAmB,CAAC,QAAQ,CAAC;YACtC,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;SACtD,CAAC,CAAC;QACH,IAAI,CAAC,0BAA0B,GAAG,qDAAyB,CAAC,QAAQ,CAAC;YACjE,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;SACtD,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,GAAG,6DAA6B,CAAC,QAAQ,CAAC;YAC3D,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;SAC/C,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,GAAG,iEAA+B,CAAC,QAAQ,CAAC;YAC9D,4BAA4B,EAAE,OAAO,CAAC,4BAA4B;SACrE,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,GAAG,2DAA4B,CAAC,QAAQ,CAAC;YACxD,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;SAChD,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,GAAG,uDAA0B,CAAC,QAAQ,CAAC;YACtD,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,SAAS,EAAE,MAAA,OAAO,CAAC,oBAAoB,mCAAI,EAAE;SAChD,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI;YACf,qBAAqB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,EAAE;YACpE,WAAW,IAAI,CAAC,GAAG,IAAI,OAAO,EAAE;YAChC,qBAAqB,IAAI,CAAC,mBAAmB,EAAE;YAC/C,oBAAoB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACzD,0BAA0B,IAAI,CAAC,gBAAgB,EAAE;YACjD,uBAAuB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;YACrE,iBAAiB,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE;SACvC,EAAE;YACC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACtB;IACL,CAAC;IAED,WAAW;QACP,MAAM,MAAM,GAA0B;YAClC,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,KAAK;YACb,MAAM,EAAE;gBACJ,QAAQ,EAAE,qBAAqB;gBAC/B,UAAU,EAAE,GAAG;aAClB;YACD,OAAO,EAAE;gBACL,UAAU,EAAE,IAAI,CAAC,iBAAiB;gBAClC,OAAO,EAAE,IAAI,CAAC,cAAc;gBAC5B,KAAK,EAAE,IAAI,CAAC,cAAc;aAC7B;YACD,OAAO,EAAE,gCAAgC;YACzC,YAAY,EAAE;gBACV,WAAW,EAAE,IAAI;gBACjB,WAAW,EAAE;oBACT,sBAAsB,EAAE,GAAG;oBAC3B,gBAAgB,EAAE,EAAE;iBACvB;aACJ;YACD,MAAM,EAAE;gBACJ,KAAK,EAAE;oBACH,WAAI,CAAC,EAAE,CAAC,EAAC,WAAW,EAAE,IAAI,EAAC,CAAC;oBAC5B,WAAI,CAAC,UAAU,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC;oBAClC,WAAI,CAAC,KAAK,EAAE;oBACZ,WAAI,CAAC,KAAK,CAAC,EAAC,2BAA2B,EAAE,IAAI,CAAC,2BAA2B,EAAC,CAAC;oBAC3E,2BAA2B;iBAC9B;aACJ;YACD,OAAO,EAAE;gBACL,GAAG,IAAI,CAAC,0BAA0B;gBAClC,eAAM,CAAC,YAAY,EAAE;gBACrB,eAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAC,eAAe,EAAE,KAAK,EAAC,CAAC;gBACjD,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;gBACtC,2BAA2B;aAC9B;YACD,KAAK,EACD,IAAI,CAAC,GAAG,KAAK,IAAI;gBACb,CAAC,CAAC;oBACI,IAAI,EAAE,YAAY;oBAClB,cAAc,EAAE,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;iBACrE;gBACH,CAAC,CAAC,KAAK;SAClB,CAAC;QACF,IAAI,IAAI,CAAC,OAAO,IAAI,mBAAQ,CAAC,OAAO,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACzC,+DAA8B,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC5E;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,UAAU,CAAC,eAAuB;QAC9B,MAAM,MAAM,GAA0B;YAClC,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;YACtB,MAAM,EAAE;gBACJ,IAAI,EAAE,eAAe;gBACrB,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,KAAM,CAAC,IAAI,CAAE,CAAC,cAAc;gBAC3J,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,iCAAiC;gBACpG,UAAU,EAAE,IAAI,CAAC,gBAAgB;gBACjC,kBAAkB,EAAE,WAAW;aAClC;YACD,OAAO,EAAE;gBACL,UAAU,EAAE,IAAI,CAAC,iBAAiB;gBAClC,OAAO,EAAE,IAAI,CAAC,cAAc;gBAC5B,KAAK,EAAE,IAAI,CAAC,cAAc;aAC7B;YACD,IAAI,EAAE,IAAI;YACV,YAAY,EAAE;gBACV,WAAW,EAAE;oBACT,sBAAsB,EAAE,GAAG;oBAC3B,gBAAgB,EAAE,EAAE;iBACvB;gBACD,SAAS,EAAE;oBACP,eAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;oBAC1C,eAAM,CAAC,SAAS,CAAC,GAAG,EAAE;oBACtB,2BAA2B;iBAC9B;aACJ;YACD,WAAW,EAAE;gBACT,iBAAiB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,GAAG,IAAI;gBACrG,YAAY,EAAE,IAAI,CAAC,gBAAgB,GAAG,IAAI;gBAC1C,WAAW,EAAE,CAAC,QAAgB,EAAE,EAAE,CAAC,mBAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;aACzI;YACD,MAAM,EAAE;gBACJ,KAAK,EAAE;oBACH,2BAA2B;oBAC3B,WAAI,CAAC,EAAE,EAAE;oBACT,WAAI,CAAC,UAAU,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;oBACjC,WAAI,CAAC,KAAK,EAAE;oBACZ,WAAI,CAAC,KAAK,CAAC,EAAC,2BAA2B,EAAE,IAAI,CAAC,2BAA2B,EAAC,CAAC;iBAC9E;aACJ;YACD,OAAO,EAAE;gBACL,GAAG,IAAI,CAAC,0BAA0B;gBAClC,eAAM,CAAC,0BAA0B,EAAE;gBACnC,eAAM,CAAC,WAAW,CAAC,EAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAC,CAAC;gBAC7D,eAAM,CAAC,UAAU,CAAC,cAAc,CAAC,EAAC,eAAe,EAAE,IAAI,CAAC,eAAe,EAAC,CAAC;gBACzE,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAC,eAAe,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnF,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;gBACtC,2BAA2B;aAC9B;SACJ,CAAC;QACF,IAAI,IAAI,CAAC,OAAO,IAAI,mBAAQ,CAAC,OAAO,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACzC,+DAA8B,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC5E;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA7LD,wDA6LC"}
|
|
@@ -5,6 +5,11 @@ export interface WebpackServerStarterOptions extends Pick<WebpackConfigGenerator
|
|
|
5
5
|
apiProxy?: {
|
|
6
6
|
target: string;
|
|
7
7
|
context: string[];
|
|
8
|
+
/**
|
|
9
|
+
* Use system socks proxy for all the api requests, you can also specify a socks proxy url, eg: socks5://127.0.0.1:1086
|
|
10
|
+
* Default: true
|
|
11
|
+
*/
|
|
12
|
+
useSystemSocksProxy?: boolean | string;
|
|
8
13
|
};
|
|
9
14
|
interceptExpressApp?: (app: NonNullable<DevServer["app"]>) => void;
|
|
10
15
|
}
|
|
@@ -25,4 +30,5 @@ export declare class WebpackServerStarter {
|
|
|
25
30
|
constructor({ projectDirectory, port, apiProxy, interceptExpressApp, dynamicPathResolvers, extraEntries, prioritizedExtensionPrefixes, defineVars, extraExtensionsForOtherRule, tsconfigFilePath, tsconfigFilename, }: WebpackServerStarterOptions);
|
|
26
31
|
run(): Promise<void>;
|
|
27
32
|
private createDevServerInstance;
|
|
33
|
+
private createAPISocksProxyAgent;
|
|
28
34
|
}
|
|
@@ -18,6 +18,8 @@ const path_1 = __importDefault(require("path"));
|
|
|
18
18
|
const webpack_1 = __importDefault(require("webpack"));
|
|
19
19
|
const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
|
|
20
20
|
const WebpackConfigGenerator_1 = require("./WebpackConfigGenerator");
|
|
21
|
+
const socks_proxy_agent_1 = require("socks-proxy-agent");
|
|
22
|
+
const SystemProxySettingsUtil_1 = require("./SystemProxySettingsUtil");
|
|
21
23
|
/**
|
|
22
24
|
* Start webpack dev server, by creating WebpackServerStarter instance and then run.
|
|
23
25
|
*
|
|
@@ -27,12 +29,14 @@ const WebpackConfigGenerator_1 = require("./WebpackConfigGenerator");
|
|
|
27
29
|
*/
|
|
28
30
|
class WebpackServerStarter {
|
|
29
31
|
constructor({ projectDirectory, port, apiProxy, interceptExpressApp, dynamicPathResolvers, extraEntries, prioritizedExtensionPrefixes, defineVars, extraExtensionsForOtherRule, tsconfigFilePath, tsconfigFilename, }) {
|
|
32
|
+
var _a;
|
|
30
33
|
this.logger = devtool_util_1.Utility.createConsoleLogger("WebpackServerStarter");
|
|
31
34
|
this.devServerConfigContentBase = path_1.default.join(projectDirectory, "static");
|
|
32
35
|
this.port = port;
|
|
33
36
|
this.apiProxy = apiProxy
|
|
34
37
|
? [
|
|
35
38
|
{
|
|
39
|
+
agent: this.createAPISocksProxyAgent((_a = apiProxy.useSystemSocksProxy) !== null && _a !== void 0 ? _a : true),
|
|
36
40
|
context: apiProxy.context,
|
|
37
41
|
target: apiProxy.target,
|
|
38
42
|
secure: false,
|
|
@@ -113,6 +117,20 @@ class WebpackServerStarter {
|
|
|
113
117
|
proxy: this.apiProxy,
|
|
114
118
|
}, (0, webpack_1.default)(this.webpackConfig));
|
|
115
119
|
}
|
|
120
|
+
createAPISocksProxyAgent(useSocksProxy) {
|
|
121
|
+
if (useSocksProxy === false)
|
|
122
|
+
return null;
|
|
123
|
+
if (typeof useSocksProxy === "string") {
|
|
124
|
+
this.logger.info(["Using socks proxy:", useSocksProxy]);
|
|
125
|
+
return new socks_proxy_agent_1.SocksProxyAgent(useSocksProxy);
|
|
126
|
+
}
|
|
127
|
+
const settings = SystemProxySettingsUtil_1.SystemProxySettingsUtil.get();
|
|
128
|
+
if (!settings)
|
|
129
|
+
return null;
|
|
130
|
+
const url = `socks://${settings.server}:${settings.port}`;
|
|
131
|
+
this.logger.info(["Using socks proxy:", url]);
|
|
132
|
+
return new socks_proxy_agent_1.SocksProxyAgent(url);
|
|
133
|
+
}
|
|
116
134
|
}
|
|
117
135
|
exports.WebpackServerStarter = WebpackServerStarter;
|
|
118
136
|
//# sourceMappingURL=WebpackServerStarter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebpackServerStarter.js","sourceRoot":"","sources":["../../src/WebpackServerStarter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAgD;AAChD,gDAAwB;AACxB,sDAA8B;AAC9B,4EAA2C;
|
|
1
|
+
{"version":3,"file":"WebpackServerStarter.js","sourceRoot":"","sources":["../../src/WebpackServerStarter.ts"],"names":[],"mappings":"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"}
|