@tramvai/cli 3.10.2 → 3.12.0

package/lib/commands/new/command.js

@@ -21,7 +21,7 @@ class NewCommand extends command_1.CLICommand {
             {
                 name: '--packageManager',
                 value: '[packageManager]',
-                description: 'Package manager for the project <npm|yarn>',
+                description: 'Package manager for the project <npm|yarn|pnpm>',
             },
             {
                 name: '--testingFramework',

package/lib/commands/new/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/new/command.ts"],"names":[],"mappings":";;AAAA,kDAAkD;AAGlD,MAAM,UAAW,SAAQ,oBAAkB;IAA3C;;QACE,SAAI,GAAG,KAAK,CAAC;QAEb,gBAAW,GAAG,0CAA0C,CAAC;QAEzD,YAAO,GAAG,YAAY,CAAC;QAEvB,YAAO,GAAG;YACR;gBACE,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,mDAAmD;aACjE;YACD;gBACE,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,YAAY;gBACnB,WAAW,EAAE,+CAA+C;aAC7D;YACD;gBACE,IAAI,EAAE,kBAAkB;gBACxB,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,4CAA4C;aAC1D;YACD;gBACE,IAAI,EAAE,oBAAoB;gBAC1B,KAAK,EAAE,oBAAoB;gBAC3B,WAAW,EAAE,4CAA4C;aAC1D;SACF,CAAC;QAEF,UAAK,GAAG,GAAG,CAAC;QAEZ,eAAU,GAAG,EAAE,CAAC;IAMlB,CAAC;IAJC,MAAM,CAAC,UAAkB;QACvB,uCAAuC;QACvC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/new/command.ts"],"names":[],"mappings":";;AAAA,kDAAkD;AAGlD,MAAM,UAAW,SAAQ,oBAAkB;IAA3C;;QACE,SAAI,GAAG,KAAK,CAAC;QAEb,gBAAW,GAAG,0CAA0C,CAAC;QAEzD,YAAO,GAAG,YAAY,CAAC;QAEvB,YAAO,GAAG;YACR;gBACE,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,mDAAmD;aACjE;YACD;gBACE,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,YAAY;gBACnB,WAAW,EAAE,+CAA+C;aAC7D;YACD;gBACE,IAAI,EAAE,kBAAkB;gBACxB,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,iDAAiD;aAC/D;YACD;gBACE,IAAI,EAAE,oBAAoB;gBAC1B,KAAK,EAAE,oBAAoB;gBAC3B,WAAW,EAAE,4CAA4C;aAC1D;SACF,CAAC;QAEF,UAAK,GAAG,GAAG,CAAC;QAEZ,eAAU,GAAG,EAAE,CAAC;IAMlB,CAAC;IAJC,MAAM,CAAC,UAAkB;QACvB,uCAAuC;QACvC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}

package/lib/commands/new/new.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../src/commands/new/new.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAyBxC,wBAA8B,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA4EhG"}
+{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../src/commands/new/new.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAyBxC,wBAA8B,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA8EhG"}

package/lib/commands/new/new.js

@@ -37,17 +37,19 @@ function createNew(context, params) {
         const sharedDir = getPathToShared();
         const blockDir = getPathToBlock(type);
         const isNpm = packageManager === 'npm';
+        const isYarn = packageManager === 'yarn';
         const isJest = testingFramework === 'jest';
         const blockDirectoryName = {
             monorepo: path_1.default.join(type === 'app' ? 'apps' : 'child-apps', name),
             multirepo: 'src',
         }[template];
-        yield (0, renderTemplate_1.renderTemplate)(templateDir, directoryName, { configEntry, isJest, isNpm });
-        yield (0, renderTemplate_1.renderTemplate)(sharedDir, directoryName, { configEntry, isJest, isNpm });
+        yield (0, renderTemplate_1.renderTemplate)(templateDir, directoryName, { configEntry, isJest, isNpm, isYarn });
+        yield (0, renderTemplate_1.renderTemplate)(sharedDir, directoryName, { configEntry, isJest, isNpm, isYarn });
         yield (0, renderTemplate_1.renderTemplate)(blockDir, path_1.default.join(directoryName, blockDirectoryName), {
             configEntry,
             isJest,
             isNpm,
+            isYarn,
         });
         if (template === 'monorepo') {
             const monorepoBlockDir = getPathToMonorepoBlock();

package/lib/commands/new/new.js.map

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

package/lib/commands/new/questions/packageManager.d.ts

@@ -1,4 +1,4 @@
-type PackageManagers = 'npm' | 'yarn';
+type PackageManagers = 'npm' | 'yarn' | 'pnpm';
 declare const packageManagerQuestion: (answer: string) => {
     type: "list";
     name: "packageManager";

package/lib/commands/new/questions/packageManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packageManager.d.ts","sourceRoot":"","sources":["../../../../src/commands/new/questions/packageManager.ts"],"names":[],"mappings":"AAAA,KAAK,eAAe,GAAG,KAAK,GAAG,MAAM,CAAC;AAItC,QAAA,MAAM,sBAAsB,WAAY,MAAM;;;;;;;CAO5C,CAAC;AAEH,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"packageManager.d.ts","sourceRoot":"","sources":["../../../../src/commands/new/questions/packageManager.ts"],"names":[],"mappings":"AAAA,KAAK,eAAe,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AAI/C,QAAA,MAAM,sBAAsB,WAAY,MAAM;;;;;;;CAO5C,CAAC;AAEH,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,CAAC"}

package/lib/commands/new/questions/packageManager.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageManagerQuestion = void 0;
-const choices = ['npm', 'yarn'];
+const choices = ['npm', 'yarn', 'pnpm'];
 const packageManagerQuestion = (answer) => ({
     type: 'list',
     name: 'packageManager',

package/lib/commands/new/questions/packageManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../../../src/commands/new/questions/packageManager.ts"],"names":[],"mappings":";;;AAEA,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAEhC,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,CAAC;IAClD,IAAI,EAAE,MAAe;IACrB,IAAI,EAAE,gBAAyB;IAC/B,OAAO,EAAE,0CAA0C;IACnD,OAAO;IACP,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IACrC,OAAO,EAAE,MAAe;CACzB,CAAC,CAAC;AAEuB,wDAAsB"}
+{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../../../src/commands/new/questions/packageManager.ts"],"names":[],"mappings":";;;AAEA,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAExC,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,CAAC;IAClD,IAAI,EAAE,MAAe;IACrB,IAAI,EAAE,gBAAyB;IAC/B,OAAO,EAAE,0CAA0C;IACnD,OAAO;IACP,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IACrC,OAAO,EAAE,MAAe;CACzB,CAAC,CAAC;AAEuB,wDAAsB"}

package/lib/commands/new/steps/installDependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installDependencies.d.ts","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AA8E9C,wBAAsB,mBAAmB,CAAC,EACxC,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,gBAAgB,GACjB,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,IAAI,CAAC;IACX,cAAc,EAAE,eAAe,CAAC;IAChC,gBAAgB,EAAE,iBAAiB,CAAC;CACrC,iBA2BA"}
+{"version":3,"file":"installDependencies.d.ts","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAkF9C,wBAAsB,mBAAmB,CAAC,EACxC,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,gBAAgB,GACjB,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,IAAI,CAAC;IACX,cAAc,EAAE,eAAe,CAAC;IAChC,gBAAgB,EAAE,iBAAiB,CAAC;CACrC,iBA2BA"}

package/lib/commands/new/steps/installDependencies.js

@@ -75,6 +75,10 @@ const packagesInstallCommands = {
         deps: ['add'],
         devDeps: ['add', '--dev'],
     },
+    pnpm: {
+        deps: ['add'],
+        devDeps: ['add', '--save-dev'],
+    },
 };
 function installDependencies({ localDir, type, packageManager, testingFramework, }) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {

package/lib/commands/new/steps/installDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"installDependencies.js","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":";;;;AACA,0DAA0B;AAC1B,0DAA0B;AAK1B,MAAM,wBAAwB,GAAG;IAC/B,wBAAwB;IACxB,oBAAoB;IACpB,qBAAqB;IACrB,2BAA2B;IAC3B,yBAAyB;IACzB,gCAAgC;IAChC,qBAAqB;IACrB,cAAc;IACd,qBAAqB;IACrB,gCAAgC;IAChC,SAAS;CACV,CAAC;AAEF,MAAM,IAAI,GAA4E;IACpF,GAAG,EAAE;QACH,YAAY,EAAE;YACZ,eAAe;YACf,gBAAgB;YAChB,gBAAgB;YAChB,wBAAwB;YACxB,mCAAmC;YACnC,wBAAwB;YACxB,wBAAwB;YACxB,qBAAqB;YACrB,wBAAwB;YACxB,wBAAwB;YACxB,wBAAwB;YACxB,wBAAwB;YACxB,OAAO;YACP,WAAW;YACX,cAAc;SACf;QACD,mBAAmB,EAAE,wBAAwB;KAC9C;IACD,WAAW,EAAE;QACX,YAAY,EAAE;YACZ,eAAe;YACf,gBAAgB;YAChB,gBAAgB;YAChB,yBAAyB;YACzB,OAAO;YACP,WAAW;YACX,cAAc;SACf;QACD,mBAAmB,EAAE,CAAC,GAAG,wBAAwB,EAAE,yBAAyB,CAAC;KAC9E;CACF,CAAC;AAEF,MAAM,eAAe,GAAG;IACtB,wBAAwB;IACxB,8BAA8B;IAC9B,gCAAgC;IAChC,cAAc;IACd,cAAc;IACd,sBAAsB;IACtB,2BAA2B;IAC3B,gCAAgC;IAChC,gBAAgB;IAChB,UAAU;IACV,aAAa;IACb,yBAAyB;IACzB,YAAY;CACb,CAAC;AAEF,MAAM,uBAAuB,GAAG;IAC9B,GAAG,EAAE;QACH,IAAI,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EAAE,oBAAoB,CAAC;QACnE,OAAO,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,oBAAoB,CAAC;KACzD;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC,KAAK,CAAC;QACb,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;KAC1B;CACF,CAAC;AAEF,SAAsB,mBAAmB,CAAC,EACxC,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,gBAAgB,GAMjB;;QACC,MAAM,eAAe,GAAG,uBAAuB,CAAC,cAAc,CAAC,CAAC;QAChE,MAAM,OAAO,GAAY;YACvB,GAAG,EAAE,QAAQ;YACb,GAAG,EAAE;gBACH,uBAAuB,EAAE,MAAM;aAChC;YACD,KAAK,EAAE,SAAS;SACjB,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,CAAC;QAE3E,MAAM,IAAA,eAAK,EAAC,cAAc,EAAE,CAAC,GAAG,eAAe,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;QAE5F,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,CAAC;QAE3E,MAAM,IAAA,eAAK,EAAC,cAAc,EAAE,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC,EAAE,OAAO,CAAC,CAAC;QAEvF,IAAI,gBAAgB,KAAK,MAAM,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,+BAA+B,CAAC,CAAC;YAE5E,MAAM,IAAA,eAAK,EACT,cAAc,EACd,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,mBAAmB,CAAC,EAC/D,OAAO,CACR,CAAC;SACH;IACH,CAAC;CAAA;AArCD,kDAqCC"}
+{"version":3,"file":"installDependencies.js","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":"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"}

package/lib/schema/autogeneratedSchema.json

@@ -1402,7 +1402,7 @@
                                             "singleton": {
                                                 "title": "if dependency is marked as singleton the dependency will be initialized only once and will not be updated",
                                                 "description": "Do not overuse that feature as it may lead to subtle bugs in case of different versions on different sides",
-                                                "default": ": false",
+                                                "default": false,
                                                 "type": "boolean"
                                             }
                                         },
@@ -2072,7 +2072,7 @@
                                             "singleton": {
                                                 "title": "if dependency is marked as singleton the dependency will be initialized only once and will not be updated",
                                                 "description": "Do not overuse that feature as it may lead to subtle bugs in case of different versions on different sides",
-                                                "default": ": false",
+                                                "default": false,
                                                 "type": "boolean"
                                             }
                                         },
@@ -2742,7 +2742,7 @@
                                             "singleton": {
                                                 "title": "if dependency is marked as singleton the dependency will be initialized only once and will not be updated",
                                                 "description": "Do not overuse that feature as it may lead to subtle bugs in case of different versions on different sides",
-                                                "default": ": false",
+                                                "default": false,
                                                 "type": "boolean"
                                             }
                                         },

package/lib/typings/application.d.ts

@@ -16,19 +16,23 @@ declare module '*.woff2' {
 }
 type ImageString = string;
 declare module '*.png' {
-    export default ImageString;
+    const src: ImageString;
+    export default src;
     export const image: ImageObject;
 }
 declare module '*.jpg' {
-    export default ImageString;
+    const src: ImageString;
+    export default src;
     export const image: ImageObject;
 }
 declare module '*.jpeg' {
-    export default ImageString;
+    const src: ImageString;
+    export default src;
     export const image: ImageObject;
 }
 declare module '*.webp' {
-    export default ImageString;
+    const src: ImageString;
+    export default src;
     export const image: ImageObject;
 }
 declare module '*.svg' {

package/lib/typings/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../src/typings/application.ts"],"names":[],"mappings":"AAAA,UAAU,WAAW;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,OAAO,QAAQ,OAAO,CAAC;IACrB,UAAU,WAAW;QACnB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;KAC7B;IACD,MAAM,UAAU,EAAE,WAAW,CAAC;IAC9B,SAAS,UAAU,CAAC;CACrB;AAED,OAAO,QAAQ,SAAS,CAAC;IACvB,MAAM,IAAI,EAAE,MAAM,CAAC;IACnB,SAAS,IAAI,CAAC;CACf;AAED,KAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,OAAO,QAAQ,OAAO,CAAC;IACrB,eAAe,WAAW,CAAC;IAC3B,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,OAAO,CAAC;IACrB,eAAe,WAAW,CAAC;IAC3B,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,QAAQ,CAAC;IACtB,eAAe,WAAW,CAAC;IAC3B,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,QAAQ,CAAC;IACtB,eAAe,WAAW,CAAC;IAC3B,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AAED,OAAO,QAAQ,OAAO,CAAC;IACrB,MAAM,KAAK,EAAE,WAAW,CAAC;IACzB,SAAS,KAAK,CAAC;CAChB;AACD,OAAO,QAAQ,aAAa,CAAC;IAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;IAErD,KAAK,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IAExD;;OAEG;IACH,MAAM,GAAG,EAAE,YAAY,CAAC;IAExB,SAAS,GAAG,CAAC;CACd"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../src/typings/application.ts"],"names":[],"mappings":"AAAA,UAAU,WAAW;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,OAAO,QAAQ,OAAO,CAAC;IACrB,UAAU,WAAW;QACnB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;KAC7B;IACD,MAAM,UAAU,EAAE,WAAW,CAAC;IAC9B,SAAS,UAAU,CAAC;CACrB;AAED,OAAO,QAAQ,SAAS,CAAC;IACvB,MAAM,IAAI,EAAE,MAAM,CAAC;IACnB,SAAS,IAAI,CAAC;CACf;AAED,KAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,OAAO,QAAQ,OAAO,CAAC;IACrB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,OAAO,CAAC;IACrB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,QAAQ,CAAC;IACtB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,QAAQ,CAAC;IACtB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AAED,OAAO,QAAQ,OAAO,CAAC;IACrB,MAAM,KAAK,EAAE,WAAW,CAAC;IACzB,SAAS,KAAK,CAAC;CAChB;AACD,OAAO,QAAQ,aAAa,CAAC;IAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;IAErD,KAAK,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IAExD;;OAEG;IACH,MAAM,GAAG,EAAE,YAAY,CAAC;IAExB,SAAS,GAAG,CAAC;CACd"}

package/lib/typings/configEntry/cli.d.ts

@@ -313,7 +313,7 @@ export interface CliConfigEntry extends ConfigEntry {
             /**
              * @title if dependency is marked as singleton the dependency will be initialized only once and will not be updated
              * @description Do not overuse that feature as it may lead to subtle bugs in case of different versions on different sides
-             * @default: false
+             * @default false
              */
             singleton: boolean;
         }>;

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkVersions = void 0;
 const tslib_1 = require("tslib");
-const execa_1 = require("execa");
+const tools_check_versions_1 = require("@tramvai/tools-check-versions");
 const checkVersions = (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        yield (0, execa_1.command)(`npx tramvai-check-versions`, { stdio: 'inherit' });
+        yield (0, tools_check_versions_1.run)();
     }
     catch (e) {
         throw new Error('Versions check failed');

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

@@ -1 +1 @@
-{"version":3,"file":"checkVersions.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/checkVersions.ts"],"names":[],"mappings":";;;;AAAA,iCAAgC;AAGzB,MAAM,aAAa,GAAG,CAAO,OAAgB,EAAE,EAAE;IACtD,IAAI;QACF,MAAM,IAAA,eAAO,EAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;KACnE;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;KAC1C;AACH,CAAC,CAAA,CAAC;AANW,QAAA,aAAa,iBAMxB"}
+{"version":3,"file":"checkVersions.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/checkVersions.ts"],"names":[],"mappings":";;;;AAAA,wEAAoD;AAG7C,MAAM,aAAa,GAAG,CAAO,OAAgB,EAAE,EAAE;IACtD,IAAI;QACF,MAAM,IAAA,0BAAG,GAAE,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;KAC1C;AACH,CAAC,CAAA,CAAC;AANW,QAAA,aAAa,iBAMxB"}

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrate = void 0;
 const tslib_1 = require("tslib");
-const execa_1 = require("execa");
+const tools_migrate_1 = require("@tramvai/tools-migrate");
 const migrate = (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        yield (0, execa_1.command)(`npx tramvai-migrate`, { stdio: 'inherit' });
+        yield (0, tools_migrate_1.run)();
     }
     catch (e) {
         throw new Error('Migrations failed');

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

@@ -1 +1 @@
-{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/migrate.ts"],"names":[],"mappings":";;;;AAAA,iCAAgC;AAGzB,MAAM,OAAO,GAAG,CAAO,OAAgB,EAAE,EAAE;IAChD,IAAI;QACF,MAAM,IAAA,eAAO,EAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;KAC5D;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACtC;AACH,CAAC,CAAA,CAAC;AANW,QAAA,OAAO,WAMlB"}
+{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/migrate.ts"],"names":[],"mappings":";;;;AAAA,0DAA6C;AAGtC,MAAM,OAAO,GAAG,CAAO,OAAgB,EAAE,EAAE;IAChD,IAAI;QACF,MAAM,IAAA,mBAAG,GAAE,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACtC;AACH,CAAC,CAAA,CAAC;AANW,QAAA,OAAO,WAMlB"}

package/lib/validators/commands/runMigrationsAndCheckVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runMigrationsAndCheckVersions.d.ts","sourceRoot":"","sources":["../../../src/validators/commands/runMigrationsAndCheckVersions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,eAAO,MAAM,6BAA6B,EAAE,SAO3C,CAAC"}
+{"version":3,"file":"runMigrationsAndCheckVersions.d.ts","sourceRoot":"","sources":["../../../src/validators/commands/runMigrationsAndCheckVersions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAI/C,eAAO,MAAM,6BAA6B,EAAE,SAO3C,CAAC"}

package/lib/validators/commands/runMigrationsAndCheckVersions.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runMigrationsAndCheckVersions = void 0;
 const tslib_1 = require("tslib");
-const execa_1 = require("execa");
 const lockfileHash_1 = require("../../utils/lockfileHash");
+const migrate_1 = require("../../utils/commands/dependencies/migrate");
+const checkVersions_1 = require("../../utils/commands/dependencies/checkVersions");
 const runMigrationsAndCheckVersions = (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     if ((0, lockfileHash_1.isLockfileChanged)(context)) {
-        yield (0, execa_1.command)(`npx tramvai-migrate`, { stdio: 'inherit' });
-        yield (0, execa_1.command)(`npx tramvai-check-versions`, { stdio: 'inherit' });
+        yield (0, migrate_1.migrate)(context);
+        yield (0, checkVersions_1.checkVersions)(context);
     }
     return { name: 'runMigrationsAndCheckVersions', status: 'ok' };
 });

package/lib/validators/commands/runMigrationsAndCheckVersions.js.map

@@ -1 +1 @@
-{"version":3,"file":"runMigrationsAndCheckVersions.js","sourceRoot":"","sources":["../../../src/validators/commands/runMigrationsAndCheckVersions.ts"],"names":[],"mappings":";;;;AAAA,iCAAgC;AAChC,2DAA6D;AAGtD,MAAM,6BAA6B,GAAc,CAAO,OAAO,EAAE,EAAE;IACxE,IAAI,IAAA,gCAAiB,EAAC,OAAO,CAAC,EAAE;QAC9B,MAAM,IAAA,eAAO,EAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAC3D,MAAM,IAAA,eAAO,EAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;KACnE;IAED,OAAO,EAAE,IAAI,EAAE,+BAA+B,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AACjE,CAAC,CAAA,CAAC;AAPW,QAAA,6BAA6B,iCAOxC"}
+{"version":3,"file":"runMigrationsAndCheckVersions.js","sourceRoot":"","sources":["../../../src/validators/commands/runMigrationsAndCheckVersions.ts"],"names":[],"mappings":";;;;AAAA,2DAA6D;AAE7D,uEAAoE;AACpE,mFAAgF;AAEzE,MAAM,6BAA6B,GAAc,CAAO,OAAO,EAAE,EAAE;IACxE,IAAI,IAAA,gCAAiB,EAAC,OAAO,CAAC,EAAE;QAC9B,MAAM,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;QACvB,MAAM,IAAA,6BAAa,EAAC,OAAO,CAAC,CAAC;KAC9B;IAED,OAAO,EAAE,IAAI,EAAE,+BAA+B,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AACjE,CAAC,CAAA,CAAC;AAPW,QAAA,6BAA6B,iCAOxC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "3.10.2",
+  "version": "3.12.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -63,17 +63,17 @@
     "@tinkoff/browserslist-config": "0.3.2",
     "@tinkoff/dippy": "0.9.1",
     "@tinkoff/is-modern-lib": "3.0.2",
-    "@tinkoff/logger": "0.10.169",
+    "@tinkoff/logger": "0.10.170",
     "@tinkoff/minicss-class-generator": "0.3.1",
-    "@tinkoff/package-manager-wrapper": "0.2.1",
+    "@tinkoff/package-manager-wrapper": "0.2.2",
     "@tinkoff/request-core": "^0.9.2",
     "@tinkoff/request-plugin-protocol-http": "^0.11.8",
     "@tinkoff/utils": "^2.1.3",
     "@tinkoff/webpack-dedupe-plugin": "2.0.2",
     "@tramvai/build": "4.0.1",
-    "@tramvai/react": "3.10.2",
-    "@tramvai/tools-check-versions": "0.5.2",
-    "@tramvai/tools-migrate": "0.7.2",
+    "@tramvai/react": "3.12.0",
+    "@tramvai/tools-check-versions": "0.5.3",
+    "@tramvai/tools-migrate": "0.7.3",
     "ajv": "^8.12.0",
     "ansi-escapes": "^4.3.2",
     "autoprefixer": "^10.4.8",

package/schema.json

@@ -1424,7 +1424,7 @@
                             "singleton": {
                               "title": "if dependency is marked as singleton the dependency will be initialized only once and will not be updated",
                               "description": "Do not overuse that feature as it may lead to subtle bugs in case of different versions on different sides",
-                              "default": ": false",
+                              "default": false,
                               "type": "boolean"
                             }
                           },
@@ -2103,7 +2103,7 @@
                               "singleton": {
                                 "title": "if dependency is marked as singleton the dependency will be initialized only once and will not be updated",
                                 "description": "Do not overuse that feature as it may lead to subtle bugs in case of different versions on different sides",
-                                "default": ": false",
+                                "default": false,
                                 "type": "boolean"
                               }
                             },
@@ -2782,7 +2782,7 @@
                                 "singleton": {
                                   "title": "if dependency is marked as singleton the dependency will be initialized only once and will not be updated",
                                   "description": "Do not overuse that feature as it may lead to subtle bugs in case of different versions on different sides",
-                                  "default": ": false",
+                                  "default": false,
                                   "type": "boolean"
                                 }
                               },

package/src/commands/new/command.ts

@@ -22,7 +22,7 @@ class NewCommand extends CLICommand<Params> {
     {
       name: '--packageManager',
       value: '[packageManager]',
-      description: 'Package manager for the project <npm|yarn>',
+      description: 'Package manager for the project <npm|yarn|pnpm>',
     },
     {
       name: '--testingFramework',

package/src/commands/new/new.ts

@@ -65,6 +65,7 @@ export default async function createNew(context: Context, params: Params): Promi
   const sharedDir = getPathToShared();
   const blockDir = getPathToBlock(type);
   const isNpm = packageManager === 'npm';
+  const isYarn = packageManager === 'yarn';
   const isJest = testingFramework === 'jest';
 
   const blockDirectoryName = {
@@ -72,12 +73,13 @@ export default async function createNew(context: Context, params: Params): Promi
     multirepo: 'src',
   }[template];
 
-  await renderTemplate(templateDir, directoryName, { configEntry, isJest, isNpm });
-  await renderTemplate(sharedDir, directoryName, { configEntry, isJest, isNpm });
+  await renderTemplate(templateDir, directoryName, { configEntry, isJest, isNpm, isYarn });
+  await renderTemplate(sharedDir, directoryName, { configEntry, isJest, isNpm, isYarn });
   await renderTemplate(blockDir, path.join(directoryName, blockDirectoryName), {
     configEntry,
     isJest,
     isNpm,
+    isYarn,
   });
   if (template === 'monorepo') {
     const monorepoBlockDir = getPathToMonorepoBlock();

package/src/commands/new/questions/packageManager.ts

@@ -1,6 +1,6 @@
-type PackageManagers = 'npm' | 'yarn';
+type PackageManagers = 'npm' | 'yarn' | 'pnpm';
 
-const choices = ['npm', 'yarn'];
+const choices = ['npm', 'yarn', 'pnpm'];
 
 const packageManagerQuestion = (answer: string) => ({
   type: 'list' as const,

package/src/commands/new/steps/installDependencies.ts

@@ -70,7 +70,7 @@ const devDependencies = [
   'typescript',
 ];
 
-const packagesInstallCommands = {
+const packagesInstallCommands: Record<PackageManagers, { deps: string[]; devDeps: string[] }> = {
   npm: {
     deps: ['install', '--save', '--package-lock', '--legacy-peer-deps'],
     devDeps: ['install', '--save-dev', '--legacy-peer-deps'],
@@ -79,6 +79,10 @@ const packagesInstallCommands = {
     deps: ['add'],
     devDeps: ['add', '--dev'],
   },
+  pnpm: {
+    deps: ['add'],
+    devDeps: ['add', '--save-dev'],
+  },
 };
 
 export async function installDependencies({

package/src/commands/new/templates/app/monorepo/README.md.hbs

@@ -4,7 +4,7 @@
 
 ## Install dependencies
 
-Run installation with selected package manager {{#if isNpm}}`npm install`{{else}}`yarn`{{/if}}
+Run installation with selected package manager {{#if isNpm}}`npm install`{{else if isYarn}}`yarn`{{else}}`pnpm install`{{/if}}
 
 ## Usage
 

package/src/commands/new/templates/app/multirepo/README.md.hbs

@@ -4,7 +4,7 @@
 
 ## Install dependencies
 
-Run installation with selected package manager {{#if isNpm}}`npm install`{{else}}`yarn`{{/if}}
+Run installation with selected package manager {{#if isNpm}}`npm install`{{else if isYarn}}`yarn`{{else}}`pnpm install`{{/if}}
 
 ## Usage
 

package/src/commands/new/templates/child-app/monorepo/README.md.hbs

@@ -4,7 +4,7 @@
 
 ## Install dependencies
 
-Run installation with selected package manager {{#if isNpm}}`npm install`{{else}}`yarn`{{/if}}
+Run installation with selected package manager {{#if isNpm}}`npm install`{{else if isYarn}}`yarn`{{else}}`pnpm install`{{/if}}
 
 ## Usage
 

package/src/commands/new/templates/child-app/multirepo/README.md.hbs

@@ -4,7 +4,7 @@
 
 ## Install dependencies
 
-Run installation with selected package manager {{#if isNpm}}`npm install`{{else}}`yarn`{{/if}}
+Run installation with selected package manager {{#if isNpm}}`npm install`{{else if isYarn}}`yarn`{{else}}`pnpm install`{{/if}}
 
 ## Usage
 

package/src/schema/autogeneratedSchema.json

@@ -1402,7 +1402,7 @@
                       "singleton": {
                         "title": "if dependency is marked as singleton the dependency will be initialized only once and will not be updated",
                         "description": "Do not overuse that feature as it may lead to subtle bugs in case of different versions on different sides",
-                        "default": ": false",
+                        "default": false,
                         "type": "boolean"
                       }
                     },
@@ -2072,7 +2072,7 @@
                       "singleton": {
                         "title": "if dependency is marked as singleton the dependency will be initialized only once and will not be updated",
                         "description": "Do not overuse that feature as it may lead to subtle bugs in case of different versions on different sides",
-                        "default": ": false",
+                        "default": false,
                         "type": "boolean"
                       }
                     },
@@ -2742,7 +2742,7 @@
                       "singleton": {
                         "title": "if dependency is marked as singleton the dependency will be initialized only once and will not be updated",
                         "description": "Do not overuse that feature as it may lead to subtle bugs in case of different versions on different sides",
-                        "default": ": false",
+                        "default": false,
                         "type": "boolean"
                       }
                     },

package/src/typings/application.ts

@@ -20,19 +20,23 @@ declare module '*.woff2' {
 type ImageString = string;
 
 declare module '*.png' {
-  export default ImageString;
+  const src: ImageString;
+  export default src;
   export const image: ImageObject;
 }
 declare module '*.jpg' {
-  export default ImageString;
+  const src: ImageString;
+  export default src;
   export const image: ImageObject;
 }
 declare module '*.jpeg' {
-  export default ImageString;
+  const src: ImageString;
+  export default src;
   export const image: ImageObject;
 }
 declare module '*.webp' {
-  export default ImageString;
+  const src: ImageString;
+  export default src;
   export const image: ImageObject;
 }
 

package/src/typings/configEntry/cli.ts

@@ -331,7 +331,7 @@ export interface CliConfigEntry extends ConfigEntry {
           /**
            * @title if dependency is marked as singleton the dependency will be initialized only once and will not be updated
            * @description Do not overuse that feature as it may lead to subtle bugs in case of different versions on different sides
-           * @default: false
+           * @default false
            */
           singleton: boolean;
         }

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

@@ -1,9 +1,9 @@
-import { command } from 'execa';
+import { run } from '@tramvai/tools-check-versions';
 import type { Context } from '../../../models/context';
 
 export const checkVersions = async (context: Context) => {
   try {
-    await command(`npx tramvai-check-versions`, { stdio: 'inherit' });
+    await run();
   } catch (e) {
     throw new Error('Versions check failed');
   }

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

@@ -1,9 +1,9 @@
-import { command } from 'execa';
+import { run } from '@tramvai/tools-migrate';
 import type { Context } from '../../../models/context';
 
 export const migrate = async (context: Context) => {
   try {
-    await command(`npx tramvai-migrate`, { stdio: 'inherit' });
+    await run();
   } catch (e) {
     throw new Error('Migrations failed');
   }

package/src/validators/commands/runMigrationsAndCheckVersions.ts

@@ -1,11 +1,12 @@
-import { command } from 'execa';
 import { isLockfileChanged } from '../../utils/lockfileHash';
 import type { Validator } from './validator.h';
+import { migrate } from '../../utils/commands/dependencies/migrate';
+import { checkVersions } from '../../utils/commands/dependencies/checkVersions';
 
 export const runMigrationsAndCheckVersions: Validator = async (context) => {
   if (isLockfileChanged(context)) {
-    await command(`npx tramvai-migrate`, { stdio: 'inherit' });
-    await command(`npx tramvai-check-versions`, { stdio: 'inherit' });
+    await migrate(context);
+    await checkVersions(context);
   }
 
   return { name: 'runMigrationsAndCheckVersions', status: 'ok' };