@tramvai/cli 2.59.2 → 2.59.3

package/lib/cli/bin-init.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const resolve_1 = tslib_1.__importDefault(require("resolve"));
 const clearExecArgv_1 = require("../utils/clearExecArgv");
+const fixYarnSettingsOverride_1 = require("../utils/fixYarnSettingsOverride");
 const handleErrors_1 = require("../utils/handleErrors");
 const sentry_1 = require("../utils/sentry");
 (0, clearExecArgv_1.clearExecArgv)();
 (0, sentry_1.initSentry)();
 (0, handleErrors_1.handleErrors)();
+(0, fixYarnSettingsOverride_1.fixYarnSettingsOverride)();
 (0, resolve_1.default)('@tramvai/cli/lib/cli', {
     basedir: process.cwd(),
 }, (error, projectLocalCli) => {

package/lib/cli/bin-init.js.map

@@ -1 +1 @@
-{"version":3,"file":"bin-init.js","sourceRoot":"","sources":["../../src/cli/bin-init.ts"],"names":[],"mappings":";;;AAAA,8DAA8B;AAC9B,0DAAuD;AACvD,wDAAqD;AACrD,4CAA6C;AAE7C,IAAA,6BAAa,GAAE,CAAC;AAChB,IAAA,mBAAU,GAAE,CAAC;AACb,IAAA,2BAAY,GAAE,CAAC;AAEf,IAAA,iBAAO,EACL,sBAAsB,EACtB;IACE,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE;CACvB,EACD,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE;IACzB,2DAA2D;IAC3D,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,aAAa,CAAC,CAAC;KACxB;SAAM;QACL,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;KAC9C;AACH,CAAC,CACF,CAAC"}
+{"version":3,"file":"bin-init.js","sourceRoot":"","sources":["../../src/cli/bin-init.ts"],"names":[],"mappings":";;;AAAA,8DAA8B;AAC9B,0DAAuD;AACvD,8EAA2E;AAC3E,wDAAqD;AACrD,4CAA6C;AAE7C,IAAA,6BAAa,GAAE,CAAC;AAChB,IAAA,mBAAU,GAAE,CAAC;AACb,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,iDAAuB,GAAE,CAAC;AAE1B,IAAA,iBAAO,EACL,sBAAsB,EACtB;IACE,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE;CACvB,EACD,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE;IACzB,2DAA2D;IAC3D,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,aAAa,CAAC,CAAC;KACxB;SAAM;QACL,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;KAC9C;AACH,CAAC,CACF,CAAC"}

package/lib/utils/commands/dependencies/packageHasVersion.js

@@ -4,14 +4,26 @@ exports.packageHasVersion = void 0;
 const tslib_1 = require("tslib");
 const util_1 = tslib_1.__importDefault(require("util"));
 const child_process_1 = tslib_1.__importDefault(require("child_process"));
+const ora_1 = tslib_1.__importDefault(require("ora"));
 const exec = util_1.default.promisify(child_process_1.default.exec);
+const addPaddingToString = (text) => text
+    .split('\n')
+    .map((line) => `  ${line}`)
+    .join('\n');
 const packageHasVersion = (packageName, version) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const spinner = (0, ora_1.default)(`Checking is ${packageName} package has ${version} version`).start();
     try {
         const { stdout } = yield exec(`npm view ${packageName}@${version} version`);
         const hasVersion = !!stdout.trim().replace('\n', '');
+        spinner.stop();
         return hasVersion;
     }
     catch (e) {
+        spinner.stop();
+        // TODO: replace with logger from di
+        console.log(`Checking failed with error:\n`);
+        console.log(`${addPaddingToString(e.message)}`);
+        console.log(`${addPaddingToString(e.stack.replace(e.message, ''))}\n`);
         return false;
     }
 });

package/lib/utils/commands/dependencies/packageHasVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageHasVersion.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/packageHasVersion.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AACxB,0EAAyC;AAEzC,MAAM,IAAI,GAAG,cAAI,CAAC,SAAS,CAAC,uBAAY,CAAC,IAAI,CAAC,CAAC;AAExC,MAAM,iBAAiB,GAAG,CAAO,WAAmB,EAAE,OAAe,EAAoB,EAAE;IAChG,IAAI;QACF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,WAAW,IAAI,OAAO,UAAU,CAAC,CAAC;QAC5E,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACrD,OAAO,UAAU,CAAC;KACnB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAA,CAAC;AARW,QAAA,iBAAiB,qBAQ5B"}
+{"version":3,"file":"packageHasVersion.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/packageHasVersion.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AACxB,0EAAyC;AACzC,sDAAsB;AAEtB,MAAM,IAAI,GAAG,cAAI,CAAC,SAAS,CAAC,uBAAY,CAAC,IAAI,CAAC,CAAC;AAE/C,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE,CAC1C,IAAI;KACD,KAAK,CAAC,IAAI,CAAC;KACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC;KAC1B,IAAI,CAAC,IAAI,CAAC,CAAC;AAET,MAAM,iBAAiB,GAAG,CAAO,WAAmB,EAAE,OAAe,EAAoB,EAAE;IAChG,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,eAAe,WAAW,gBAAgB,OAAO,UAAU,CAAC,CAAC,KAAK,EAAE,CAAC;IAEzF,IAAI;QACF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,WAAW,IAAI,OAAO,UAAU,CAAC,CAAC;QAC5E,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACrD,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,UAAU,CAAC;KACnB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,oCAAoC;QACpC,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACvE,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAA,CAAC;AAhBW,QAAA,iBAAiB,qBAgB5B"}

package/lib/utils/fixYarnSettingsOverride.d.ts

@@ -0,0 +1 @@
+export declare function fixYarnSettingsOverride(): void;

package/lib/utils/fixYarnSettingsOverride.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixYarnSettingsOverride = void 0;
+const tslib_1 = require("tslib");
+const ini_1 = tslib_1.__importDefault(require("ini"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+function readNpmRc(cwd) {
+    const npmrcPath = path_1.default.join(cwd, '.npmrc');
+    return fs_1.default.existsSync(npmrcPath) ? fs_1.default.readFileSync(npmrcPath).toString('utf8') : '';
+}
+function fixYarnSettingsOverride() {
+    const cwd = process.cwd();
+    const npmRc = readNpmRc(cwd);
+    const classicYarn = process.env.npm_config_user_agent
+        ? process.env.npm_config_user_agent.indexOf('yarn/1') !== -1
+        : false;
+    // yarn 1 overrides npmrc settings with its own set of npm config envs so `yarn publish-command` wont work if it depends on those
+    // strict-ssl is one of those important settings, so copy it to envs and override yarn default one
+    if (classicYarn && npmRc) {
+        if (npmRc.indexOf('strict-ssl') !== -1) {
+            const parsedNpmRc = ini_1.default.parse(npmRc);
+            if (parsedNpmRc['strict-ssl'] !== undefined) {
+                process.env.npm_config_strict_ssl = parsedNpmRc['strict-ssl'];
+            }
+            if (parsedNpmRc.registry !== undefined) {
+                process.env.npm_config_registry = parsedNpmRc.registry;
+            }
+            if (parsedNpmRc.ca !== undefined) {
+                process.env.npm_config_ca = parsedNpmRc.ca;
+            }
+        }
+    }
+}
+exports.fixYarnSettingsOverride = fixYarnSettingsOverride;
+//# sourceMappingURL=fixYarnSettingsOverride.js.map

package/lib/utils/fixYarnSettingsOverride.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fixYarnSettingsOverride.js","sourceRoot":"","sources":["../../src/utils/fixYarnSettingsOverride.ts"],"names":[],"mappings":";;;;AAAA,sDAAsB;AACtB,wDAAwB;AACxB,oDAAoB;AAEpB,SAAS,SAAS,CAAC,GAAW;IAC5B,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC3C,OAAO,YAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,YAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACrF,CAAC;AAED,SAAgB,uBAAuB;IACrC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACnD,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC5D,CAAC,CAAC,KAAK,CAAC;IAEV,iIAAiI;IACjI,kGAAkG;IAClG,IAAI,WAAW,IAAI,KAAK,EAAE;QACxB,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE;YACtC,MAAM,WAAW,GAAG,aAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAErC,IAAI,WAAW,CAAC,YAAY,CAAC,KAAK,SAAS,EAAE;gBAC3C,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;aAC/D;YACD,IAAI,WAAW,CAAC,QAAQ,KAAK,SAAS,EAAE;gBACtC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,WAAW,CAAC,QAAQ,CAAC;aACxD;YACD,IAAI,WAAW,CAAC,EAAE,KAAK,SAAS,EAAE;gBAChC,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC;aAC5C;SACF;KACF;AACH,CAAC;AAxBD,0DAwBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "2.59.2",
+  "version": "2.59.3",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -68,7 +68,7 @@
     "@tinkoff/request-plugin-protocol-http": "^0.11.6",
     "@tinkoff/utils": "^2.1.3",
     "@tramvai/build": "3.0.7",
-    "@tramvai/react": "2.59.2",
+    "@tramvai/react": "2.59.3",
     "@tramvai/tools-check-versions": "0.4.7",
     "@tramvai/tools-migrate": "0.6.8",
     "ajv": "^6.12.6",
@@ -106,6 +106,7 @@
     "handlebars": "^4.7.7",
     "http-proxy": "^1.18.1",
     "image-size": "^1.0.2",
+    "ini": "^3.0.1",
     "inquirer": "^7.3.3",
     "inquirer-autocomplete-prompt": "^1.4.0",
     "inspectpack": "^4.7.1",

package/src/cli/bin-init.ts

@@ -1,11 +1,13 @@
 import resolve from 'resolve';
 import { clearExecArgv } from '../utils/clearExecArgv';
+import { fixYarnSettingsOverride } from '../utils/fixYarnSettingsOverride';
 import { handleErrors } from '../utils/handleErrors';
 import { initSentry } from '../utils/sentry';
 
 clearExecArgv();
 initSentry();
 handleErrors();
+fixYarnSettingsOverride();
 
 resolve(
   '@tramvai/cli/lib/cli',

package/src/utils/commands/dependencies/packageHasVersion.ts

@@ -1,14 +1,29 @@
 import util from 'util';
 import childProcess from 'child_process';
+import ora from 'ora';
 
 const exec = util.promisify(childProcess.exec);
 
+const addPaddingToString = (text: string) =>
+  text
+    .split('\n')
+    .map((line) => `  ${line}`)
+    .join('\n');
+
 export const packageHasVersion = async (packageName: string, version: string): Promise<boolean> => {
+  const spinner = ora(`Checking is ${packageName} package has ${version} version`).start();
+
   try {
     const { stdout } = await exec(`npm view ${packageName}@${version} version`);
     const hasVersion = !!stdout.trim().replace('\n', '');
+    spinner.stop();
     return hasVersion;
   } catch (e) {
+    spinner.stop();
+    // TODO: replace with logger from di
+    console.log(`Checking failed with error:\n`);
+    console.log(`${addPaddingToString(e.message)}`);
+    console.log(`${addPaddingToString(e.stack.replace(e.message, ''))}\n`);
     return false;
   }
 };

package/src/utils/fixYarnSettingsOverride.ts

@@ -0,0 +1,34 @@
+import ini from 'ini';
+import path from 'path';
+import fs from 'fs';
+
+function readNpmRc(cwd: string): string {
+  const npmrcPath = path.join(cwd, '.npmrc');
+  return fs.existsSync(npmrcPath) ? fs.readFileSync(npmrcPath).toString('utf8') : '';
+}
+
+export function fixYarnSettingsOverride() {
+  const cwd = process.cwd();
+  const npmRc = readNpmRc(cwd);
+  const classicYarn = process.env.npm_config_user_agent
+    ? process.env.npm_config_user_agent.indexOf('yarn/1') !== -1
+    : false;
+
+  // yarn 1 overrides npmrc settings with its own set of npm config envs so `yarn publish-command` wont work if it depends on those
+  // strict-ssl is one of those important settings, so copy it to envs and override yarn default one
+  if (classicYarn && npmRc) {
+    if (npmRc.indexOf('strict-ssl') !== -1) {
+      const parsedNpmRc = ini.parse(npmRc);
+
+      if (parsedNpmRc['strict-ssl'] !== undefined) {
+        process.env.npm_config_strict_ssl = parsedNpmRc['strict-ssl'];
+      }
+      if (parsedNpmRc.registry !== undefined) {
+        process.env.npm_config_registry = parsedNpmRc.registry;
+      }
+      if (parsedNpmRc.ca !== undefined) {
+        process.env.npm_config_ca = parsedNpmRc.ca;
+      }
+    }
+  }
+}