@tramvai/cli 2.148.0 → 2.148.1
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/README.md +3 -3
- package/lib/api/build/providers/shared.js +4 -3
- package/lib/api/build/providers/shared.js.map +1 -1
- package/lib/api/start/application.js.map +1 -1
- package/lib/api/start/index.js +5 -2
- package/lib/api/start/index.js.map +1 -1
- package/lib/api/start/providers/application/shared.js +2 -5
- package/lib/api/start/providers/application/shared.js.map +1 -1
- package/lib/api/start/providers/child-app/shared.js +2 -2
- package/lib/api/start/providers/child-app/shared.js.map +1 -1
- package/lib/api/start/providers/module/shared.js +2 -2
- package/lib/api/start/providers/module/shared.js.map +1 -1
- package/lib/api/start/utils/createServer.d.ts +1 -1
- package/lib/api/start-prod/application.js +2 -0
- package/lib/api/start-prod/application.js.map +1 -1
- package/lib/api/start-prod/index.js +5 -2
- package/lib/api/start-prod/index.js.map +1 -1
- package/lib/api/start-prod/providers/application.js +2 -5
- package/lib/api/start-prod/providers/application.js.map +1 -1
- package/lib/api/start-prod/providers/child-app.js +2 -5
- package/lib/api/start-prod/providers/child-app.js.map +1 -1
- package/lib/commands/createApp.js +1 -0
- package/lib/commands/createApp.js.map +1 -1
- package/lib/commands/static/application.js +4 -1
- package/lib/commands/static/application.js.map +1 -1
- package/lib/config/configManager.d.ts +0 -3
- package/lib/config/configManager.js +5 -5
- package/lib/config/configManager.js.map +1 -1
- package/lib/di/providers/config.js +1 -1
- package/lib/di/providers/config.js.map +1 -1
- package/lib/di/providers/index.d.ts +1 -0
- package/lib/di/providers/index.js +1 -0
- package/lib/di/providers/index.js.map +1 -1
- package/lib/di/providers/network.d.ts +2 -0
- package/lib/di/providers/network.js +17 -0
- package/lib/di/providers/network.js.map +1 -0
- package/lib/di/tokens/index.d.ts +1 -0
- package/lib/di/tokens/index.js +1 -0
- package/lib/di/tokens/index.js.map +1 -1
- package/lib/di/tokens/network.d.ts +4 -0
- package/lib/di/tokens/network.js +6 -0
- package/lib/di/tokens/network.js.map +1 -0
- package/lib/di/tokens/server.d.ts +2 -2
- package/lib/library/webpack/constants/stats.d.ts +1 -1
- package/lib/library/webpack/utils/threadLoader.js +1 -1
- package/lib/library/webpack/utils/threadLoader.js.map +1 -1
- package/lib/models/port-manager.d.ts +30 -0
- package/lib/models/port-manager.js +72 -0
- package/lib/models/port-manager.js.map +1 -0
- package/lib/schema/autogeneratedSchema.json +15 -15
- package/lib/utils/detectPortSync.d.ts +0 -13
- package/lib/utils/detectPortSync.js +0 -21
- package/lib/utils/detectPortSync.js.map +1 -1
- package/package.json +2 -3
- package/schema.json +15 -15
- package/src/api/build/providers/shared.ts +5 -11
- package/src/api/start/__integration__/start.test.ts +3 -3
- package/src/api/start/application.ts +1 -0
- package/src/api/start/index.ts +5 -2
- package/src/api/start/providers/application/shared.ts +6 -12
- package/src/api/start/providers/child-app/shared.ts +5 -4
- package/src/api/start/providers/module/shared.ts +5 -4
- package/src/api/start-prod/application.ts +5 -1
- package/src/api/start-prod/index.ts +5 -2
- package/src/api/start-prod/providers/application.ts +8 -16
- package/src/api/start-prod/providers/child-app.ts +6 -7
- package/src/commands/createApp.ts +2 -0
- package/src/commands/static/application.ts +7 -0
- package/src/config/configManager.ts +6 -5
- package/src/di/providers/config.ts +1 -1
- package/src/di/providers/index.ts +1 -0
- package/src/di/providers/network.ts +16 -0
- package/src/di/tokens/index.ts +1 -0
- package/src/di/tokens/network.ts +5 -0
- package/src/library/webpack/utils/threadLoader.ts +1 -1
- package/src/models/port-manager.ts +79 -0
- package/src/schema/autogeneratedSchema.json +15 -15
- package/src/utils/detectPortSync.ts +0 -24
package/README.md
CHANGED
|
@@ -67,7 +67,7 @@ Name generation is configured via the options `cssLocalIdentNameDev` and `cssLoc
|
|
|
67
67
|
```json
|
|
68
68
|
{
|
|
69
69
|
"postcss": {
|
|
70
|
-
"cssLocalIdentName": "[hash:base64:5]"
|
|
70
|
+
"cssLocalIdentName": "[hash:base64:5]" // default value (deprecated)
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
```
|
|
@@ -79,7 +79,7 @@ or
|
|
|
79
79
|
"postcss": {
|
|
80
80
|
"cssLocalIdentName": {
|
|
81
81
|
"development": "[name]__[local]_[minicss]", // available values see in the docs to [css-loader](https://github.com/webpack-contrib/css-loader)
|
|
82
|
-
"production": "[minicss]"
|
|
82
|
+
"production": "[minicss]" // additionally new tag `minicss` can be used for the generating minimal css names. Based on [article](https://dev.to/denisx/reduce-bundle-size-via-one-letter-css-classname-hash-strategy-10g6)
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
85
|
}
|
|
@@ -268,7 +268,7 @@ NODE_OPTIONS="--max_semi_space_size=64" tramvai start-prod {appName}
|
|
|
268
268
|
|
|
269
269
|
### How to get CPU profile of @tramvai/cli work?
|
|
270
270
|
|
|
271
|
-
Run application server or production
|
|
271
|
+
Run application server or production build with env variable `TRAMVAI_CPU_PROFILE`:
|
|
272
272
|
|
|
273
273
|
```bash
|
|
274
274
|
TRAMVAI_CPU_PROFILE=1 tramvai build {appName}
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sharedProviders = void 0;
|
|
4
|
+
const dippy_1 = require("@tinkoff/dippy");
|
|
4
5
|
const tokens_1 = require("../../../di/tokens");
|
|
5
6
|
const configManager_1 = require("../../../config/configManager");
|
|
6
7
|
exports.sharedProviders = [
|
|
7
|
-
{
|
|
8
|
+
(0, dippy_1.provide)({
|
|
8
9
|
provide: tokens_1.CONFIG_MANAGER_TOKEN,
|
|
9
|
-
useFactory: ({ configEntry, parameters
|
|
10
|
+
useFactory: ({ configEntry, parameters }) => {
|
|
10
11
|
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'production', buildType: 'client' }));
|
|
11
12
|
},
|
|
12
13
|
deps: {
|
|
13
14
|
configEntry: tokens_1.CONFIG_ENTRY_TOKEN,
|
|
14
15
|
parameters: tokens_1.COMMAND_PARAMETERS_TOKEN,
|
|
15
16
|
},
|
|
16
|
-
},
|
|
17
|
+
}),
|
|
17
18
|
];
|
|
18
19
|
//# sourceMappingURL=shared.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/build/providers/shared.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/build/providers/shared.ts"],"names":[],"mappings":";;;AAAA,0CAAyC;AAEzC,+CAI4B;AAC5B,iEAAoE;AAGvD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;YAC1C,OAAO,IAAA,mCAAmB,EAAC,WAAqC,kCAC3D,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;CACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/api/start/application.ts"],"names":[],"mappings":";;;;AAEA,2CAA4C;AAC5C,4CAKyB;AACzB,qCAKkB;AAClB,yDAAsD;AACtD,2DAAiE;AACjE,2DAAiE;AACjE,+CAA8E;AAC9E,uCAAmD;AAE5C,MAAM,gBAAgB,GAAG,CAAO,EAAa,EAAU,EAAE;IAC9D,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,iCAAkC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/api/start/application.ts"],"names":[],"mappings":";;;;AAEA,2CAA4C;AAC5C,4CAKyB;AACzB,qCAKkB;AAClB,yDAAsD;AACtD,2DAAiE;AACjE,2DAAiE;AACjE,+CAA8E;AAC9E,uCAAmD;AAE5C,MAAM,gBAAgB,GAAG,CAAO,EAAa,EAAU,EAAE;IAC9D,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,iCAAkC,CAAC,CAAC;IAE3D,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE9B,MAAM,iBAAiB,GAAG,SAAS,KAAK,QAAQ,CAAC;IACjD,MAAM,iBAAiB,GAAG,SAAS,KAAK,QAAQ,CAAC;IAEjD,IAAA,sBAAiB,EAAC,EAAE,EAAE;QACpB,GAAG,wBAAqB;QACxB,GAAG,wBAAe;QAClB,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,wBAAe,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9C,CAAC,CAAC;IAEH,MAAM,IAAA,yBAAW,EAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,2BAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAEzE,MAAM,YAAY,GAAG,EAAE,CAAC,GAAG,CAAC,4BAAmB,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,qBAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/D,IAAA,mBAAU,EAAC,EAAE,CAAC,CAAC;IAEf,MAAM,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,uCAA8B,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,SAAS,EAAE;QAC5D,OAAO,EAAE;YACP,iBAAiB;YACjB,iBAAiB;SAClB;KACF,CAAC,CAAC;IAEH,MAAM,IAAA,yBAAW,EAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,8BAAqB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC5E,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,4BAAmB,CAAC,EAAE,CAAC,CAAC;IAEvF,qCACE,MAAM;QACN,YAAY;QACZ,OAAO,IACJ,YAAY,KACf,KAAK,EAAE,GAAS,EAAE;YAChB,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;YAC3B,MAAM,IAAA,yBAAW,EAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,4BAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAA,IACD;AACJ,CAAC,CAAA,CAAC;AA1CW,QAAA,gBAAgB,oBA0C3B"}
|
package/lib/api/start/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
3
4
|
const createCommand_1 = require("../../commands/createCommand");
|
|
4
5
|
const application_1 = require("./application");
|
|
5
6
|
const module_1 = require("./module");
|
|
@@ -7,8 +8,10 @@ const tokens_1 = require("../../di/tokens");
|
|
|
7
8
|
const child_app_1 = require("./child-app");
|
|
8
9
|
exports.default = (0, createCommand_1.createCommand)({
|
|
9
10
|
name: 'start',
|
|
10
|
-
command: (di) => {
|
|
11
|
+
command: (di) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
11
12
|
const configEntry = di.get(tokens_1.CONFIG_ENTRY_TOKEN);
|
|
13
|
+
const portManager = di.get(tokens_1.PORT_MANAGER_TOKEN);
|
|
14
|
+
yield portManager.computeAvailablePorts();
|
|
12
15
|
switch (configEntry.type) {
|
|
13
16
|
case 'application':
|
|
14
17
|
return (0, application_1.startApplication)(di);
|
|
@@ -17,6 +20,6 @@ exports.default = (0, createCommand_1.createCommand)({
|
|
|
17
20
|
case 'child-app':
|
|
18
21
|
return (0, child_app_1.startChildApp)(di);
|
|
19
22
|
}
|
|
20
|
-
},
|
|
23
|
+
}),
|
|
21
24
|
});
|
|
22
25
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/start/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/start/index.ts"],"names":[],"mappings":";;;AAGA,gEAA6D;AAE7D,+CAAiD;AACjD,qCAAuC;AACvC,4CAAyE;AACzE,2CAA4C;AAqC5C,kBAAe,IAAA,6BAAa,EAAC;IAC3B,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,CAAO,EAAE,EAAU,EAAE;QAC5B,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,2BAAkB,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,2BAAkB,CAAC,CAAC;QAE/C,MAAM,WAAW,CAAC,qBAAqB,EAAE,CAAC;QAE1C,QAAQ,WAAW,CAAC,IAAI,EAAE;YACxB,KAAK,aAAa;gBAChB,OAAO,IAAA,8BAAgB,EAAC,EAAE,CAAC,CAAC;YAC9B,KAAK,QAAQ;gBACX,OAAO,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC;YACzB,KAAK,WAAW;gBACd,OAAO,IAAA,yBAAa,EAAC,EAAE,CAAC,CAAC;SAC5B;IACH,CAAC,CAAA;CACF,CAAC,CAAC"}
|
|
@@ -9,17 +9,14 @@ const stopServer_1 = require("../../utils/stopServer");
|
|
|
9
9
|
const configManager_1 = require("../../../../config/configManager");
|
|
10
10
|
const createServer_1 = require("../../utils/createServer");
|
|
11
11
|
const listenServer_1 = require("../../utils/listenServer");
|
|
12
|
-
const detectPortSync_1 = require("../../../../utils/detectPortSync");
|
|
13
12
|
exports.sharedProviders = [
|
|
14
13
|
(0, dippy_1.provide)({
|
|
15
14
|
provide: tokens_2.CONFIG_MANAGER_TOKEN,
|
|
16
|
-
useFactory: ({ configEntry, parameters }) => (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'development', port:
|
|
17
|
-
request: parameters.staticPort,
|
|
18
|
-
fallback: configManager_1.DEFAULT_STATIC_PORT,
|
|
19
|
-
}) })),
|
|
15
|
+
useFactory: ({ configEntry, parameters, portManager }) => (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'development', port: portManager.port, staticPort: portManager.staticPort })),
|
|
20
16
|
deps: {
|
|
21
17
|
configEntry: tokens_2.CONFIG_ENTRY_TOKEN,
|
|
22
18
|
parameters: tokens_2.COMMAND_PARAMETERS_TOKEN,
|
|
19
|
+
portManager: tokens_2.PORT_MANAGER_TOKEN,
|
|
23
20
|
},
|
|
24
21
|
}),
|
|
25
22
|
(0, dippy_1.provide)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/application/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AAEzC,yCAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/application/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AAEzC,yCAAuE;AACvE,kDAM+B;AAC/B,uDAAoD;AAEpD,oEAAuE;AACvE,2DAAwD;AACxD,2DAAwD;AAE3C,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CACvD,IAAA,mCAAmB,EAAC,WAAqC,kCACpD,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,WAAW,CAAC,IAAI,EACtB,UAAU,EAAE,WAAW,CAAC,UAAU,IAClC;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;YACpC,WAAW,EAAE,2BAAkB;SAChC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE;YAC9C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;oBAEjD,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC;gBAC3F,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;CACM,CAAC"}
|
|
@@ -9,14 +9,14 @@ const stopServer_1 = require("../../utils/stopServer");
|
|
|
9
9
|
const createServer_1 = require("../../utils/createServer");
|
|
10
10
|
const listenServer_1 = require("../../utils/listenServer");
|
|
11
11
|
const configManager_1 = require("../../../../config/configManager");
|
|
12
|
-
const detectPortSync_1 = require("../../../../utils/detectPortSync");
|
|
13
12
|
exports.sharedProviders = [
|
|
14
13
|
(0, dippy_1.provide)({
|
|
15
14
|
provide: tokens_2.CONFIG_MANAGER_TOKEN,
|
|
16
|
-
useFactory: ({ configEntry, parameters }) => (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'development', port:
|
|
15
|
+
useFactory: ({ configEntry, parameters, portManager }) => (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'development', port: portManager.port })),
|
|
17
16
|
deps: {
|
|
18
17
|
configEntry: tokens_2.CONFIG_ENTRY_TOKEN,
|
|
19
18
|
parameters: tokens_2.COMMAND_PARAMETERS_TOKEN,
|
|
19
|
+
portManager: tokens_2.PORT_MANAGER_TOKEN,
|
|
20
20
|
},
|
|
21
21
|
}),
|
|
22
22
|
(0, dippy_1.provide)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/child-app/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,yCAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/child-app/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,yCAAuE;AACvE,kDAM+B;AAE/B,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AACxD,oEAAuE;AAE1D,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CACvD,IAAA,mCAAmB,EAAC,WAAkC,kCACjD,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,WAAW,CAAC,IAAI,IACtB;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;YACpC,WAAW,EAAE,2BAAkB;SAChC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,EAAE;YAC9C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;oBAErC,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC/C,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;CACM,CAAC"}
|
|
@@ -9,14 +9,14 @@ const configManager_1 = require("../../../../config/configManager");
|
|
|
9
9
|
const stopServer_1 = require("../../utils/stopServer");
|
|
10
10
|
const createServer_1 = require("../../utils/createServer");
|
|
11
11
|
const listenServer_1 = require("../../utils/listenServer");
|
|
12
|
-
const detectPortSync_1 = require("../../../../utils/detectPortSync");
|
|
13
12
|
exports.sharedProviders = [
|
|
14
13
|
(0, dippy_1.provide)({
|
|
15
14
|
provide: tokens_2.CONFIG_MANAGER_TOKEN,
|
|
16
|
-
useFactory: ({ configEntry, parameters }) => (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'development', port:
|
|
15
|
+
useFactory: ({ configEntry, parameters, portManager }) => (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'development', port: portManager.port })),
|
|
17
16
|
deps: {
|
|
18
17
|
configEntry: tokens_2.CONFIG_ENTRY_TOKEN,
|
|
19
18
|
parameters: tokens_2.COMMAND_PARAMETERS_TOKEN,
|
|
19
|
+
portManager: tokens_2.PORT_MANAGER_TOKEN,
|
|
20
20
|
},
|
|
21
21
|
}),
|
|
22
22
|
(0, dippy_1.provide)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/module/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,yCAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/module/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,yCAAuE;AACvE,kDAM+B;AAC/B,oEAAuE;AACvE,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AAG3C,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CACvD,IAAA,mCAAmB,EAAC,WAAgC,kCAC/C,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,WAAW,CAAC,IAAI,IACtB;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;YACpC,WAAW,EAAE,2BAAkB;SAChC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,EAAE;YAC9C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;oBAErC,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC/C,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;CACM,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import stoppable from 'stoppable';
|
|
2
|
-
export declare const createServer: () => import("
|
|
2
|
+
export declare const createServer: () => import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> & stoppable.WithStop;
|
|
@@ -11,6 +11,8 @@ const di_1 = require("../../utils/di");
|
|
|
11
11
|
const __1 = require("..");
|
|
12
12
|
const startProdApplication = (di) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
13
13
|
const parameters = di.get(tokens_1.COMMAND_PARAMETERS_TOKEN);
|
|
14
|
+
const portManager = di.get(tokens_1.PORT_MANAGER_TOKEN);
|
|
15
|
+
yield portManager.computeAvailablePorts();
|
|
14
16
|
(0, di_1.registerProviders)(di, [...shared_1.sharedProviders, ...application_1.applicationsProviders]);
|
|
15
17
|
yield (0, runHandlers_1.runHandlers)(di.get({ token: tokens_2.INIT_HANDLER_TOKEN, optional: true }));
|
|
16
18
|
const _a = yield (0, __1.build)(parameters), { builder } = _a, buildResult = tslib_1.__rest(_a, ["builder"]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/api/start-prod/application.ts"],"names":[],"mappings":";;;;AAEA,
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/api/start-prod/application.ts"],"names":[],"mappings":";;;;AAEA,4CAAoG;AACpG,qCAKkB;AAClB,yDAAsD;AACtD,yDAAgE;AAChE,+CAAqD;AACrD,uCAAmD;AACnD,0BAA2B;AAEpB,MAAM,oBAAoB,GAAG,CAAO,EAAa,EAAU,EAAE;IAClE,MAAM,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,iCAAwB,CAAW,CAAC;IAC9D,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,2BAAkB,CAAC,CAAC;IAE/C,MAAM,WAAW,CAAC,qBAAqB,EAAE,CAAC;IAE1C,IAAA,sBAAiB,EAAC,EAAE,EAAE,CAAC,GAAG,wBAAe,EAAE,GAAG,mCAAqB,CAAC,CAAC,CAAC;IAEtE,MAAM,IAAA,yBAAW,EAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,2BAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAEzE,MAAM,KAA8B,MAAM,IAAA,SAAK,EAAC,UAAU,CAAC,EAArD,EAAE,OAAO,OAA4C,EAAvC,WAAW,sBAAzB,WAA2B,CAA0B,CAAC;IAE5D,MAAM,YAAY,GAAG,EAAE,CAAC,GAAG,CAAC,4BAAmB,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,6BAAoB,CAAC,CAAC;IAEnD,MAAM,IAAA,yBAAW,EAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,8BAAqB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAE5E,MAAM,KAAK,GAAG,GAAS,EAAE;QACvB,aAAa,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,IAAA,yBAAW,EAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,4BAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAA,CAAC;IAEF,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,GAAS,EAAE;QAClC,MAAM,KAAK,EAAE,CAAC;IAChB,CAAC,CAAA,CAAC,CAAC;IAEH,qCACE,YAAY;QACZ,aAAa,IACV,WAAW;QACd,0BAA0B;QAC1B,oEAAoE;QACpE,OAAO,EAAE,OAAQ,EACjB,KAAK,IACL;AACJ,CAAC,CAAA,CAAC;AAnCW,QAAA,oBAAoB,wBAmC/B"}
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
3
4
|
const createCommand_1 = require("../../commands/createCommand");
|
|
4
5
|
const tokens_1 = require("../../di/tokens");
|
|
5
6
|
const application_1 = require("./application");
|
|
6
7
|
const child_app_1 = require("./child-app");
|
|
7
8
|
exports.default = (0, createCommand_1.createCommand)({
|
|
8
9
|
name: 'start-prod',
|
|
9
|
-
command: (di) => {
|
|
10
|
+
command: (di) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
10
11
|
const configEntry = di.get(tokens_1.CONFIG_ENTRY_TOKEN);
|
|
12
|
+
const portManager = di.get(tokens_1.PORT_MANAGER_TOKEN);
|
|
13
|
+
yield portManager.computeAvailablePorts();
|
|
11
14
|
switch (configEntry.type) {
|
|
12
15
|
case 'application':
|
|
13
16
|
return (0, application_1.startProdApplication)(di);
|
|
@@ -15,6 +18,6 @@ exports.default = (0, createCommand_1.createCommand)({
|
|
|
15
18
|
case 'child-app':
|
|
16
19
|
return (0, child_app_1.startProdChildApp)(di);
|
|
17
20
|
}
|
|
18
|
-
},
|
|
21
|
+
}),
|
|
19
22
|
});
|
|
20
23
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/start-prod/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/start-prod/index.ts"],"names":[],"mappings":";;;AAIA,gEAA6D;AAE7D,4CAAyE;AAEzE,+CAAqD;AACrD,2CAAgD;AA2BhD,kBAAe,IAAA,6BAAa,EAAC;IAC3B,IAAI,EAAE,YAAY;IAClB,OAAO,EAAE,CAAO,EAAE,EAAU,EAAE;QAC5B,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,2BAAkB,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,2BAAkB,CAAC,CAAC;QAE/C,MAAM,WAAW,CAAC,qBAAqB,EAAE,CAAC;QAE1C,QAAQ,WAAW,CAAC,IAAI,EAAE;YACxB,KAAK,aAAa;gBAChB,OAAO,IAAA,kCAAoB,EAAC,EAAE,CAAC,CAAC;YAClC,KAAK,QAAQ,CAAC;YACd,KAAK,WAAW;gBACd,OAAO,IAAA,6BAAiB,EAAC,EAAE,CAAC,CAAC;SAChC;IACH,CAAC,CAAA;CACF,CAAC,CAAC"}
|
|
@@ -8,19 +8,16 @@ const child_process_1 = require("child_process");
|
|
|
8
8
|
const tokens_1 = require("../../../di/tokens");
|
|
9
9
|
const tokens_2 = require("../tokens");
|
|
10
10
|
const constants_1 = require("../../../config/constants");
|
|
11
|
-
const detectPortSync_1 = require("../../../utils/detectPortSync");
|
|
12
11
|
const safeRequire_1 = require("../../../utils/safeRequire");
|
|
13
12
|
const configManager_1 = require("../../../config/configManager");
|
|
14
13
|
exports.applicationsProviders = [
|
|
15
14
|
(0, dippy_1.provide)({
|
|
16
15
|
provide: tokens_1.CONFIG_MANAGER_TOKEN,
|
|
17
|
-
useFactory: ({ configEntry, parameters }) => (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'production', buildType: 'client', port:
|
|
18
|
-
request: parameters.staticPort,
|
|
19
|
-
fallback: configManager_1.DEFAULT_STATIC_PORT,
|
|
20
|
-
}) })),
|
|
16
|
+
useFactory: ({ configEntry, parameters, portManager }) => (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'production', buildType: 'client', port: portManager.port, staticPort: portManager.staticPort })),
|
|
21
17
|
deps: {
|
|
22
18
|
configEntry: tokens_1.CONFIG_ENTRY_TOKEN,
|
|
23
19
|
parameters: tokens_1.COMMAND_PARAMETERS_TOKEN,
|
|
20
|
+
portManager: tokens_1.PORT_MANAGER_TOKEN,
|
|
24
21
|
},
|
|
25
22
|
}),
|
|
26
23
|
(0, dippy_1.provide)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../src/api/start-prod/providers/application.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,0CAAyC;AACzC,iDAAqC;AACrC,+
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../src/api/start-prod/providers/application.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,0CAAyC;AACzC,iDAAqC;AACrC,+CAK4B;AAE5B,sCAAsE;AACtE,yDAAuD;AACvD,4DAAyD;AAEzD,iEAAoE;AAEvD,QAAA,qBAAqB,GAAwB;IACxD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CACvD,IAAA,mCAAmB,EAAC,WAAqC,kCACpD,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,WAAW,CAAC,IAAI,EACtB,UAAU,EAAE,WAAW,CAAC,UAAU,IAClC;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;YACpC,WAAW,EAAE,2BAAkB;SAChC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,EAAE,EAAE;YAC5C,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;YAC3B,MAAM,mBAAmB,GACvB,aACD,CAAC,YAAY,CAAC;gBACb,SAAS,EAAE,QAAQ;aACpB,CAAC,CAAC;YACH,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,mBAAmB,CAAC;YAC1D,MAAM,IAAI,GAAG,mBAAmB,CAAC,SAAS,CAAC;YAE3C,OAAO,IAAA,oBAAI,EAAC,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE;gBAC/C,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,sBAAU,CAAC,CAAC,CAAC,EAAE;gBACjC,GAAG,EAAE,IAAI;gBACT,GAAG,4EACE,IAAA,yBAAW,EAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,EAAE,IAAI,CAAC,GACjE,IAAA,yBAAW,EAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,GACrD,GAAG,GACH,OAAO,CAAC,GAAG,KACd,QAAQ,EAAE,YAAY,EACtB,mBAAmB,EAAE,YAAY,EACjC,IAAI,EAAE,GAAG,IAAI,EAAE,EACf,WAAW,EAAE,GAAG,IAAI,EAAE,EACtB,aAAa,EAAE,YAAY,GAC5B;aACF,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;YACnC,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;oBACnC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;wBAC9B,OAAO,EAAE,CAAC;oBACZ,CAAC,CAAC,CAAC;oBAEH,aAAa,CAAC,IAAI,EAAE,CAAC;gBACvB,CAAC,CAAC,CAAC;YACL,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACM,CAAC"}
|
|
@@ -4,17 +4,14 @@ exports.childAppProviders = void 0;
|
|
|
4
4
|
const dippy_1 = require("@tinkoff/dippy");
|
|
5
5
|
const tokens_1 = require("../../../di/tokens");
|
|
6
6
|
const configManager_1 = require("../../../config/configManager");
|
|
7
|
-
const detectPortSync_1 = require("../../../utils/detectPortSync");
|
|
8
7
|
exports.childAppProviders = [
|
|
9
8
|
(0, dippy_1.provide)({
|
|
10
9
|
provide: tokens_1.CONFIG_MANAGER_TOKEN,
|
|
11
|
-
useFactory: ({ configEntry, parameters }) => (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'production', buildType: 'client',
|
|
12
|
-
request: parameters.staticPort,
|
|
13
|
-
fallback: configManager_1.DEFAULT_STATIC_MODULE_PORT,
|
|
14
|
-
}) })),
|
|
10
|
+
useFactory: ({ configEntry, parameters, portManager }) => (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'production', buildType: 'client', port: portManager.port, staticPort: portManager.staticPort })),
|
|
15
11
|
deps: {
|
|
16
12
|
configEntry: tokens_1.CONFIG_ENTRY_TOKEN,
|
|
17
13
|
parameters: tokens_1.COMMAND_PARAMETERS_TOKEN,
|
|
14
|
+
portManager: tokens_1.PORT_MANAGER_TOKEN,
|
|
18
15
|
},
|
|
19
16
|
}),
|
|
20
17
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-app.js","sourceRoot":"","sources":["../../../../src/api/start-prod/providers/child-app.ts"],"names":[],"mappings":";;;AACA,0CAAyC;AACzC,+
|
|
1
|
+
{"version":3,"file":"child-app.js","sourceRoot":"","sources":["../../../../src/api/start-prod/providers/child-app.ts"],"names":[],"mappings":";;;AACA,0CAAyC;AACzC,+CAK4B;AAC5B,iEAAoE;AAGvD,QAAA,iBAAiB,GAAwB;IACpD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CACvD,IAAA,mCAAmB,EAAC,WAAkC,kCACjD,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,WAAW,CAAC,IAAI,EACtB,UAAU,EAAE,WAAW,CAAC,UAAU,IAClC;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;YACpC,WAAW,EAAE,2BAAkB;SAChC;KACF,CAAC;CACM,CAAC"}
|
|
@@ -13,6 +13,7 @@ const createApp = ({ commands, providers, }) => {
|
|
|
13
13
|
...providers_1.commandsProviders,
|
|
14
14
|
...providers_1.packageManagerProviders,
|
|
15
15
|
...providers_1.builderProviders,
|
|
16
|
+
...providers_1.networkProviders,
|
|
16
17
|
...providers,
|
|
17
18
|
{
|
|
18
19
|
provide: tokens_1.COMMAND_PARAMETERS_TOKEN,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createApp.js","sourceRoot":"","sources":["../../src/commands/createApp.ts"],"names":[],"mappings":";;;AACA,0CAAsD;AACtD,qCAA+C;AAC/C,+
|
|
1
|
+
{"version":3,"file":"createApp.js","sourceRoot":"","sources":["../../src/commands/createApp.ts"],"names":[],"mappings":";;;AACA,0CAAsD;AACtD,qCAA+C;AAC/C,+CAQyB;AACzB,yCAAiG;AAE1F,MAAM,SAAS,GAAG,CAAC,EACxB,QAAQ,EACR,SAAS,GAIV,EAA+B,EAAE;IAChC,MAAM,aAAa,GAAG,IAAA,wBAAiB,EAAC;QACtC,GAAG,8BAAkB;QACrB,GAAG,wBAAY;QACf,GAAG,2BAAe;QAClB,GAAG,6BAAiB;QACpB,GAAG,mCAAuB;QAC1B,GAAG,4BAAgB;QACnB,GAAG,4BAAgB;QACnB,GAAG,SAAS;QACZ;YACE,OAAO,EAAE,iCAAwB;YACjC,QAAQ,EAAE,EAAE;SACb;QACD;YACE,OAAO,EAAE,0BAAiB;YAC1B,QAAQ,EAAE,QAAQ;SACnB;KACF,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,mBAAmB,GAAG,EAAE;YACnD,OAAO,IAAA,4BAAoB,EAAC,aAAa,EAAE,mBAAmB,CAAC;iBAC5D,GAAG,CAAC,6BAAoB,CAAC;iBACzB,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QACtC,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAjCW,QAAA,SAAS,aAiCpB"}
|
|
@@ -16,10 +16,13 @@ const staticServer_1 = require("./staticServer");
|
|
|
16
16
|
const server_1 = require("./server");
|
|
17
17
|
const handle_server_output_1 = require("./utils/handle-server-output");
|
|
18
18
|
const request_1 = require("../../utils/dev-app/request");
|
|
19
|
+
const port_manager_1 = require("../../models/port-manager");
|
|
19
20
|
// eslint-disable-next-line max-statements
|
|
20
21
|
const staticApp = (context, configEntry, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
21
22
|
var _a;
|
|
22
|
-
const
|
|
23
|
+
const network = new port_manager_1.PortManager({ configEntry, commandParams: options });
|
|
24
|
+
yield network.computeAvailablePorts();
|
|
25
|
+
const clientConfigManager = (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({ env: 'production' }, options), { buildType: 'client', modern: false, port: network.port, staticPort: network.staticPort }));
|
|
23
26
|
const serverConfigManager = clientConfigManager.withSettings({ buildType: 'server' });
|
|
24
27
|
if (options.buildType !== 'none') {
|
|
25
28
|
context.logger.event({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/commands/static/application.ts"],"names":[],"mappings":";;;;AAAA,6FAA6D;AAE7D,wDAAwB;AACxB,iCAA6B;AAC7B,8DAA6B;AAC7B,4DAA2B;AAK3B,8DAAiE;AACjE,yCAA4C;AAC5C,qFAAmG;AACnG,yDAAsD;AACtD,oCAA+B;AAC/B,iDAAmD;AACnD,qCAAuC;AACvC,uEAAkE;AAClE,yDAA4D;
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/commands/static/application.ts"],"names":[],"mappings":";;;;AAAA,6FAA6D;AAE7D,wDAAwB;AACxB,iCAA6B;AAC7B,8DAA6B;AAC7B,4DAA2B;AAK3B,8DAAiE;AACjE,yCAA4C;AAC5C,qFAAmG;AACnG,yDAAsD;AACtD,oCAA+B;AAC/B,iDAAmD;AACnD,qCAAuC;AACvC,uEAAkE;AAClE,yDAA4D;AAC5D,4DAAwD;AAExD,0CAA0C;AACnC,MAAM,SAAS,GAAG,CACvB,OAAgB,EAChB,WAAmC,EACnC,OAAe,EACS,EAAE;;IAC1B,MAAM,OAAO,GAAG,IAAI,0BAAW,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,CAAC;IAEzE,MAAM,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAEtC,MAAM,mBAAmB,GAAG,IAAA,mCAAmB,EAAC,WAAW,gCACzD,GAAG,EAAE,YAAY,IACd,OAAO,KACV,SAAS,EAAE,QAAQ,EACnB,MAAM,EAAE,KAAK,EACb,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,UAAU,EAAE,OAAO,CAAC,UAAU,IAC9B,CAAC;IACH,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtF,IAAI,OAAO,CAAC,SAAS,KAAK,MAAM,EAAE;QAChC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,sBAAsB;YAC7B,OAAO,EAAE,iCAAiC;SAC3C,CAAC,CAAC;QAEH,MAAM,WAAG,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEhC,MAAM,IAAA,sDAAkC,EAAC,mBAAmB,CAAC,CAAC;KAC/D;SAAM;QACL,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,sBAAsB;YAC7B,OAAO,EAAE,iCAAiC;SAC3C,CAAC,CAAC;KACJ;IAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAAC;IACjF,MAAM,IAAI,GAAG,mBAAmB,CAAC,SAAS,CAAC;IAC3C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAE/C,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,sBAAsB;YAC7B,OAAO,EACL,gEAAgE;gBAChE,0EAA0E;gBAC1E,0CAA0C;SAC7C,CAAC,CAAC;KACJ;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,6BAA6B;QACpC,OAAO,EAAE,+CAA+C,IAAI,IAAI,IAAI,EAAE;KACvE,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAiB,EAAC,mBAAmB,CAAC,CAAC;IAClE,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,YAAY,CAAC;IAC5D,MAAM,YAAY,iDACb,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,MAAM,IAAI,CAAC,IAAA,gBAAK,GAAE,CAAC,IAAI;QACpE,CAAC,iCACM,IAAA,yBAAW,EAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,EAAE,IAAI,CAAC,GACjE,IAAA,yBAAW,EAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,EAE5D,CAAC,CAAC,EAAE,CAAC,GACJ,OAAO,CAAC,GAAG,KACd,QAAQ,EAAE,YAAY,EACtB,mBAAmB,EAAE,QAAQ,EAC7B,qBAAqB,EAAE,MAAM,EAC7B,IAAI,EAAE,GAAG,IAAI,EAAE,EACf,WAAW,EAAE,GAAG,IAAI,EAAE,EACtB,yBAAyB,EAAE,kBAAkB,EAC7C,aAAa,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,kBAAkB,GAClD,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,YAAI,EAAC,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE;QACvD,GAAG,EAAE,IAAI;QACT,GAAG,EAAE,YAAY;KAClB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE;QACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,sBAAsB;YAC7B,OAAO,EAAE,kCAAkC;YAC3C,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;QACzC,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,OAAO;SACR;QAED,IAAA,yCAAkB,EAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,oBAAoB,MAAA,YAAY,CAAC,mBAAmB,mCAAI,IAAI,SAAS,CAAC;IAEjG,MAAM,OAAO,CAAC,IAAI,CAAC;QACjB,MAAM;QACN,IAAA,iBAAM,EAAC;YACL,SAAS,EAAE,CAAC,kBAAkB,CAAC;YAC/B,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,GAAG;YACb,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;SACxB,CAAC;KACH,CAAC,CAAC;IAEH,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,6BAA6B;QACpC,OAAO,EAAE,mDAAmD;KAC7D,CAAC,CAAC;IAEH,IAAI,KAAK,GAAG,MAAM,IAAA,uBAAa,EAAC,mBAAmB,CAAC,CAAC;IAErD,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,KAAK,GAAG,IAAA,sBAAY,EAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;KAChD;SAAM,IAAI,OAAO,CAAC,GAAG,CAAC,mCAAmC,KAAK,MAAM,EAAE;QACrE,mFAAmF;QACnF,KAAK,GAAG,CAAC,oBAAoB,CAAC,CAAC;KAChC;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,yBAAyB;QAChC,OAAO,EAAE,yCAAyC;KACnD,CAAC,CAAC;IAEH,MAAM,IAAA,yBAAc,EAAC,OAAO,EAAE,mBAAmB,EAAE,KAAK,CAAC,CAAC;IAE1D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,6BAA6B;QACpC,OAAO,EAAE,oDAAoD;KAC9D,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,EAAE,CAAC;IAEd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,8BAA8B;QACrC,OAAO,EAAE,qCAAqC;KAC/C,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,KAAK,EAAE;QACjB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,IAAA,oBAAW,EAAC,mBAAmB,CAAC,CAAC;QAE1D,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACzB,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,YAAY,CAAC,KAAK,EAAE,CAAC;KACtB;IAED,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,qCAAqC;KAC/C,CAAC;AACJ,CAAC,CAAA,CAAC;AAvKW,QAAA,SAAS,aAuKpB"}
|
|
@@ -35,9 +35,6 @@ export type ConfigManager<C extends ConfigEntry = ConfigEntry, E extends Env = E
|
|
|
35
35
|
dehydrate(): [C, Settings<E>];
|
|
36
36
|
assetsPrefix?: string;
|
|
37
37
|
};
|
|
38
|
-
export declare const DEFAULT_PORT = 3000;
|
|
39
38
|
export declare const DEFAULT_STATIC_HOST = "localhost";
|
|
40
|
-
export declare const DEFAULT_STATIC_PORT = 4000;
|
|
41
|
-
export declare const DEFAULT_STATIC_MODULE_PORT = 4040;
|
|
42
39
|
export declare const createConfigManager: <C extends ConfigEntry = ConfigEntry, E extends Env = Env>(configEntry: C, settings: Settings<E>) => ConfigManager<C, E>;
|
|
43
40
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createConfigManager = exports.
|
|
3
|
+
exports.createConfigManager = exports.DEFAULT_STATIC_HOST = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const nil_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/nil"));
|
|
6
6
|
const array_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/array"));
|
|
@@ -13,6 +13,7 @@ const validate_1 = require("./validate");
|
|
|
13
13
|
const moduleVersion_1 = tslib_1.__importDefault(require("../utils/moduleVersion"));
|
|
14
14
|
const packageVersion_1 = require("../utils/packageVersion");
|
|
15
15
|
const showConfig_1 = require("./showConfig");
|
|
16
|
+
const port_manager_1 = require("../models/port-manager");
|
|
16
17
|
const getOption = (optionName, cfgs, dflt) => {
|
|
17
18
|
const getter = (0, prop_1.default)(optionName);
|
|
18
19
|
for (let i = 0; i < cfgs.length; i++) {
|
|
@@ -34,10 +35,7 @@ const omitEnvOptions = (env, options) => {
|
|
|
34
35
|
return value;
|
|
35
36
|
}, options);
|
|
36
37
|
};
|
|
37
|
-
exports.DEFAULT_PORT = 3000;
|
|
38
38
|
exports.DEFAULT_STATIC_HOST = 'localhost';
|
|
39
|
-
exports.DEFAULT_STATIC_PORT = 4000;
|
|
40
|
-
exports.DEFAULT_STATIC_MODULE_PORT = 4040;
|
|
41
39
|
// eslint-disable-next-line max-statements, complexity
|
|
42
40
|
const createConfigManager = (configEntry, settings) => {
|
|
43
41
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
@@ -73,7 +71,9 @@ const createConfigManager = (configEntry, settings) => {
|
|
|
73
71
|
env,
|
|
74
72
|
rootDir,
|
|
75
73
|
buildType,
|
|
76
|
-
debug, port: Number((_f = settings.port) !== null && _f !== void 0 ? _f :
|
|
74
|
+
debug, port: Number((_f = settings.port) !== null && _f !== void 0 ? _f : port_manager_1.PortManager.DEFAULT_PORT), staticHost: (_g = settings.staticHost) !== null && _g !== void 0 ? _g : exports.DEFAULT_STATIC_HOST, staticPort: Number((_h = settings.staticPort) !== null && _h !== void 0 ? _h : (type === 'module'
|
|
75
|
+
? port_manager_1.PortManager.DEFAULT_MODULE_STATIC_PORT
|
|
76
|
+
: port_manager_1.PortManager.DEFAULT_STATIC_PORT)), modern,
|
|
77
77
|
// eslint-disable-next-line no-nested-ternary
|
|
78
78
|
sourceMap: debug
|
|
79
79
|
? // allow to disable sourcemaps with debug flag, when sourceMap passed to cli api
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configManager.js","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":";;;;AAAA,wEAA0C;AAC1C,4EAA8C;AAC9C,8EAAgD;AAChD,8EAA8C;AAC9C,4EAA+C;AAC/C,+BAA+B;AAI/B,0DAAoE;AACpE,yCAA2E;AAC3E,mFAAmD;AACnD,4DAAyD;AACzD,6CAA0C;
|
|
1
|
+
{"version":3,"file":"configManager.js","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ exports.configProviders = [
|
|
|
41
41
|
}
|
|
42
42
|
const { content, isSuccessful } = (0, getTramvaiConfig_1.getTramvaiConfig)(rootDir);
|
|
43
43
|
if (!isSuccessful) {
|
|
44
|
-
throw new Error('Config neither passed as parameter
|
|
44
|
+
throw new Error('Config neither passed as parameter nor found in file system');
|
|
45
45
|
}
|
|
46
46
|
const manager = new config_1.ConfigManager({ config: content, syncConfigFile: syncJsonFile_1.syncJsonFile });
|
|
47
47
|
return manager.getProject(target);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/di/providers/config.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,sCAKmB;AACnB,mEAAgE;AAChE,gDAAoD;AACpD,2DAAwD;AAE3C,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,2BAAkB;QAC3B,UAAU,EAAE,GAAG,EAAE;YACf,OAAO,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC;KACF;IACD;QACE,OAAO,EAAE,8BAAqB;QAC9B,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;;YACzB,OAAO,MAAA,MAAM,CAAC,OAAO,mCAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACzC,CAAC;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,iCAAwB;SACjC;KACF;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,UAAU,EAAE,CAAC,EACX,MAAM,EACN,OAAO,GAIR,EAAE,EAAE;YACH,IAAI,QAAQ,IAAI,MAAM,EAAE;gBACtB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;gBAE1B,MAAM,OAAO,GAAG,IAAI,sBAAa,CAAC;oBAChC,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE;oBAC/C,cAAc,EAAE,2BAAY;iBAC7B,CAAC,CAAC;gBAEH,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACxC;YAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;YAE1B,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;aACH;YAED,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,IAAA,mCAAgB,EAAC,OAAO,CAAC,CAAC;YAE5D,IAAI,CAAC,YAAY,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/di/providers/config.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,sCAKmB;AACnB,mEAAgE;AAChE,gDAAoD;AACpD,2DAAwD;AAE3C,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,2BAAkB;QAC3B,UAAU,EAAE,GAAG,EAAE;YACf,OAAO,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC;KACF;IACD;QACE,OAAO,EAAE,8BAAqB;QAC9B,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;;YACzB,OAAO,MAAA,MAAM,CAAC,OAAO,mCAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACzC,CAAC;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,iCAAwB;SACjC;KACF;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,UAAU,EAAE,CAAC,EACX,MAAM,EACN,OAAO,GAIR,EAAE,EAAE;YACH,IAAI,QAAQ,IAAI,MAAM,EAAE;gBACtB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;gBAE1B,MAAM,OAAO,GAAG,IAAI,sBAAa,CAAC;oBAChC,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE;oBAC/C,cAAc,EAAE,2BAAY;iBAC7B,CAAC,CAAC;gBAEH,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACxC;YAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;YAE1B,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;aACH;YAED,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,IAAA,mCAAgB,EAAC,OAAO,CAAC,CAAC;YAE5D,IAAI,CAAC,YAAY,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;aAChF;YAED,MAAM,OAAO,GAAG,IAAI,sBAAa,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,2BAAY,EAAE,CAAC,CAAC;YAErF,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,iCAAwB;YAChC,OAAO,EAAE,8BAAqB;SAC/B;KACF;CACO,CAAC"}
|
|
@@ -7,4 +7,5 @@ tslib_1.__exportStar(require("./config"), exports);
|
|
|
7
7
|
tslib_1.__exportStar(require("./commands"), exports);
|
|
8
8
|
tslib_1.__exportStar(require("./packageManager"), exports);
|
|
9
9
|
tslib_1.__exportStar(require("./builder"), exports);
|
|
10
|
+
tslib_1.__exportStar(require("./network"), exports);
|
|
10
11
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/di/providers/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B;AAC5B,gDAAsB;AACtB,mDAAyB;AACzB,qDAA2B;AAC3B,2DAAiC;AACjC,oDAA0B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/di/providers/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B;AAC5B,gDAAsB;AACtB,mDAAyB;AACzB,qDAA2B;AAC3B,2DAAiC;AACjC,oDAA0B;AAC1B,oDAA0B"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.networkProviders = void 0;
|
|
4
|
+
const dippy_1 = require("@tinkoff/dippy");
|
|
5
|
+
const tokens_1 = require("../tokens");
|
|
6
|
+
const port_manager_1 = require("../../models/port-manager");
|
|
7
|
+
exports.networkProviders = [
|
|
8
|
+
(0, dippy_1.provide)({
|
|
9
|
+
provide: tokens_1.PORT_MANAGER_TOKEN,
|
|
10
|
+
useClass: port_manager_1.PortManager,
|
|
11
|
+
deps: {
|
|
12
|
+
configEntry: tokens_1.CONFIG_ENTRY_TOKEN,
|
|
13
|
+
commandParams: tokens_1.COMMAND_PARAMETERS_TOKEN,
|
|
14
|
+
},
|
|
15
|
+
}),
|
|
16
|
+
];
|
|
17
|
+
//# sourceMappingURL=network.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/di/providers/network.ts"],"names":[],"mappings":";;;AAAA,0CAAyC;AAGzC,sCAA6F;AAC7F,4DAAwD;AAE3C,QAAA,gBAAgB,GAAwB;IACnD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,QAAQ,EAAE,0BAAW;QACrB,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,aAAa,EAAE,iCAAwB;SACxC;KACF,CAAC;CACM,CAAC"}
|
package/lib/di/tokens/index.d.ts
CHANGED
package/lib/di/tokens/index.js
CHANGED
|
@@ -10,4 +10,5 @@ tslib_1.__exportStar(require("./config"), exports);
|
|
|
10
10
|
tslib_1.__exportStar(require("./packageManager"), exports);
|
|
11
11
|
tslib_1.__exportStar(require("./builder"), exports);
|
|
12
12
|
tslib_1.__exportStar(require("./server"), exports);
|
|
13
|
+
tslib_1.__exportStar(require("./network"), exports);
|
|
13
14
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/di/tokens/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B;AAC5B,mDAAyB;AACzB,oDAA0B;AAC1B,gDAAsB;AACtB,+CAAqB;AACrB,mDAAyB;AACzB,2DAAiC;AACjC,oDAA0B;AAC1B,mDAAyB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/di/tokens/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B;AAC5B,mDAAyB;AACzB,oDAA0B;AAC1B,gDAAsB;AACtB,+CAAqB;AACrB,mDAAyB;AACzB,2DAAiC;AACjC,oDAA0B;AAC1B,mDAAyB;AACzB,oDAA0B"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PORT_MANAGER_TOKEN = void 0;
|
|
4
|
+
const dippy_1 = require("@tinkoff/dippy");
|
|
5
|
+
exports.PORT_MANAGER_TOKEN = (0, dippy_1.createToken)('portManager');
|
|
6
|
+
//# sourceMappingURL=network.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/di/tokens/network.ts"],"names":[],"mappings":";;;AAAA,0CAA6C;AAIhC,QAAA,kBAAkB,GAAG,IAAA,mBAAW,EAAc,aAAa,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export declare const SERVER_TOKEN: import("
|
|
1
|
+
export declare const SERVER_TOKEN: import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> & import("stoppable").WithStop & {
|
|
2
2
|
__type?: "base token";
|
|
3
3
|
};
|
|
4
|
-
export declare const STATIC_SERVER_TOKEN: import("
|
|
4
|
+
export declare const STATIC_SERVER_TOKEN: import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> & import("stoppable").WithStop & {
|
|
5
5
|
__type?: "base token";
|
|
6
6
|
};
|
|
@@ -56,7 +56,7 @@ export declare const DEV_STATS_OPTIONS: {
|
|
|
56
56
|
groupReasonsByOrigin?: boolean;
|
|
57
57
|
hash?: boolean;
|
|
58
58
|
ids?: boolean;
|
|
59
|
-
logging?: boolean | "error" | "
|
|
59
|
+
logging?: boolean | "error" | "warn" | "info" | "none" | "log" | "verbose";
|
|
60
60
|
loggingDebug?: string | boolean | RegExp | (string | RegExp | ((value: string) => boolean))[] | ((value: string) => boolean);
|
|
61
61
|
loggingTrace?: boolean;
|
|
62
62
|
moduleAssets?: boolean;
|
|
@@ -16,7 +16,7 @@ const createWorkerPoolConfig = (configManager) => {
|
|
|
16
16
|
};
|
|
17
17
|
const isApplicable = (configManager) => {
|
|
18
18
|
return (
|
|
19
|
-
// thread-loader uses child_process.fork
|
|
19
|
+
// thread-loader uses child_process.fork under the hood, and sometimes (50/50) work in these processes does not get into inspector.Session profile
|
|
20
20
|
!process.env.TRAMVAI_CPU_PROFILE &&
|
|
21
21
|
// TODO: check that there is still issue with windows systems and thread-loader
|
|
22
22
|
process.platform !== 'win32' &&
|