@tramvai/cli 2.160.21 → 2.160.25

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.
Files changed (55) hide show
  1. package/lib/commands/new/command.js +1 -1
  2. package/lib/commands/new/command.js.map +1 -1
  3. package/lib/commands/new/new.d.ts.map +1 -1
  4. package/lib/commands/new/new.js +4 -2
  5. package/lib/commands/new/new.js.map +1 -1
  6. package/lib/commands/new/questions/packageManager.d.ts +1 -1
  7. package/lib/commands/new/questions/packageManager.d.ts.map +1 -1
  8. package/lib/commands/new/questions/packageManager.js +1 -1
  9. package/lib/commands/new/questions/packageManager.js.map +1 -1
  10. package/lib/commands/new/steps/installDependencies.d.ts.map +1 -1
  11. package/lib/commands/new/steps/installDependencies.js +4 -0
  12. package/lib/commands/new/steps/installDependencies.js.map +1 -1
  13. package/lib/commands/static/application.d.ts.map +1 -1
  14. package/lib/commands/static/application.js +6 -1
  15. package/lib/commands/static/application.js.map +1 -1
  16. package/lib/config/configManager.d.ts.map +1 -1
  17. package/lib/config/configManager.js +5 -0
  18. package/lib/config/configManager.js.map +1 -1
  19. package/lib/library/webpack/blocks/rootErrorBoundary.d.ts +2 -1
  20. package/lib/library/webpack/blocks/rootErrorBoundary.d.ts.map +1 -1
  21. package/lib/library/webpack/blocks/rootErrorBoundary.js +3 -5
  22. package/lib/library/webpack/blocks/rootErrorBoundary.js.map +1 -1
  23. package/lib/schema/autogeneratedSchema.json +20 -15
  24. package/lib/typings/application.d.ts +8 -4
  25. package/lib/typings/application.d.ts.map +1 -1
  26. package/lib/typings/configEntry/application.d.ts +5 -0
  27. package/lib/typings/configEntry/application.d.ts.map +1 -1
  28. package/lib/utils/commands/dependencies/checkVersions.js +2 -2
  29. package/lib/utils/commands/dependencies/checkVersions.js.map +1 -1
  30. package/lib/utils/commands/dependencies/migrate.js +2 -2
  31. package/lib/utils/commands/dependencies/migrate.js.map +1 -1
  32. package/lib/validators/commands/runMigrationsAndCheckVersions.d.ts.map +1 -1
  33. package/lib/validators/commands/runMigrationsAndCheckVersions.js +4 -3
  34. package/lib/validators/commands/runMigrationsAndCheckVersions.js.map +1 -1
  35. package/package.json +2 -2
  36. package/schema.json +20 -15
  37. package/src/commands/new/command.ts +1 -1
  38. package/src/commands/new/new.ts +4 -2
  39. package/src/commands/new/questions/packageManager.ts +2 -2
  40. package/src/commands/new/steps/installDependencies.ts +5 -1
  41. package/src/commands/new/templates/app/monorepo/README.md.hbs +1 -1
  42. package/src/commands/new/templates/app/multirepo/README.md.hbs +1 -1
  43. package/src/commands/new/templates/child-app/monorepo/README.md.hbs +1 -1
  44. package/src/commands/new/templates/child-app/multirepo/README.md.hbs +1 -1
  45. package/src/commands/static/application.ts +12 -2
  46. package/src/config/configManager.ts +11 -0
  47. package/src/library/webpack/blocks/rootErrorBoundary.ts +27 -24
  48. package/src/models/config.spec.ts +2 -0
  49. package/src/schema/autogeneratedSchema.json +20 -15
  50. package/src/schema/tramvai.spec.ts +1 -0
  51. package/src/typings/application.ts +8 -4
  52. package/src/typings/configEntry/application.ts +5 -0
  53. package/src/utils/commands/dependencies/checkVersions.ts +2 -2
  54. package/src/utils/commands/dependencies/migrate.ts +2 -2
  55. 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,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"}
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,CA4EhG"}
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"}
@@ -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":"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"}
1
+ {"version":3,"file":"new.js","sourceRoot":"","sources":["../../../src/commands/new/new.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- type PackageManagers = 'npm' | 'yarn';
1
+ type PackageManagers = 'npm' | 'yarn' | 'pnpm';
2
2
  declare const packageManagerQuestion: (answer: string) => {
3
3
  type: "list";
4
4
  name: "packageManager";
@@ -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;AAItC,QAAA,MAAM,sBAAsB,WAAY,MAAM;;;;;;;CAO5C,CAAC;AAEH,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,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;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"}
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;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"}
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,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"}
1
+ {"version":3,"file":"installDependencies.js","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../src/commands/static/application.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AACpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAaxC,eAAO,MAAM,SAAS,YACX,OAAO,eACH,sBAAsB,WAC1B,MAAM,KACd,QAAQ,aAAa,CAmKvB,CAAC"}
1
+ {"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../src/commands/static/application.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AACpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAaxC,eAAO,MAAM,SAAS,YACX,OAAO,eACH,sBAAsB,WAC1B,MAAM,KACd,QAAQ,aAAa,CA4KvB,CAAC"}
@@ -7,6 +7,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
7
7
  const execa_1 = require("execa");
8
8
  const wait_on_1 = tslib_1.__importDefault(require("wait-on"));
9
9
  const env_ci_1 = tslib_1.__importDefault(require("env-ci"));
10
+ const string_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/string"));
10
11
  const configManager_1 = require("../../config/configManager");
11
12
  const generate_1 = require("./generate");
12
13
  const copyStatsJsonFile_1 = require("../../builder/webpack/utils/copyStatsJsonFile");
@@ -40,7 +41,7 @@ const staticApp = (context, configEntry, options) => tslib_1.__awaiter(void 0, v
40
41
  message: `message: build step was skipped`,
41
42
  });
42
43
  }
43
- const { name, host, port, staticPort, staticHost, output } = serverConfigManager;
44
+ const { host, port, fileSystemPages: { rootErrorBoundaryPath }, } = serverConfigManager;
44
45
  const root = serverConfigManager.buildPath;
45
46
  const assetsPrefix = process.env.ASSETS_PREFIX;
46
47
  if (!assetsPrefix) {
@@ -95,6 +96,10 @@ const staticApp = (context, configEntry, options) => tslib_1.__awaiter(void 0, v
95
96
  message: `message: server started, fetch application routes`,
96
97
  });
97
98
  let paths = yield (0, request_1.appBundleInfo)(serverConfigManager);
99
+ if ((0, string_1.default)(rootErrorBoundaryPath)) {
100
+ // implicit connection with packages/modules/server/src/server/error.ts
101
+ paths.push('/_errors/5xx');
102
+ }
98
103
  if (options.onlyPages) {
99
104
  paths = (0, intersection_1.default)(paths, options.onlyPages);
100
105
  }
@@ -1 +1 @@
1
- {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/commands/static/application.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/commands/static/application.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"configManager.d.ts","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,GAAG;IAErC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE7B,GAAG,CAAC,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAgBD,KAAK,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;KACnD,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,iBAAiB,CAAC,MAAM,CAAC,CAAC,GACvD,CAAC,GACD,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAClC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GACvB,CAAC,CAAC,GAAG,CAAC;CACX,CAAC;AAmBF,MAAM,MAAM,aAAa,CACvB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,GAAG,GAAG,GAAG,IACjB,eAAe,CAAC,CAAC,CAAC,GACpB,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,SAAS,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEJ,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAG/C,eAAO,MAAM,mBAAmB,0HAgJ/B,CAAC"}
1
+ {"version":3,"file":"configManager.d.ts","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,GAAG;IAErC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE7B,GAAG,CAAC,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAgBD,KAAK,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;KACnD,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,iBAAiB,CAAC,MAAM,CAAC,CAAC,GACvD,CAAC,GACD,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAClC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GACvB,CAAC,CAAC,GAAG,CAAC;CACX,CAAC;AAmBF,MAAM,MAAM,aAAa,CACvB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,GAAG,GAAG,GAAG,IACjB,eAAe,CAAC,CAAC,CAAC,GACpB,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,SAAS,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEJ,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAG/C,eAAO,MAAM,mBAAmB,0HA0J/B,CAAC"}
@@ -8,6 +8,7 @@ const object_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/object"));
8
8
  const prop_1 = tslib_1.__importDefault(require("@tinkoff/utils/object/prop"));
9
9
  const map_1 = tslib_1.__importDefault(require("@tinkoff/utils/object/map"));
10
10
  const path_1 = require("path");
11
+ const fs_1 = tslib_1.__importDefault(require("fs"));
11
12
  const common_1 = require("../typings/configEntry/common");
12
13
  const validate_1 = require("./validate");
13
14
  const moduleVersion_1 = tslib_1.__importDefault(require("../utils/moduleVersion"));
@@ -115,6 +116,10 @@ const createConfigManager = (configEntry, settings) => {
115
116
  }
116
117
  }
117
118
  }
119
+ const rootErrorBoundaryPath = (0, path_1.resolve)(config.rootDir, config.root, config.fileSystemPages.rootErrorBoundaryPath);
120
+ config.fileSystemPages.rootErrorBoundaryPath = fs_1.default.existsSync(rootErrorBoundaryPath)
121
+ ? rootErrorBoundaryPath
122
+ : undefined;
118
123
  }
119
124
  else if ((0, validate_1.isChildApp)(config)) {
120
125
  config.buildPath = (0, path_1.resolve)(rootDir, ...config.output.split('/'));
@@ -1 +1 @@
1
- {"version":3,"file":"configManager.js","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"configManager.js","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":";;;;AAAA,wEAA0C;AAC1C,4EAA8C;AAC9C,8EAAgD;AAChD,8EAA8C;AAC9C,4EAA+C;AAC/C,+BAA+B;AAC/B,oDAAoB;AAIpB,0DAAoE;AACpE,yCAA2E;AAC3E,mFAAmD;AACnD,4DAAyD;AACzD,6CAA0C;AAE1C,yDAAqD;AA8BrD,MAAM,SAAS,GAAG,CAAI,UAAkB,EAAE,IAAW,EAAE,IAAO,EAAK,EAAE;IACnE,MAAM,MAAM,GAAG,IAAA,cAAI,EAAC,UAAU,CAAC,CAAC;IAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9B,IAAI,CAAC,IAAA,aAAK,EAAC,KAAK,CAAC,EAAE;YACjB,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAUF,MAAM,cAAc,GAAG,CACrB,GAAQ,EACR,OAAU,EACU,EAAE;IACtB,OAAO,IAAA,aAAM,EAAC,CAAC,KAAK,EAAE,EAAE;QACtB,IAAI,IAAA,4BAAmB,EAAC,KAAK,CAAC,EAAE;YAC9B,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;SACnB;QAED,IAAI,IAAA,gBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,IAAA,eAAO,EAAC,KAAK,CAAC,EAAE;YACtC,OAAO,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACnC;QAED,OAAO,KAAK,CAAC;IACf,CAAC,EAAE,OAAO,CAAC,CAAC;AACd,CAAC,CAAC;AAcW,QAAA,mBAAmB,GAAG,WAAW,CAAC;AAE/C,sDAAsD;AAC/C,MAAM,mBAAmB,GAAG,CACjC,WAAc,EACd,QAAqB,EACA,EAAE;;IACvB,MAAM,GAAG,GAAM,MAAA,QAAQ,CAAC,GAAG,mCAAK,aAAmB,CAAC;IACpD,MAAM,qBAAqB,GAAG,cAAc,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAE/D,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAC7B,MAAM,OAAO,GAAG,MAAA,QAAQ,CAAC,OAAO,mCAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAClD,MAAM,KAAK,GAAG,MAAA,QAAQ,CAAC,KAAK,mCAAI,KAAK,CAAC;IACtC,MAAM,cAAc,GAAG,MAAA,QAAQ,CAAC,cAAc,mCAAI,KAAK,CAAC;IACxD,MAAM,MAAM,GAAG,MAAA,QAAQ,CAAC,MAAM,mCAAI,EAAE,CAAC;IACrC,6DAA6D;IAC7D,4FAA4F;IAC5F,oHAAoH;IACpH,uGAAuG;IACvG,MAAM,4BAA4B,GAChC,CAAC,OAAO,CAAC,GAAG,CAAC,mCAAmC;QAC9C,MAAM,CAAC,mCAAmC,CAAC,KAAK,MAAM,IAAI,GAAG,KAAK,aAAa,CAAC;IACpF,MAAM,MAAM,GAAG,4BAA4B;QACzC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,SAAS,mCAAI,QAAQ,CAAC;IACjD,IAAI,MAAM,GAAW,UAAU,CAAC;IAEhC,IAAI,SAAS,KAAK,QAAQ,EAAE;QAC1B,MAAM,GAAG,MAAM,CAAC;KACjB;SAAM,IAAI,MAAM,EAAE;QACjB,MAAM,GAAG,QAAQ,CAAC;KACnB;IAED,MAAM,MAAM,+DACP,qBAAqB,KACxB,OAAO,EACL,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,uBAAa,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACrD,IAAA,+BAAc,EAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC;YACzC,SAAS,EACX,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,KAAK,EACd,eAAe,EAAE,KAAK,EACtB,eAAe,EAAE,KAAK,EACtB,eAAe,EAAE,IAAI,EACrB,uBAAuB,EAAE,KAAK,EAC9B,WAAW,EAAE,EAAE;QACf,4DAA4D;QAC5D,mEAAmE;QACnE,SAAS,EAAE,IAAI,EACf,UAAU,EAAE,KAAK,EACjB,GAAG,EAAE,KAAK,KACP,QAAQ,KACX,MAAM;QACN,GAAG;QACH,OAAO;QACP,SAAS;QACT,KAAK;QACL,cAAc,EACd,IAAI,EAAE,MAAM,CAAC,MAAA,QAAQ,CAAC,IAAI,mCAAI,0BAAW,CAAC,YAAY,CAAC,EACvD,UAAU,EAAE,MAAA,QAAQ,CAAC,UAAU,mCAAI,2BAAmB,EACtD,UAAU,EAAE,MAAM,CAChB,MAAA,QAAQ,CAAC,UAAU,mCACjB,CAAC,IAAI,KAAK,QAAQ;YAChB,CAAC,CAAC,0BAAW,CAAC,0BAA0B;YACxC,CAAC,CAAC,0BAAW,CAAC,mBAAmB,CAAC,CACvC,EACD,MAAM;QACN,6CAA6C;QAC7C,SAAS,EAAE,KAAK;YACd,CAAC,CAAC,gFAAgF;gBAChF,OAAO,QAAQ,CAAC,SAAS,KAAK,SAAS;oBACvC,CAAC,CAAC,QAAQ,CAAC,SAAS;oBACpB,CAAC,CAAC,IAAI;YACR,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,qBAAqB,CAAC,EAAE,KAAK,CAAC,EACpE,MAAM,EACN,SAAS,EAAE,EAAE,EACb,YAAY,CAAC,gBAAgB;YAC3B,OAAO,IAAA,2BAAmB,EAAC,WAAW,kCACjC,QAAQ,GACR,gBAAgB,EACnB,CAAC;QACL,CAAC;QACD,SAAS;YACP,OAAO;gBACL,WAAW;gDAEN,QAAQ;oBACX,2CAA2C;oBAC3C,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,SAAS;aAEpB,CAAC;QACJ,CAAC,GACF,CAAC;IAEF,IAAI,IAAA,wBAAa,EAAC,MAAM,CAAC,EAAE;QACzB,MAAM,CAAC,YAAY;YACjB,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,QAAQ;gBACjE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa;gBAC3B,CAAC,CAAC,UAAU,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAC9E,KAAK,EACL,EAAE,CACH,GAAG,CAAC;QACX,MAAM,CAAC,SAAS,GAAG,IAAA,cAAO,EACxB,OAAO,EACP,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CACrE,CAAC;QAEF,MAAM,GAAG,GAAG,MAAA,MAAM,CAAC,WAAW,0CAAE,GAAG,CAAC;QAEpC,IAAI,MAAA,GAAG,CAAC,WAAW,0CAAE,OAAO,EAAE;YAC5B,GAAG,CAAC,WAAW,mCACV,GAAG,CAAC,WAAW,KAClB,KAAK,EAAE,MAAA,GAAG,CAAC,WAAW,CAAC,KAAK,mCAAI,MAAA,GAAG,CAAC,EAAE,0CAAE,KAAK,EAC7C,IAAI,EAAE,MAAA,GAAG,CAAC,WAAW,CAAC,IAAI,mCAAI,MAAM,CAAC,IAAI,EACzC,UAAU,EAAE,MAAA,GAAG,CAAC,WAAW,CAAC,IAAI,mCAAI,MAAM,CAAC,IAAI,EAC/C,WAAW,EAAE,MAAA,GAAG,CAAC,WAAW,CAAC,WAAW,mCAAI,GAAG,CAAC,IAAI,CAAC,UAAU,GAChE,CAAC;YAEF,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAC3C,IAAI,GAAG,KAAK,YAAY,EAAE;oBACxB,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;oBACjC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;oBAC5C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;oBAChD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAE1C,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;iBACzF;qBAAM;oBACL,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;iBAC3F;aACF;SACF;QAED,MAAM,qBAAqB,GAAG,IAAA,cAAO,EACnC,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,eAAe,CAAC,qBAAqB,CAC7C,CAAC;QAEF,MAAM,CAAC,eAAe,CAAC,qBAAqB,GAAG,YAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACjF,CAAC,CAAC,qBAAqB;YACvB,CAAC,CAAC,SAAS,CAAC;KACf;SAAM,IAAI,IAAA,qBAAU,EAAC,MAAM,CAAC,EAAE;QAC7B,MAAM,CAAC,SAAS,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;KAClE;SAAM,IAAI,IAAA,mBAAQ,EAAC,MAAM,CAAC,EAAE;QAC3B,MAAM,CAAC,SAAS,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;KAC/F;IAED,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC;KACpB;IAED,IAAA,mBAAQ,EAAC,MAAM,CAAC,CAAC;IAEjB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA1JW,QAAA,mBAAmB,uBA0J9B"}
@@ -1,4 +1,5 @@
1
1
  import type Config from 'webpack-chain';
2
2
  import type { ConfigManager } from '../../../config/configManager';
3
- export declare const rootErrorBoundaryFactory: (configManager: ConfigManager) => (config: Config) => void;
3
+ import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
4
+ export declare const rootErrorBoundaryFactory: (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => void;
4
5
  //# sourceMappingURL=rootErrorBoundary.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"rootErrorBoundary.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/rootErrorBoundary.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAKnE,eAAO,MAAM,wBAAwB,kBAAmB,aAAa,cAAc,MAAM,SAuBxF,CAAC"}
1
+ {"version":3,"file":"rootErrorBoundary.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/rootErrorBoundary.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAKvF,eAAO,MAAM,wBAAwB,kBACnB,cAAc,sBAAsB,CAAC,cAAc,MAAM,SAwBxE,CAAC"}
@@ -2,16 +2,14 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.rootErrorBoundaryFactory = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const fs_1 = tslib_1.__importDefault(require("fs"));
6
5
  const path_1 = tslib_1.__importDefault(require("path"));
6
+ const string_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/string"));
7
7
  const ROOT_ERROR_BOUNDARY_CHUNK_NAME = 'rootErrorBoundary';
8
8
  const ROOT_ERROR_BOUNDARY_ALIAS = '@/__private__/error';
9
9
  const rootErrorBoundaryFactory = (configManager) => (config) => {
10
- const { root, rootDir, buildType } = configManager;
11
- const rootErrorBoundaryPath = path_1.default.resolve(rootDir, root, 'error.tsx');
10
+ const { buildType, fileSystemPages: { rootErrorBoundaryPath }, } = configManager;
12
11
  const fakeErrorBoundaryModule = require.resolve('../application/fakeRootErrorBoundaryModule');
13
- const doesErrorBoundaryExist = fs_1.default.existsSync(rootErrorBoundaryPath);
14
- if (doesErrorBoundaryExist) {
12
+ if ((0, string_1.default)(rootErrorBoundaryPath)) {
15
13
  config
16
14
  .when(buildType === 'client',
17
15
  // We don't need additional entrypoint on the server
@@ -1 +1 @@
1
- {"version":3,"file":"rootErrorBoundary.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/rootErrorBoundary.ts"],"names":[],"mappings":";;;;AAAA,oDAAoB;AACpB,wDAAwB;AAKxB,MAAM,8BAA8B,GAAG,mBAAmB,CAAC;AAC3D,MAAM,yBAAyB,GAAG,qBAAqB,CAAC;AAEjD,MAAM,wBAAwB,GAAG,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3F,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;IACnD,MAAM,qBAAqB,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IACvE,MAAM,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAC;IAC9F,MAAM,sBAAsB,GAAG,YAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAEpE,IAAI,sBAAsB,EAAE;QAC1B,MAAM;aACH,IAAI,CACH,SAAS,KAAK,QAAQ;QACtB,oDAAoD;QACpD,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC,GAAG,CAAC,uBAAuB,CAAC,EACrF,CAAC,MAAM,EAAE,EAAE;QACT,yEAAyE;QACzE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAyB,EAAE,qBAAqB,CAAC,CAC7E;aACA,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC;aAClC,OAAO,CAAC,KAAK,CAAC;aACd,IAAI,CAAC,IAAI,MAAM,CAAC,uBAAuB,CAAC,CAAC;aACzC,GAAG,CAAC,4BAA4B,CAAC;aACjC,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,4BAA4B,CAAC,CAAC;aAC9E,OAAO,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,SAAS,EAAE,CAAC,CAAC;KACxD;AACH,CAAC,CAAC;AAvBW,QAAA,wBAAwB,4BAuBnC"}
1
+ {"version":3,"file":"rootErrorBoundary.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/rootErrorBoundary.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAGxB,8EAAgD;AAIhD,MAAM,8BAA8B,GAAG,mBAAmB,CAAC;AAC3D,MAAM,yBAAyB,GAAG,qBAAqB,CAAC;AAEjD,MAAM,wBAAwB,GACnC,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3E,MAAM,EACJ,SAAS,EACT,eAAe,EAAE,EAAE,qBAAqB,EAAE,GAC3C,GAAG,aAAa,CAAC;IAClB,MAAM,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAC;IAE9F,IAAI,IAAA,gBAAQ,EAAC,qBAAqB,CAAC,EAAE;QACnC,MAAM;aACH,IAAI,CACH,SAAS,KAAK,QAAQ;QACtB,oDAAoD;QACpD,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC,GAAG,CAAC,uBAAuB,CAAC,EACrF,CAAC,MAAM,EAAE,EAAE;QACT,yEAAyE;QACzE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAyB,EAAE,qBAAqB,CAAC,CAC7E;aACA,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC;aAClC,OAAO,CAAC,KAAK,CAAC;aACd,IAAI,CAAC,IAAI,MAAM,CAAC,uBAAuB,CAAC,CAAC;aACzC,GAAG,CAAC,4BAA4B,CAAC;aACjC,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,4BAA4B,CAAC,CAAC;aAC9E,OAAO,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,SAAS,EAAE,CAAC,CAAC;KACxD;AACH,CAAC,CAAC;AAzBS,QAAA,wBAAwB,4BAyBjC"}
@@ -94,6 +94,11 @@
94
94
  "componentsPattern": {
95
95
  "title": "Test Regexp to add only files with specific name to list of FS Components",
96
96
  "type": "string"
97
+ },
98
+ "rootErrorBoundaryPath": {
99
+ "title": "Path to RootErrorBoundary component (relative to \"root\" directory)",
100
+ "default": "error.tsx",
101
+ "type": "string"
97
102
  }
98
103
  },
99
104
  "additionalProperties": false
@@ -1139,23 +1144,23 @@
1139
1144
  "dotAll": {
1140
1145
  "type": "boolean"
1141
1146
  },
1142
- "__@match@6837": {
1147
+ "__@match@6838": {
1143
1148
  "type": "object",
1144
1149
  "additionalProperties": false
1145
1150
  },
1146
- "__@replace@6839": {
1151
+ "__@replace@6840": {
1147
1152
  "type": "object",
1148
1153
  "additionalProperties": false
1149
1154
  },
1150
- "__@search@6842": {
1155
+ "__@search@6843": {
1151
1156
  "type": "object",
1152
1157
  "additionalProperties": false
1153
1158
  },
1154
- "__@split@6844": {
1159
+ "__@split@6845": {
1155
1160
  "type": "object",
1156
1161
  "additionalProperties": false
1157
1162
  },
1158
- "__@matchAll@6846": {
1163
+ "__@matchAll@6847": {
1159
1164
  "type": "object",
1160
1165
  "additionalProperties": false
1161
1166
  }
@@ -1809,23 +1814,23 @@
1809
1814
  "dotAll": {
1810
1815
  "type": "boolean"
1811
1816
  },
1812
- "__@match@6837": {
1817
+ "__@match@6838": {
1813
1818
  "type": "object",
1814
1819
  "additionalProperties": false
1815
1820
  },
1816
- "__@replace@6839": {
1821
+ "__@replace@6840": {
1817
1822
  "type": "object",
1818
1823
  "additionalProperties": false
1819
1824
  },
1820
- "__@search@6842": {
1825
+ "__@search@6843": {
1821
1826
  "type": "object",
1822
1827
  "additionalProperties": false
1823
1828
  },
1824
- "__@split@6844": {
1829
+ "__@split@6845": {
1825
1830
  "type": "object",
1826
1831
  "additionalProperties": false
1827
1832
  },
1828
- "__@matchAll@6846": {
1833
+ "__@matchAll@6847": {
1829
1834
  "type": "object",
1830
1835
  "additionalProperties": false
1831
1836
  }
@@ -2479,23 +2484,23 @@
2479
2484
  "dotAll": {
2480
2485
  "type": "boolean"
2481
2486
  },
2482
- "__@match@6837": {
2487
+ "__@match@6838": {
2483
2488
  "type": "object",
2484
2489
  "additionalProperties": false
2485
2490
  },
2486
- "__@replace@6839": {
2491
+ "__@replace@6840": {
2487
2492
  "type": "object",
2488
2493
  "additionalProperties": false
2489
2494
  },
2490
- "__@search@6842": {
2495
+ "__@search@6843": {
2491
2496
  "type": "object",
2492
2497
  "additionalProperties": false
2493
2498
  },
2494
- "__@split@6844": {
2499
+ "__@split@6845": {
2495
2500
  "type": "object",
2496
2501
  "additionalProperties": false
2497
2502
  },
2498
- "__@matchAll@6846": {
2503
+ "__@matchAll@6847": {
2499
2504
  "type": "object",
2500
2505
  "additionalProperties": false
2501
2506
  }
@@ -16,19 +16,23 @@ declare module '*.woff2' {
16
16
  }
17
17
  type ImageString = string;
18
18
  declare module '*.png' {
19
- export default ImageString;
19
+ const src: ImageString;
20
+ export default src;
20
21
  export const image: ImageObject;
21
22
  }
22
23
  declare module '*.jpg' {
23
- export default ImageString;
24
+ const src: ImageString;
25
+ export default src;
24
26
  export const image: ImageObject;
25
27
  }
26
28
  declare module '*.jpeg' {
27
- export default ImageString;
29
+ const src: ImageString;
30
+ export default src;
28
31
  export const image: ImageObject;
29
32
  }
30
33
  declare module '*.webp' {
31
- export default ImageString;
34
+ const src: ImageString;
35
+ export default src;
32
36
  export const image: ImageObject;
33
37
  }
34
38
  declare module '*.svg' {
@@ -1 +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"}
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,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"}
@@ -166,6 +166,11 @@ export interface ApplicationConfigEntry extends CliConfigEntry {
166
166
  * @title Test Regexp to add only files with specific name to list of FS Components
167
167
  */
168
168
  componentsPattern: string;
169
+ /**
170
+ * @title Path to RootErrorBoundary component (relative to "root" directory)
171
+ * @default "error.tsx"
172
+ */
173
+ rootErrorBoundaryPath?: string;
169
174
  };
170
175
  /**
171
176
  * @title Configure the options on webpack splitChunks
@@ -1 +1 @@
1
- {"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../src/typings/configEntry/application.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../src/typings/configEntry/application.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 execa_1 = require("execa");
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, execa_1.command)(`npx tramvai-check-versions`, { stdio: 'inherit' });
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,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"}
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 execa_1 = require("execa");
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, execa_1.command)(`npx tramvai-migrate`, { stdio: 'inherit' });
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,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"}
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":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,eAAO,MAAM,6BAA6B,EAAE,SAO3C,CAAC"}
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, execa_1.command)(`npx tramvai-migrate`, { stdio: 'inherit' });
10
- yield (0, execa_1.command)(`npx tramvai-check-versions`, { stdio: 'inherit' });
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,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"}
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": "2.160.21",
3
+ "version": "2.160.25",
4
4
  "description": "Cli инструмент для сборки и запуска приложений",
5
5
  "files": [
6
6
  "src",
@@ -71,7 +71,7 @@
71
71
  "@tinkoff/utils": "^2.1.3",
72
72
  "@tinkoff/webpack-dedupe-plugin": "1.0.5",
73
73
  "@tramvai/build": "3.1.4",
74
- "@tramvai/react": "2.160.21",
74
+ "@tramvai/react": "2.160.25",
75
75
  "@tramvai/tools-check-versions": "0.4.18",
76
76
  "@tramvai/tools-migrate": "0.6.23",
77
77
  "ajv": "^8.12.0",
package/schema.json CHANGED
@@ -116,6 +116,11 @@
116
116
  "componentsPattern": {
117
117
  "title": "Test Regexp to add only files with specific name to list of FS Components",
118
118
  "type": "string"
119
+ },
120
+ "rootErrorBoundaryPath": {
121
+ "title": "Path to RootErrorBoundary component (relative to \"root\" directory)",
122
+ "default": "error.tsx",
123
+ "type": "string"
119
124
  }
120
125
  },
121
126
  "additionalProperties": false
@@ -1161,23 +1166,23 @@
1161
1166
  "dotAll": {
1162
1167
  "type": "boolean"
1163
1168
  },
1164
- "__@match@6837": {
1169
+ "__@match@6838": {
1165
1170
  "type": "object",
1166
1171
  "additionalProperties": false
1167
1172
  },
1168
- "__@replace@6839": {
1173
+ "__@replace@6840": {
1169
1174
  "type": "object",
1170
1175
  "additionalProperties": false
1171
1176
  },
1172
- "__@search@6842": {
1177
+ "__@search@6843": {
1173
1178
  "type": "object",
1174
1179
  "additionalProperties": false
1175
1180
  },
1176
- "__@split@6844": {
1181
+ "__@split@6845": {
1177
1182
  "type": "object",
1178
1183
  "additionalProperties": false
1179
1184
  },
1180
- "__@matchAll@6846": {
1185
+ "__@matchAll@6847": {
1181
1186
  "type": "object",
1182
1187
  "additionalProperties": false
1183
1188
  }
@@ -1840,23 +1845,23 @@
1840
1845
  "dotAll": {
1841
1846
  "type": "boolean"
1842
1847
  },
1843
- "__@match@6837": {
1848
+ "__@match@6838": {
1844
1849
  "type": "object",
1845
1850
  "additionalProperties": false
1846
1851
  },
1847
- "__@replace@6839": {
1852
+ "__@replace@6840": {
1848
1853
  "type": "object",
1849
1854
  "additionalProperties": false
1850
1855
  },
1851
- "__@search@6842": {
1856
+ "__@search@6843": {
1852
1857
  "type": "object",
1853
1858
  "additionalProperties": false
1854
1859
  },
1855
- "__@split@6844": {
1860
+ "__@split@6845": {
1856
1861
  "type": "object",
1857
1862
  "additionalProperties": false
1858
1863
  },
1859
- "__@matchAll@6846": {
1864
+ "__@matchAll@6847": {
1860
1865
  "type": "object",
1861
1866
  "additionalProperties": false
1862
1867
  }
@@ -2519,23 +2524,23 @@
2519
2524
  "dotAll": {
2520
2525
  "type": "boolean"
2521
2526
  },
2522
- "__@match@6837": {
2527
+ "__@match@6838": {
2523
2528
  "type": "object",
2524
2529
  "additionalProperties": false
2525
2530
  },
2526
- "__@replace@6839": {
2531
+ "__@replace@6840": {
2527
2532
  "type": "object",
2528
2533
  "additionalProperties": false
2529
2534
  },
2530
- "__@search@6842": {
2535
+ "__@search@6843": {
2531
2536
  "type": "object",
2532
2537
  "additionalProperties": false
2533
2538
  },
2534
- "__@split@6844": {
2539
+ "__@split@6845": {
2535
2540
  "type": "object",
2536
2541
  "additionalProperties": false
2537
2542
  },
2538
- "__@matchAll@6846": {
2543
+ "__@matchAll@6847": {
2539
2544
  "type": "object",
2540
2545
  "additionalProperties": false
2541
2546
  }
@@ -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',
@@ -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();
@@ -1,6 +1,6 @@
1
- type PackageManagers = 'npm' | 'yarn';
1
+ type PackageManagers = 'npm' | 'yarn' | 'pnpm';
2
2
 
3
- const choices = ['npm', 'yarn'];
3
+ const choices = ['npm', 'yarn', 'pnpm'];
4
4
 
5
5
  const packageManagerQuestion = (answer: string) => ({
6
6
  type: 'list' as const,
@@ -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
 
@@ -4,6 +4,7 @@ import path from 'path';
4
4
  import { node } from 'execa';
5
5
  import waitOn from 'wait-on';
6
6
  import envCi from 'env-ci';
7
+ import isString from '@tinkoff/utils/is/string';
7
8
  import type { Context } from '../../models/context';
8
9
  import type { CommandResult } from '../../models/command';
9
10
  import type { ApplicationConfigEntry } from '../../typings/configEntry/application';
@@ -29,7 +30,7 @@ export const staticApp = async (
29
30
 
30
31
  await network.computeAvailablePorts();
31
32
 
32
- const clientConfigManager = createConfigManager(configEntry, {
33
+ const clientConfigManager = createConfigManager<ApplicationConfigEntry>(configEntry, {
33
34
  env: 'production',
34
35
  ...options,
35
36
  buildType: 'client',
@@ -57,7 +58,11 @@ export const staticApp = async (
57
58
  });
58
59
  }
59
60
 
60
- const { name, host, port, staticPort, staticHost, output } = serverConfigManager;
61
+ const {
62
+ host,
63
+ port,
64
+ fileSystemPages: { rootErrorBoundaryPath },
65
+ } = serverConfigManager;
61
66
  const root = serverConfigManager.buildPath;
62
67
  const assetsPrefix = process.env.ASSETS_PREFIX;
63
68
 
@@ -138,6 +143,11 @@ export const staticApp = async (
138
143
 
139
144
  let paths = await appBundleInfo(serverConfigManager);
140
145
 
146
+ if (isString(rootErrorBoundaryPath)) {
147
+ // implicit connection with packages/modules/server/src/server/error.ts
148
+ paths.push('/_errors/5xx');
149
+ }
150
+
141
151
  if (options.onlyPages) {
142
152
  paths = intersection(paths, options.onlyPages);
143
153
  } else if (process.env.TRAMVAI_FORCE_CLIENT_SIDE_RENDERING === 'true') {
@@ -4,6 +4,7 @@ import isObject from '@tinkoff/utils/is/object';
4
4
  import prop from '@tinkoff/utils/object/prop';
5
5
  import mapObj from '@tinkoff/utils/object/map';
6
6
  import { resolve } from 'path';
7
+ import fs from 'fs';
7
8
  import type { BuildType } from '../typings/projectType';
8
9
  import type { Env } from '../typings/Env';
9
10
  import type { ConfigEntry, OverridableOption } from '../typings/configEntry/common';
@@ -228,6 +229,16 @@ export const createConfigManager = <C extends ConfigEntry = ConfigEntry, E exten
228
229
  }
229
230
  }
230
231
  }
232
+
233
+ const rootErrorBoundaryPath = resolve(
234
+ config.rootDir,
235
+ config.root,
236
+ config.fileSystemPages.rootErrorBoundaryPath
237
+ );
238
+
239
+ config.fileSystemPages.rootErrorBoundaryPath = fs.existsSync(rootErrorBoundaryPath)
240
+ ? rootErrorBoundaryPath
241
+ : undefined;
231
242
  } else if (isChildApp(config)) {
232
243
  config.buildPath = resolve(rootDir, ...config.output.split('/'));
233
244
  } else if (isModule(config)) {
@@ -1,33 +1,36 @@
1
- import fs from 'fs';
2
1
  import path from 'path';
3
2
  import type Config from 'webpack-chain';
4
3
 
4
+ import isString from '@tinkoff/utils/is/string';
5
5
  import type { ConfigManager } from '../../../config/configManager';
6
+ import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
6
7
 
7
8
  const ROOT_ERROR_BOUNDARY_CHUNK_NAME = 'rootErrorBoundary';
8
9
  const ROOT_ERROR_BOUNDARY_ALIAS = '@/__private__/error';
9
10
 
10
- export const rootErrorBoundaryFactory = (configManager: ConfigManager) => (config: Config) => {
11
- const { root, rootDir, buildType } = configManager;
12
- const rootErrorBoundaryPath = path.resolve(rootDir, root, 'error.tsx');
13
- const fakeErrorBoundaryModule = require.resolve('../application/fakeRootErrorBoundaryModule');
14
- const doesErrorBoundaryExist = fs.existsSync(rootErrorBoundaryPath);
11
+ export const rootErrorBoundaryFactory =
12
+ (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
13
+ const {
14
+ buildType,
15
+ fileSystemPages: { rootErrorBoundaryPath },
16
+ } = configManager;
17
+ const fakeErrorBoundaryModule = require.resolve('../application/fakeRootErrorBoundaryModule');
15
18
 
16
- if (doesErrorBoundaryExist) {
17
- config
18
- .when(
19
- buildType === 'client',
20
- // We don't need additional entrypoint on the server
21
- (client) => client.entry(ROOT_ERROR_BOUNDARY_CHUNK_NAME).add(fakeErrorBoundaryModule),
22
- (server) =>
23
- // Hack that allows to require a root error boundary module on the server
24
- server.resolve.alias.set(ROOT_ERROR_BOUNDARY_ALIAS, rootErrorBoundaryPath)
25
- )
26
- .module.rule('root-error-boundary')
27
- .enforce('pre')
28
- .test(new RegExp(fakeErrorBoundaryModule))
29
- .use('root-error-boundary-loader')
30
- .loader(path.resolve(__dirname, '..', 'loaders', 'root-error-boundary-loader'))
31
- .options({ path: rootErrorBoundaryPath, buildType });
32
- }
33
- };
19
+ if (isString(rootErrorBoundaryPath)) {
20
+ config
21
+ .when(
22
+ buildType === 'client',
23
+ // We don't need additional entrypoint on the server
24
+ (client) => client.entry(ROOT_ERROR_BOUNDARY_CHUNK_NAME).add(fakeErrorBoundaryModule),
25
+ (server) =>
26
+ // Hack that allows to require a root error boundary module on the server
27
+ server.resolve.alias.set(ROOT_ERROR_BOUNDARY_ALIAS, rootErrorBoundaryPath)
28
+ )
29
+ .module.rule('root-error-boundary')
30
+ .enforce('pre')
31
+ .test(new RegExp(fakeErrorBoundaryModule))
32
+ .use('root-error-boundary-loader')
33
+ .loader(path.resolve(__dirname, '..', 'loaders', 'root-error-boundary-loader'))
34
+ .options({ path: rootErrorBoundaryPath, buildType });
35
+ }
36
+ };
@@ -83,6 +83,7 @@ it('should populate defaults for config', () => {
83
83
  "fileSystemPages": {
84
84
  "enabled": false,
85
85
  "pagesDir": "pages",
86
+ "rootErrorBoundaryPath": "error.tsx",
86
87
  "routesDir": "routes",
87
88
  },
88
89
  "generateDataQaTag": false,
@@ -326,6 +327,7 @@ it('should populate defaults for overridable options', () => {
326
327
  "fileSystemPages": {
327
328
  "enabled": true,
328
329
  "pagesDir": "pages",
330
+ "rootErrorBoundaryPath": "error.tsx",
329
331
  "routesDir": "routes",
330
332
  },
331
333
  "generateDataQaTag": false,
@@ -94,6 +94,11 @@
94
94
  "componentsPattern": {
95
95
  "title": "Test Regexp to add only files with specific name to list of FS Components",
96
96
  "type": "string"
97
+ },
98
+ "rootErrorBoundaryPath": {
99
+ "title": "Path to RootErrorBoundary component (relative to \"root\" directory)",
100
+ "default": "error.tsx",
101
+ "type": "string"
97
102
  }
98
103
  },
99
104
  "additionalProperties": false
@@ -1139,23 +1144,23 @@
1139
1144
  "dotAll": {
1140
1145
  "type": "boolean"
1141
1146
  },
1142
- "__@match@6837": {
1147
+ "__@match@6838": {
1143
1148
  "type": "object",
1144
1149
  "additionalProperties": false
1145
1150
  },
1146
- "__@replace@6839": {
1151
+ "__@replace@6840": {
1147
1152
  "type": "object",
1148
1153
  "additionalProperties": false
1149
1154
  },
1150
- "__@search@6842": {
1155
+ "__@search@6843": {
1151
1156
  "type": "object",
1152
1157
  "additionalProperties": false
1153
1158
  },
1154
- "__@split@6844": {
1159
+ "__@split@6845": {
1155
1160
  "type": "object",
1156
1161
  "additionalProperties": false
1157
1162
  },
1158
- "__@matchAll@6846": {
1163
+ "__@matchAll@6847": {
1159
1164
  "type": "object",
1160
1165
  "additionalProperties": false
1161
1166
  }
@@ -1809,23 +1814,23 @@
1809
1814
  "dotAll": {
1810
1815
  "type": "boolean"
1811
1816
  },
1812
- "__@match@6837": {
1817
+ "__@match@6838": {
1813
1818
  "type": "object",
1814
1819
  "additionalProperties": false
1815
1820
  },
1816
- "__@replace@6839": {
1821
+ "__@replace@6840": {
1817
1822
  "type": "object",
1818
1823
  "additionalProperties": false
1819
1824
  },
1820
- "__@search@6842": {
1825
+ "__@search@6843": {
1821
1826
  "type": "object",
1822
1827
  "additionalProperties": false
1823
1828
  },
1824
- "__@split@6844": {
1829
+ "__@split@6845": {
1825
1830
  "type": "object",
1826
1831
  "additionalProperties": false
1827
1832
  },
1828
- "__@matchAll@6846": {
1833
+ "__@matchAll@6847": {
1829
1834
  "type": "object",
1830
1835
  "additionalProperties": false
1831
1836
  }
@@ -2479,23 +2484,23 @@
2479
2484
  "dotAll": {
2480
2485
  "type": "boolean"
2481
2486
  },
2482
- "__@match@6837": {
2487
+ "__@match@6838": {
2483
2488
  "type": "object",
2484
2489
  "additionalProperties": false
2485
2490
  },
2486
- "__@replace@6839": {
2491
+ "__@replace@6840": {
2487
2492
  "type": "object",
2488
2493
  "additionalProperties": false
2489
2494
  },
2490
- "__@search@6842": {
2495
+ "__@search@6843": {
2491
2496
  "type": "object",
2492
2497
  "additionalProperties": false
2493
2498
  },
2494
- "__@split@6844": {
2499
+ "__@split@6845": {
2495
2500
  "type": "object",
2496
2501
  "additionalProperties": false
2497
2502
  },
2498
- "__@matchAll@6846": {
2503
+ "__@matchAll@6847": {
2499
2504
  "type": "object",
2500
2505
  "additionalProperties": false
2501
2506
  }
@@ -112,6 +112,7 @@ describe('JSON schema для tramvai.json', () => {
112
112
  "fileSystemPages": {
113
113
  "enabled": false,
114
114
  "pagesDir": "pages",
115
+ "rootErrorBoundaryPath": "error.tsx",
115
116
  "routesDir": "routes",
116
117
  },
117
118
  "generateDataQaTag": false,
@@ -20,19 +20,23 @@ declare module '*.woff2' {
20
20
  type ImageString = string;
21
21
 
22
22
  declare module '*.png' {
23
- export default ImageString;
23
+ const src: ImageString;
24
+ export default src;
24
25
  export const image: ImageObject;
25
26
  }
26
27
  declare module '*.jpg' {
27
- export default ImageString;
28
+ const src: ImageString;
29
+ export default src;
28
30
  export const image: ImageObject;
29
31
  }
30
32
  declare module '*.jpeg' {
31
- export default ImageString;
33
+ const src: ImageString;
34
+ export default src;
32
35
  export const image: ImageObject;
33
36
  }
34
37
  declare module '*.webp' {
35
- export default ImageString;
38
+ const src: ImageString;
39
+ export default src;
36
40
  export const image: ImageObject;
37
41
  }
38
42
 
@@ -174,6 +174,11 @@ export interface ApplicationConfigEntry extends CliConfigEntry {
174
174
  * @title Test Regexp to add only files with specific name to list of FS Components
175
175
  */
176
176
  componentsPattern: string;
177
+ /**
178
+ * @title Path to RootErrorBoundary component (relative to "root" directory)
179
+ * @default "error.tsx"
180
+ */
181
+ rootErrorBoundaryPath?: string;
177
182
  };
178
183
  /**
179
184
  * @title Configure the options on webpack splitChunks
@@ -1,9 +1,9 @@
1
- import { command } from 'execa';
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 command(`npx tramvai-check-versions`, { stdio: 'inherit' });
6
+ await run();
7
7
  } catch (e) {
8
8
  throw new Error('Versions check failed');
9
9
  }
@@ -1,9 +1,9 @@
1
- import { command } from 'execa';
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 command(`npx tramvai-migrate`, { stdio: 'inherit' });
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 command(`npx tramvai-migrate`, { stdio: 'inherit' });
8
- await command(`npx tramvai-check-versions`, { stdio: 'inherit' });
8
+ await migrate(context);
9
+ await checkVersions(context);
9
10
  }
10
11
 
11
12
  return { name: 'runMigrationsAndCheckVersions', status: 'ok' };