npm - @tramvai/cli - Versions diffs - 7.5.3 → 7.11.0 - Mend

@tramvai/cli 7.5.3 → 7.11.0

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.

Files changed (90) hide show

package/lib/cli/index.js CHANGED Viewed

@@ -53,6 +53,7 @@ async function cliInitialized(cliArgs = process.argv) {
         const tasksMap = await loadTasks();
         const { content: packageInfo = defaultPackageInfo } = (0, getRootFile_1.getRootFile)('package.json');
         const { content: config } = (0, getTramvaiConfig_1.getTramvaiConfig)();
+        // todo: different build id here, can be a problem?
         const configManager = new config_1.ConfigManager({ config, syncConfigFile: syncJsonFile_1.syncJsonFile });
         const packageManager = (0, package_manager_wrapper_1.resolvePackageManager)({ rootDir: process.cwd() });
         analytics = new analytics_1.AnalyticsService({

package/lib/cli/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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~~AAxED~~,~~wCAwEC~~"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}

package/lib/commands/static/generate.d.ts CHANGED Viewed

@@ -2,5 +2,13 @@ import type { Context } from '../../models/context';
 import type { ConfigManager } from '../../config/configManager';
 import type { ApplicationConfigEntry } from '../../typings/configEntry/application';
 import type { Params } from './command';
-export declare const generateStatic: (context: Context, params: Params, configManager: ConfigManager<ApplicationConfigEntry>, paths: string[]) => Promise<any[]>;
+export interface PrerenderRequest {
+    /**
+     * Page path, for example, '/product/123/', without query parameters
+     */
+    pathname: string;
+    headers?: Record<string, string>;
+    query?: Record<string, string>;
+}
+export declare const generateStatic: (context: Context, params: Params, configManager: ConfigManager<ApplicationConfigEntry>, paths: Array<string | PrerenderRequest>) => Promise<void>;
 //# sourceMappingURL=generate.d.ts.map

package/lib/commands/static/generate.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/static/generate.ts"],"names":[],"mappings":"AAIA,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;AAIxC,eAAO,MAAM,cAAc,YAChB,OAAO,UACR,MAAM,iBACC,cAAc,sBAAsB,CAAC,SAC7C,MAAM,~~EAAE~~,~~mBAoEhB~~,CAAC"}
1	+ {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/static/generate.ts"],"names":[],"mappings":"AAIA,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;AAIxC,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED,eAAO,MAAM,cAAc,YAChB,OAAO,UACR,MAAM,iBACC,cAAc,sBAAsB,CAAC,SAC7C,MAAM,MAAM,GAAG,gBAAgB,CAAC,kBAqIxC,CAAC"}

package/lib/commands/static/generate.js CHANGED Viewed

@@ -5,14 +5,16 @@ const tslib_1 = require("tslib");
 const path_1 = require("path");
 const promise_queue_1 = tslib_1.__importDefault(require("promise-queue"));
 const fs_extra_1 = require("fs-extra");
-const request_plugin_protocol_http_1 = require("@tinkoff/request-plugin-protocol-http");
 const request_1 = require("../../utils/dev-app/request");
 const MAX_CONCURRENT = 10;
 const generateStatic = async (context, params, configManager, paths) => {
+    const meta = {
+        staticPages: [],
+    };
     const { header = [], folder = '' } = params;
     const q = new promise_queue_1.default(MAX_CONCURRENT);
     const promises = [];
-    const headers = header.reduce((result, item) => {
+    const baseHeaders = header.reduce((result, item) => {
         const [key, value] = item.split(':');
         // eslint-disable-next-line no-param-reassign
         result[key.trim()] = value.trim();
@@ -22,43 +24,89 @@ const generateStatic = async (context, params, configManager, paths) => {
     });
     const { rootDir, output } = configManager;
     const staticPath = (0, path_1.resolve)(rootDir, output.static, folder);
-    for (const path of paths) {
-        promises.push(q.add(async () => {
+    for (const pathOrRequest of paths) {
+        promises.push(
+        // eslint-disable-next-line max-statements
+        q.add(async () => {
             let response;
+            const request = typeof pathOrRequest === 'string' ? { pathname: pathOrRequest } : pathOrRequest;
+            const { pathname, headers: requestHeaders = {}, query = {} } = request;
+            const mergedHeaders = {
+                ...baseHeaders,
+                ...requestHeaders,
+            };
             try {
                 context.logger.event({
                     type: 'debug',
                     event: 'COMMAND:STATIC:PAGE_FETCH',
-                    message: `path: ${path}, message: start fetching page`,
+                    message: `path: ${pathname}, message: start fetching page`,
+                    payload: {
+                        headers: mergedHeaders,
+                        query,
+                    },
                 });
-                response = (0, request_1.appRequest)(configManager, path, { headers });
-                const html = await response;
-                await (0, fs_extra_1.outputFile)((0, path_1.join)(staticPath, path, 'index.html'), html);
-                context.logger.event({
-                    type: 'debug',
-                    event: 'COMMAND:STATIC:PAGE_CREATED',
-                    message: `path: ${path}, message: page created successfully`,
+                response = await (0, request_1.appFetch)(configManager, pathname, {
+                    query,
+                    headers: mergedHeaders,
+                    // we need to save raw redirect response status code and headers
+                    redirect: 'manual',
                 });
-            }
-            catch (e) {
-                const responseHeaders = response ? (0, request_plugin_protocol_http_1.getHeaders)(response) : {};
-                if (responseHeaders['x-tramvai-prerender-skip'] === 'true') {
+                if (response?.headers?.get('x-tramvai-prerender-skip') === 'true') {
                     context.logger.event({
                         type: 'debug',
                         event: 'COMMAND:STATIC:PAGE_SKIP',
-                        message: `path: ${path}, message: page prerender skipped`,
+                        message: `path: ${pathname}, message: page prerender skipped`,
+                        payload: {
+                            headers: mergedHeaders,
+                            query,
+                        },
                     });
                     return;
                 }
+                const keyHeader = response.headers.get('x-tramvai-static-page-key');
+                const routeHeader = response.headers.get('x-tramvai-static-page-route');
+                const filename = keyHeader ? `index.${keyHeader}.html` : 'index.html';
+                const metaFilename = keyHeader ? `index.${keyHeader}.json` : 'index.json';
+                const outputPath = (0, path_1.join)(staticPath, pathname, filename);
+                const metaOutputPath = (0, path_1.join)(staticPath, pathname, metaFilename);
+                if (typeof routeHeader === 'string') {
+                    const route = JSON.parse(routeHeader);
+                    if (!meta.staticPages.some((item) => item.name === route.name || item.path === route.path)) {
+                        meta.staticPages.push(route);
+                    }
+                }
+                await (0, fs_extra_1.outputFile)(outputPath, await response.text());
+                await (0, fs_extra_1.outputFile)(metaOutputPath, JSON.stringify({
+                    // @ts-expect-error
+                    headers: Object.fromEntries(response.headers),
+                    status: response.status,
+                }, null, 2));
+                context.logger.event({
+                    type: 'debug',
+                    event: 'COMMAND:STATIC:PAGE_CREATED',
+                    message: `path: ${pathname}${keyHeader ? `, key: ${keyHeader}` : ''}, message: page created successfully at ${outputPath}`,
+                    payload: {
+                        headers: mergedHeaders,
+                        query,
+                    },
+                });
+            }
+            catch (e) {
                 context.logger.event({
                     type: 'error',
                     event: 'COMMAND:STATIC:ERROR',
-                    message: `path: ${path}, message: ${e.message}`,
+                    message: `path: ${pathname}, message: ${e.message}`,
+                    payload: {
+                        headers: mergedHeaders,
+                        query,
+                    },
                 });
             }
         }));
     }
-    return Promise.all(promises);
+    return Promise.all(promises).then(() => {
+        return (0, fs_extra_1.outputFile)((0, path_1.join)(staticPath, 'meta.json'), JSON.stringify(meta, null, 2));
+    });
 };
 exports.generateStatic = generateStatic;
 //# sourceMappingURL=generate.js.map

package/lib/commands/static/generate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/commands/static/generate.ts"],"names":[],"mappings":";;;;AAAA,+BAAqC;AACrC,0EAAmC;AACnC,uCAAsC;~~AACtC~~,~~wFAAmE~~;~~AAInE~~,~~yDAAyD;AAGzD,~~MAAM,cAAc,GAAG,EAAE,CAAC;~~AAEnB~~,MAAM,cAAc,GAAG,KAAK,EACjC,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,~~CAC3B~~,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACf,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,EACD;QACE,qBAAqB,EAAE,MAAM;KACJ,CAC5B,CAAC;IAEF,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,KAAK,IAAI,EAAE;YACf,IAAI,~~QAAa~~,CAAC;~~YAElB~~,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,QAAQ,GAAG,IAAA,~~oBAAU~~,EAAC,aAAa,EAAE,~~IAAI~~,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;~~gBACxD~~,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC;~~gBAE5B~~,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~~,MAAM,~~eAAe~~,~~GAAG~~,QAAQ,CAAC,CAAC,CAAC,IAAA,~~yCAAU~~,~~EAAC~~,~~QAAQ~~,CAAC,CAAC,CAAC,CAAC,~~EAAE~~,CAAC;~~gBAE7D~~,~~IAAI~~,~~eAAe~~,CAAC,~~0BAA0B~~,CAAC,~~KAAK~~,~~MAAM~~,~~EAAE~~;~~oBAC1D~~,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;~~wBACnB~~,IAAI,EAAE,OAAO;~~wBACb~~,KAAK,EAAE,~~0BAA0B~~;~~wBACjC~~,OAAO,EAAE,SAAS,~~IAAI~~,~~mCAAmC;qBAC1D~~,CAAC,CAAC;~~oBAEH~~,OAAO;~~iBACR~~;~~gBAED~~,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,CAAC,CACH,CAAC;KACH;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;~~AAC/B~~,CAAC,CAAC;~~AAxEW~~,QAAA,cAAc,~~kBAwEzB~~"}
1	+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/commands/static/generate.ts"],"names":[],"mappings":"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"}

package/lib/commands/update/update.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAQ1D,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;kCAGS,OAAO,wBACiB,MAAM,KACtC,QAAQ,aAAa,CAAC;AAHzB,~~wBA0EE~~"}
1	+ {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAQ1D,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;kCAGS,OAAO,wBACiB,MAAM,KACtC,QAAQ,aAAa,CAAC;AAHzB,wBA4EE"}

package/lib/commands/update/update.js CHANGED Viewed

@@ -32,6 +32,7 @@ exports.default = async (context, { to: version = 'latest', tag }) => {
         message: 'Installing dependencies',
     });
     await context.packageManager.install({ stdio: 'inherit' });
+    // todo если с --tag то для npm надо запустить `npm update --no-save`
     if (context.packageManager.name !== 'npm') {
         // npm dedupe is extremely slow in most cases
         // so execute it only for yarn

package/lib/commands/update/update.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":";;AAEA,uGAAoG;AACpG,uEAAoE;AACpE,2DAAwD;AACxD,mFAAgF;AAEhF,6FAA0F;AAO1F,kBAAe,KAAK,EAClB,OAAgB,EAChB,EAAE,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAE,GAAG,EAAU,EACf,EAAE;IAC1B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAC/D,MAAM,eAAe,GAAG,GAAG;QACzB,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,IAAA,iDAAuB,EAAC,cAAc,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACrE,MAAM,cAAc,GAAG,MAAM,IAAA,uCAAkB,GAAE,CAAC;IAElD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;KACH;IAED,IAAI,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,eAAe,EAAE;QACpE,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;KACH;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,oCAAoC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,KAAK,eAAe,0BAA0B,cAAc,GAAG;KACpI,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE;QACrC,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAClD,IAAA,qCAAiB,EAAC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,CAAC,CACtF,CACF,CAAC;KACH;IAED,MAAM,IAAA,qCAAiB,EAAC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IAEjF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,yBAAyB;KACnC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAE3D,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE;QACzC,6CAA6C;QAC7C,8BAA8B;QAC9B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,OAAO,EAAE,0BAA0B;SACpC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;KAC3D;IAED,MAAM,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;IAEvB,MAAM,IAAA,6BAAa,EAAC,OAAO,CAAC,CAAC;IAE7B,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE;QACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,QAAQ;YACf,OAAO,EACL,8FAA8F;SACjG,CAAC,CAAC;KACJ;IAED,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;AACL,CAAC,CAAC"}
1	+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":";;AAEA,uGAAoG;AACpG,uEAAoE;AACpE,2DAAwD;AACxD,mFAAgF;AAEhF,6FAA0F;AAO1F,kBAAe,KAAK,EAClB,OAAgB,EAChB,EAAE,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAE,GAAG,EAAU,EACf,EAAE;IAC1B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAC/D,MAAM,eAAe,GAAG,GAAG;QACzB,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,IAAA,iDAAuB,EAAC,cAAc,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACrE,MAAM,cAAc,GAAG,MAAM,IAAA,uCAAkB,GAAE,CAAC;IAElD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;KACH;IAED,IAAI,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,eAAe,EAAE;QACpE,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;KACH;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,oCAAoC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,KAAK,eAAe,0BAA0B,cAAc,GAAG;KACpI,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE;QACrC,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAClD,IAAA,qCAAiB,EAAC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,CAAC,CACtF,CACF,CAAC;KACH;IAED,MAAM,IAAA,qCAAiB,EAAC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IAEjF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,yBAAyB;KACnC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAE3D,qEAAqE;IAErE,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE;QACzC,6CAA6C;QAC7C,8BAA8B;QAC9B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,OAAO,EAAE,0BAA0B;SACpC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;KAC3D;IAED,MAAM,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;IAEvB,MAAM,IAAA,6BAAa,EAAC,OAAO,CAAC,CAAC;IAE7B,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE;QACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,QAAQ;YACf,OAAO,EACL,8FAA8F;SACjG,CAAC,CAAC;KACJ;IAED,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;AACL,CAAC,CAAC"}

package/lib/config/configManager.d.ts CHANGED Viewed

@@ -8,6 +8,7 @@ export interface Settings<E extends Env> {
     rootDir?: string;
     version?: string;
     buildType?: BuildType;
+    buildId?: string;
     debug?: string | boolean;
     verboseWebpack?: boolean;
     trace?: boolean;
@@ -33,8 +34,10 @@ type OmitOverridable<T extends Record<string, any>> = {
     [key in keyof T]: T[key] extends OverridableOption<infer U> ? U : T[key] extends Record<string, any> ? OmitOverridable<T[key]> : T[key];
 };
 export type ConfigManager<C extends ConfigEntry = ConfigEntry, E extends Env = Env> = OmitOverridable<C> & Required<Settings<E>> & {
+    buildId: string;
     target: Target;
     buildPath: string;
+    prerenderPagesPath?: string;
     withSettings(settings: Settings<E>): ConfigManager<C, E>;
     dehydrate(): [C, Settings<E>];
     assetsPrefix?: string;

package/lib/config/configManager.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"configManager.d.ts","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"~~AAOA~~,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,GAAG;IAErC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE7B,GAAG,CAAC,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,GAAG,OAAO,CAAC;IAChF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAgBD,KAAK,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;KACnD,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,iBAAiB,CAAC,MAAM,CAAC,CAAC,GACvD,CAAC,GACD,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAChC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GACvB,CAAC,CAAC,GAAG,CAAC;CACb,CAAC;AAmBF,MAAM,MAAM,aAAa,CACvB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,GAAG,GAAG,GAAG,IACjB,eAAe,CAAC,CAAC,CAAC,GACpB,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,SAAS,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CACjC,CAAC;AAEJ,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAG/C,eAAO,MAAM,mBAAmB,~~0HAgJ~~/B,CAAC"}
1	+ {"version":3,"file":"configManager.d.ts","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"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"}

package/lib/config/configManager.js CHANGED Viewed

@@ -9,6 +9,7 @@ const prop_1 = tslib_1.__importDefault(require("@tinkoff/utils/object/prop"));
 const map_1 = tslib_1.__importDefault(require("@tinkoff/utils/object/map"));
 const path_1 = require("path");
 const fs_1 = tslib_1.__importDefault(require("fs"));
+const nanoid_1 = require("nanoid");
 const common_1 = require("../typings/configEntry/common");
 const validate_1 = require("./validate");
 const moduleVersion_1 = tslib_1.__importDefault(require("../utils/moduleVersion"));
@@ -39,6 +40,7 @@ const omitEnvOptions = (env, options) => {
 exports.DEFAULT_STATIC_HOST = 'localhost';
 // eslint-disable-next-line max-statements, complexity
 const createConfigManager = (configEntry, settings) => {
+    const buildId = settings.buildId ?? (0, nanoid_1.nanoid)();
     const env = settings.env ?? 'development';
     const normalizedConfigEntry = omitEnvOptions(env, configEntry);
     const { type } = configEntry;
@@ -52,6 +54,7 @@ const createConfigManager = (configEntry, settings) => {
         target = 'node';
     }
     const config = {
+        buildId,
         ...normalizedConfigEntry,
         version: (type === 'module' ? (0, moduleVersion_1.default)(configEntry) : '') ||
             (0, packageVersion_1.packageVersion)(configEntry, env, rootDir) ||
@@ -106,6 +109,7 @@ const createConfigManager = (configEntry, settings) => {
             return [
                 configEntry,
                 {
+                    buildId,
                     ...settings,
                     // drop options that couldn't be serialized
                     stdout: undefined,
@@ -120,6 +124,10 @@ const createConfigManager = (configEntry, settings) => {
                 ? process.env.ASSETS_PREFIX
                 : `${config.httpProtocol}://${config.staticHost}:${config.staticPort}/${config.output.client.replace(/\/$/, '')}/`;
         config.buildPath = (0, path_1.resolve)(rootDir, buildType === 'server' ? config.output.server : config.output.client);
+        config.prerenderPagesPath =
+            env === 'development'
+                ? (0, path_1.resolve)(rootDir, config.output.static, config.buildId)
+                : (0, path_1.resolve)(rootDir, config.output.static);
         const pwa = config.experiments?.pwa;
         if (pwa.webmanifest?.enabled) {
             pwa.webmanifest = {

package/lib/config/configManager.js.map CHANGED Viewed

	@@ -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;AAC/B,oDAAoB;~~AAIpB~~,0DAAoE;AACpE,yCAA2E;AAC3E,mFAAmD;AACnD,4DAAyD;AACzD,6CAA0C;AAE1C,yDAAqD;~~AAiCrD~~,MAAM,SAAS,GAAG,CAAI,UAAkB,EAAE,IAAW,EAAE,YAAe,EAAK,EAAE;IAC3E,MAAM,MAAM,GAAG,IAAA,cAAI,EAAC,UAAU,CAAC,CAAC;IAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9B,IAAI,CAAC,IAAA,aAAK,EAAC,KAAK,CAAC,EAAE;YACjB,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAUF,MAAM,cAAc,GAAG,CACrB,GAAQ,EACR,OAAU,EACU,EAAE;IACtB,OAAO,IAAA,aAAM,EAAC,CAAC,KAAK,EAAE,EAAE;QACtB,IAAI,IAAA,4BAAmB,EAAC,KAAK,CAAC,EAAE;YAC9B,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;SACnB;QAED,IAAI,IAAA,gBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,IAAA,eAAO,EAAC,KAAK,CAAC,EAAE;YACtC,OAAO,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACnC;QAED,OAAO,KAAK,CAAC;IACf,CAAC,EAAE,OAAO,CAAC,CAAC;AACd,CAAC,CAAC;~~AAeW~~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~~QAEF~~,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC;QACpC,IAAI,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE;YAC5B,GAAG,CAAC,WAAW,GAAG;gBAChB,GAAG,GAAG,CAAC,WAAW;gBAClB,KAAK,EAAE,GAAG,CAAC,WAAW,CAAC,KAAK,IAAI,GAAG,CAAC,EAAE,EAAE,KAAK;gBAC7C,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI;gBACzC,UAAU,EAAE,GAAG,CAAC,WAAW,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI;gBACrD,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,WAAW,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU;aAChE,CAAC;YAEF,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAC3C,IAAI,GAAG,KAAK,YAAY,EAAE;oBACxB,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;oBACjC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;oBAC5C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;oBAChD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAE1C,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;iBACzF;qBAAM;oBACL,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;iBAC3F;aACF;SACF;QAED,MAAM,qBAAqB,GAAG,IAAA,cAAO,EACnC,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,eAAe,CAAC,qBAAqB,CAC7C,CAAC;QAEF,MAAM,CAAC,eAAe,CAAC,qBAAqB,GAAG,YAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACjF,CAAC,CAAC,qBAAqB;YACvB,CAAC,CAAC,SAAS,CAAC;KACf;SAAM,IAAI,IAAA,qBAAU,EAAC,MAAM,CAAC,EAAE;QAC7B,MAAM,CAAC,SAAS,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;KAClE;SAAM,IAAI,IAAA,mBAAQ,EAAC,MAAM,CAAC,EAAE;QAC3B,MAAM,CAAC,SAAS,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;KAC/F;IAED,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC;KACpB;IAED,IAAA,mBAAQ,EAAC,MAAM,CAAC,CAAC;IAEjB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;~~AAhJW~~,QAAA,mBAAmB,~~uBAgJ9B~~"}
1	+ {"version":3,"file":"configManager.js","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"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"}

package/lib/di/tokens/config.d.ts CHANGED Viewed

@@ -144,8 +144,10 @@ export declare const CONFIG_MANAGER_TOKEN: {
     root: string;
     type: import("../../typings/projectType").ProjectType;
 } & Required<import("../../config/configManager").Settings<Env>> & {
+    buildId: string;
     target: import("../../typings/target").Target;
     buildPath: string;
+    prerenderPagesPath?: string;
     withSettings(settings: import("../../config/configManager").Settings<Env>): ConfigManager<CliConfigEntry, Env>;
     dehydrate(): [CliConfigEntry, import("../../config/configManager").Settings<Env>];
     assetsPrefix?: string;

package/lib/di/tokens/config.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/di/tokens/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,eAAO,MAAM,kBAAkB;;CAAqC,CAAC;AACrE,eAAO,MAAM,qBAAqB;;CAAwC,CAAC;AAE3E,eAAO,MAAM,gBAAgB;;;;EAAiC,CAAC;AAC/D,eAAO,MAAM,kBAAkB;;CAA2C,CAAC;AAC3E,eAAO,MAAM,oBAAoB~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~CAA+D,CAAC"}
1	+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/di/tokens/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,eAAO,MAAM,kBAAkB;;CAAqC,CAAC;AACrE,eAAO,MAAM,qBAAqB;;CAAwC,CAAC;AAE3E,eAAO,MAAM,gBAAgB;;;;EAAiC,CAAC;AAC/D,eAAO,MAAM,kBAAkB;;CAA2C,CAAC;AAC3E,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAA+D,CAAC"}

package/lib/library/webpack/blocks/configToEnv.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"configToEnv.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/configToEnv.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAGvE,eAAO,MAAM,WAAW,kBAAmB,cAAc,WAAW,CAAC,cAAc,MAAM,~~SA6BxF~~,CAAC"}
1	+ {"version":3,"file":"configToEnv.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/configToEnv.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAGvE,eAAO,MAAM,WAAW,kBAAmB,cAAc,WAAW,CAAC,cAAc,MAAM,SA+BxF,CAAC"}

package/lib/library/webpack/blocks/configToEnv.js CHANGED Viewed

@@ -1,15 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configToEnv = void 0;
+const tslib_1 = require("tslib");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const validate_1 = require("../../../config/validate");
 const shouldUseReactRoot_1 = require("../../../utils/shouldUseReactRoot");
 const configToEnv = (configManager) => (config) => {
-    const { fileSystemPages, shared, experiments } = (0, validate_1.isApplication)(configManager)
+    const { fileSystemPages, shared, experiments, output } = (0, validate_1.isApplication)(configManager)
         ? configManager
         : {
             fileSystemPages: { enabled: false, routesDir: false, pagesDir: false },
             shared: { criticalChunks: [] },
             experiments: {},
+            output: { static: 'dist/client' },
         };
     config.plugin('define').tap((args) => [
         {
@@ -21,6 +24,7 @@ const configToEnv = (configManager) => (config) => {
             'process.env.__TRAMVAI_CRITICAL_CHUNKS': `'${JSON.stringify(shared.criticalChunks)}'`,
             'process.env.__TRAMVAI_VIEW_TRANSITIONS': `'${JSON.stringify(experiments.viewTransitions)}'`,
             'process.env.__TRAMVAI_REACT_TRANSITIONS': `'${JSON.stringify(experiments.reactTransitions)}'`,
+            'process.env.__TRAMVAI_OUTPUT_STATIC': `${JSON.stringify(configManager.env === 'development' ? node_path_1.default.join(output.static, configManager.buildId) : output.static)}`,
         },
     ]);
 };

package/lib/library/webpack/blocks/configToEnv.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"configToEnv.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/configToEnv.ts"],"names":[],"mappings":"~~;;;AAEA~~,uDAAyD;AAEzD,0EAAuE;AAEhE,MAAM,WAAW,GAAG,CAAC,aAAyC,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3F,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,wBAAa,EAAC,aAAa,CAAC;~~QAC3E~~,CAAC,CAAC,aAAa;QACf,CAAC,CAAC;YACE,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;YACtE,MAAM,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE;YAC9B,WAAW,EAAE,EAAE;~~SAChB~~,CAAC;IAEN,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,6DAA6D,EAAE,IAAI,CAAC,SAAS,CAC3E,eAAe,CAAC,OAAO,CACxB;YACD,2DAA2D,EAAE,IAAI,CAAC,SAAS,CACzE,eAAe,CAAC,SAAS,CAC1B;YACD,0DAA0D,EAAE,IAAI,CAAC,SAAS,CACxE,eAAe,CAAC,QAAQ,CACzB;YACD,2CAA2C,EAAE,IAAI,CAAC,SAAS,CAAC,IAAA,uCAAkB,GAAE,CAAC;YACjF,uCAAuC,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG;YACrF,wCAAwC,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,GAAG;YAC5F,yCAAyC,EAAE,IAAI,IAAI,CAAC,SAAS,CAC3D,WAAW,CAAC,gBAAgB,CAC7B,GAAG;~~SACL~~;KACF,CAAC,CAAC;AACL,CAAC,CAAC;~~AA7BW~~,QAAA,WAAW,~~eA6BtB~~"}
1	+ {"version":3,"file":"configToEnv.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/configToEnv.ts"],"names":[],"mappings":";;;;AAAA,kEAA6B;AAG7B,uDAAyD;AAEzD,0EAAuE;AAEhE,MAAM,WAAW,GAAG,CAAC,aAAyC,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3F,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAA,wBAAa,EAAC,aAAa,CAAC;QACnF,CAAC,CAAC,aAAa;QACf,CAAC,CAAC;YACE,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;YACtE,MAAM,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE;YAC9B,WAAW,EAAE,EAAE;YACf,MAAM,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE;SAClC,CAAC;IAEN,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,6DAA6D,EAAE,IAAI,CAAC,SAAS,CAC3E,eAAe,CAAC,OAAO,CACxB;YACD,2DAA2D,EAAE,IAAI,CAAC,SAAS,CACzE,eAAe,CAAC,SAAS,CAC1B;YACD,0DAA0D,EAAE,IAAI,CAAC,SAAS,CACxE,eAAe,CAAC,QAAQ,CACzB;YACD,2CAA2C,EAAE,IAAI,CAAC,SAAS,CAAC,IAAA,uCAAkB,GAAE,CAAC;YACjF,uCAAuC,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG;YACrF,wCAAwC,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,GAAG;YAC5F,yCAAyC,EAAE,IAAI,IAAI,CAAC,SAAS,CAC3D,WAAW,CAAC,gBAAgB,CAC7B,GAAG;YACJ,qCAAqC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,mBAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;SAClK;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA/BW,QAAA,WAAW,eA+BtB"}

package/lib/utils/dev-app/request.d.ts CHANGED Viewed

@@ -1,6 +1,9 @@
 import type { Request } from '@tinkoff/request-core';
 import type { ConfigManager } from '../../config/configManager';
 export declare const appRequest: <T>(configManager: ConfigManager, path: string, options?: Request) => import("@tinkoff/request-core").MakeRequestResult<T>;
+export declare const appFetch: (configManager: ConfigManager, path: string, { query, ...options }?: RequestInit & {
+    query?: Record<string, string>;
+}) => Promise<Response>;
 export declare const appBundleInfo: (configManager: ConfigManager) => Promise<string[]>;
 export declare const appPrerenderRoutes: (configManager: ConfigManager) => Promise<string[]>;
 //# sourceMappingURL=request.d.ts.map

package/lib/utils/dev-app/request.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
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;AAEF,eAAO,MAAM,kBAAkB,kBAAyB,aAAa,sBAapE,CAAC"}
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;AAEF,eAAO,MAAM,QAAQ,kBACJ,aAAa,QACtB,MAAM;YACwC,OAAO,MAAM,EAAE,MAAM,CAAC;uBAW3E,CAAC;AAOF,eAAO,MAAM,aAAa,kBAAyB,aAAa,sBAS/D,CAAC;AAEF,eAAO,MAAM,kBAAkB,kBAAyB,aAAa,sBAapE,CAAC"}

package/lib/utils/dev-app/request.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appPrerenderRoutes = exports.appBundleInfo = exports.appRequest = void 0;
+exports.appPrerenderRoutes = exports.appBundleInfo = exports.appFetch = exports.appRequest = void 0;
 const tslib_1 = require("tslib");
 const propOr_1 = tslib_1.__importDefault(require("@tinkoff/utils/object/propOr"));
 const request_core_1 = tslib_1.__importDefault(require("@tinkoff/request-core"));
@@ -13,6 +13,16 @@ const appRequest = (configManager, path, options) => {
     return request({ url: `${serverPath}${path}`, ...options });
 };
 exports.appRequest = appRequest;
+const appFetch = (configManager, path, { query = {}, ...options } = {}) => {
+    const { host, port } = configManager;
+    const serverPath = `http://${host}:${port}/`;
+    const url = new URL(path, serverPath);
+    Object.entries(query).forEach(([key, value]) => {
+        url.searchParams.append(key, value);
+    });
+    return fetch(url, options);
+};
+exports.appFetch = appFetch;
 const appBundleInfo = async (configManager) => {
     const { name } = configManager;
     const response = await (0, exports.appRequest)(configManager, `/${name}/papi/bundleInfo`, {

package/lib/utils/dev-app/request.js.map CHANGED Viewed

	@@ -1 +1 @@
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,CAAI,EAAE,GAAG,EAAE,GAAG,UAAU,GAAG,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;AACjE,CAAC,CAAC;AALW,QAAA,UAAU,cAKrB;AAOK,MAAM,aAAa,GAAG,KAAK,EAAE,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,CAAC;AATW,QAAA,aAAa,iBASxB;AAEK,MAAM,kBAAkB,GAAG,KAAK,EAAE,aAA4B,EAAE,EAAE;IACvE,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IAE/B,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAC/B,aAAa,EACb,IAAI,IAAI,uBAAuB,EAC/B;QACE,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,CAAC;KACT,CACF,CAAC;IAEF,OAAO,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC,CAAC;AAbW,QAAA,kBAAkB,sBAa7B"}
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,CAAI,EAAE,GAAG,EAAE,GAAG,UAAU,GAAG,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;AACjE,CAAC,CAAC;AALW,QAAA,UAAU,cAKrB;AAEK,MAAM,QAAQ,GAAG,CACtB,aAA4B,EAC5B,IAAY,EACZ,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,OAAO,KAAuD,EAAE,EACjF,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IACrC,MAAM,UAAU,GAAG,UAAU,IAAI,IAAI,IAAI,GAAG,CAAC;IAC7C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAEtC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC7C,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC;AAdW,QAAA,QAAQ,YAcnB;AAOK,MAAM,aAAa,GAAG,KAAK,EAAE,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,CAAC;AATW,QAAA,aAAa,iBASxB;AAEK,MAAM,kBAAkB,GAAG,KAAK,EAAE,aAA4B,EAAE,EAAE;IACvE,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IAE/B,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAC/B,aAAa,EACb,IAAI,IAAI,uBAAuB,EAC/B;QACE,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,CAAC;KACT,CACF,CAAC;IAEF,OAAO,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC,CAAC;AAbW,QAAA,kBAAkB,sBAa7B"}

package/lib/utils/tramvaiVersions.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tramvaiVersions.d.ts","sourceRoot":"","sources":["../../src/utils/tramvaiVersions.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,kBAAkB,~~qBAuB7B~~,CAAC;AAEH,eAAO,MAAM,gBAAgB,SAAU,MAAM,YAE5C,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,YAE1C,CAAC"}
1	+ {"version":3,"file":"tramvaiVersions.d.ts","sourceRoot":"","sources":["../../src/utils/tramvaiVersions.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,kBAAkB,qBAwB7B,CAAC;AAEH,eAAO,MAAM,gBAAgB,SAAU,MAAM,YAE5C,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,YAE1C,CAAC"}

package/lib/utils/tramvaiVersions.js CHANGED Viewed

@@ -6,6 +6,7 @@ exports.isDependantLib = exports.isUnifiedVersion = exports.DEPENDANT_LIBS_MAP =
 // actual version to update will be calculated from the some of the @tramvai/module
 exports.DEPENDANT_LIBS_MAP = new Map([
     ['@tinkoff/logger', '@tramvai/module-log'],
+    ['@tinkoff/env-validators', '@tramvai/module-client-hints'],
     ['@tinkoff/dippy', '@tramvai/core'],
     ['@tinkoff/router', '@tramvai/module-router'],
     ['@tinkoff/url', '@tramvai/module-common'],

package/lib/utils/tramvaiVersions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tramvaiVersions.js","sourceRoot":"","sources":["../../src/utils/tramvaiVersions.ts"],"names":[],"mappings":";;;AAAA,oDAAoD;AACpD,iCAAiC;AACjC,mFAAmF;AACtE,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACxC,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;IAC1C,CAAC,gBAAgB,EAAE,eAAe,CAAC;IACnC,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,cAAc,EAAE,wBAAwB,CAAC;IAC1C,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,gBAAgB,EAAE,8BAA8B,CAAC;IAClD,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,sBAAsB,EAAE,wBAAwB,CAAC;IAClD,CAAC,0BAA0B,EAAE,wBAAwB,CAAC;IACtD,CAAC,0BAA0B,EAAE,yBAAyB,CAAC;IACvD,CAAC,6BAA6B,EAAE,wBAAwB,CAAC;IACzD,CAAC,yBAAyB,EAAE,EAAE,CAAC;IAC/B,CAAC,8BAA8B,EAAE,cAAc,CAAC;IAChD,CAAC,sBAAsB,EAAE,6BAA6B,CAAC;IACvD,CAAC,uBAAuB,EAAE,wBAAwB,CAAC;IACnD,CAAC,+BAA+B,EAAE,8CAA8C,CAAC;IACjF,CAAC,6BAA6B,EAAE,8CAA8C,CAAC;IAC/E,CAAC,qCAAqC,EAAE,oCAAoC,CAAC;IAC7E,CAAC,iCAAiC,EAAE,gCAAgC,CAAC;IACrE,CAAC,+BAA+B,EAAE,EAAE,CAAC;IACrC,CAAC,0BAA0B,EAAE,EAAE,CAAC;IAChC,CAAC,mCAAmC,EAAE,EAAE,CAAC;CAC1C,CAAC,CAAC;AAEI,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;IAC/C,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEK,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;IAC7C,OAAO,0BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB"}
1	+ {"version":3,"file":"tramvaiVersions.js","sourceRoot":"","sources":["../../src/utils/tramvaiVersions.ts"],"names":[],"mappings":";;;AAAA,oDAAoD;AACpD,iCAAiC;AACjC,mFAAmF;AACtE,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACxC,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;IAC1C,CAAC,yBAAyB,EAAE,8BAA8B,CAAC;IAC3D,CAAC,gBAAgB,EAAE,eAAe,CAAC;IACnC,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,cAAc,EAAE,wBAAwB,CAAC;IAC1C,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,gBAAgB,EAAE,8BAA8B,CAAC;IAClD,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,sBAAsB,EAAE,wBAAwB,CAAC;IAClD,CAAC,0BAA0B,EAAE,wBAAwB,CAAC;IACtD,CAAC,0BAA0B,EAAE,yBAAyB,CAAC;IACvD,CAAC,6BAA6B,EAAE,wBAAwB,CAAC;IACzD,CAAC,yBAAyB,EAAE,EAAE,CAAC;IAC/B,CAAC,8BAA8B,EAAE,cAAc,CAAC;IAChD,CAAC,sBAAsB,EAAE,6BAA6B,CAAC;IACvD,CAAC,uBAAuB,EAAE,wBAAwB,CAAC;IACnD,CAAC,+BAA+B,EAAE,8CAA8C,CAAC;IACjF,CAAC,6BAA6B,EAAE,8CAA8C,CAAC;IAC/E,CAAC,qCAAqC,EAAE,oCAAoC,CAAC;IAC7E,CAAC,iCAAiC,EAAE,gCAAgC,CAAC;IACrE,CAAC,+BAA+B,EAAE,EAAE,CAAC;IACrC,CAAC,0BAA0B,EAAE,EAAE,CAAC;IAChC,CAAC,mCAAmC,EAAE,EAAE,CAAC;CAC1C,CAAC,CAAC;AAEI,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;IAC/C,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEK,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;IAC7C,OAAO,0BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "7.5.3",
+  "version": "7.11.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "engines": {
     "node": ">=20.18.1"
@@ -75,13 +75,13 @@
     "@tinkoff/request-plugin-retry": "^0.3.0",
     "@tinkoff/utils": "^2.1.3",
     "@tinkoff/webpack-dedupe-plugin": "6.0.1",
-    "@tramvai/api": "7.5.3",
+    "@tramvai/api": "7.11.0",
     "@tramvai/build": "8.0.1",
-    "@tramvai/plugin-babel-transpiler": "7.5.3",
-    "@tramvai/plugin-swc-transpiler": "7.5.3",
-    "@tramvai/plugin-webpack-builder": "7.5.3",
-    "@tramvai/plugin-webpack-pwa": "7.5.3",
-    "@tramvai/react": "7.5.3",
+    "@tramvai/plugin-babel-transpiler": "7.11.0",
+    "@tramvai/plugin-swc-transpiler": "7.11.0",
+    "@tramvai/plugin-webpack-builder": "7.11.0",
+    "@tramvai/plugin-webpack-pwa": "7.11.0",
+    "@tramvai/react": "7.11.0",
     "@tramvai/tools-check-versions": "0.9.2",
     "@tramvai/tools-migrate": "0.11.3",
     "ajv": "^8.12.0",
@@ -130,6 +130,7 @@
     "lightningcss-loader": "^3.0.0",
     "loader-utils": "^3.2.1",
     "mini-css-extract-plugin": "2.7.6",
+    "nanoid": "^3.3.11",
     "node-plop": "^0.26.0",
     "noop-stream": "^0.1.0",
     "null-loader": "^4.0.1",
@@ -164,7 +165,7 @@
     "thread-loader": "^3.0.4",
     "tsconfig-paths-webpack-plugin": "^4.0.1",
     "tslib": "^2.4.0",
-    "undici": "^7.18.2",
+    "undici": "^7.24.4",
     "utility-types": "^3.10.0",
     "validate-npm-package-name": "^3.0.0",
     "wait-on": "^5.3.0",

package/src/api/build/providers/shared.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { provide } from '@tinkoff/dippy';
 import type { Provider } from '@tinkoff/dippy';
+import { nanoid } from 'nanoid';
 import {
   CONFIG_MANAGER_TOKEN,
   COMMAND_PARAMETERS_TOKEN,
@@ -7,12 +8,14 @@ import {
 } from '../../../di/tokens';
 import { createConfigManager } from '../../../config/configManager';
 import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
+import { BUILD_ID_TOKEN } from '../../../builder/webpack/tokens';
 export const sharedProviders: readonly Provider[] = [
   provide({
     provide: CONFIG_MANAGER_TOKEN,
-    useFactory: ({ configEntry, parameters }) => {
+    useFactory: ({ configEntry, parameters, buildId }) => {
       return createConfigManager(configEntry as ApplicationConfigEntry, {
+        buildId,
         ...parameters,
         appEnv: parameters.env,
         env: 'production',
@@ -22,6 +25,13 @@ export const sharedProviders: readonly Provider[] = [
     deps: {
       configEntry: CONFIG_ENTRY_TOKEN,
       parameters: COMMAND_PARAMETERS_TOKEN,
+      buildId: BUILD_ID_TOKEN,
+    },
+  }),
+  provide({
+    provide: BUILD_ID_TOKEN,
+    useFactory: () => {
+      return nanoid();
     },
   }),
 ];

package/src/api/start/application.ts CHANGED Viewed

@@ -51,14 +51,26 @@ export const startApplication = async (di: Container): Result => {
   await runHandlers(di.get({ token: PROCESS_HANDLER_TOKEN, optional: true }));
   const builderStart = await builder.start({ strictError: di.get(STRICT_ERROR_HANDLE) });
+  const close = async () => {
+    await builderStart.close();
+    await runHandlers(di.get({ token: CLOSE_HANDLER_TOKEN, optional: true }));
+  };
+  // CLI will wait for this handlers before exiting
+  // @reference `packages/cli/src/cli/runCLI.ts`
+  if (!global.__TRAMVAI_EXIT_HANDLERS__) {
+    global.__TRAMVAI_EXIT_HANDLERS__ = [];
+  }
+  global.__TRAMVAI_EXIT_HANDLERS__.push(async () => {
+    await close();
+  });
   return {
     server,
     staticServer,
     builder,
     ...builderStart,
-    close: async () => {
-      await builderStart.close();
-      await runHandlers(di.get({ token: CLOSE_HANDLER_TOKEN, optional: true }));
-    },
+    close,
   };
 };

package/src/api/start/providers/application/shared.ts CHANGED Viewed

@@ -15,13 +15,15 @@ import { createConfigManager } from '../../../../config/configManager';
 import { createServer } from '../../utils/createServer';
 import { listenServer } from '../../utils/listenServer';
 import { selfSignedCertificateProvider } from '../../../shared/providers/selfSignedCertificateProvider';
+import { BUILD_ID_TOKEN } from '../../../../builder/webpack/tokens';
 export const sharedProviders: readonly Provider[] = [
   ...selfSignedCertificateProvider,
   provide({
     provide: CONFIG_MANAGER_TOKEN,
-    useFactory: ({ configEntry, parameters, portManager }) =>
+    useFactory: ({ configEntry, parameters, portManager, buildId }) =>
       createConfigManager(configEntry as ApplicationConfigEntry, {
+        buildId,
         ...parameters,
         appEnv: parameters.env,
         env: 'development',
@@ -32,6 +34,7 @@ export const sharedProviders: readonly Provider[] = [
       configEntry: CONFIG_ENTRY_TOKEN,
       parameters: COMMAND_PARAMETERS_TOKEN,
       portManager: PORT_MANAGER_TOKEN,
+      buildId: BUILD_ID_TOKEN,
     },
   }),
   provide({