@tramvai/cli 3.10.0 → 3.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.
- package/lib/commands/new/command.js +1 -1
- package/lib/commands/new/command.js.map +1 -1
- package/lib/commands/new/new.d.ts.map +1 -1
- package/lib/commands/new/new.js +4 -2
- package/lib/commands/new/new.js.map +1 -1
- package/lib/commands/new/questions/packageManager.d.ts +1 -1
- package/lib/commands/new/questions/packageManager.d.ts.map +1 -1
- package/lib/commands/new/questions/packageManager.js +1 -1
- package/lib/commands/new/questions/packageManager.js.map +1 -1
- package/lib/commands/new/steps/installDependencies.d.ts.map +1 -1
- package/lib/commands/new/steps/installDependencies.js +4 -0
- package/lib/commands/new/steps/installDependencies.js.map +1 -1
- package/lib/utils/commands/dependencies/checkVersions.js +2 -2
- package/lib/utils/commands/dependencies/checkVersions.js.map +1 -1
- package/lib/utils/commands/dependencies/migrate.js +2 -2
- package/lib/utils/commands/dependencies/migrate.js.map +1 -1
- package/lib/validators/commands/runMigrationsAndCheckVersions.d.ts.map +1 -1
- package/lib/validators/commands/runMigrationsAndCheckVersions.js +4 -3
- package/lib/validators/commands/runMigrationsAndCheckVersions.js.map +1 -1
- package/package.json +6 -6
- package/src/commands/new/command.ts +1 -1
- package/src/commands/new/new.ts +4 -2
- package/src/commands/new/questions/packageManager.ts +2 -2
- package/src/commands/new/steps/installDependencies.ts +5 -1
- package/src/commands/new/templates/app/monorepo/README.md.hbs +1 -1
- package/src/commands/new/templates/app/multirepo/README.md.hbs +1 -1
- package/src/commands/new/templates/child-app/monorepo/README.md.hbs +1 -1
- package/src/commands/new/templates/child-app/multirepo/README.md.hbs +1 -1
- package/src/utils/commands/dependencies/checkVersions.ts +2 -2
- package/src/utils/commands/dependencies/migrate.ts +2 -2
- package/src/validators/commands/runMigrationsAndCheckVersions.ts +4 -3
|
@@ -21,7 +21,7 @@ class NewCommand extends command_1.CLICommand {
|
|
|
21
21
|
{
|
|
22
22
|
name: '--packageManager',
|
|
23
23
|
value: '[packageManager]',
|
|
24
|
-
description: 'Package manager for the project <npm|yarn>',
|
|
24
|
+
description: 'Package manager for the project <npm|yarn|pnpm>',
|
|
25
25
|
},
|
|
26
26
|
{
|
|
27
27
|
name: '--testingFramework',
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -1 +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,
|
|
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,CA8EhG"}
|
package/lib/commands/new/new.js
CHANGED
|
@@ -37,17 +37,19 @@ function createNew(context, params) {
|
|
|
37
37
|
const sharedDir = getPathToShared();
|
|
38
38
|
const blockDir = getPathToBlock(type);
|
|
39
39
|
const isNpm = packageManager === 'npm';
|
|
40
|
+
const isYarn = packageManager === 'yarn';
|
|
40
41
|
const isJest = testingFramework === 'jest';
|
|
41
42
|
const blockDirectoryName = {
|
|
42
43
|
monorepo: path_1.default.join(type === 'app' ? 'apps' : 'child-apps', name),
|
|
43
44
|
multirepo: 'src',
|
|
44
45
|
}[template];
|
|
45
|
-
yield (0, renderTemplate_1.renderTemplate)(templateDir, directoryName, { configEntry, isJest, isNpm });
|
|
46
|
-
yield (0, renderTemplate_1.renderTemplate)(sharedDir, directoryName, { configEntry, isJest, isNpm });
|
|
46
|
+
yield (0, renderTemplate_1.renderTemplate)(templateDir, directoryName, { configEntry, isJest, isNpm, isYarn });
|
|
47
|
+
yield (0, renderTemplate_1.renderTemplate)(sharedDir, directoryName, { configEntry, isJest, isNpm, isYarn });
|
|
47
48
|
yield (0, renderTemplate_1.renderTemplate)(blockDir, path_1.default.join(directoryName, blockDirectoryName), {
|
|
48
49
|
configEntry,
|
|
49
50
|
isJest,
|
|
50
51
|
isNpm,
|
|
52
|
+
isYarn,
|
|
51
53
|
});
|
|
52
54
|
if (template === 'monorepo') {
|
|
53
55
|
const monorepoBlockDir = getPathToMonorepoBlock();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../src/commands/new/new.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AACxB,0DAA0B;AAC1B,gEAAgC;AAIhC,qEAAkE;AAClE,2DAAwD;AACxD,iEAA8D;AAG9D,mDAAwD;AAExD,+DAAoE;AAEpE,mEAAwE;AAExE,2CAAgD;AAEhD,qEAAqE;AACrE,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAE,QAAmB,EAAE,EAAE,CAC5D,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,qCAAqC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AACjF,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,4CAA4C,CAAC,CAAC;AACpG,MAAM,cAAc,GAAG,CAAC,IAAU,EAAE,EAAE,CACpC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,qCAAqC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAChF,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAClC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,oDAAoD,CAAC,CAAC;AAChF,MAAM,yBAAyB,GAAG,CAAC,IAAU,EAAE,gBAAmC,EAAE,EAAE,CACpF,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,qCAAqC,EAAE,IAAI,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;AAEpG,SAA8B,SAAS,CAAC,OAAgB,EAAE,MAAc;;QACtE,MAAM,EACJ,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,aAAa,EACvB,cAAc,EAAE,mBAAmB,EACnC,gBAAgB,EAAE,qBAAqB,GACxC,GAAG,MAAM,CAAC;QACX,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;QAC1D,MAAM,IAAI,GAAG,cAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAgB;YAC/B,IAAI,EAAE,aAAa;YACnB,IAAI;YACJ,IAAI,EAAE,aAAa;SACpB,CAAC;QAEF,MAAM,EACJ,IAAI,GAAG,SAAS,EAChB,QAAQ,GAAG,aAAa,EACxB,cAAc,GAAG,mBAAmB,EACpC,gBAAgB,GAAG,qBAAqB,GACzC,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAKtB;YACD,IAAA,mBAAY,EAAC,SAAS,CAAC;YACvB,IAAA,2BAAgB,EAAC,aAAa,CAAC;YAC/B,IAAA,uCAAsB,EAAC,mBAAmB,CAAC;YAC3C,IAAA,2CAAwB,EAAC,qBAAqB,CAAC;SAChD,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,cAAc,KAAK,KAAK,CAAC;QACvC,MAAM,MAAM,GAAG,gBAAgB,KAAK,MAAM,CAAC;QAE3C,MAAM,kBAAkB,GAAG;YACzB,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,EAAE,IAAI,CAAC;YACjE,SAAS,EAAE,KAAK;SACjB,CAAC,QAAQ,CAAC,CAAC;QAEZ,MAAM,IAAA,+BAAc,EAAC,WAAW,EAAE,aAAa,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../src/commands/new/new.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +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;
|
|
1
|
+
{"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.packageManagerQuestion = void 0;
|
|
4
|
-
const choices = ['npm', 'yarn'];
|
|
4
|
+
const choices = ['npm', 'yarn', 'pnpm'];
|
|
5
5
|
const packageManagerQuestion = (answer) => ({
|
|
6
6
|
type: 'list',
|
|
7
7
|
name: 'packageManager',
|
|
@@ -1 +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;
|
|
1
|
+
{"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"}
|
|
@@ -1 +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;
|
|
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;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"}
|
|
@@ -75,6 +75,10 @@ const packagesInstallCommands = {
|
|
|
75
75
|
deps: ['add'],
|
|
76
76
|
devDeps: ['add', '--dev'],
|
|
77
77
|
},
|
|
78
|
+
pnpm: {
|
|
79
|
+
deps: ['add'],
|
|
80
|
+
devDeps: ['add', '--save-dev'],
|
|
81
|
+
},
|
|
78
82
|
};
|
|
79
83
|
function installDependencies({ localDir, type, packageManager, testingFramework, }) {
|
|
80
84
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"installDependencies.js","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.checkVersions = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const
|
|
5
|
+
const tools_check_versions_1 = require("@tramvai/tools-check-versions");
|
|
6
6
|
const checkVersions = (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
7
7
|
try {
|
|
8
|
-
yield (0,
|
|
8
|
+
yield (0, tools_check_versions_1.run)();
|
|
9
9
|
}
|
|
10
10
|
catch (e) {
|
|
11
11
|
throw new Error('Versions check failed');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkVersions.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/checkVersions.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"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"}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.migrate = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const
|
|
5
|
+
const tools_migrate_1 = require("@tramvai/tools-migrate");
|
|
6
6
|
const migrate = (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
7
7
|
try {
|
|
8
|
-
yield (0,
|
|
8
|
+
yield (0, tools_migrate_1.run)();
|
|
9
9
|
}
|
|
10
10
|
catch (e) {
|
|
11
11
|
throw new Error('Migrations failed');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/migrate.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runMigrationsAndCheckVersions.d.ts","sourceRoot":"","sources":["../../../src/validators/commands/runMigrationsAndCheckVersions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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"}
|
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.runMigrationsAndCheckVersions = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const execa_1 = require("execa");
|
|
6
5
|
const lockfileHash_1 = require("../../utils/lockfileHash");
|
|
6
|
+
const migrate_1 = require("../../utils/commands/dependencies/migrate");
|
|
7
|
+
const checkVersions_1 = require("../../utils/commands/dependencies/checkVersions");
|
|
7
8
|
const runMigrationsAndCheckVersions = (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
8
9
|
if ((0, lockfileHash_1.isLockfileChanged)(context)) {
|
|
9
|
-
yield (0,
|
|
10
|
-
yield (0,
|
|
10
|
+
yield (0, migrate_1.migrate)(context);
|
|
11
|
+
yield (0, checkVersions_1.checkVersions)(context);
|
|
11
12
|
}
|
|
12
13
|
return { name: 'runMigrationsAndCheckVersions', status: 'ok' };
|
|
13
14
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runMigrationsAndCheckVersions.js","sourceRoot":"","sources":["../../../src/validators/commands/runMigrationsAndCheckVersions.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/cli",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.11.0",
|
|
4
4
|
"description": "Cli инструмент для сборки и запуска приложений",
|
|
5
5
|
"files": [
|
|
6
6
|
"src",
|
|
@@ -63,17 +63,17 @@
|
|
|
63
63
|
"@tinkoff/browserslist-config": "0.3.2",
|
|
64
64
|
"@tinkoff/dippy": "0.9.1",
|
|
65
65
|
"@tinkoff/is-modern-lib": "3.0.2",
|
|
66
|
-
"@tinkoff/logger": "0.10.
|
|
66
|
+
"@tinkoff/logger": "0.10.170",
|
|
67
67
|
"@tinkoff/minicss-class-generator": "0.3.1",
|
|
68
|
-
"@tinkoff/package-manager-wrapper": "0.2.
|
|
68
|
+
"@tinkoff/package-manager-wrapper": "0.2.2",
|
|
69
69
|
"@tinkoff/request-core": "^0.9.2",
|
|
70
70
|
"@tinkoff/request-plugin-protocol-http": "^0.11.8",
|
|
71
71
|
"@tinkoff/utils": "^2.1.3",
|
|
72
72
|
"@tinkoff/webpack-dedupe-plugin": "2.0.2",
|
|
73
73
|
"@tramvai/build": "4.0.1",
|
|
74
|
-
"@tramvai/react": "3.
|
|
75
|
-
"@tramvai/tools-check-versions": "0.5.
|
|
76
|
-
"@tramvai/tools-migrate": "0.7.
|
|
74
|
+
"@tramvai/react": "3.11.0",
|
|
75
|
+
"@tramvai/tools-check-versions": "0.5.3",
|
|
76
|
+
"@tramvai/tools-migrate": "0.7.3",
|
|
77
77
|
"ajv": "^8.12.0",
|
|
78
78
|
"ansi-escapes": "^4.3.2",
|
|
79
79
|
"autoprefixer": "^10.4.8",
|
|
@@ -22,7 +22,7 @@ class NewCommand extends CLICommand<Params> {
|
|
|
22
22
|
{
|
|
23
23
|
name: '--packageManager',
|
|
24
24
|
value: '[packageManager]',
|
|
25
|
-
description: 'Package manager for the project <npm|yarn>',
|
|
25
|
+
description: 'Package manager for the project <npm|yarn|pnpm>',
|
|
26
26
|
},
|
|
27
27
|
{
|
|
28
28
|
name: '--testingFramework',
|
package/src/commands/new/new.ts
CHANGED
|
@@ -65,6 +65,7 @@ export default async function createNew(context: Context, params: Params): Promi
|
|
|
65
65
|
const sharedDir = getPathToShared();
|
|
66
66
|
const blockDir = getPathToBlock(type);
|
|
67
67
|
const isNpm = packageManager === 'npm';
|
|
68
|
+
const isYarn = packageManager === 'yarn';
|
|
68
69
|
const isJest = testingFramework === 'jest';
|
|
69
70
|
|
|
70
71
|
const blockDirectoryName = {
|
|
@@ -72,12 +73,13 @@ export default async function createNew(context: Context, params: Params): Promi
|
|
|
72
73
|
multirepo: 'src',
|
|
73
74
|
}[template];
|
|
74
75
|
|
|
75
|
-
await renderTemplate(templateDir, directoryName, { configEntry, isJest, isNpm });
|
|
76
|
-
await renderTemplate(sharedDir, directoryName, { configEntry, isJest, isNpm });
|
|
76
|
+
await renderTemplate(templateDir, directoryName, { configEntry, isJest, isNpm, isYarn });
|
|
77
|
+
await renderTemplate(sharedDir, directoryName, { configEntry, isJest, isNpm, isYarn });
|
|
77
78
|
await renderTemplate(blockDir, path.join(directoryName, blockDirectoryName), {
|
|
78
79
|
configEntry,
|
|
79
80
|
isJest,
|
|
80
81
|
isNpm,
|
|
82
|
+
isYarn,
|
|
81
83
|
});
|
|
82
84
|
if (template === 'monorepo') {
|
|
83
85
|
const monorepoBlockDir = getPathToMonorepoBlock();
|
|
@@ -70,7 +70,7 @@ const devDependencies = [
|
|
|
70
70
|
'typescript',
|
|
71
71
|
];
|
|
72
72
|
|
|
73
|
-
const packagesInstallCommands = {
|
|
73
|
+
const packagesInstallCommands: Record<PackageManagers, { deps: string[]; devDeps: string[] }> = {
|
|
74
74
|
npm: {
|
|
75
75
|
deps: ['install', '--save', '--package-lock', '--legacy-peer-deps'],
|
|
76
76
|
devDeps: ['install', '--save-dev', '--legacy-peer-deps'],
|
|
@@ -79,6 +79,10 @@ const packagesInstallCommands = {
|
|
|
79
79
|
deps: ['add'],
|
|
80
80
|
devDeps: ['add', '--dev'],
|
|
81
81
|
},
|
|
82
|
+
pnpm: {
|
|
83
|
+
deps: ['add'],
|
|
84
|
+
devDeps: ['add', '--save-dev'],
|
|
85
|
+
},
|
|
82
86
|
};
|
|
83
87
|
|
|
84
88
|
export async function installDependencies({
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
## Install dependencies
|
|
6
6
|
|
|
7
|
-
Run installation with selected package manager {{#if isNpm}}`npm install`{{else}}`yarn`{{/if}}
|
|
7
|
+
Run installation with selected package manager {{#if isNpm}}`npm install`{{else if isYarn}}`yarn`{{else}}`pnpm install`{{/if}}
|
|
8
8
|
|
|
9
9
|
## Usage
|
|
10
10
|
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
## Install dependencies
|
|
6
6
|
|
|
7
|
-
Run installation with selected package manager {{#if isNpm}}`npm install`{{else}}`yarn`{{/if}}
|
|
7
|
+
Run installation with selected package manager {{#if isNpm}}`npm install`{{else if isYarn}}`yarn`{{else}}`pnpm install`{{/if}}
|
|
8
8
|
|
|
9
9
|
## Usage
|
|
10
10
|
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
## Install dependencies
|
|
6
6
|
|
|
7
|
-
Run installation with selected package manager {{#if isNpm}}`npm install`{{else}}`yarn`{{/if}}
|
|
7
|
+
Run installation with selected package manager {{#if isNpm}}`npm install`{{else if isYarn}}`yarn`{{else}}`pnpm install`{{/if}}
|
|
8
8
|
|
|
9
9
|
## Usage
|
|
10
10
|
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
## Install dependencies
|
|
6
6
|
|
|
7
|
-
Run installation with selected package manager {{#if isNpm}}`npm install`{{else}}`yarn`{{/if}}
|
|
7
|
+
Run installation with selected package manager {{#if isNpm}}`npm install`{{else if isYarn}}`yarn`{{else}}`pnpm install`{{/if}}
|
|
8
8
|
|
|
9
9
|
## Usage
|
|
10
10
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { run } from '@tramvai/tools-check-versions';
|
|
2
2
|
import type { Context } from '../../../models/context';
|
|
3
3
|
|
|
4
4
|
export const checkVersions = async (context: Context) => {
|
|
5
5
|
try {
|
|
6
|
-
await
|
|
6
|
+
await run();
|
|
7
7
|
} catch (e) {
|
|
8
8
|
throw new Error('Versions check failed');
|
|
9
9
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { run } from '@tramvai/tools-migrate';
|
|
2
2
|
import type { Context } from '../../../models/context';
|
|
3
3
|
|
|
4
4
|
export const migrate = async (context: Context) => {
|
|
5
5
|
try {
|
|
6
|
-
await
|
|
6
|
+
await run();
|
|
7
7
|
} catch (e) {
|
|
8
8
|
throw new Error('Migrations failed');
|
|
9
9
|
}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { command } from 'execa';
|
|
2
1
|
import { isLockfileChanged } from '../../utils/lockfileHash';
|
|
3
2
|
import type { Validator } from './validator.h';
|
|
3
|
+
import { migrate } from '../../utils/commands/dependencies/migrate';
|
|
4
|
+
import { checkVersions } from '../../utils/commands/dependencies/checkVersions';
|
|
4
5
|
|
|
5
6
|
export const runMigrationsAndCheckVersions: Validator = async (context) => {
|
|
6
7
|
if (isLockfileChanged(context)) {
|
|
7
|
-
await
|
|
8
|
-
await
|
|
8
|
+
await migrate(context);
|
|
9
|
+
await checkVersions(context);
|
|
9
10
|
}
|
|
10
11
|
|
|
11
12
|
return { name: 'runMigrationsAndCheckVersions', status: 'ok' };
|