@tramvai/cli 2.137.0 → 2.139.3
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.
|
@@ -18,6 +18,7 @@ const handle_server_output_1 = require("./utils/handle-server-output");
|
|
|
18
18
|
const request_1 = require("../../utils/dev-app/request");
|
|
19
19
|
// eslint-disable-next-line max-statements
|
|
20
20
|
const staticApp = (context, configEntry, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
+
var _a;
|
|
21
22
|
const clientConfigManager = (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({ env: 'production' }, options), { buildType: 'client', modern: false }));
|
|
22
23
|
const serverConfigManager = clientConfigManager.withSettings({ buildType: 'server' });
|
|
23
24
|
if (options.buildType !== 'none') {
|
|
@@ -55,10 +56,11 @@ const staticApp = (context, configEntry, options) => tslib_1.__awaiter(void 0, v
|
|
|
55
56
|
});
|
|
56
57
|
const staticServer = yield (0, staticServer_1.startStaticServer)(clientConfigManager);
|
|
57
58
|
const staticAssetsPrefix = serverConfigManager.assetsPrefix;
|
|
59
|
+
const envVariables = Object.assign(Object.assign(Object.assign({}, (process.env.DANGEROUS_UNSAFE_ENV_FILES === 'true' || !(0, env_ci_1.default)().isCi
|
|
60
|
+
? Object.assign(Object.assign({}, (0, safeRequire_1.safeRequire)(path_1.default.resolve(process.cwd(), 'env.development'), true)), (0, safeRequire_1.safeRequire)(path_1.default.resolve(process.cwd(), 'env'), true)) : {})), process.env), { NODE_ENV: 'production', TRAMVAI_CLI_COMMAND: 'static', CACHE_WARMUP_DISABLED: 'true', PORT: `${port}`, PORT_SERVER: `${port}`, TRAMVAI_CLI_ASSETS_PREFIX: staticAssetsPrefix, ASSETS_PREFIX: assetsPrefix !== null && assetsPrefix !== void 0 ? assetsPrefix : staticAssetsPrefix });
|
|
58
61
|
const server = (0, execa_1.node)(path_1.default.resolve(root, 'server.js'), [], {
|
|
59
62
|
cwd: root,
|
|
60
|
-
env:
|
|
61
|
-
? Object.assign(Object.assign({}, (0, safeRequire_1.safeRequire)(path_1.default.resolve(process.cwd(), 'env.development'), true)), (0, safeRequire_1.safeRequire)(path_1.default.resolve(process.cwd(), 'env'), true)) : {})), process.env), { NODE_ENV: 'production', TRAMVAI_CLI_COMMAND: 'static', CACHE_WARMUP_DISABLED: 'true', PORT: `${port}`, PORT_SERVER: `${port}`, TRAMVAI_CLI_ASSETS_PREFIX: staticAssetsPrefix, ASSETS_PREFIX: assetsPrefix !== null && assetsPrefix !== void 0 ? assetsPrefix : staticAssetsPrefix }),
|
|
63
|
+
env: envVariables,
|
|
62
64
|
});
|
|
63
65
|
server.catch((reason) => {
|
|
64
66
|
context.logger.event({
|
|
@@ -74,11 +76,11 @@ const staticApp = (context, configEntry, options) => tslib_1.__awaiter(void 0, v
|
|
|
74
76
|
}
|
|
75
77
|
(0, handle_server_output_1.handleServerOutput)(context.logger, chunk);
|
|
76
78
|
});
|
|
77
|
-
const
|
|
79
|
+
const readinessProbePath = `http://localhost:${(_a = envVariables.UTILITY_SERVER_PORT) !== null && _a !== void 0 ? _a : port}/readyz`;
|
|
78
80
|
yield Promise.race([
|
|
79
81
|
server,
|
|
80
82
|
(0, wait_on_1.default)({
|
|
81
|
-
resources: [
|
|
83
|
+
resources: [readinessProbePath],
|
|
82
84
|
delay: 1000,
|
|
83
85
|
interval: 250,
|
|
84
86
|
timeout: 10 * 60 * 1000,
|
|
@@ -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;AAE5D,0CAA0C;AACnC,MAAM,SAAS,GAAG,CACvB,OAAgB,EAChB,WAAmC,EACnC,OAAe,EACS,EAAE
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/commands/static/application.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/cli",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.139.3",
|
|
4
4
|
"description": "Cli инструмент для сборки и запуска приложений",
|
|
5
5
|
"files": [
|
|
6
6
|
"src",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"@tinkoff/utils": "^2.1.3",
|
|
72
72
|
"@tinkoff/webpack-dedupe-plugin": "1.0.5",
|
|
73
73
|
"@tramvai/build": "3.1.4",
|
|
74
|
-
"@tramvai/react": "2.
|
|
74
|
+
"@tramvai/react": "2.139.3",
|
|
75
75
|
"@tramvai/tools-check-versions": "0.4.17",
|
|
76
76
|
"@tramvai/tools-migrate": "0.6.21",
|
|
77
77
|
"ajv": "^6.12.6",
|
|
@@ -73,25 +73,26 @@ export const staticApp = async (
|
|
|
73
73
|
|
|
74
74
|
const staticServer = await startStaticServer(clientConfigManager);
|
|
75
75
|
const staticAssetsPrefix = serverConfigManager.assetsPrefix;
|
|
76
|
+
const envVariables = {
|
|
77
|
+
...(process.env.DANGEROUS_UNSAFE_ENV_FILES === 'true' || !envCi().isCi
|
|
78
|
+
? {
|
|
79
|
+
...safeRequire(path.resolve(process.cwd(), 'env.development'), true),
|
|
80
|
+
...safeRequire(path.resolve(process.cwd(), 'env'), true),
|
|
81
|
+
}
|
|
82
|
+
: {}),
|
|
83
|
+
...process.env,
|
|
84
|
+
NODE_ENV: 'production',
|
|
85
|
+
TRAMVAI_CLI_COMMAND: 'static',
|
|
86
|
+
CACHE_WARMUP_DISABLED: 'true',
|
|
87
|
+
PORT: `${port}`,
|
|
88
|
+
PORT_SERVER: `${port}`,
|
|
89
|
+
TRAMVAI_CLI_ASSETS_PREFIX: staticAssetsPrefix,
|
|
90
|
+
ASSETS_PREFIX: assetsPrefix ?? staticAssetsPrefix,
|
|
91
|
+
};
|
|
76
92
|
|
|
77
93
|
const server = node(path.resolve(root, 'server.js'), [], {
|
|
78
94
|
cwd: root,
|
|
79
|
-
env:
|
|
80
|
-
...(process.env.DANGEROUS_UNSAFE_ENV_FILES === 'true' || !envCi().isCi
|
|
81
|
-
? {
|
|
82
|
-
...safeRequire(path.resolve(process.cwd(), 'env.development'), true),
|
|
83
|
-
...safeRequire(path.resolve(process.cwd(), 'env'), true),
|
|
84
|
-
}
|
|
85
|
-
: {}),
|
|
86
|
-
...process.env,
|
|
87
|
-
NODE_ENV: 'production',
|
|
88
|
-
TRAMVAI_CLI_COMMAND: 'static',
|
|
89
|
-
CACHE_WARMUP_DISABLED: 'true',
|
|
90
|
-
PORT: `${port}`,
|
|
91
|
-
PORT_SERVER: `${port}`,
|
|
92
|
-
TRAMVAI_CLI_ASSETS_PREFIX: staticAssetsPrefix,
|
|
93
|
-
ASSETS_PREFIX: assetsPrefix ?? staticAssetsPrefix,
|
|
94
|
-
},
|
|
95
|
+
env: envVariables,
|
|
95
96
|
});
|
|
96
97
|
|
|
97
98
|
server.catch((reason) => {
|
|
@@ -110,12 +111,12 @@ export const staticApp = async (
|
|
|
110
111
|
handleServerOutput(context.logger, chunk);
|
|
111
112
|
});
|
|
112
113
|
|
|
113
|
-
const
|
|
114
|
+
const readinessProbePath = `http://localhost:${envVariables.UTILITY_SERVER_PORT ?? port}/readyz`;
|
|
114
115
|
|
|
115
116
|
await Promise.race([
|
|
116
117
|
server,
|
|
117
118
|
waitOn({
|
|
118
|
-
resources: [
|
|
119
|
+
resources: [readinessProbePath],
|
|
119
120
|
delay: 1000,
|
|
120
121
|
interval: 250,
|
|
121
122
|
timeout: 10 * 60 * 1000,
|