@tramvai/module-server 5.10.0 → 5.14.10

package/lib/modules/dependenciesVersion.es.js

@@ -23,7 +23,7 @@ DependenciesVersionModule = __decorate([
                 provide: SERVER_MODULE_PAPI_PRIVATE_ROUTE,
                 multi: true,
                 useFactory: () => {
-                    const { dependencies = [] } = packageJson !== null && packageJson !== void 0 ? packageJson : {};
+                    const { dependencies = [] } = packageJson ?? {};
                     return createPapiMethod({
                         path: '/dependenciesVersion',
                         method: 'get',

package/lib/modules/dependenciesVersion.js

@@ -27,7 +27,7 @@ exports.DependenciesVersionModule = tslib.__decorate([
                 provide: tokensServer.SERVER_MODULE_PAPI_PRIVATE_ROUTE,
                 multi: true,
                 useFactory: () => {
-                    const { dependencies = [] } = packageJson !== null && packageJson !== void 0 ? packageJson : {};
+                    const { dependencies = [] } = packageJson ?? {};
                     return papi.createPapiMethod({
                         path: '/dependenciesVersion',
                         method: 'get',

package/lib/modules/earlyHints/service.es.js

@@ -14,7 +14,6 @@ class EarlyHintsManager {
     }
     getHints() {
         return this.resourcesRegistry.getPageResources().reduce((acc, resource) => {
-            var _a, _b;
             let resourceHint = null;
             let cdnHint = null;
             if (!resource.payload) {
@@ -28,13 +27,13 @@ class EarlyHintsManager {
                 resourceHint = `Link: <${resource.payload}>; rel=preload;${as}`;
                 cdnHint = this.getCdnHintForResource(resource);
             }
-            if (resource.type === 'style' && ((_a = resource.attrs) === null || _a === void 0 ? void 0 : _a['data-critical']) === 'true') {
+            if (resource.type === 'style' && resource.attrs?.['data-critical'] === 'true') {
                 resourceHint = `Link: <${resource.payload}>; rel=preload; as=style`;
                 cdnHint = this.getCdnHintForResource(resource);
             }
             // prevent scripts preloading because of potential large numbers of JS chunks for every page
             // still check JS chunks for preconnects
-            if (resource.type === 'script' && ((_b = resource.attrs) === null || _b === void 0 ? void 0 : _b['data-critical']) === 'true') {
+            if (resource.type === 'script' && resource.attrs?.['data-critical'] === 'true') {
                 cdnHint = this.getCdnHintForResource(resource);
             }
             if (this.doesHintUniq(cdnHint)) {
@@ -70,8 +69,7 @@ class EarlyHintsManager {
         return `${result.join(endOfLine)}${endOfLine.repeat(2)}`;
     }
     getAsAttribute(resource) {
-        var _a;
-        return ((_a = resource.attrs) === null || _a === void 0 ? void 0 : _a.as) !== undefined ? ` as=${resource.attrs.as}` : '';
+        return resource.attrs?.as !== undefined ? ` as=${resource.attrs.as}` : '';
     }
     getCdnHintForResource(resource) {
         const match = resource.payload.match(/https:\/\/[^/'"]+/gi);

package/lib/modules/earlyHints/service.js

@@ -18,7 +18,6 @@ class EarlyHintsManager {
     }
     getHints() {
         return this.resourcesRegistry.getPageResources().reduce((acc, resource) => {
-            var _a, _b;
             let resourceHint = null;
             let cdnHint = null;
             if (!resource.payload) {
@@ -32,13 +31,13 @@ class EarlyHintsManager {
                 resourceHint = `Link: <${resource.payload}>; rel=preload;${as}`;
                 cdnHint = this.getCdnHintForResource(resource);
             }
-            if (resource.type === 'style' && ((_a = resource.attrs) === null || _a === void 0 ? void 0 : _a['data-critical']) === 'true') {
+            if (resource.type === 'style' && resource.attrs?.['data-critical'] === 'true') {
                 resourceHint = `Link: <${resource.payload}>; rel=preload; as=style`;
                 cdnHint = this.getCdnHintForResource(resource);
             }
             // prevent scripts preloading because of potential large numbers of JS chunks for every page
             // still check JS chunks for preconnects
-            if (resource.type === 'script' && ((_b = resource.attrs) === null || _b === void 0 ? void 0 : _b['data-critical']) === 'true') {
+            if (resource.type === 'script' && resource.attrs?.['data-critical'] === 'true') {
                 cdnHint = this.getCdnHintForResource(resource);
             }
             if (this.doesHintUniq(cdnHint)) {
@@ -74,8 +73,7 @@ class EarlyHintsManager {
         return `${result.join(endOfLine)}${endOfLine.repeat(2)}`;
     }
     getAsAttribute(resource) {
-        var _a;
-        return ((_a = resource.attrs) === null || _a === void 0 ? void 0 : _a.as) !== undefined ? ` as=${resource.attrs.as}` : '';
+        return resource.attrs?.as !== undefined ? ` as=${resource.attrs.as}` : '';
     }
     getCdnHintForResource(resource) {
         const match = resource.payload.match(/https:\/\/[^/'"]+/gi);

package/lib/modules/papi/api/index.es.js

@@ -36,12 +36,11 @@ function createApi(rootApp, papiList, { baseUrl, di, logger, papiInitHandlers })
             app[method](path, {
                 schema,
                 errorHandler: async (error, req, res) => {
-                    var _a;
                     res.status(error.validation ? 400 : 503);
                     childLog.error(error);
                     return {
                         resultCode: 'INTERNAL_ERROR',
-                        errorMessage: (_a = error.message) !== null && _a !== void 0 ? _a : 'internal error',
+                        errorMessage: error.message ?? 'internal error',
                     };
                 },
             }, async (req, res) => {

package/lib/modules/papi/api/index.js

@@ -44,12 +44,11 @@ function createApi(rootApp, papiList, { baseUrl, di, logger, papiInitHandlers })
             app[method](path, {
                 schema,
                 errorHandler: async (error, req, res) => {
-                    var _a;
                     res.status(error.validation ? 400 : 503);
                     childLog.error(error);
                     return {
                         resultCode: 'INTERNAL_ERROR',
-                        errorMessage: (_a = error.message) !== null && _a !== void 0 ? _a : 'internal error',
+                        errorMessage: error.message ?? 'internal error',
                     };
                 },
             }, async (req, res) => {

package/lib/modules/papi/server/executor.es.js

@@ -7,12 +7,11 @@ const papiExecutorProvider = provide({
     provide: PAPI_EXECUTOR,
     scope: Scope.REQUEST,
     useFactory: ({ di, logger, fastifyRequest, requestManager, responseManager, asyncLocalStorage, }) => {
-        var _a;
         const papiLog = logger('papi');
         const papiOptions = {
             requestManager,
             responseManager,
-            params: (_a = fastifyRequest.params) !== null && _a !== void 0 ? _a : {},
+            params: fastifyRequest.params ?? {},
             cookies: requestManager.getCookies(),
             headers: requestManager.getHeaders(),
             body: requestManager.getBody(),

package/lib/modules/papi/server/executor.js

@@ -11,12 +11,11 @@ const papiExecutorProvider = dippy.provide({
     provide: tokensServerPrivate.PAPI_EXECUTOR,
     scope: dippy.Scope.REQUEST,
     useFactory: ({ di, logger, fastifyRequest, requestManager, responseManager, asyncLocalStorage, }) => {
-        var _a;
         const papiLog = logger('papi');
         const papiOptions = {
             requestManager,
             responseManager,
-            params: (_a = fastifyRequest.params) !== null && _a !== void 0 ? _a : {},
+            params: fastifyRequest.params ?? {},
             cookies: requestManager.getCookies(),
             headers: requestManager.getHeaders(),
             body: requestManager.getBody(),

package/lib/modules/proxy.es.js

@@ -19,14 +19,14 @@ ServerProxyModule = __decorate([
                 useFactory: ({ defaultProxies }) => {
                     return (app) => {
                         const proxyConfig = safeNodeRequire(resolve(process.cwd(), 'proxy.conf'));
-                        const proxies = defaultProxies !== null && defaultProxies !== void 0 ? defaultProxies : [];
+                        const proxies = defaultProxies ?? [];
                         if (!proxyConfig && proxies.length === 0) {
                             return;
                         }
                         if (isArray(proxyConfig)) {
                             proxies.push(...proxyConfig);
                         }
-                        else if (proxyConfig === null || proxyConfig === void 0 ? void 0 : proxyConfig.target) {
+                        else if (proxyConfig?.target) {
                             proxies.push(proxyConfig);
                         }
                         else if (isObject(proxyConfig)) {

package/lib/modules/proxy.js

@@ -29,14 +29,14 @@ exports.ServerProxyModule = tslib.__decorate([
                 useFactory: ({ defaultProxies }) => {
                     return (app) => {
                         const proxyConfig = require$1.safeNodeRequire(path.resolve(process.cwd(), 'proxy.conf'));
-                        const proxies = defaultProxies !== null && defaultProxies !== void 0 ? defaultProxies : [];
+                        const proxies = defaultProxies ?? [];
                         if (!proxyConfig && proxies.length === 0) {
                             return;
                         }
                         if (isArray__default["default"](proxyConfig)) {
                             proxies.push(...proxyConfig);
                         }
-                        else if (proxyConfig === null || proxyConfig === void 0 ? void 0 : proxyConfig.target) {
+                        else if (proxyConfig?.target) {
                             proxies.push(proxyConfig);
                         }
                         else if (isObject__default["default"](proxyConfig)) {

package/lib/modules/serverTiming.es.js

@@ -11,7 +11,6 @@ const ServerTimingModule = declareModule({
             scope: Scope.SINGLETON,
             multi: true,
             useValue: (di, type, status, timingInfo) => {
-                var _a;
                 if (type === 'server' && status === 'customer') {
                     const responseManager = di.get(RESPONSE_MANAGER_TOKEN);
                     const reply = di.get(FASTIFY_RESPONSE);
@@ -19,7 +18,7 @@ const ServerTimingModule = declareModule({
                     if (reply.sent) {
                         return;
                     }
-                    const initialHeader = (_a = responseManager.getHeader('Server-Timing')) !== null && _a !== void 0 ? _a : '';
+                    const initialHeader = responseManager.getHeader('Server-Timing') ?? '';
                     const entries = [];
                     // index for custom sort
                     let index = 0;

package/lib/modules/serverTiming.js

@@ -15,7 +15,6 @@ const ServerTimingModule = core.declareModule({
             scope: core.Scope.SINGLETON,
             multi: true,
             useValue: (di, type, status, timingInfo) => {
-                var _a;
                 if (type === 'server' && status === 'customer') {
                     const responseManager = di.get(tokensCommon.RESPONSE_MANAGER_TOKEN);
                     const reply = di.get(tokensServerPrivate.FASTIFY_RESPONSE);
@@ -23,7 +22,7 @@ const ServerTimingModule = core.declareModule({
                     if (reply.sent) {
                         return;
                     }
-                    const initialHeader = (_a = responseManager.getHeader('Server-Timing')) !== null && _a !== void 0 ? _a : '';
+                    const initialHeader = responseManager.getHeader('Server-Timing') ?? '';
                     const entries = [];
                     // index for custom sort
                     let index = 0;

package/lib/modules/statics.es.js

@@ -14,7 +14,7 @@ ServerStaticsModule = __decorate([
             provide({
                 provide: WEB_FASTIFY_APP_BEFORE_INIT_TOKEN,
                 useFactory: ({ options }) => {
-                    const path = (options === null || options === void 0 ? void 0 : options.path) || 'public';
+                    const path = options?.path || 'public';
                     return (instance) => {
                         instance.register(FastifyStatic, {
                             decorateReply: false,

package/lib/modules/statics.js

@@ -22,7 +22,7 @@ exports.ServerStaticsModule = tslib.__decorate([
             core.provide({
                 provide: tokensServerPrivate.WEB_FASTIFY_APP_BEFORE_INIT_TOKEN,
                 useFactory: ({ options }) => {
-                    const path$1 = (options === null || options === void 0 ? void 0 : options.path) || 'public';
+                    const path$1 = options?.path || 'public';
                     return (instance) => {
                         instance.register(FastifyStatic__default["default"], {
                             decorateReply: false,

package/lib/server/error/index.es.js

@@ -14,7 +14,7 @@ const errorHandler = async (app, { log, beforeError, afterError, fetchWebpackSta
             response: renderErrorBoundaryPageToString({
                 element: RootErrorBoundary,
                 requestUrl: '/5xx.html',
-                error: staticRootErrorBoundaryError !== null && staticRootErrorBoundaryError !== void 0 ? staticRootErrorBoundaryError : {
+                error: staticRootErrorBoundaryError ?? {
                     name: 'STATIC_ROOT_ERROR_BOUNDARY_ERROR',
                     message: 'Default error for root error boundary',
                 },

package/lib/server/error/index.js

@@ -22,7 +22,7 @@ const errorHandler = async (app, { log, beforeError, afterError, fetchWebpackSta
             response: renderErrorBoundaryPageToString.renderErrorBoundaryPageToString({
                 element: RootErrorBoundary,
                 requestUrl: '/5xx.html',
-                error: staticRootErrorBoundaryError !== null && staticRootErrorBoundaryError !== void 0 ? staticRootErrorBoundaryError : {
+                error: staticRootErrorBoundaryError ?? {
                     name: 'STATIC_ROOT_ERROR_BOUNDARY_ERROR',
                     message: 'Default error for root error boundary',
                 },

package/lib/server/server.es.js

@@ -3,8 +3,7 @@ import https from 'https';
 import { readFileSync } from 'fs';
 
 const serverFactory = () => {
-    var _a;
-    const httpsOptions = JSON.parse((_a = process.env.HTTPS) !== null && _a !== void 0 ? _a : null);
+    const httpsOptions = JSON.parse(process.env.HTTPS ?? null);
     if (httpsOptions && httpsOptions.key && httpsOptions.cert) {
         return https.createServer({
             key: readFileSync(httpsOptions.key),

package/lib/server/server.js

@@ -12,8 +12,7 @@ var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
 
 const serverFactory = () => {
-    var _a;
-    const httpsOptions = JSON.parse((_a = process.env.HTTPS) !== null && _a !== void 0 ? _a : null);
+    const httpsOptions = JSON.parse(process.env.HTTPS ?? null);
     if (httpsOptions && httpsOptions.key && httpsOptions.cert) {
         return https__default["default"].createServer({
             key: fs.readFileSync(httpsOptions.key),

package/lib/server/static.es.js

@@ -5,13 +5,12 @@ import os from 'os';
 
 const DEFAULT_STATIC_HOST = 'localhost';
 const staticAppCommand = ({ logger, envManager, appInfo, }) => {
-    var _a;
     if (!envManager.get('DEV_STATIC')) {
         return async function staticAppNoop() { };
     }
     const log = logger('server:static');
     const port = +envManager.get('PORT_STATIC');
-    const host = ((_a = envManager.get('HOST_STATIC')) !== null && _a !== void 0 ? _a : DEFAULT_STATIC_HOST).replace('localhost', '0.0.0.0');
+    const host = (envManager.get('HOST_STATIC') ?? DEFAULT_STATIC_HOST).replace('localhost', '0.0.0.0');
     const appVersion = envManager.get('APP_VERSION');
     return async function staticApp() {
         const appStatic = fastify();

package/lib/server/static.js

@@ -15,13 +15,12 @@ var os__default = /*#__PURE__*/_interopDefaultLegacy(os);
 
 const DEFAULT_STATIC_HOST = 'localhost';
 const staticAppCommand = ({ logger, envManager, appInfo, }) => {
-    var _a;
     if (!envManager.get('DEV_STATIC')) {
         return async function staticAppNoop() { };
     }
     const log = logger('server:static');
     const port = +envManager.get('PORT_STATIC');
-    const host = ((_a = envManager.get('HOST_STATIC')) !== null && _a !== void 0 ? _a : DEFAULT_STATIC_HOST).replace('localhost', '0.0.0.0');
+    const host = (envManager.get('HOST_STATIC') ?? DEFAULT_STATIC_HOST).replace('localhost', '0.0.0.0');
     const appVersion = envManager.get('APP_VERSION');
     return async function staticApp() {
         const appStatic = fastify__default["default"]();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-server",
-  "version": "5.10.0",
+  "version": "5.14.10",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -26,13 +26,13 @@
     "@tinkoff/monkeypatch": "5.0.2",
     "@tinkoff/terminus": "0.4.2",
     "@tinkoff/url": "0.11.2",
-    "@tramvai/module-cache-warmup": "5.10.0",
-    "@tramvai/module-metrics": "5.10.0",
-    "@tramvai/papi": "5.10.0",
-    "@tramvai/tokens-server": "5.10.0",
-    "@tramvai/tokens-router": "5.10.0",
-    "@tramvai/tokens-server-private": "5.10.0",
-    "@tramvai/safe-strings": "0.8.3",
+    "@tramvai/module-cache-warmup": "5.14.10",
+    "@tramvai/module-metrics": "5.14.10",
+    "@tramvai/papi": "5.14.10",
+    "@tramvai/tokens-server": "5.14.10",
+    "@tramvai/tokens-router": "5.14.10",
+    "@tramvai/tokens-server-private": "5.14.10",
+    "@tramvai/safe-strings": "0.8.4",
     "fastify": "^4.14.1",
     "@fastify/cookie": "^8.3.0",
     "@fastify/compress": "^6.2.0",
@@ -44,14 +44,14 @@
   "peerDependencies": {
     "@tinkoff/dippy": "0.11.3",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "5.10.0",
-    "@tramvai/core": "5.10.0",
-    "@tramvai/react": "5.10.0",
-    "@tramvai/module-common": "5.10.0",
-    "@tramvai/module-environment": "5.10.0",
-    "@tramvai/tokens-common": "5.10.0",
-    "@tramvai/tokens-core-private": "5.10.0",
-    "@tramvai/tokens-render": "5.10.0",
+    "@tramvai/cli": "5.14.10",
+    "@tramvai/core": "5.14.10",
+    "@tramvai/react": "5.14.10",
+    "@tramvai/module-common": "5.14.10",
+    "@tramvai/module-environment": "5.14.10",
+    "@tramvai/tokens-common": "5.14.10",
+    "@tramvai/tokens-core-private": "5.14.10",
+    "@tramvai/tokens-render": "5.14.10",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "tslib": "^2.4.0"