@naturalcycles/backend-lib 4.17.8 → 4.17.10

package/dist/deploy/backend.cfg.util.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBackendCfg = void 0;
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const fs = require("fs-extra");
 const yaml = require("js-yaml");
 const paths_cnst_1 = require("../paths.cnst");
 const backendCfgSchema = nodejs_lib_1.AjvSchema.readJsonSync(`${paths_cnst_1.resourcesDir}/backendCfg.schema.json`, {
@@ -13,7 +12,7 @@ function getBackendCfg(projectDir = '.') {
     (0, nodejs_lib_1.requireFileToExist)(backendCfgYamlPath);
     const backendCfg = {
         serviceWithBranchName: true,
-        ...yaml.load(fs.readFileSync(backendCfgYamlPath, 'utf8')),
+        ...yaml.load((0, nodejs_lib_1._readFileSync)(backendCfgYamlPath)),
     };
     backendCfgSchema.validate(backendCfg);
     return backendCfg;

package/dist/deploy/deployHealthCheck.js

@@ -90,7 +90,7 @@ async function deployHealthCheck(url, opt = {}) {
             retry: {
                 count: 0,
             },
-            followRedirects: false,
+            redirect: 'error',
         });
         if (err) {
             console.log(err);

package/dist/deploy/deployPrepare.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployPrepare = exports.deployPrepareYargsOptions = void 0;
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const fs_1 = require("@naturalcycles/nodejs-lib/dist/fs");
-const fs = require("fs-extra");
 const paths_cnst_1 = require("../paths.cnst");
 const backend_cfg_util_1 = require("./backend.cfg.util");
 const deploy_util_1 = require("./deploy.util");
@@ -60,7 +60,7 @@ async function deployPrepare(opt = {}) {
     const appYamlPassEnv = opt.appYamlPassEnv || backendCfg.appYamlPassEnv;
     console.log(`1. Copy files to ${(0, colors_1.dimGrey)(targetDir)}`);
     // Clean targetDir
-    fs.emptyDirSync(targetDir);
+    (0, nodejs_lib_1._emptyDirSync)(targetDir);
     (0, fs_1.kpySync)({
         baseDir: defaultFilesDir,
         outputDir: targetDir,
@@ -76,7 +76,7 @@ async function deployPrepare(opt = {}) {
     if (NPM_TOKEN && createNpmrc) {
         const npmrcPath = `${targetDir}/.npmrc`;
         const npmrc = `//registry.npmjs.org/:_authToken=${NPM_TOKEN}`;
-        fs.writeFileSync(npmrcPath, npmrc);
+        (0, nodejs_lib_1._writeFileSync)(npmrcPath, npmrc);
     }
     console.log(`2. Generate ${(0, colors_1.dimGrey)('deployInfo.json')} and ${(0, colors_1.dimGrey)('app.yaml')} in targetDir`);
     const deployInfo = await (0, deploy_util_1.createAndSaveDeployInfo)(backendCfg, targetDir);

package/dist/server/genericErrorMiddleware.js

@@ -48,7 +48,7 @@ function respondWithError(req, res, err) {
     }
     if (res.headersSent)
         return;
-    const httpError = (0, js_lib_1._errorToErrorObject)(originalError);
+    const httpError = (0, js_lib_1._errorLikeToErrorObject)(originalError);
     if (!includeErrorStack)
         delete httpError.stack;
     httpError.data.errorId = errorId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.17.8",
+  "version": "4.17.10",
   "scripts": {
     "prepare": "husky install",
     "serve": "APP_ENV=dev nodemon",
@@ -30,7 +30,6 @@
     "express": "^4.16.4",
     "express-promise-router": "^4.0.0",
     "firebase-admin": "^11.0.0",
-    "fs-extra": "^11.0.0",
     "helmet": "^7.0.0",
     "js-yaml": "^4.0.0",
     "on-finished": "^2.3.0",

package/src/deploy/backend.cfg.util.ts

@@ -1,6 +1,5 @@
 import { StringMap } from '@naturalcycles/js-lib'
-import { AjvSchema, requireFileToExist } from '@naturalcycles/nodejs-lib'
-import * as fs from 'fs-extra'
+import { _readFileSync, AjvSchema, requireFileToExist } from '@naturalcycles/nodejs-lib'
 import * as yaml from 'js-yaml'
 import { resourcesDir } from '../paths.cnst'
 
@@ -64,7 +63,7 @@ export function getBackendCfg(projectDir: string = '.'): BackendCfg {
 
   const backendCfg: BackendCfg = {
     serviceWithBranchName: true,
-    ...(yaml.load(fs.readFileSync(backendCfgYamlPath, 'utf8')) as any),
+    ...(yaml.load(_readFileSync(backendCfgYamlPath)) as any),
   }
 
   backendCfgSchema.validate(backendCfg)

package/src/deploy/deployHealthCheck.ts

@@ -132,7 +132,7 @@ export async function deployHealthCheck(
       retry: {
         count: 0,
       },
-      followRedirects: false,
+      redirect: 'error',
     })
 
     if (err) {

package/src/deploy/deployPrepare.ts

@@ -1,6 +1,6 @@
+import { _emptyDirSync, _writeFileSync } from '@naturalcycles/nodejs-lib'
 import { dimGrey } from '@naturalcycles/nodejs-lib/dist/colors'
 import { kpySync } from '@naturalcycles/nodejs-lib/dist/fs'
-import * as fs from 'fs-extra'
 import { srcDir } from '../paths.cnst'
 import { getBackendCfg } from './backend.cfg.util'
 import { DeployInfo } from './deploy.model'
@@ -77,7 +77,7 @@ export async function deployPrepare(opt: DeployPrepareOptions = {}): Promise<Dep
   console.log(`1. Copy files to ${dimGrey(targetDir)}`)
 
   // Clean targetDir
-  fs.emptyDirSync(targetDir)
+  _emptyDirSync(targetDir)
 
   kpySync({
     baseDir: defaultFilesDir,
@@ -96,7 +96,7 @@ export async function deployPrepare(opt: DeployPrepareOptions = {}): Promise<Dep
   if (NPM_TOKEN && createNpmrc) {
     const npmrcPath = `${targetDir}/.npmrc`
     const npmrc = `//registry.npmjs.org/:_authToken=${NPM_TOKEN}`
-    fs.writeFileSync(npmrcPath, npmrc)
+    _writeFileSync(npmrcPath, npmrc)
   }
 
   console.log(`2. Generate ${dimGrey('deployInfo.json')} and ${dimGrey('app.yaml')} in targetDir`)

package/src/server/genericErrorMiddleware.ts

@@ -1,6 +1,6 @@
 import {
   _anyToError,
-  _errorToErrorObject,
+  _errorLikeToErrorObject,
   _filterUndefinedValues,
   AppError,
   BackendErrorResponseObject,
@@ -81,7 +81,7 @@ export function respondWithError(req: BackendRequest, res: BackendResponse, err:
 
   if (res.headersSent) return
 
-  const httpError = _errorToErrorObject(originalError)
+  const httpError = _errorLikeToErrorObject(originalError)
   if (!includeErrorStack) delete httpError.stack
 
   httpError.data.errorId = errorId