@tramvai/cli 5.24.0 → 5.40.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.
Files changed (122) hide show
  1. package/README.md +38 -0
  2. package/bin/platform.js +26 -1
  3. package/bin/spawn.js +36 -8
  4. package/lib/api/start-prod/providers/application.js +2 -2
  5. package/lib/api/start-prod/providers/application.js.map +1 -1
  6. package/lib/builder/webpack/devServer/pool/process/pool.d.ts.map +1 -1
  7. package/lib/builder/webpack/devServer/pool/process/pool.js +2 -1
  8. package/lib/builder/webpack/devServer/pool/process/pool.js.map +1 -1
  9. package/lib/builder/webpack/devServer/pool/thread/pool.d.ts.map +1 -1
  10. package/lib/builder/webpack/devServer/pool/thread/pool.js +2 -1
  11. package/lib/builder/webpack/devServer/pool/thread/pool.js.map +1 -1
  12. package/lib/builder/webpack/devServer/server.d.ts.map +1 -1
  13. package/lib/builder/webpack/devServer/server.js +31 -2
  14. package/lib/builder/webpack/devServer/server.js.map +1 -1
  15. package/lib/builder/webpack/tokens.d.ts +3 -3
  16. package/lib/cli/CLI.d.ts +1 -1
  17. package/lib/cli/CLI.d.ts.map +1 -1
  18. package/lib/cli/CLI.js +2 -2
  19. package/lib/cli/CLI.js.map +1 -1
  20. package/lib/cli/index.d.ts.map +1 -1
  21. package/lib/cli/index.js +1 -2
  22. package/lib/cli/index.js.map +1 -1
  23. package/lib/commands/add/add.d.ts +3 -2
  24. package/lib/commands/add/add.d.ts.map +1 -1
  25. package/lib/commands/add/add.js +8 -2
  26. package/lib/commands/add/add.js.map +1 -1
  27. package/lib/commands/add/checkPackageValidator.d.ts +1 -1
  28. package/lib/commands/add/checkPackageValidator.d.ts.map +1 -1
  29. package/lib/commands/add/checkPackageValidator.js +7 -2
  30. package/lib/commands/add/checkPackageValidator.js.map +1 -1
  31. package/lib/commands/add/command.d.ts +8 -3
  32. package/lib/commands/add/command.d.ts.map +1 -1
  33. package/lib/commands/add/command.js +6 -1
  34. package/lib/commands/add/command.js.map +1 -1
  35. package/lib/commands/new/new.d.ts.map +1 -1
  36. package/lib/commands/new/new.js +22 -20
  37. package/lib/commands/new/new.js.map +1 -1
  38. package/lib/commands/new/steps/installDependencies.d.ts +4 -3
  39. package/lib/commands/new/steps/installDependencies.d.ts.map +1 -1
  40. package/lib/commands/new/steps/installDependencies.js +58 -20
  41. package/lib/commands/new/steps/installDependencies.js.map +1 -1
  42. package/lib/commands/update/update.d.ts.map +1 -1
  43. package/lib/commands/update/update.js +14 -3
  44. package/lib/commands/update/update.js.map +1 -1
  45. package/lib/commands/update/updatePackageJson.d.ts +1 -1
  46. package/lib/commands/update/updatePackageJson.d.ts.map +1 -1
  47. package/lib/commands/update/updatePackageJson.js +5 -11
  48. package/lib/commands/update/updatePackageJson.js.map +1 -1
  49. package/lib/config/configManager.d.ts +1 -1
  50. package/lib/config/configManager.d.ts.map +1 -1
  51. package/lib/config/constants.d.ts +0 -1
  52. package/lib/config/constants.d.ts.map +1 -1
  53. package/lib/config/constants.js +1 -2
  54. package/lib/config/constants.js.map +1 -1
  55. package/lib/config/utils.d.ts +2 -0
  56. package/lib/config/utils.d.ts.map +1 -0
  57. package/lib/config/utils.js +19 -0
  58. package/lib/config/utils.js.map +1 -0
  59. package/lib/di/tokens/config.d.ts +1 -1
  60. package/lib/library/webpack/application/client/dev.js +1 -1
  61. package/lib/library/webpack/application/client/dev.js.map +1 -1
  62. package/lib/library/webpack/application/client/prod/optimization/splitChunks.d.ts.map +1 -1
  63. package/lib/library/webpack/application/client/prod/optimization/splitChunks.js +51 -1
  64. package/lib/library/webpack/application/client/prod/optimization/splitChunks.js.map +1 -1
  65. package/lib/library/webpack/application/server/dev.js +1 -1
  66. package/lib/library/webpack/application/server/dev.js.map +1 -1
  67. package/lib/library/webpack/utils/threadLoader.d.ts.map +1 -1
  68. package/lib/library/webpack/utils/threadLoader.js +1 -0
  69. package/lib/library/webpack/utils/threadLoader.js.map +1 -1
  70. package/lib/models/context.d.ts +3 -3
  71. package/lib/models/context.d.ts.map +1 -1
  72. package/lib/models/context.js +1 -2
  73. package/lib/models/context.js.map +1 -1
  74. package/lib/schema/autogeneratedSchema.json +29 -24
  75. package/lib/typings/configEntry/application.d.ts +5 -0
  76. package/lib/typings/configEntry/application.d.ts.map +1 -1
  77. package/lib/typings/configEntry/cli.d.ts +1 -1
  78. package/lib/typings/configEntry/cli.d.ts.map +1 -1
  79. package/lib/utils/commands/dependencies/findTramvaiVersion.js +1 -1
  80. package/lib/utils/commands/dependencies/findTramvaiVersion.js.map +1 -1
  81. package/lib/utils/commands/dependencies/getWorkspaceRootByAppName.d.ts +3 -0
  82. package/lib/utils/commands/dependencies/getWorkspaceRootByAppName.d.ts.map +1 -0
  83. package/lib/utils/commands/dependencies/getWorkspaceRootByAppName.js +8 -0
  84. package/lib/utils/commands/dependencies/getWorkspaceRootByAppName.js.map +1 -0
  85. package/lib/utils/npmRequire.js +1 -1
  86. package/lib/utils/npmRequire.js.map +1 -1
  87. package/package.json +5 -4
  88. package/schema.json +29 -24
  89. package/src/api/start-prod/providers/application.ts +2 -2
  90. package/src/builder/webpack/devServer/pool/process/pool.ts +3 -2
  91. package/src/builder/webpack/devServer/pool/thread/pool.ts +3 -2
  92. package/src/builder/webpack/devServer/server.ts +38 -2
  93. package/src/cli/CLI.ts +1 -3
  94. package/src/cli/index.ts +1 -3
  95. package/src/commands/add/add.ts +17 -3
  96. package/src/commands/add/checkPackageValidator.ts +6 -2
  97. package/src/commands/add/command.ts +6 -1
  98. package/src/commands/new/new.ts +34 -21
  99. package/src/commands/new/steps/installDependencies.ts +75 -27
  100. package/src/commands/new/templates/monorepo-block/package.json.hbs +5 -0
  101. package/src/commands/new/templates/shared/package.json.hbs +2 -1
  102. package/src/commands/update/update.ts +26 -3
  103. package/src/commands/update/updatePackageJson.spec.ts +16 -10
  104. package/src/commands/update/updatePackageJson.ts +10 -15
  105. package/src/config/configManager.ts +1 -1
  106. package/src/config/constants.ts +0 -2
  107. package/src/config/utils.ts +18 -0
  108. package/src/library/swc/__integration__/swc.start.test.ts +3 -0
  109. package/src/library/webpack/application/client/dev.ts +1 -1
  110. package/src/library/webpack/application/client/prod/optimization/splitChunks.ts +66 -2
  111. package/src/library/webpack/application/server/dev.ts +1 -1
  112. package/src/library/webpack/utils/threadLoader.ts +1 -0
  113. package/src/models/config.spec.ts +2 -0
  114. package/src/models/context.ts +3 -2
  115. package/src/schema/autogeneratedSchema.json +29 -24
  116. package/src/schema/tramvai.spec.ts +1 -0
  117. package/src/typings/configEntry/application.ts +5 -0
  118. package/src/typings/configEntry/cli.ts +6 -1
  119. package/src/typings/webpack-chain/index.d.ts +1 -0
  120. package/src/utils/commands/dependencies/findTramvaiVersion.ts +1 -1
  121. package/src/utils/commands/dependencies/getWorkspaceRootByAppName.ts +5 -0
  122. package/src/utils/npmRequire.ts +1 -1
package/README.md CHANGED
@@ -42,6 +42,14 @@ After any command you can pass `--help` string, e.g. `tramvai --help` or `tramva
42
42
 
43
43
  ## Explanation
44
44
 
45
+ ### Workspaces
46
+
47
+ If you are using monorepo, you may not want to install all tramvai modules into your repository root. CLI can automatically define monorepo context and provides some special behaviour and options for ceratin commands:
48
+
49
+ - `tramvai new` will install all tramvai modules (except `@tramvai/cli`) into provided app workspace if `monorepo` template chosen
50
+ - `tramvai add` supports `--app` or `-a` parameter. You can provide any app name from your `tramvai.json` to install module into workspace
51
+ - `tramvai update` will automatically update tramvai modules for all existing workspaces in your project
52
+
45
53
  ### Notifications settings
46
54
 
47
55
  Inside `tramvai.json` the settings for the notification can be specified at path `notifications`. Parameters are passed to [webpack-build-notifier](https://github.com/RoccoC/webpack-build-notifier#config-options). You can specify global configuration or a specific configuration either for client or server build.
@@ -221,6 +229,14 @@ tramvai start my-app --debug
221
229
 
222
230
  Then open chrome devTools, click on NodeJs logo in the upper left corner. New window with the nodejs devtools will be opened that allows to debug memory and cpu usage, debug code and take the performance profiles.
223
231
 
232
+ Also `--debug` supports `wait` and `break` values for `--inspect` ([doc](https://nodejs.org/en/learn/getting-started/debugging#command-line-options)).
233
+
234
+ ```sh
235
+ tramvai start my-app --debug=wait
236
+ ```
237
+
238
+ Will start tramvai with `--inspect-wait`.
239
+
224
240
  ### Get details for deprecated and warning logs
225
241
 
226
242
  It might be useful to get the stacktraces of some of the warnings.
@@ -277,6 +293,28 @@ You can use `NODE_OPTIONS` env variable, e.g.:
277
293
  NODE_OPTIONS="--max-semi-space-size=64" tramvai start-prod {appName}
278
294
  ```
279
295
 
296
+ ### How to debug webpack build?
297
+
298
+ For webpack build debug use `TRAMVAI_DEBUG_BUILD` env variable.
299
+
300
+ ```bash
301
+ TRAMVAI_DEBUG_BUILD=1 tramvai build {appName}
302
+ ```
303
+
304
+ You can also change the inspect command.
305
+
306
+ ```bash
307
+ TRAMVAI_DEBUG_BUILD=wait tramvai build {appName}
308
+ ```
309
+
310
+ Equal to `--inspect-wait`.
311
+
312
+ ```bash
313
+ TRAMVAI_DEBUG_BUILD=break tramvai build {appName}
314
+ ```
315
+
316
+ Equal to `--inspect-break`.
317
+
280
318
  ### How to get CPU profile of @tramvai/cli work?
281
319
 
282
320
  Run application server or production build with env variable `TRAMVAI_CPU_PROFILE`:
package/bin/platform.js CHANGED
@@ -2,4 +2,29 @@
2
2
 
3
3
  process.title = 'tramvai';
4
4
 
5
- require('./spawn')('../lib/cli/bin-init');
5
+ const path = require('node:path');
6
+ const chokidar = require('chokidar');
7
+ const chalk = require('chalk');
8
+
9
+ let abortController;
10
+
11
+ function run() {
12
+ return require('./spawn')('../lib/cli/bin-init');
13
+ }
14
+
15
+ abortController = run();
16
+
17
+ const watchedFileName = 'tramvai.json';
18
+ function onConfigChange() {
19
+ console.log(chalk.yellow(`${watchedFileName} changed, restart process...`));
20
+
21
+ abortController.abort();
22
+ abortController = run();
23
+ }
24
+
25
+ try {
26
+ const tramvaiJsonPath = path.resolve(process.cwd(), watchedFileName);
27
+ chokidar.watch(tramvaiJsonPath).on('change', onConfigChange);
28
+ } catch (err) {
29
+ console.error(`Something went wrong while watching for changes in ${watchedFileName}: ${err}`);
30
+ }
package/bin/spawn.js CHANGED
@@ -1,18 +1,24 @@
1
- const { spawnSync } = require('child_process');
1
+ const { spawn: cpSpawn } = require('child_process');
2
+ const exit = require('exit');
2
3
 
3
4
  const args = process.argv.slice(2);
4
5
  const maxMemory = process.env.MAX_USED_MEMORY || '3000';
5
6
  const maxSemiSpaceSize = process.env.MAX_SEMI_SPACE_SIZE || '128';
7
+ const debugBuild = process.env.TRAMVAI_DEBUG_BUILD;
6
8
  const defaultArgs = [
7
9
  `--max-old-space-size=${maxMemory}`,
8
10
  `--max-semi-space-size=${maxSemiSpaceSize}`,
9
- ];
11
+ getDebugOption(debugBuild),
12
+ ].filter(Boolean);
10
13
 
11
14
  const paramsIndex = args.findIndex((x) => !x.startsWith('-'));
12
15
  const nodeArgs = paramsIndex > 0 ? args.slice(0, paramsIndex) : [];
13
16
 
14
17
  module.exports = function spawn(executePath) {
15
- const { status, signal } = spawnSync(
18
+ const controller = new AbortController();
19
+ const { signal } = controller;
20
+
21
+ const cliInstance = cpSpawn(
16
22
  'node',
17
23
  defaultArgs
18
24
  .concat(nodeArgs)
@@ -20,13 +26,35 @@ module.exports = function spawn(executePath) {
20
26
  .concat(args.slice(paramsIndex > 0 ? paramsIndex : 0)),
21
27
  // this is the first place where we can pass env which will be used by webpack
22
28
  // about watchpack issue - https://github.com/webpack/watchpack/issues/222, https://github.com/vercel/next.js/pull/51826
23
- { stdio: 'inherit', env: { ...process.env, WATCHPACK_WATCHER_LIMIT: '20' } }
29
+ { stdio: 'inherit', env: { ...process.env, WATCHPACK_WATCHER_LIMIT: '20' }, signal }
24
30
  );
25
31
 
26
- if (signal) {
27
- throw new Error(`Process was exited with signal "${signal}"
32
+ cliInstance.on('error', (err) => {
33
+ if (err.code !== 'ABORT_ERR') {
34
+ console.error(err);
35
+ console.warn(`Process was exited with code "${err.code}"
28
36
  It's unexpected, please check available/used memory and cpu while running last command`);
29
- }
37
+ exit(1);
38
+ }
39
+ });
40
+
41
+ cliInstance.on('exit', (code) => {
42
+ exit(code);
43
+ });
30
44
 
31
- process.exit(status);
45
+ return controller;
32
46
  };
47
+
48
+ function getDebugOption(debugType) {
49
+ if (debugType === 'wait') {
50
+ return '--inspect-wait';
51
+ }
52
+
53
+ if (debugType === 'break') {
54
+ return '--inspect-brk';
55
+ }
56
+
57
+ if (debugType) {
58
+ return '--inspect';
59
+ }
60
+ }
@@ -7,7 +7,7 @@ const dippy_1 = require("@tinkoff/dippy");
7
7
  const child_process_1 = require("child_process");
8
8
  const tokens_1 = require("../../../di/tokens");
9
9
  const tokens_2 = require("../tokens");
10
- const constants_1 = require("../../../config/constants");
10
+ const utils_1 = require("../../../config/utils");
11
11
  const safeRequire_1 = require("../../../utils/safeRequire");
12
12
  const configManager_1 = require("../../../config/configManager");
13
13
  const selfSignedCertificateProvider_1 = require("../../shared/providers/selfSignedCertificateProvider");
@@ -52,7 +52,7 @@ exports.applicationsProviders = [
52
52
  const { debug, port, assetsPrefix, https } = serverConfigManager;
53
53
  const root = serverConfigManager.buildPath;
54
54
  return (0, child_process_1.fork)(path_1.default.resolve(root, 'server.js'), [], {
55
- execArgv: debug ? constants_1.DEBUG_ARGV : [],
55
+ execArgv: (0, utils_1.getDebugArg)(debug),
56
56
  cwd: root,
57
57
  env: {
58
58
  ...(0, safeRequire_1.safeRequire)(path_1.default.resolve(process.cwd(), 'env.development'), true),
@@ -1 +1 @@
1
- {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../src/api/start-prod/providers/application.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../src/api/start-prod/providers/application.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../../src/builder/webpack/devServer/pool/process/pool.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAUzD,eAAO,MAAM,mBAAmB,EAAE,mBAAmB,CAAC,MAAM,CA2D3D,CAAC"}
1
+ {"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../../src/builder/webpack/devServer/pool/process/pool.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAWzD,eAAO,MAAM,mBAAmB,EAAE,mBAAmB,CAAC,MAAM,CA2D3D,CAAC"}
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
5
5
  const path_1 = tslib_1.__importDefault(require("path"));
6
6
  const cluster_1 = tslib_1.__importDefault(require("cluster"));
7
7
  const constants_1 = require("../../../../../config/constants");
8
+ const utils_1 = require("../../../../../config/utils");
8
9
  const tokens_1 = require("../../../tokens");
9
10
  const tokens_2 = require("../../../../../di/tokens");
10
11
  const ProcessWorkerBridge = (di) => {
@@ -18,7 +19,7 @@ const ProcessWorkerBridge = (di) => {
18
19
  cluster_1.default.setupPrimary({
19
20
  // указываем другой файл для работы cluster.fork
20
21
  exec: path_1.default.resolve(__dirname, './worker.js'),
21
- execArgv: [].concat(configManager.debug ? constants_1.DEBUG_ARGV : [], configManager.trace ? constants_1.TRACE_ARGV : []),
22
+ execArgv: [].concat((0, utils_1.getDebugArg)(configManager.debug), configManager.trace ? constants_1.TRACE_ARGV : []),
22
23
  // устанавливаем в качестве дебага дефолтный порт мастера, т.к. у нас и так один процесс может работать
23
24
  inspectPort: process.debugPort,
24
25
  silent: true,
@@ -1 +1 @@
1
- {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../../../../src/builder/webpack/devServer/pool/process/pool.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,8DAA8B;AAE9B,+DAAyE;AACzE,4CAA8D;AAC9D,qDAKkC;AAE3B,MAAM,mBAAmB,GAAgC,CAAC,EAAE,EAAE,EAAE;IACrE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,iCAAwB,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,oCAA2B,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;IACpC,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,OAAO;QACL,KAAK,CAAC,KAAK;YACT,iBAAO,CAAC,YAAY,CAAC;gBACnB,gDAAgD;gBAChD,IAAI,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC;gBAC5C,QAAQ,EAAG,EAAe,CAAC,MAAM,CAC/B,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAU,CAAC,CAAC,CAAC,EAAE,EACrC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAU,CAAC,CAAC,CAAC,EAAE,CACtC;gBACD,uGAAuG;gBACvG,WAAW,EAAE,OAAO,CAAC,SAAS;gBAC9B,MAAM,EAAE,IAAI;gBACZ,aAAa;gBACb,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,8BAAqB,CAAC;aACnC,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,MAAM;YACV,MAAM,MAAM,GAAG,iBAAO,CAAC,IAAI,CAAC;gBAC1B,GAAG,GAAG;gBACN,QAAQ,EAAE,aAAa;gBACvB,iEAAiE;gBACjE,8EAA8E;gBAC9E,IAAI,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE;gBAC7B,WAAW,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE;gBACpC,WAAW,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE;gBAC1C,WAAW,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE;gBAC1C,+BAA+B,EAAE,WAAW;aAC7C,CAAC,CAAC;YAEH,WAAW,GAAG,KAAK,CAAC;YAEpB,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAEpC,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,MAAM;YAClB,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE;gBACxB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAChC;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO;YAC9B,IAAI,IAAI,KAAK,QAAQ,EAAE;gBACrB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;gBAErC,MAAM,CAAC,IAAI,CAAC;oBACV,QAAQ;oBACR,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;iBACjC,CAAC,CAAC;aACJ;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AA3DW,QAAA,mBAAmB,uBA2D9B"}
1
+ {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../../../../src/builder/webpack/devServer/pool/process/pool.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,8DAA8B;AAE9B,+DAA6D;AAC7D,uDAA0D;AAC1D,4CAA8D;AAC9D,qDAKkC;AAE3B,MAAM,mBAAmB,GAAgC,CAAC,EAAE,EAAE,EAAE;IACrE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,iCAAwB,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,oCAA2B,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;IACpC,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,OAAO;QACL,KAAK,CAAC,KAAK;YACT,iBAAO,CAAC,YAAY,CAAC;gBACnB,gDAAgD;gBAChD,IAAI,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC;gBAC5C,QAAQ,EAAG,EAAe,CAAC,MAAM,CAC/B,IAAA,mBAAW,EAAC,aAAa,CAAC,KAAK,CAAC,EAChC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAU,CAAC,CAAC,CAAC,EAAE,CACtC;gBACD,uGAAuG;gBACvG,WAAW,EAAE,OAAO,CAAC,SAAS;gBAC9B,MAAM,EAAE,IAAI;gBACZ,aAAa;gBACb,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,8BAAqB,CAAC;aACnC,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,MAAM;YACV,MAAM,MAAM,GAAG,iBAAO,CAAC,IAAI,CAAC;gBAC1B,GAAG,GAAG;gBACN,QAAQ,EAAE,aAAa;gBACvB,iEAAiE;gBACjE,8EAA8E;gBAC9E,IAAI,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE;gBAC7B,WAAW,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE;gBACpC,WAAW,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE;gBAC1C,WAAW,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE;gBAC1C,+BAA+B,EAAE,WAAW;aAC7C,CAAC,CAAC;YAEH,WAAW,GAAG,KAAK,CAAC;YAEpB,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAEpC,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,MAAM;YAClB,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE;gBACxB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAChC;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO;YAC9B,IAAI,IAAI,KAAK,QAAQ,EAAE;gBACrB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;gBAErC,MAAM,CAAC,IAAI,CAAC;oBACV,QAAQ;oBACR,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;iBACjC,CAAC,CAAC;aACJ;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AA3DW,QAAA,mBAAmB,uBA2D9B"}
@@ -1 +1 @@
1
- {"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../../src/builder/webpack/devServer/pool/thread/pool.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAKzD,eAAO,MAAM,kBAAkB,EAAE,mBAAmB,CAAC,MAAM,CA4D1D,CAAC"}
1
+ {"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../../src/builder/webpack/devServer/pool/thread/pool.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAMzD,eAAO,MAAM,kBAAkB,EAAE,mBAAmB,CAAC,MAAM,CA4D1D,CAAC"}
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
5
5
  const path_1 = tslib_1.__importDefault(require("path"));
6
6
  const worker_threads_1 = require("worker_threads");
7
7
  const constants_1 = require("../../../../../config/constants");
8
+ const utils_1 = require("../../../../../config/utils");
8
9
  const tokens_1 = require("../../../tokens");
9
10
  const tokens_2 = require("../../../../../di/tokens");
10
11
  const ThreadWorkerBridge = (di) => {
@@ -26,7 +27,7 @@ const ThreadWorkerBridge = (di) => {
26
27
  // but it currently affects only jest tests probably because of jest's workers usage
27
28
  process.chdir(di.get(tokens_2.CONFIG_ROOT_DIR_TOKEN));
28
29
  const worker = new worker_threads_1.Worker(path_1.default.resolve(__dirname, './worker.js'), {
29
- execArgv: [].concat(configManager.debug ? constants_1.DEBUG_ARGV : [], configManager.trace ? constants_1.TRACE_ARGV : []),
30
+ execArgv: [].concat((0, utils_1.getDebugArg)(configManager.debug), configManager.trace ? constants_1.TRACE_ARGV : []),
30
31
  env: {
31
32
  ...process.env,
32
33
  ...env,
@@ -1 +1 @@
1
- {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../../../../src/builder/webpack/devServer/pool/thread/pool.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AACxB,mDAAwC;AAExC,+DAAyE;AACzE,4CAA8D;AAC9D,qDAA2F;AAEpF,MAAM,kBAAkB,GAAgC,CAAC,EAAE,EAAE,EAAE;IACpE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,iCAAwB,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,oCAA2B,CAAC,CAAC;IAC1D,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,OAAO;QACL,KAAK,CAAC,KAAK,KAAI,CAAC;QAChB,KAAK,CAAC,MAAM;YACV,2GAA2G;YAC3G,0FAA0F;YAC1F,4CAA4C;YAC5C,gBAAgB;YAChB,qEAAqE;YACrE,gDAAgD;YAChD,sEAAsE;YACtE,yDAAyD;YACzD,6FAA6F;YAC7F,oFAAoF;YACpF,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,8BAAqB,CAAC,CAAC,CAAC;YAE7C,MAAM,MAAM,GAAG,IAAI,uBAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE;gBAChE,QAAQ,EAAE,EAAE,CAAC,MAAM,CACjB,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAU,CAAC,CAAC,CAAC,EAAE,EACrC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAU,CAAC,CAAC,CAAC,EAAE,CACtC;gBACD,GAAG,EAAE;oBACH,GAAG,OAAO,CAAC,GAAG;oBACd,GAAG,GAAG;oBACN,QAAQ,EAAE,aAAa;oBACvB,iEAAiE;oBACjE,8EAA8E;oBAC9E,IAAI,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE;oBAC7B,WAAW,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE;oBACpC,WAAW,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE;oBAC1C,WAAW,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE;oBAC1C,+BAA+B,EAAE,WAAW;iBAC7C;aACF,CAAC,CAAC;YAEH,WAAW,GAAG,KAAK,CAAC;YAEpB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,MAAM;YAClB,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC;QAC3B,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO;YAC9B,IAAI,IAAI,KAAK,QAAQ,EAAE;gBACrB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;gBAErC,MAAM,CAAC,WAAW,CAChB;oBACE,QAAQ;oBACR,MAAM;iBACP,EACD,CAAC,MAAM,CAAC,MAAM,CAAC,CAChB,CAAC;aACH;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AA5DW,QAAA,kBAAkB,sBA4D7B"}
1
+ {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../../../../src/builder/webpack/devServer/pool/thread/pool.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AACxB,mDAAwC;AAExC,+DAA6D;AAC7D,uDAA0D;AAC1D,4CAA8D;AAC9D,qDAA2F;AAEpF,MAAM,kBAAkB,GAAgC,CAAC,EAAE,EAAE,EAAE;IACpE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,iCAAwB,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,oCAA2B,CAAC,CAAC;IAC1D,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,OAAO;QACL,KAAK,CAAC,KAAK,KAAI,CAAC;QAChB,KAAK,CAAC,MAAM;YACV,2GAA2G;YAC3G,0FAA0F;YAC1F,4CAA4C;YAC5C,gBAAgB;YAChB,qEAAqE;YACrE,gDAAgD;YAChD,sEAAsE;YACtE,yDAAyD;YACzD,6FAA6F;YAC7F,oFAAoF;YACpF,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,8BAAqB,CAAC,CAAC,CAAC;YAE7C,MAAM,MAAM,GAAG,IAAI,uBAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE;gBAChE,QAAQ,EAAE,EAAE,CAAC,MAAM,CACjB,IAAA,mBAAW,EAAC,aAAa,CAAC,KAAK,CAAC,EAChC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAU,CAAC,CAAC,CAAC,EAAE,CACtC;gBACD,GAAG,EAAE;oBACH,GAAG,OAAO,CAAC,GAAG;oBACd,GAAG,GAAG;oBACN,QAAQ,EAAE,aAAa;oBACvB,iEAAiE;oBACjE,8EAA8E;oBAC9E,IAAI,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE;oBAC7B,WAAW,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE;oBACpC,WAAW,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE;oBAC1C,WAAW,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE;oBAC1C,+BAA+B,EAAE,WAAW;iBAC7C;aACF,CAAC,CAAC;YAEH,WAAW,GAAG,KAAK,CAAC;YAEpB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,MAAM;YAClB,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC;QAC3B,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO;YAC9B,IAAI,IAAI,KAAK,QAAQ,EAAE;gBACrB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;gBAErC,MAAM,CAAC,WAAW,CAChB;oBACE,QAAQ;oBACR,MAAM;iBACP,EACD,CAAC,MAAM,CAAC,MAAM,CAAC,CAChB,CAAC;aACH;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AA5DW,QAAA,kBAAkB,sBA4D7B"}
@@ -1 +1 @@
1
- {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/server.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAMxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAKvF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAevD,OAAO,QAAQ,SAAS,CAAC;IACvB,MAAa,UAAU;QAErB,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;KACxB;CACF;AAID,eAAO,MAAM,YAAY;QAOnB,SAAS;YACL,MAAM;cACJ,QAAQ,aAAa;mBAChB,cAAc,sBAAsB,EAAE,aAAa,CAAC;YAC3D,mBAAmB,GAAG,IAAI;uDAyQnC,CAAC"}
1
+ {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAMxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAKvF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAevD,OAAO,QAAQ,SAAS,CAAC;IACvB,MAAa,UAAU;QAErB,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;KACxB;CACF;AAID,eAAO,MAAM,YAAY;QAOnB,SAAS;YACL,MAAM;cACJ,QAAQ,aAAa;mBAChB,cAAc,sBAAsB,EAAE,aAAa,CAAC;YAC3D,mBAAmB,GAAG,IAAI;uDA2SnC,CAAC"}
@@ -4,6 +4,8 @@ exports.serverRunner = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const noop_1 = tslib_1.__importDefault(require("@tinkoff/utils/function/noop"));
6
6
  const each_1 = tslib_1.__importDefault(require("@tinkoff/utils/object/each"));
7
+ const chokidar_1 = tslib_1.__importDefault(require("chokidar"));
8
+ const chalk_1 = tslib_1.__importDefault(require("chalk"));
7
9
  const path_1 = tslib_1.__importDefault(require("path"));
8
10
  const death_1 = tslib_1.__importDefault(require("death"));
9
11
  const http_proxy_1 = require("http-proxy");
@@ -200,12 +202,12 @@ const serverRunner = ({ di, config, compiler, configManager, server, }) => {
200
202
  await pool.start();
201
203
  }
202
204
  });
203
- compiler.hooks.done.tap(HOOK_NAME, async (stats) => {
205
+ async function runWorker(stats) {
204
206
  if (serverInvalidated) {
205
207
  workerPort = null;
206
208
  workerPortPromise = null;
207
209
  serverInvalidated = false;
208
- if (stats.hasErrors()) {
210
+ if (stats?.hasErrors()) {
209
211
  // всплыли ошибки при сборке - просто игнорим калбек чтобы не падать ниже и дать возможность выполнить пересборку
210
212
  return;
211
213
  }
@@ -240,6 +242,33 @@ const serverRunner = ({ di, config, compiler, configManager, server, }) => {
240
242
  const script = fs.readFileSync(filename);
241
243
  await send(worker, 'script', { filename: realFilename, script });
242
244
  }
245
+ }
246
+ // отключаем watch за при выключенном rebuild
247
+ if (!configManager.noServerRebuild) {
248
+ const watchedFileName = 'env.development.js';
249
+ try {
250
+ const envPath = path_1.default.resolve(process.cwd(), watchedFileName);
251
+ const watchHandler = (_changedFilePath) => {
252
+ console.log(chalk_1.default.yellow(`${envPath} changed, restart server...`));
253
+ serverInvalidated = true;
254
+ runWorker();
255
+ };
256
+ const watcher = chokidar_1.default.watch(envPath);
257
+ watcher.on('change', watchHandler);
258
+ di.register({
259
+ provide: tokens_1.CLOSE_HANDLER_TOKEN,
260
+ multi: true,
261
+ useValue: () => {
262
+ watcher.close();
263
+ },
264
+ });
265
+ }
266
+ catch (err) {
267
+ console.error(`Something went wrong while watching for changes in ${watchedFileName}: ${err}`);
268
+ }
269
+ }
270
+ compiler.hooks.done.tap(HOOK_NAME, async (stats) => {
271
+ runWorker(stats);
243
272
  });
244
273
  };
245
274
  };
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/server.ts"],"names":[],"mappings":"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"}
@@ -83,7 +83,7 @@ export declare const CLIENT_CONFIG_MANAGER_TOKEN: {
83
83
  poll?: number | boolean;
84
84
  stdin?: boolean;
85
85
  };
86
- devtool: "eval" | "eval-cheap-source-map" | "eval-cheap-module-source-map" | "eval-source-map";
86
+ devtool: false | "eval" | "eval-cheap-source-map" | "eval-cheap-module-source-map" | "eval-source-map";
87
87
  };
88
88
  dedupe: {
89
89
  enabled: boolean;
@@ -216,7 +216,7 @@ export declare const CLIENT_MODERN_CONFIG_MANAGER_TOKEN: {
216
216
  poll?: number | boolean;
217
217
  stdin?: boolean;
218
218
  };
219
- devtool: "eval" | "eval-cheap-source-map" | "eval-cheap-module-source-map" | "eval-source-map";
219
+ devtool: false | "eval" | "eval-cheap-source-map" | "eval-cheap-module-source-map" | "eval-source-map";
220
220
  };
221
221
  dedupe: {
222
222
  enabled: boolean;
@@ -349,7 +349,7 @@ export declare const SERVER_CONFIG_MANAGER_TOKEN: {
349
349
  poll?: number | boolean;
350
350
  stdin?: boolean;
351
351
  };
352
- devtool: "eval" | "eval-cheap-source-map" | "eval-cheap-module-source-map" | "eval-source-map";
352
+ devtool: false | "eval" | "eval-cheap-source-map" | "eval-cheap-module-source-map" | "eval-source-map";
353
353
  };
354
354
  dedupe: {
355
355
  enabled: boolean;
package/lib/cli/CLI.d.ts CHANGED
@@ -13,7 +13,7 @@ export declare class CLI {
13
13
  runCommand: (name: string, params: any) => Promise<CommandResult>;
14
14
  getTasks: () => Task[];
15
15
  getCommands: () => Command<any>[];
16
- constructor(commandsMap: CommandMap, tasksMap: TaskMap, logger: Logger, config: ConfigManager, analytics: Analytics, cliRootDir: string, cliPackageManager: PackageManager, packageManager: PackageManager);
16
+ constructor(commandsMap: CommandMap, tasksMap: TaskMap, logger: Logger, config: ConfigManager, analytics: Analytics, cliRootDir: string, cliPackageManager: PackageManager);
17
17
  run(argv: any): Promise<CommandResult>;
18
18
  protected createCommandLineUI(argv: any): Promise<CommandResult>;
19
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"CLI.d.ts","sourceRoot":"","sources":["../../src/cli/CLI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAEvE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,qBAAa,GAAG;IACd,OAAO,EAAE,OAAO,CAAC;IAEjB,KAAK,EAAE,IAAI,EAAE,CAAC;IAEd,QAAQ,EAAE,OAAO,EAAE,CAAC;IAEpB,OAAO,SAAU,MAAM,UAAU,GAAG,kDAQlC;IAEF,UAAU,SAAU,MAAM,UAAU,GAAG,4BAQrC;IAEF,QAAQ,eAEN;IAEF,WAAW,uBAET;gBAGA,WAAW,EAAE,UAAU,EACvB,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,aAAa,EACrB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,cAAc,EACjC,cAAc,EAAE,cAAc;IAmB1B,GAAG,CAAC,IAAI,EAAE,GAAG;IAInB,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC;CAKjE"}
1
+ {"version":3,"file":"CLI.d.ts","sourceRoot":"","sources":["../../src/cli/CLI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAEvE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,qBAAa,GAAG;IACd,OAAO,EAAE,OAAO,CAAC;IAEjB,KAAK,EAAE,IAAI,EAAE,CAAC;IAEd,QAAQ,EAAE,OAAO,EAAE,CAAC;IAEpB,OAAO,SAAU,MAAM,UAAU,GAAG,kDAQlC;IAEF,UAAU,SAAU,MAAM,UAAU,GAAG,4BAQrC;IAEF,QAAQ,eAEN;IAEF,WAAW,uBAET;gBAGA,WAAW,EAAE,UAAU,EACvB,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,aAAa,EACrB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,cAAc;IAkB7B,GAAG,CAAC,IAAI,EAAE,GAAG;IAInB,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC;CAKjE"}
package/lib/cli/CLI.js CHANGED
@@ -4,7 +4,7 @@ exports.CLI = void 0;
4
4
  const commander_1 = require("../ui/commander");
5
5
  const context_1 = require("../models/context");
6
6
  class CLI {
7
- constructor(commandsMap, tasksMap, logger, config, analytics, cliRootDir, cliPackageManager, packageManager) {
7
+ constructor(commandsMap, tasksMap, logger, config, analytics, cliRootDir, cliPackageManager) {
8
8
  this.runTask = (name, params) => {
9
9
  const task = this.tasks.find((item) => item.name === name);
10
10
  if (!task) {
@@ -25,7 +25,7 @@ class CLI {
25
25
  this.getCommands = () => {
26
26
  return this.commands;
27
27
  };
28
- this.context = new context_1.Context(config, logger, analytics, cliRootDir, cliPackageManager, packageManager, this.runTask, this.runCommand, this.getTasks, this.getCommands);
28
+ this.context = new context_1.Context(config, logger, analytics, cliRootDir, cliPackageManager, this.runTask, this.runCommand, this.getTasks, this.getCommands);
29
29
  this.tasks = tasksMap.map((TaskItem) => new TaskItem(this.context));
30
30
  this.commands = commandsMap.map((CommandItem) => new CommandItem(this.context));
31
31
  }
@@ -1 +1 @@
1
- {"version":3,"file":"CLI.js","sourceRoot":"","sources":["../../src/cli/CLI.ts"],"names":[],"mappings":";;;AACA,+CAA4C;AAC5C,+CAA4C;AAO5C,MAAa,GAAG;IAmCd,YACE,WAAuB,EACvB,QAAiB,EACjB,MAAc,EACd,MAAqB,EACrB,SAAoB,EACpB,UAAkB,EAClB,iBAAiC,EACjC,cAA8B;QApChC,YAAO,GAAG,CAAC,IAAY,EAAE,MAAW,EAAE,EAAE;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAE3D,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,YAAY,CAAC,CAAC;aAC3C;YAED,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC,CAAC;QAEF,eAAU,GAAG,CAAC,IAAY,EAAE,MAAW,EAAE,EAAE;YACzC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAEjE,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,YAAY,CAAC,CAAC;aAC9C;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC,CAAC;QAEF,aAAQ,GAAG,GAAG,EAAE;YACd,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC,CAAC;QAEF,gBAAW,GAAG,GAAG,EAAE;YACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC,CAAC;QAYA,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAO,CACxB,MAAM,EACN,MAAM,EACN,SAAS,EACT,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,WAAW,CACjB,CAAC;QAEF,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAS;QACjB,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAES,mBAAmB,CAAC,IAAS;QACrC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAA,qBAAS,EAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAvED,kBAuEC"}
1
+ {"version":3,"file":"CLI.js","sourceRoot":"","sources":["../../src/cli/CLI.ts"],"names":[],"mappings":";;;AACA,+CAA4C;AAC5C,+CAA4C;AAO5C,MAAa,GAAG;IAmCd,YACE,WAAuB,EACvB,QAAiB,EACjB,MAAc,EACd,MAAqB,EACrB,SAAoB,EACpB,UAAkB,EAClB,iBAAiC;QAnCnC,YAAO,GAAG,CAAC,IAAY,EAAE,MAAW,EAAE,EAAE;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAE3D,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,YAAY,CAAC,CAAC;aAC3C;YAED,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC,CAAC;QAEF,eAAU,GAAG,CAAC,IAAY,EAAE,MAAW,EAAE,EAAE;YACzC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAEjE,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,YAAY,CAAC,CAAC;aAC9C;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC,CAAC;QAEF,aAAQ,GAAG,GAAG,EAAE;YACd,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC,CAAC;QAEF,gBAAW,GAAG,GAAG,EAAE;YACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC,CAAC;QAWA,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAO,CACxB,MAAM,EACN,MAAM,EACN,SAAS,EACT,UAAU,EACV,iBAAiB,EACjB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,WAAW,CACjB,CAAC;QAEF,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAS;QACjB,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAES,mBAAmB,CAAC,IAAS;QACrC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAA,qBAAS,EAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AArED,kBAqEC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAqDA,wBAAsB,cAAc,CAAC,OAAO,WAAe,sDA0D1D"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAqDA,wBAAsB,cAAc,CAAC,OAAO,WAAe,sDAwD1D"}
package/lib/cli/index.js CHANGED
@@ -65,12 +65,11 @@ async function cliInitialized(cliArgs = process.argv) {
65
65
  enabled: process.env.TRAMVAI_ENABLE_ANALYTICS === 'true',
66
66
  });
67
67
  const configManager = new config_1.ConfigManager({ config, syncConfigFile: syncJsonFile_1.syncJsonFile });
68
- const packageManager = (0, package_manager_wrapper_1.resolvePackageManager)({ rootDir: process.cwd() });
69
68
  const cliRootDir = path_1.default.resolve(__dirname, '../', '../');
70
69
  const cliPackageManager = new package_manager_wrapper_1.NpmPackageManager({
71
70
  rootDir: cliRootDir,
72
71
  });
73
- const cliInstance = new CLI_1.CLI(commandsMap, tasksMap, logger, configManager, analytic, cliRootDir, cliPackageManager, packageManager);
72
+ const cliInstance = new CLI_1.CLI(commandsMap, tasksMap, logger, configManager, analytic, cliRootDir, cliPackageManager);
74
73
  return await cliInstance.run(cliArgs);
75
74
  }
76
75
  catch (e) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,10 @@
1
1
  import type { Context } from '../../models/context';
2
2
  import type { CommandResult } from '../../models/command';
3
3
  export type Params = {
4
- packageName: string;
4
+ packageNames: string | string[];
5
5
  dev?: boolean;
6
+ app?: string;
6
7
  };
7
- declare const _default: (context: Context, { packageName, dev }: Params) => Promise<CommandResult>;
8
+ declare const _default: (context: Context, { packageNames, dev, app }: Params) => Promise<CommandResult>;
8
9
  export default _default;
9
10
  //# sourceMappingURL=add.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/commands/add/add.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAK1D,MAAM,MAAM,MAAM,GAAG;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;kCAE6B,OAAO,wBAAwB,MAAM,KAAG,QAAQ,aAAa,CAAC;AAA7F,wBAmCE"}
1
+ {"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/commands/add/add.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAM1D,MAAM,MAAM,MAAM,GAAG;IACnB,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAChC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;kCAGS,OAAO,8BACY,MAAM,KACjC,QAAQ,aAAa,CAAC;AAHzB,wBA+CE"}
@@ -3,15 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const migrate_1 = require("../../utils/commands/dependencies/migrate");
4
4
  const findTramvaiVersion_1 = require("../../utils/commands/dependencies/findTramvaiVersion");
5
5
  const checkVersions_1 = require("../../utils/commands/dependencies/checkVersions");
6
- exports.default = async (context, { packageName, dev }) => {
6
+ const getWorkspaceRootByAppName_1 = require("../../utils/commands/dependencies/getWorkspaceRootByAppName");
7
+ exports.default = async (context, { packageNames, dev, app }) => {
7
8
  const version = await (0, findTramvaiVersion_1.findTramvaiVersion)();
8
9
  if (!version) {
9
10
  throw new Error('Could not resolve tramvai version from package.json. Do you have @tramvai/core installed?');
10
11
  }
12
+ const workspace = app ? (0, getWorkspaceRootByAppName_1.getWorkspaceRootByAppName)(context, app) : undefined;
13
+ if (workspace && !context.packageManager.isWorkspaceExists(workspace)) {
14
+ throw new Error(`Workspace ${workspace} for app ${app} is not exists. Check your package.json and tramvai.json`);
15
+ }
11
16
  await context.packageManager.install({
12
- name: packageName,
17
+ packageNames,
13
18
  version,
14
19
  devDependency: dev,
20
+ workspace,
15
21
  stdio: 'inherit',
16
22
  });
17
23
  if (context.packageManager.name !== 'npm') {
@@ -1 +1 @@
1
- {"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/commands/add/add.ts"],"names":[],"mappings":";;AAEA,uEAAoE;AACpE,6FAA0F;AAC1F,mFAAgF;AAOhF,kBAAe,KAAK,EAAE,OAAgB,EAAE,EAAE,WAAW,EAAE,GAAG,EAAU,EAA0B,EAAE;IAC9F,MAAM,OAAO,GAAG,MAAM,IAAA,uCAAkB,GAAE,CAAC;IAE3C,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;KACH;IAED,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;QACnC,IAAI,EAAE,WAAW;QACjB,OAAO;QACP,aAAa,EAAE,GAAG;QAClB,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE;QACzC,6CAA6C;QAC7C,8BAA8B;QAC9B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,OAAO,EAAE,0BAA0B;SACpC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;KAC3D;IAED,MAAM,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;IAEvB,MAAM,IAAA,6BAAa,EAAC,OAAO,CAAC,CAAC;IAE7B,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;AACL,CAAC,CAAC"}
1
+ {"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/commands/add/add.ts"],"names":[],"mappings":";;AAEA,uEAAoE;AACpE,6FAA0F;AAC1F,mFAAgF;AAChF,2GAAwG;AAQxG,kBAAe,KAAK,EAClB,OAAgB,EAChB,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,EAAU,EACV,EAAE;IAC1B,MAAM,OAAO,GAAG,MAAM,IAAA,uCAAkB,GAAE,CAAC;IAE3C,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;KACH;IAED,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,IAAA,qDAAyB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,IAAI,SAAS,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE;QACrE,MAAM,IAAI,KAAK,CACb,aAAa,SAAS,YAAY,GAAG,0DAA0D,CAChG,CAAC;KACH;IAED,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;QACnC,YAAY;QACZ,OAAO;QACP,aAAa,EAAE,GAAG;QAClB,SAAS;QACT,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE;QACzC,6CAA6C;QAC7C,8BAA8B;QAC9B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,OAAO,EAAE,0BAA0B;SACpC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;KAC3D;IAED,MAAM,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;IAEvB,MAAM,IAAA,6BAAa,EAAC,OAAO,CAAC,CAAC;IAE7B,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;AACL,CAAC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import type { Params } from './add';
2
- export declare const checkPackage: (_: any, { packageName }: Params) => Promise<{
2
+ export declare const checkPackage: (_: any, { packageNames }: Params) => Promise<{
3
3
  name: string;
4
4
  status: string;
5
5
  }>;
@@ -1 +1 @@
1
- {"version":3,"file":"checkPackageValidator.d.ts","sourceRoot":"","sources":["../../../src/commands/add/checkPackageValidator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAEpC,eAAO,MAAM,YAAY,4BAA8B,MAAM;;;EAO5D,CAAC"}
1
+ {"version":3,"file":"checkPackageValidator.d.ts","sourceRoot":"","sources":["../../../src/commands/add/checkPackageValidator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAEpC,eAAO,MAAM,YAAY,6BAA+B,MAAM;;;EAW7D,CAAC"}
@@ -3,8 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.checkPackage = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const latest_version_1 = tslib_1.__importDefault(require("latest-version"));
6
- const checkPackage = async (_, { packageName }) => {
7
- await (0, latest_version_1.default)(packageName);
6
+ const checkPackage = async (_, { packageNames }) => {
7
+ if (Array.isArray(packageNames)) {
8
+ await Promise.all(packageNames.map((packageName) => (0, latest_version_1.default)(packageName)));
9
+ }
10
+ else {
11
+ await (0, latest_version_1.default)(packageNames);
12
+ }
8
13
  return {
9
14
  name: 'checkPackage',
10
15
  status: 'ok',
@@ -1 +1 @@
1
- {"version":3,"file":"checkPackageValidator.js","sourceRoot":"","sources":["../../../src/commands/add/checkPackageValidator.ts"],"names":[],"mappings":";;;;AAAA,4EAA2C;AAGpC,MAAM,YAAY,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,WAAW,EAAU,EAAE,EAAE;IAC/D,MAAM,IAAA,wBAAa,EAAC,WAAW,CAAC,CAAC;IAEjC,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,IAAI;KACb,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,YAAY,gBAOvB"}
1
+ {"version":3,"file":"checkPackageValidator.js","sourceRoot":"","sources":["../../../src/commands/add/checkPackageValidator.ts"],"names":[],"mappings":";;;;AAAA,4EAA2C;AAGpC,MAAM,YAAY,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,YAAY,EAAU,EAAE,EAAE;IAChE,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC/B,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAA,wBAAa,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC;KAClF;SAAM;QACL,MAAM,IAAA,wBAAa,EAAC,YAAY,CAAC,CAAC;KACnC;IAED,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,IAAI;KACb,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,YAAY,gBAWvB"}
@@ -4,12 +4,17 @@ declare class AddCommand extends CLICommand {
4
4
  name: string;
5
5
  description: string;
6
6
  command: string;
7
- options: {
7
+ options: ({
8
8
  name: string;
9
9
  description: string;
10
- }[];
10
+ value?: undefined;
11
+ } | {
12
+ name: string;
13
+ value: string;
14
+ description: string;
15
+ })[];
11
16
  alias: string;
12
- validators: ((_: any, { packageName }: Params) => Promise<{
17
+ validators: ((_: any, { packageNames }: Params) => Promise<{
13
18
  name: string;
14
19
  status: string;
15
20
  }>)[];
@@ -1 +1 @@
1
- {"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../src/commands/add/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAEpC,cAAM,UAAW,SAAQ,UAAU;IACjC,IAAI,SAAS;IAEb,WAAW,SAAqC;IAEhD,OAAO,SAAuB;IAE9B,OAAO;;;QAKL;IAEF,KAAK,SAAM;IAEX,UAAU;;;UAAkB;IAEtB,MAAM,CAAC,UAAU,EAAE,MAAM;CAIhC;AAED,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../src/commands/add/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAEpC,cAAM,UAAW,SAAQ,UAAU;IACjC,IAAI,SAAS;IAEb,WAAW,SAAqC;IAEhD,OAAO,SAA2B;IAElC,OAAO;;;;;;;;SAUL;IAEF,KAAK,SAAM;IAEX,UAAU;;;UAAkB;IAEtB,MAAM,CAAC,UAAU,EAAE,MAAM;CAIhC;AAED,eAAe,UAAU,CAAC"}
@@ -7,12 +7,17 @@ class AddCommand extends command_1.CLICommand {
7
7
  super(...arguments);
8
8
  this.name = 'add';
9
9
  this.description = 'Tramvai package install command';
10
- this.command = 'add <packageName>';
10
+ this.command = 'add <packageNames...>';
11
11
  this.options = [
12
12
  {
13
13
  name: '-D, --dev',
14
14
  description: 'Save package to devDependencies',
15
15
  },
16
+ {
17
+ name: '-a, --app',
18
+ value: '[app]',
19
+ description: 'Install package in app-specific workspace',
20
+ },
16
21
  ];
17
22
  this.alias = '';
18
23
  this.validators = [checkPackageValidator_1.checkPackage];