@tramvai/cli 3.41.13 → 3.41.19
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/lib/commands/static/application.js +1 -1
- package/lib/commands/static/application.js.map +1 -1
- package/lib/commands/static/command.d.ts +2 -0
- package/lib/commands/static/command.d.ts.map +1 -1
- package/lib/commands/static/command.js +10 -0
- package/lib/commands/static/command.js.map +1 -1
- package/lib/commands/static/generate.d.ts +2 -1
- package/lib/commands/static/generate.d.ts.map +1 -1
- package/lib/commands/static/generate.js +10 -3
- package/lib/commands/static/generate.js.map +1 -1
- package/lib/commands/static/static.d.ts +2 -1
- package/lib/commands/static/static.d.ts.map +1 -1
- package/lib/commands/static/static.js.map +1 -1
- package/lib/schema/autogeneratedSchema.json +15 -15
- package/lib/utils/dev-app/request.d.ts +2 -1
- package/lib/utils/dev-app/request.d.ts.map +1 -1
- package/lib/utils/dev-app/request.js +8 -4
- package/lib/utils/dev-app/request.js.map +1 -1
- package/package.json +6 -5
- package/schema.json +15 -15
- package/src/commands/static/application.ts +1 -1
- package/src/commands/static/command.ts +12 -0
- package/src/commands/static/generate.ts +13 -2
- package/src/commands/static/static.ts +2 -1
- package/src/schema/autogeneratedSchema.json +15 -15
- package/src/utils/dev-app/request.ts +9 -4
|
@@ -116,7 +116,7 @@ const staticApp = (context, configEntry, options) => tslib_1.__awaiter(void 0, v
|
|
|
116
116
|
event: 'COMMAND:STATIC:GENERATE',
|
|
117
117
|
message: `message: routes fetched, generate pages`,
|
|
118
118
|
});
|
|
119
|
-
yield (0, generate_1.generateStatic)(context, serverConfigManager, paths);
|
|
119
|
+
yield (0, generate_1.generateStatic)(context, options, serverConfigManager, paths);
|
|
120
120
|
context.logger.event({
|
|
121
121
|
type: 'debug',
|
|
122
122
|
event: 'COMMAND:STATIC:CLOSE_SERVER',
|
|
@@ -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;AAC3B,8EAAgD;AAKhD,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,WAAW,GAAG,IAAI,0BAAW,CAAC;QAClC,WAAW;QACX,aAAa,EAAE,OAAO;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,MAAM,WAAW,CAAC,qBAAqB,EAAE,CAAC;IAE1C,MAAM,mBAAmB,GAAG,IAAA,mCAAmB,EAAyB,WAAW,gCACjF,GAAG,EAAE,YAAY,IACd,OAAO,KACV,SAAS,EAAE,QAAQ,EACnB,MAAM,EAAE,KAAK,EACb,IAAI,EAAE,WAAW,CAAC,IAAI,EACtB,UAAU,EAAE,WAAW,CAAC,UAAU,IAClC,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,EACJ,IAAI,EACJ,IAAI,EACJ,eAAe,EAAE,EAAE,qBAAqB,EAAE,GAC3C,GAAG,mBAAmB,CAAC;IACxB,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,GAAG,mBAAmB,CAAC,YAAY,gBAC5D,MAAA,YAAY,CAAC,mBAAmB,mCAAI,IACtC,SAAS,CAAC;IAEV,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,IAAA,gBAAQ,EAAC,qBAAqB,CAAC,EAAE;QACnC,uEAAuE;QACvE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;KAC5B;IAED,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;
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/commands/static/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../src/commands/static/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIlD,MAAM,MAAM,MAAM,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../src/commands/static/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIlD,MAAM,MAAM,MAAM,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,qBAAa,aAAc,SAAQ,UAAU,CAAC,MAAM,CAAC;IACnD,IAAI,SAAY;IAEhB,WAAW,SAAwD;IAEnE,OAAO,SAAqB;IAE5B,OAAO;;;;;;;;;;;;;;;6BAoBkB,MAAM;;;;;;6BAgBN,MAAM;;;SAQ7B;IAEF,KAAK,SAAQ;IAEb,UAAU,8DAAqD;IAE/D,MAAM,CAAC,UAAU,EAAE,MAAM;CAI1B"}
|
|
@@ -33,6 +33,16 @@ class StaticCommand extends command_1.CLICommand {
|
|
|
33
33
|
transformer: (value) => value.split(','),
|
|
34
34
|
description: 'Specify the comma separated paths list for static HTML generation',
|
|
35
35
|
},
|
|
36
|
+
{
|
|
37
|
+
name: '--header',
|
|
38
|
+
value: '[header...]',
|
|
39
|
+
description: 'Add extra headers, which will be added to request for application pages',
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
name: '--folder',
|
|
43
|
+
value: '[folder]',
|
|
44
|
+
description: 'Subfolder, when generated pages will be placed',
|
|
45
|
+
},
|
|
36
46
|
{
|
|
37
47
|
name: '--fileCache',
|
|
38
48
|
value: '[fileCache]',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/static/command.ts"],"names":[],"mappings":";;;AAAA,kDAAkD;AAClD,qEAAwE;AACxE,2GAAwG;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/static/command.ts"],"names":[],"mappings":";;;AAAA,kDAAkD;AAClD,qEAAwE;AACxE,2GAAwG;AAYxG,MAAa,aAAc,SAAQ,oBAAkB;IAArD;;QACE,SAAI,GAAG,QAAQ,CAAC;QAEhB,gBAAW,GAAG,oDAAoD,CAAC;QAEnE,YAAO,GAAG,iBAAiB,CAAC;QAE5B,YAAO,GAAG;YACR;gBACE,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,yCAAyC;aACvD;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,SAAS;gBAChB,WAAW,EAAE,sCAAsC;aACpD;YACD;gBACE,IAAI,EAAE,iBAAiB;gBACvB,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,uBAAuB;gBACpC,YAAY,EAAE,KAAK;aACpB;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;gBAChD,WAAW,EAAE,mEAAmE;aACjF;YACD;gBACE,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,yEAAyE;aACvF;YACD;gBACE,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,UAAU;gBACjB,WAAW,EAAE,gDAAgD;aAC9D;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO;gBACjD,WAAW,EAAE,2DAA2D;aACzE;YACD;gBACE,IAAI,EAAE,kBAAkB;gBACxB,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,4BAA4B;aAC1C;SACF,CAAC;QAEF,UAAK,GAAG,IAAI,CAAC;QAEb,eAAU,GAAG,CAAC,6BAAgB,EAAE,6DAA6B,CAAC,CAAC;IAMjE,CAAC;IAJC,MAAM,CAAC,UAAkB;QACvB,uCAAuC;QACvC,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC/D,CAAC;CACF;AA7DD,sCA6DC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Context } from '../../models/context';
|
|
2
2
|
import type { ConfigManager } from '../../config/configManager';
|
|
3
3
|
import type { ApplicationConfigEntry } from '../../typings/configEntry/application';
|
|
4
|
-
|
|
4
|
+
import type { Params } from './command';
|
|
5
|
+
export declare const generateStatic: (context: Context, params: Params, configManager: ConfigManager<ApplicationConfigEntry>, paths: string[]) => Promise<any[]>;
|
|
5
6
|
//# sourceMappingURL=generate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/static/generate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/static/generate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAEpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAKxC,eAAO,MAAM,cAAc,YAChB,OAAO,UACR,MAAM,iBACC,cAAc,sBAAsB,CAAC,SAC7C,MAAM,EAAE,mBA0DhB,CAAC"}
|
|
@@ -8,11 +8,18 @@ const fs_extra_1 = require("fs-extra");
|
|
|
8
8
|
const request_1 = require("../../utils/dev-app/request");
|
|
9
9
|
const MAX_CONCURRENT = 10;
|
|
10
10
|
const DYNAMIC_PAGE_REGEX = /\/:.+\//g;
|
|
11
|
-
const generateStatic = (context, configManager, paths) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
11
|
+
const generateStatic = (context, params, configManager, paths) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
12
|
+
const { header = [], folder = '' } = params;
|
|
12
13
|
const q = new promise_queue_1.default(MAX_CONCURRENT);
|
|
13
14
|
const promises = [];
|
|
15
|
+
const headers = header.reduce((result, item) => {
|
|
16
|
+
const [key, value] = item.split(':');
|
|
17
|
+
// eslint-disable-next-line no-param-reassign
|
|
18
|
+
result[key.trim()] = value.trim();
|
|
19
|
+
return result;
|
|
20
|
+
}, {});
|
|
14
21
|
const { rootDir, output } = configManager;
|
|
15
|
-
const staticPath = (0, path_1.resolve)(rootDir, output.static);
|
|
22
|
+
const staticPath = (0, path_1.resolve)(rootDir, output.static, folder);
|
|
16
23
|
for (const path of paths) {
|
|
17
24
|
promises.push(q.add(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
18
25
|
// @todo need something similar to https://nextjs.org/docs/basic-features/data-fetching#getstaticpaths-static-generation
|
|
@@ -30,7 +37,7 @@ const generateStatic = (context, configManager, paths) => tslib_1.__awaiter(void
|
|
|
30
37
|
event: 'COMMAND:STATIC:PAGE_FETCH',
|
|
31
38
|
message: `path: ${path}, message: start fetching page`,
|
|
32
39
|
});
|
|
33
|
-
const html = yield (0, request_1.appRequest)(configManager, path);
|
|
40
|
+
const html = yield (0, request_1.appRequest)(configManager, path, { headers });
|
|
34
41
|
yield (0, fs_extra_1.outputFile)((0, path_1.join)(staticPath, path, 'index.html'), html);
|
|
35
42
|
context.logger.event({
|
|
36
43
|
type: 'debug',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/commands/static/generate.ts"],"names":[],"mappings":";;;;AAAA,+BAAqC;AACrC,0EAAmC;AACnC,uCAAsC;AAItC,yDAAyD;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/commands/static/generate.ts"],"names":[],"mappings":";;;;AAAA,+BAAqC;AACrC,0EAAmC;AACnC,uCAAsC;AAItC,yDAAyD;AAGzD,MAAM,cAAc,GAAG,EAAE,CAAC;AAC1B,MAAM,kBAAkB,GAAG,UAAU,CAAC;AAE/B,MAAM,cAAc,GAAG,CAC5B,OAAgB,EAChB,MAAc,EACd,aAAoD,EACpD,KAAe,EACf,EAAE;IACF,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IAC5C,MAAM,CAAC,GAAG,IAAI,uBAAM,CAAC,cAAc,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QAC7C,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAErC,6CAA6C;QAC7C,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAElC,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,EAA4B,CAAC,CAAC;IAEjC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAC1C,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE3D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,QAAQ,CAAC,IAAI,CACX,CAAC,CAAC,GAAG,CAAC,GAAS,EAAE;YACf,wHAAwH;YACxH,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACjC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;oBACnB,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,yCAAyC;oBAChD,OAAO,EAAE,SAAS,IAAI,0DAA0D;iBACjF,CAAC,CAAC;gBACH,OAAO;aACR;YAED,IAAI;gBACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;oBACnB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,2BAA2B;oBAClC,OAAO,EAAE,SAAS,IAAI,gCAAgC;iBACvD,CAAC,CAAC;gBAEH,MAAM,IAAI,GAAG,MAAM,IAAA,oBAAU,EAAC,aAAa,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;gBAEhE,MAAM,IAAA,qBAAU,EAAC,IAAA,WAAI,EAAC,UAAU,EAAE,IAAI,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;gBAE7D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;oBACnB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,6BAA6B;oBACpC,OAAO,EAAE,SAAS,IAAI,sCAAsC;iBAC7D,CAAC,CAAC;aACJ;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;oBACnB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,sBAAsB;oBAC7B,OAAO,EAAE,SAAS,IAAI,cAAc,CAAC,CAAC,OAAO,EAAE;iBAChD,CAAC,CAAC;aACJ;QACH,CAAC,CAAA,CAAC,CACH,CAAC;KACH;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC,CAAA,CAAC;AA9DW,QAAA,cAAc,kBA8DzB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Context } from '../../models/context';
|
|
2
2
|
import type { CommandResult } from '../../models/command';
|
|
3
|
-
|
|
3
|
+
import type { Params } from './command';
|
|
4
|
+
declare const _default: (context: Context, parameters: Params) => Promise<CommandResult>;
|
|
4
5
|
export default _default;
|
|
5
6
|
//# sourceMappingURL=static.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../../../src/commands/static/static.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../../../src/commands/static/static.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;kCAET,OAAO,cAAc,MAAM,KAAG,QAAQ,aAAa,CAAC;AAAnF,wBAiBE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static.js","sourceRoot":"","sources":["../../../src/commands/static/static.ts"],"names":[],"mappings":";;;AACA,+CAA0C;
|
|
1
|
+
{"version":3,"file":"static.js","sourceRoot":"","sources":["../../../src/commands/static/static.ts"],"names":[],"mappings":";;;AACA,+CAA0C;AAK1C,kBAAe,CAAO,OAAgB,EAAE,UAAkB,EAA0B,EAAE;IACpF,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IAC9B,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAEtD,IAAI,WAAW,CAAC,IAAI,KAAK,aAAa,EAAE;QACtC,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAS,EAAC,OAAO,EAAE,WAAqC,EAAE,UAAU,CAAC,CAAC;QAE3F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,wBAAwB;YAC/B,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;KACf;IAED,MAAM,IAAI,KAAK,CAAC,WAAW,WAAW,CAAC,IAAI,iBAAiB,CAAC,CAAC;AAChE,CAAC,CAAA,CAAC"}
|
|
@@ -1183,23 +1183,23 @@
|
|
|
1183
1183
|
"dotAll": {
|
|
1184
1184
|
"type": "boolean"
|
|
1185
1185
|
},
|
|
1186
|
-
"__@match@
|
|
1186
|
+
"__@match@7210": {
|
|
1187
1187
|
"type": "object",
|
|
1188
1188
|
"additionalProperties": false
|
|
1189
1189
|
},
|
|
1190
|
-
"__@replace@
|
|
1190
|
+
"__@replace@7212": {
|
|
1191
1191
|
"type": "object",
|
|
1192
1192
|
"additionalProperties": false
|
|
1193
1193
|
},
|
|
1194
|
-
"__@search@
|
|
1194
|
+
"__@search@7215": {
|
|
1195
1195
|
"type": "object",
|
|
1196
1196
|
"additionalProperties": false
|
|
1197
1197
|
},
|
|
1198
|
-
"__@split@
|
|
1198
|
+
"__@split@7217": {
|
|
1199
1199
|
"type": "object",
|
|
1200
1200
|
"additionalProperties": false
|
|
1201
1201
|
},
|
|
1202
|
-
"__@matchAll@
|
|
1202
|
+
"__@matchAll@7219": {
|
|
1203
1203
|
"type": "object",
|
|
1204
1204
|
"additionalProperties": false
|
|
1205
1205
|
}
|
|
@@ -1891,23 +1891,23 @@
|
|
|
1891
1891
|
"dotAll": {
|
|
1892
1892
|
"type": "boolean"
|
|
1893
1893
|
},
|
|
1894
|
-
"__@match@
|
|
1894
|
+
"__@match@7210": {
|
|
1895
1895
|
"type": "object",
|
|
1896
1896
|
"additionalProperties": false
|
|
1897
1897
|
},
|
|
1898
|
-
"__@replace@
|
|
1898
|
+
"__@replace@7212": {
|
|
1899
1899
|
"type": "object",
|
|
1900
1900
|
"additionalProperties": false
|
|
1901
1901
|
},
|
|
1902
|
-
"__@search@
|
|
1902
|
+
"__@search@7215": {
|
|
1903
1903
|
"type": "object",
|
|
1904
1904
|
"additionalProperties": false
|
|
1905
1905
|
},
|
|
1906
|
-
"__@split@
|
|
1906
|
+
"__@split@7217": {
|
|
1907
1907
|
"type": "object",
|
|
1908
1908
|
"additionalProperties": false
|
|
1909
1909
|
},
|
|
1910
|
-
"__@matchAll@
|
|
1910
|
+
"__@matchAll@7219": {
|
|
1911
1911
|
"type": "object",
|
|
1912
1912
|
"additionalProperties": false
|
|
1913
1913
|
}
|
|
@@ -2599,23 +2599,23 @@
|
|
|
2599
2599
|
"dotAll": {
|
|
2600
2600
|
"type": "boolean"
|
|
2601
2601
|
},
|
|
2602
|
-
"__@match@
|
|
2602
|
+
"__@match@7210": {
|
|
2603
2603
|
"type": "object",
|
|
2604
2604
|
"additionalProperties": false
|
|
2605
2605
|
},
|
|
2606
|
-
"__@replace@
|
|
2606
|
+
"__@replace@7212": {
|
|
2607
2607
|
"type": "object",
|
|
2608
2608
|
"additionalProperties": false
|
|
2609
2609
|
},
|
|
2610
|
-
"__@search@
|
|
2610
|
+
"__@search@7215": {
|
|
2611
2611
|
"type": "object",
|
|
2612
2612
|
"additionalProperties": false
|
|
2613
2613
|
},
|
|
2614
|
-
"__@split@
|
|
2614
|
+
"__@split@7217": {
|
|
2615
2615
|
"type": "object",
|
|
2616
2616
|
"additionalProperties": false
|
|
2617
2617
|
},
|
|
2618
|
-
"__@matchAll@
|
|
2618
|
+
"__@matchAll@7219": {
|
|
2619
2619
|
"type": "object",
|
|
2620
2620
|
"additionalProperties": false
|
|
2621
2621
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import type { Request } from '@tinkoff/request-core';
|
|
1
2
|
import type { ConfigManager } from '../../config/configManager';
|
|
2
|
-
export declare const appRequest: <T>(configManager: ConfigManager, path: string) => import("@tinkoff/request-core").MakeRequestResult<T>;
|
|
3
|
+
export declare const appRequest: <T>(configManager: ConfigManager, path: string, options?: Request) => import("@tinkoff/request-core").MakeRequestResult<T>;
|
|
3
4
|
export declare const appBundleInfo: (configManager: ConfigManager) => Promise<string[]>;
|
|
4
5
|
//# sourceMappingURL=request.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/utils/dev-app/request.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/utils/dev-app/request.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAIrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAIhE,eAAO,MAAM,UAAU,qBAAsB,aAAa,QAAQ,MAAM,YAAY,OAAO,yDAK1F,CAAC;AAOF,eAAO,MAAM,aAAa,kBAAyB,aAAa,sBAS/D,CAAC"}
|
|
@@ -5,16 +5,20 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const propOr_1 = tslib_1.__importDefault(require("@tinkoff/utils/object/propOr"));
|
|
6
6
|
const request_core_1 = tslib_1.__importDefault(require("@tinkoff/request-core"));
|
|
7
7
|
const request_plugin_protocol_http_1 = tslib_1.__importDefault(require("@tinkoff/request-plugin-protocol-http"));
|
|
8
|
-
const
|
|
9
|
-
const
|
|
8
|
+
const request_plugin_retry_1 = tslib_1.__importDefault(require("@tinkoff/request-plugin-retry"));
|
|
9
|
+
const request = (0, request_core_1.default)([(0, request_plugin_retry_1.default)(), (0, request_plugin_protocol_http_1.default)()]);
|
|
10
|
+
const appRequest = (configManager, path, options) => {
|
|
10
11
|
const { host, port } = configManager;
|
|
11
12
|
const serverPath = `http://${host}:${port}`;
|
|
12
|
-
return request({ url: `${serverPath}${path}` });
|
|
13
|
+
return request(Object.assign({ url: `${serverPath}${path}` }, options));
|
|
13
14
|
};
|
|
14
15
|
exports.appRequest = appRequest;
|
|
15
16
|
const appBundleInfo = (configManager) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
16
17
|
const { name } = configManager;
|
|
17
|
-
const response = yield (0, exports.appRequest)(configManager, `/${name}/papi/bundleInfo
|
|
18
|
+
const response = yield (0, exports.appRequest)(configManager, `/${name}/papi/bundleInfo`, {
|
|
19
|
+
timeout: 5000,
|
|
20
|
+
retry: 3,
|
|
21
|
+
});
|
|
18
22
|
return (0, propOr_1.default)('payload', [], response);
|
|
19
23
|
});
|
|
20
24
|
exports.appBundleInfo = appBundleInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/utils/dev-app/request.ts"],"names":[],"mappings":";;;;AAAA,kFAAkD;
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/utils/dev-app/request.ts"],"names":[],"mappings":";;;;AAAA,kFAAkD;AAElD,iFAAkD;AAClD,iHAAyD;AACzD,iGAAkD;AAGlD,MAAM,OAAO,GAAG,IAAA,sBAAa,EAAC,CAAC,IAAA,8BAAK,GAAE,EAAE,IAAA,sCAAI,GAAE,CAAC,CAAC,CAAC;AAE1C,MAAM,UAAU,GAAG,CAAI,aAA4B,EAAE,IAAY,EAAE,OAAiB,EAAE,EAAE;IAC7F,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IACrC,MAAM,UAAU,GAAG,UAAU,IAAI,IAAI,IAAI,EAAE,CAAC;IAE5C,OAAO,OAAO,iBAAM,GAAG,EAAE,GAAG,UAAU,GAAG,IAAI,EAAE,IAAK,OAAO,EAAG,CAAC;AACjE,CAAC,CAAC;AALW,QAAA,UAAU,cAKrB;AAOK,MAAM,aAAa,GAAG,CAAO,aAA4B,EAAE,EAAE;IAClE,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IAE/B,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAqB,aAAa,EAAE,IAAI,IAAI,kBAAkB,EAAE;QAC/F,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,CAAC;KACT,CAAC,CAAC;IAEH,OAAO,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC,CAAA,CAAC;AATW,QAAA,aAAa,iBASxB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/cli",
|
|
3
|
-
"version": "3.41.
|
|
3
|
+
"version": "3.41.19",
|
|
4
4
|
"description": "Cli инструмент для сборки и запуска приложений",
|
|
5
5
|
"files": [
|
|
6
6
|
"src",
|
|
@@ -64,17 +64,18 @@
|
|
|
64
64
|
"@tinkoff/browserslist-config": "0.3.3",
|
|
65
65
|
"@tinkoff/dippy": "0.9.4",
|
|
66
66
|
"@tinkoff/is-modern-lib": "3.0.4",
|
|
67
|
-
"@tinkoff/logger": "0.10.
|
|
67
|
+
"@tinkoff/logger": "0.10.173",
|
|
68
68
|
"@tinkoff/minicss-class-generator": "0.3.1",
|
|
69
69
|
"@tinkoff/package-manager-wrapper": "0.2.2",
|
|
70
70
|
"@tinkoff/request-core": "^0.10.0",
|
|
71
71
|
"@tinkoff/request-plugin-protocol-http": "^0.12.1",
|
|
72
|
+
"@tinkoff/request-plugin-retry": "^0.3.0",
|
|
72
73
|
"@tinkoff/utils": "^2.1.3",
|
|
73
74
|
"@tinkoff/webpack-dedupe-plugin": "2.0.2",
|
|
74
75
|
"@tramvai/build": "4.1.3",
|
|
75
|
-
"@tramvai/react": "3.41.
|
|
76
|
-
"@tramvai/tools-check-versions": "0.5.
|
|
77
|
-
"@tramvai/tools-migrate": "0.7.
|
|
76
|
+
"@tramvai/react": "3.41.19",
|
|
77
|
+
"@tramvai/tools-check-versions": "0.5.6",
|
|
78
|
+
"@tramvai/tools-migrate": "0.7.6",
|
|
78
79
|
"ajv": "^8.12.0",
|
|
79
80
|
"ansi-escapes": "^4.3.2",
|
|
80
81
|
"autoprefixer": "^10.4.8",
|
package/schema.json
CHANGED
|
@@ -1205,23 +1205,23 @@
|
|
|
1205
1205
|
"dotAll": {
|
|
1206
1206
|
"type": "boolean"
|
|
1207
1207
|
},
|
|
1208
|
-
"__@match@
|
|
1208
|
+
"__@match@7210": {
|
|
1209
1209
|
"type": "object",
|
|
1210
1210
|
"additionalProperties": false
|
|
1211
1211
|
},
|
|
1212
|
-
"__@replace@
|
|
1212
|
+
"__@replace@7212": {
|
|
1213
1213
|
"type": "object",
|
|
1214
1214
|
"additionalProperties": false
|
|
1215
1215
|
},
|
|
1216
|
-
"__@search@
|
|
1216
|
+
"__@search@7215": {
|
|
1217
1217
|
"type": "object",
|
|
1218
1218
|
"additionalProperties": false
|
|
1219
1219
|
},
|
|
1220
|
-
"__@split@
|
|
1220
|
+
"__@split@7217": {
|
|
1221
1221
|
"type": "object",
|
|
1222
1222
|
"additionalProperties": false
|
|
1223
1223
|
},
|
|
1224
|
-
"__@matchAll@
|
|
1224
|
+
"__@matchAll@7219": {
|
|
1225
1225
|
"type": "object",
|
|
1226
1226
|
"additionalProperties": false
|
|
1227
1227
|
}
|
|
@@ -1922,23 +1922,23 @@
|
|
|
1922
1922
|
"dotAll": {
|
|
1923
1923
|
"type": "boolean"
|
|
1924
1924
|
},
|
|
1925
|
-
"__@match@
|
|
1925
|
+
"__@match@7210": {
|
|
1926
1926
|
"type": "object",
|
|
1927
1927
|
"additionalProperties": false
|
|
1928
1928
|
},
|
|
1929
|
-
"__@replace@
|
|
1929
|
+
"__@replace@7212": {
|
|
1930
1930
|
"type": "object",
|
|
1931
1931
|
"additionalProperties": false
|
|
1932
1932
|
},
|
|
1933
|
-
"__@search@
|
|
1933
|
+
"__@search@7215": {
|
|
1934
1934
|
"type": "object",
|
|
1935
1935
|
"additionalProperties": false
|
|
1936
1936
|
},
|
|
1937
|
-
"__@split@
|
|
1937
|
+
"__@split@7217": {
|
|
1938
1938
|
"type": "object",
|
|
1939
1939
|
"additionalProperties": false
|
|
1940
1940
|
},
|
|
1941
|
-
"__@matchAll@
|
|
1941
|
+
"__@matchAll@7219": {
|
|
1942
1942
|
"type": "object",
|
|
1943
1943
|
"additionalProperties": false
|
|
1944
1944
|
}
|
|
@@ -2639,23 +2639,23 @@
|
|
|
2639
2639
|
"dotAll": {
|
|
2640
2640
|
"type": "boolean"
|
|
2641
2641
|
},
|
|
2642
|
-
"__@match@
|
|
2642
|
+
"__@match@7210": {
|
|
2643
2643
|
"type": "object",
|
|
2644
2644
|
"additionalProperties": false
|
|
2645
2645
|
},
|
|
2646
|
-
"__@replace@
|
|
2646
|
+
"__@replace@7212": {
|
|
2647
2647
|
"type": "object",
|
|
2648
2648
|
"additionalProperties": false
|
|
2649
2649
|
},
|
|
2650
|
-
"__@search@
|
|
2650
|
+
"__@search@7215": {
|
|
2651
2651
|
"type": "object",
|
|
2652
2652
|
"additionalProperties": false
|
|
2653
2653
|
},
|
|
2654
|
-
"__@split@
|
|
2654
|
+
"__@split@7217": {
|
|
2655
2655
|
"type": "object",
|
|
2656
2656
|
"additionalProperties": false
|
|
2657
2657
|
},
|
|
2658
|
-
"__@matchAll@
|
|
2658
|
+
"__@matchAll@7219": {
|
|
2659
2659
|
"type": "object",
|
|
2660
2660
|
"additionalProperties": false
|
|
2661
2661
|
}
|
|
@@ -167,7 +167,7 @@ export const staticApp = async (
|
|
|
167
167
|
message: `message: routes fetched, generate pages`,
|
|
168
168
|
});
|
|
169
169
|
|
|
170
|
-
await generateStatic(context, serverConfigManager, paths);
|
|
170
|
+
await generateStatic(context, options, serverConfigManager, paths);
|
|
171
171
|
|
|
172
172
|
context.logger.event({
|
|
173
173
|
type: 'debug',
|
|
@@ -8,6 +8,8 @@ export type Params = {
|
|
|
8
8
|
serve?: boolean;
|
|
9
9
|
buildType: 'all' | 'none';
|
|
10
10
|
onlyPages?: string[];
|
|
11
|
+
header?: string[];
|
|
12
|
+
folder?: string;
|
|
11
13
|
};
|
|
12
14
|
|
|
13
15
|
export class StaticCommand extends CLICommand<Params> {
|
|
@@ -40,6 +42,16 @@ export class StaticCommand extends CLICommand<Params> {
|
|
|
40
42
|
transformer: (value: string) => value.split(','),
|
|
41
43
|
description: 'Specify the comma separated paths list for static HTML generation',
|
|
42
44
|
},
|
|
45
|
+
{
|
|
46
|
+
name: '--header',
|
|
47
|
+
value: '[header...]',
|
|
48
|
+
description: 'Add extra headers, which will be added to request for application pages',
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
name: '--folder',
|
|
52
|
+
value: '[folder]',
|
|
53
|
+
description: 'Subfolder, when generated pages will be placed',
|
|
54
|
+
},
|
|
43
55
|
{
|
|
44
56
|
name: '--fileCache',
|
|
45
57
|
value: '[fileCache]',
|
|
@@ -5,20 +5,31 @@ import type { Context } from '../../models/context';
|
|
|
5
5
|
import type { ConfigManager } from '../../config/configManager';
|
|
6
6
|
import type { ApplicationConfigEntry } from '../../typings/configEntry/application';
|
|
7
7
|
import { appRequest } from '../../utils/dev-app/request';
|
|
8
|
+
import type { Params } from './command';
|
|
8
9
|
|
|
9
10
|
const MAX_CONCURRENT = 10;
|
|
10
11
|
const DYNAMIC_PAGE_REGEX = /\/:.+\//g;
|
|
11
12
|
|
|
12
13
|
export const generateStatic = async (
|
|
13
14
|
context: Context,
|
|
15
|
+
params: Params,
|
|
14
16
|
configManager: ConfigManager<ApplicationConfigEntry>,
|
|
15
17
|
paths: string[]
|
|
16
18
|
) => {
|
|
19
|
+
const { header = [], folder = '' } = params;
|
|
17
20
|
const q = new PQueue(MAX_CONCURRENT);
|
|
18
21
|
const promises = [];
|
|
22
|
+
const headers = header.reduce((result, item) => {
|
|
23
|
+
const [key, value] = item.split(':');
|
|
24
|
+
|
|
25
|
+
// eslint-disable-next-line no-param-reassign
|
|
26
|
+
result[key.trim()] = value.trim();
|
|
27
|
+
|
|
28
|
+
return result;
|
|
29
|
+
}, {} as Record<string, string>);
|
|
19
30
|
|
|
20
31
|
const { rootDir, output } = configManager;
|
|
21
|
-
const staticPath = resolve(rootDir, output.static);
|
|
32
|
+
const staticPath = resolve(rootDir, output.static, folder);
|
|
22
33
|
|
|
23
34
|
for (const path of paths) {
|
|
24
35
|
promises.push(
|
|
@@ -40,7 +51,7 @@ export const generateStatic = async (
|
|
|
40
51
|
message: `path: ${path}, message: start fetching page`,
|
|
41
52
|
});
|
|
42
53
|
|
|
43
|
-
const html = await appRequest(configManager, path);
|
|
54
|
+
const html = await appRequest(configManager, path, { headers });
|
|
44
55
|
|
|
45
56
|
await outputFile(join(staticPath, path, 'index.html'), html);
|
|
46
57
|
|
|
@@ -2,8 +2,9 @@ import type { Context } from '../../models/context';
|
|
|
2
2
|
import { staticApp } from './application';
|
|
3
3
|
import type { CommandResult } from '../../models/command';
|
|
4
4
|
import type { ApplicationConfigEntry } from '../../typings/configEntry/application';
|
|
5
|
+
import type { Params } from './command';
|
|
5
6
|
|
|
6
|
-
export default async (context: Context, parameters): Promise<CommandResult> => {
|
|
7
|
+
export default async (context: Context, parameters: Params): Promise<CommandResult> => {
|
|
7
8
|
const { target } = parameters;
|
|
8
9
|
const configEntry = context.config.getProject(target);
|
|
9
10
|
|
|
@@ -1183,23 +1183,23 @@
|
|
|
1183
1183
|
"dotAll": {
|
|
1184
1184
|
"type": "boolean"
|
|
1185
1185
|
},
|
|
1186
|
-
"__@match@
|
|
1186
|
+
"__@match@7210": {
|
|
1187
1187
|
"type": "object",
|
|
1188
1188
|
"additionalProperties": false
|
|
1189
1189
|
},
|
|
1190
|
-
"__@replace@
|
|
1190
|
+
"__@replace@7212": {
|
|
1191
1191
|
"type": "object",
|
|
1192
1192
|
"additionalProperties": false
|
|
1193
1193
|
},
|
|
1194
|
-
"__@search@
|
|
1194
|
+
"__@search@7215": {
|
|
1195
1195
|
"type": "object",
|
|
1196
1196
|
"additionalProperties": false
|
|
1197
1197
|
},
|
|
1198
|
-
"__@split@
|
|
1198
|
+
"__@split@7217": {
|
|
1199
1199
|
"type": "object",
|
|
1200
1200
|
"additionalProperties": false
|
|
1201
1201
|
},
|
|
1202
|
-
"__@matchAll@
|
|
1202
|
+
"__@matchAll@7219": {
|
|
1203
1203
|
"type": "object",
|
|
1204
1204
|
"additionalProperties": false
|
|
1205
1205
|
}
|
|
@@ -1891,23 +1891,23 @@
|
|
|
1891
1891
|
"dotAll": {
|
|
1892
1892
|
"type": "boolean"
|
|
1893
1893
|
},
|
|
1894
|
-
"__@match@
|
|
1894
|
+
"__@match@7210": {
|
|
1895
1895
|
"type": "object",
|
|
1896
1896
|
"additionalProperties": false
|
|
1897
1897
|
},
|
|
1898
|
-
"__@replace@
|
|
1898
|
+
"__@replace@7212": {
|
|
1899
1899
|
"type": "object",
|
|
1900
1900
|
"additionalProperties": false
|
|
1901
1901
|
},
|
|
1902
|
-
"__@search@
|
|
1902
|
+
"__@search@7215": {
|
|
1903
1903
|
"type": "object",
|
|
1904
1904
|
"additionalProperties": false
|
|
1905
1905
|
},
|
|
1906
|
-
"__@split@
|
|
1906
|
+
"__@split@7217": {
|
|
1907
1907
|
"type": "object",
|
|
1908
1908
|
"additionalProperties": false
|
|
1909
1909
|
},
|
|
1910
|
-
"__@matchAll@
|
|
1910
|
+
"__@matchAll@7219": {
|
|
1911
1911
|
"type": "object",
|
|
1912
1912
|
"additionalProperties": false
|
|
1913
1913
|
}
|
|
@@ -2599,23 +2599,23 @@
|
|
|
2599
2599
|
"dotAll": {
|
|
2600
2600
|
"type": "boolean"
|
|
2601
2601
|
},
|
|
2602
|
-
"__@match@
|
|
2602
|
+
"__@match@7210": {
|
|
2603
2603
|
"type": "object",
|
|
2604
2604
|
"additionalProperties": false
|
|
2605
2605
|
},
|
|
2606
|
-
"__@replace@
|
|
2606
|
+
"__@replace@7212": {
|
|
2607
2607
|
"type": "object",
|
|
2608
2608
|
"additionalProperties": false
|
|
2609
2609
|
},
|
|
2610
|
-
"__@search@
|
|
2610
|
+
"__@search@7215": {
|
|
2611
2611
|
"type": "object",
|
|
2612
2612
|
"additionalProperties": false
|
|
2613
2613
|
},
|
|
2614
|
-
"__@split@
|
|
2614
|
+
"__@split@7217": {
|
|
2615
2615
|
"type": "object",
|
|
2616
2616
|
"additionalProperties": false
|
|
2617
2617
|
},
|
|
2618
|
-
"__@matchAll@
|
|
2618
|
+
"__@matchAll@7219": {
|
|
2619
2619
|
"type": "object",
|
|
2620
2620
|
"additionalProperties": false
|
|
2621
2621
|
}
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import propOr from '@tinkoff/utils/object/propOr';
|
|
2
|
+
import type { Request } from '@tinkoff/request-core';
|
|
2
3
|
import createRequest from '@tinkoff/request-core';
|
|
3
4
|
import http from '@tinkoff/request-plugin-protocol-http';
|
|
5
|
+
import retry from '@tinkoff/request-plugin-retry';
|
|
4
6
|
import type { ConfigManager } from '../../config/configManager';
|
|
5
7
|
|
|
6
|
-
const request = createRequest([http()]);
|
|
8
|
+
const request = createRequest([retry(), http()]);
|
|
7
9
|
|
|
8
|
-
export const appRequest = <T>(configManager: ConfigManager, path: string) => {
|
|
10
|
+
export const appRequest = <T>(configManager: ConfigManager, path: string, options?: Request) => {
|
|
9
11
|
const { host, port } = configManager;
|
|
10
12
|
const serverPath = `http://${host}:${port}`;
|
|
11
13
|
|
|
12
|
-
return request<T>({ url: `${serverPath}${path}
|
|
14
|
+
return request<T>({ url: `${serverPath}${path}`, ...options });
|
|
13
15
|
};
|
|
14
16
|
|
|
15
17
|
interface BundleInfoResponse {
|
|
@@ -20,7 +22,10 @@ interface BundleInfoResponse {
|
|
|
20
22
|
export const appBundleInfo = async (configManager: ConfigManager) => {
|
|
21
23
|
const { name } = configManager;
|
|
22
24
|
|
|
23
|
-
const response = await appRequest<BundleInfoResponse>(configManager, `/${name}/papi/bundleInfo
|
|
25
|
+
const response = await appRequest<BundleInfoResponse>(configManager, `/${name}/papi/bundleInfo`, {
|
|
26
|
+
timeout: 5000,
|
|
27
|
+
retry: 3,
|
|
28
|
+
});
|
|
24
29
|
|
|
25
30
|
return propOr('payload', [], response);
|
|
26
31
|
};
|