@tramvai/cli 4.34.4 → 4.36.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 (60) hide show
  1. package/lib/builder/webpack/tokens.d.ts +3 -0
  2. package/lib/builder/webpack/tokens.d.ts.map +1 -1
  3. package/lib/commands/static/application.js +1 -1
  4. package/lib/commands/static/application.js.map +1 -1
  5. package/lib/commands/static/command.d.ts +2 -0
  6. package/lib/commands/static/command.d.ts.map +1 -1
  7. package/lib/commands/static/command.js +10 -0
  8. package/lib/commands/static/command.js.map +1 -1
  9. package/lib/commands/static/generate.d.ts +2 -1
  10. package/lib/commands/static/generate.d.ts.map +1 -1
  11. package/lib/commands/static/generate.js +10 -3
  12. package/lib/commands/static/generate.js.map +1 -1
  13. package/lib/commands/static/static.d.ts +2 -1
  14. package/lib/commands/static/static.d.ts.map +1 -1
  15. package/lib/commands/static/static.js.map +1 -1
  16. package/lib/di/tokens/config.d.ts +1 -0
  17. package/lib/di/tokens/config.d.ts.map +1 -1
  18. package/lib/library/babel/index.d.ts +1 -1
  19. package/lib/library/babel/index.d.ts.map +1 -1
  20. package/lib/library/babel/index.js +3 -1
  21. package/lib/library/babel/index.js.map +1 -1
  22. package/lib/library/babel/plugins/fill-declare-action-name.d.ts +6 -0
  23. package/lib/library/babel/plugins/fill-declare-action-name.d.ts.map +1 -0
  24. package/lib/library/babel/plugins/fill-declare-action-name.js +95 -0
  25. package/lib/library/babel/plugins/fill-declare-action-name.js.map +1 -0
  26. package/lib/library/babel/plugins/types.h.d.ts +2 -2
  27. package/lib/library/babel/plugins/types.h.d.ts.map +1 -1
  28. package/lib/library/webpack/utils/transpiler.d.ts +1 -0
  29. package/lib/library/webpack/utils/transpiler.d.ts.map +1 -1
  30. package/lib/library/webpack/utils/transpiler.js +3 -3
  31. package/lib/library/webpack/utils/transpiler.js.map +1 -1
  32. package/lib/schema/autogeneratedSchema.json +30 -15
  33. package/lib/typings/configEntry/cli.d.ts +5 -0
  34. package/lib/typings/configEntry/cli.d.ts.map +1 -1
  35. package/lib/utils/dev-app/request.d.ts +2 -1
  36. package/lib/utils/dev-app/request.d.ts.map +1 -1
  37. package/lib/utils/dev-app/request.js +8 -4
  38. package/lib/utils/dev-app/request.js.map +1 -1
  39. package/package.json +3 -2
  40. package/schema.json +30 -15
  41. package/src/commands/static/application.ts +1 -1
  42. package/src/commands/static/command.ts +12 -0
  43. package/src/commands/static/generate.ts +13 -2
  44. package/src/commands/static/static.ts +2 -1
  45. package/src/library/babel/index.ts +3 -0
  46. package/src/library/babel/plugins/__fixtures__/fill-declare-action-name/import-mixed.ts +17 -0
  47. package/src/library/babel/plugins/__fixtures__/fill-declare-action-name/import-with-name.ts +28 -0
  48. package/src/library/babel/plugins/__fixtures__/fill-declare-action-name/import-without-name.ts +25 -0
  49. package/src/library/babel/plugins/__fixtures__/fill-declare-action-name/require-with-name.ts +21 -0
  50. package/src/library/babel/plugins/__fixtures__/fill-declare-action-name/require-without-name.ts +19 -0
  51. package/src/library/babel/plugins/__snapshots__/fill-declare-action-name.spec.ts.snap +266 -0
  52. package/src/library/babel/plugins/fill-declare-action-name.spec.ts +37 -0
  53. package/src/library/babel/plugins/fill-declare-action-name.ts +110 -0
  54. package/src/library/babel/plugins/types.h.ts +2 -2
  55. package/src/library/webpack/utils/transpiler.ts +9 -1
  56. package/src/models/config.spec.ts +4 -0
  57. package/src/schema/autogeneratedSchema.json +30 -15
  58. package/src/schema/tramvai.spec.ts +2 -0
  59. package/src/typings/configEntry/cli.ts +5 -0
  60. package/src/utils/dev-app/request.ts +9 -4
@@ -1 +1 @@
1
- {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/typings/configEntry/cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/typings/configEntry/cli.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
+ import type { Request } from '@tinkoff/request-core';
1
2
  import type { ConfigManager } from '../../config/configManager';
2
- export declare const appRequest: <T>(configManager: ConfigManager, path: string) => import("@tinkoff/request-core").MakeRequestResult<T>;
3
+ export declare const appRequest: <T>(configManager: ConfigManager, path: string, options?: Request) => import("@tinkoff/request-core").MakeRequestResult<T>;
3
4
  export declare const appBundleInfo: (configManager: ConfigManager) => Promise<string[]>;
4
5
  //# sourceMappingURL=request.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/utils/dev-app/request.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAIhE,eAAO,MAAM,UAAU,qBAAsB,aAAa,QAAQ,MAAM,yDAKvE,CAAC;AAOF,eAAO,MAAM,aAAa,kBAAyB,aAAa,sBAM/D,CAAC"}
1
+ {"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/utils/dev-app/request.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAIrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAIhE,eAAO,MAAM,UAAU,qBAAsB,aAAa,QAAQ,MAAM,YAAY,OAAO,yDAK1F,CAAC;AAOF,eAAO,MAAM,aAAa,kBAAyB,aAAa,sBAS/D,CAAC"}
@@ -5,16 +5,20 @@ const tslib_1 = require("tslib");
5
5
  const propOr_1 = tslib_1.__importDefault(require("@tinkoff/utils/object/propOr"));
6
6
  const request_core_1 = tslib_1.__importDefault(require("@tinkoff/request-core"));
7
7
  const request_plugin_protocol_http_1 = tslib_1.__importDefault(require("@tinkoff/request-plugin-protocol-http"));
8
- const request = (0, request_core_1.default)([(0, request_plugin_protocol_http_1.default)()]);
9
- const appRequest = (configManager, path) => {
8
+ const request_plugin_retry_1 = tslib_1.__importDefault(require("@tinkoff/request-plugin-retry"));
9
+ const request = (0, request_core_1.default)([(0, request_plugin_retry_1.default)(), (0, request_plugin_protocol_http_1.default)()]);
10
+ const appRequest = (configManager, path, options) => {
10
11
  const { host, port } = configManager;
11
12
  const serverPath = `http://${host}:${port}`;
12
- return request({ url: `${serverPath}${path}` });
13
+ return request(Object.assign({ url: `${serverPath}${path}` }, options));
13
14
  };
14
15
  exports.appRequest = appRequest;
15
16
  const appBundleInfo = (configManager) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
16
17
  const { name } = configManager;
17
- const response = yield (0, exports.appRequest)(configManager, `/${name}/papi/bundleInfo`);
18
+ const response = yield (0, exports.appRequest)(configManager, `/${name}/papi/bundleInfo`, {
19
+ timeout: 5000,
20
+ retry: 3,
21
+ });
18
22
  return (0, propOr_1.default)('payload', [], response);
19
23
  });
20
24
  exports.appBundleInfo = appBundleInfo;
@@ -1 +1 @@
1
- {"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/utils/dev-app/request.ts"],"names":[],"mappings":";;;;AAAA,kFAAkD;AAClD,iFAAkD;AAClD,iHAAyD;AAGzD,MAAM,OAAO,GAAG,IAAA,sBAAa,EAAC,CAAC,IAAA,sCAAI,GAAE,CAAC,CAAC,CAAC;AAEjC,MAAM,UAAU,GAAG,CAAI,aAA4B,EAAE,IAAY,EAAE,EAAE;IAC1E,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IACrC,MAAM,UAAU,GAAG,UAAU,IAAI,IAAI,IAAI,EAAE,CAAC;IAE5C,OAAO,OAAO,CAAI,EAAE,GAAG,EAAE,GAAG,UAAU,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC;AALW,QAAA,UAAU,cAKrB;AAOK,MAAM,aAAa,GAAG,CAAO,aAA4B,EAAE,EAAE;IAClE,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IAE/B,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAqB,aAAa,EAAE,IAAI,IAAI,kBAAkB,CAAC,CAAC;IAEjG,OAAO,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC,CAAA,CAAC;AANW,QAAA,aAAa,iBAMxB"}
1
+ {"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/utils/dev-app/request.ts"],"names":[],"mappings":";;;;AAAA,kFAAkD;AAElD,iFAAkD;AAClD,iHAAyD;AACzD,iGAAkD;AAGlD,MAAM,OAAO,GAAG,IAAA,sBAAa,EAAC,CAAC,IAAA,8BAAK,GAAE,EAAE,IAAA,sCAAI,GAAE,CAAC,CAAC,CAAC;AAE1C,MAAM,UAAU,GAAG,CAAI,aAA4B,EAAE,IAAY,EAAE,OAAiB,EAAE,EAAE;IAC7F,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IACrC,MAAM,UAAU,GAAG,UAAU,IAAI,IAAI,IAAI,EAAE,CAAC;IAE5C,OAAO,OAAO,iBAAM,GAAG,EAAE,GAAG,UAAU,GAAG,IAAI,EAAE,IAAK,OAAO,EAAG,CAAC;AACjE,CAAC,CAAC;AALW,QAAA,UAAU,cAKrB;AAOK,MAAM,aAAa,GAAG,CAAO,aAA4B,EAAE,EAAE;IAClE,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IAE/B,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAqB,aAAa,EAAE,IAAI,IAAI,kBAAkB,EAAE;QAC/F,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,CAAC;KACT,CAAC,CAAC;IAEH,OAAO,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC,CAAA,CAAC;AATW,QAAA,aAAa,iBASxB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/cli",
3
- "version": "4.34.4",
3
+ "version": "4.36.0",
4
4
  "description": "Cli инструмент для сборки и запуска приложений",
5
5
  "files": [
6
6
  "src",
@@ -69,10 +69,11 @@
69
69
  "@tinkoff/package-manager-wrapper": "0.3.1",
70
70
  "@tinkoff/request-core": "^0.10.0",
71
71
  "@tinkoff/request-plugin-protocol-http": "^0.12.1",
72
+ "@tinkoff/request-plugin-retry": "^0.3.0",
72
73
  "@tinkoff/utils": "^2.1.3",
73
74
  "@tinkoff/webpack-dedupe-plugin": "3.0.1",
74
75
  "@tramvai/build": "5.0.3",
75
- "@tramvai/react": "4.34.4",
76
+ "@tramvai/react": "4.36.0",
76
77
  "@tramvai/tools-check-versions": "0.6.4",
77
78
  "@tramvai/tools-migrate": "0.8.4",
78
79
  "ajv": "^8.12.0",
package/schema.json CHANGED
@@ -957,6 +957,11 @@
957
957
  "title": "automatically resolve [requiredVersion](https://webpack.js.org/plugins/module-federation-plugin/#requiredversion) for shared dependencies",
958
958
  "default": false,
959
959
  "type": "boolean"
960
+ },
961
+ "enableFillDeclareActionNamePlugin": {
962
+ "title": "Включает использование плагина fill-declare-action-name",
963
+ "default": false,
964
+ "type": "boolean"
960
965
  }
961
966
  },
962
967
  "additionalProperties": false
@@ -1205,23 +1210,23 @@
1205
1210
  "dotAll": {
1206
1211
  "type": "boolean"
1207
1212
  },
1208
- "__@match@7107": {
1213
+ "__@match@7211": {
1209
1214
  "type": "object",
1210
1215
  "additionalProperties": false
1211
1216
  },
1212
- "__@replace@7109": {
1217
+ "__@replace@7213": {
1213
1218
  "type": "object",
1214
1219
  "additionalProperties": false
1215
1220
  },
1216
- "__@search@7112": {
1221
+ "__@search@7216": {
1217
1222
  "type": "object",
1218
1223
  "additionalProperties": false
1219
1224
  },
1220
- "__@split@7114": {
1225
+ "__@split@7218": {
1221
1226
  "type": "object",
1222
1227
  "additionalProperties": false
1223
1228
  },
1224
- "__@matchAll@7116": {
1229
+ "__@matchAll@7220": {
1225
1230
  "type": "object",
1226
1231
  "additionalProperties": false
1227
1232
  }
@@ -1736,6 +1741,11 @@
1736
1741
  "title": "automatically resolve [requiredVersion](https://webpack.js.org/plugins/module-federation-plugin/#requiredversion) for shared dependencies",
1737
1742
  "default": false,
1738
1743
  "type": "boolean"
1744
+ },
1745
+ "enableFillDeclareActionNamePlugin": {
1746
+ "title": "Включает использование плагина fill-declare-action-name",
1747
+ "default": false,
1748
+ "type": "boolean"
1739
1749
  }
1740
1750
  },
1741
1751
  "additionalProperties": false
@@ -1922,23 +1932,23 @@
1922
1932
  "dotAll": {
1923
1933
  "type": "boolean"
1924
1934
  },
1925
- "__@match@7107": {
1935
+ "__@match@7211": {
1926
1936
  "type": "object",
1927
1937
  "additionalProperties": false
1928
1938
  },
1929
- "__@replace@7109": {
1939
+ "__@replace@7213": {
1930
1940
  "type": "object",
1931
1941
  "additionalProperties": false
1932
1942
  },
1933
- "__@search@7112": {
1943
+ "__@search@7216": {
1934
1944
  "type": "object",
1935
1945
  "additionalProperties": false
1936
1946
  },
1937
- "__@split@7114": {
1947
+ "__@split@7218": {
1938
1948
  "type": "object",
1939
1949
  "additionalProperties": false
1940
1950
  },
1941
- "__@matchAll@7116": {
1951
+ "__@matchAll@7220": {
1942
1952
  "type": "object",
1943
1953
  "additionalProperties": false
1944
1954
  }
@@ -2453,6 +2463,11 @@
2453
2463
  "title": "automatically resolve [requiredVersion](https://webpack.js.org/plugins/module-federation-plugin/#requiredversion) for shared dependencies",
2454
2464
  "default": false,
2455
2465
  "type": "boolean"
2466
+ },
2467
+ "enableFillDeclareActionNamePlugin": {
2468
+ "title": "Включает использование плагина fill-declare-action-name",
2469
+ "default": false,
2470
+ "type": "boolean"
2456
2471
  }
2457
2472
  },
2458
2473
  "additionalProperties": false
@@ -2639,23 +2654,23 @@
2639
2654
  "dotAll": {
2640
2655
  "type": "boolean"
2641
2656
  },
2642
- "__@match@7107": {
2657
+ "__@match@7211": {
2643
2658
  "type": "object",
2644
2659
  "additionalProperties": false
2645
2660
  },
2646
- "__@replace@7109": {
2661
+ "__@replace@7213": {
2647
2662
  "type": "object",
2648
2663
  "additionalProperties": false
2649
2664
  },
2650
- "__@search@7112": {
2665
+ "__@search@7216": {
2651
2666
  "type": "object",
2652
2667
  "additionalProperties": false
2653
2668
  },
2654
- "__@split@7114": {
2669
+ "__@split@7218": {
2655
2670
  "type": "object",
2656
2671
  "additionalProperties": false
2657
2672
  },
2658
- "__@matchAll@7116": {
2673
+ "__@matchAll@7220": {
2659
2674
  "type": "object",
2660
2675
  "additionalProperties": false
2661
2676
  }
@@ -167,7 +167,7 @@ export const staticApp = async (
167
167
  message: `message: routes fetched, generate pages`,
168
168
  });
169
169
 
170
- await generateStatic(context, serverConfigManager, paths);
170
+ await generateStatic(context, options, serverConfigManager, paths);
171
171
 
172
172
  context.logger.event({
173
173
  type: 'debug',
@@ -8,6 +8,8 @@ export type Params = {
8
8
  serve?: boolean;
9
9
  buildType: 'all' | 'none';
10
10
  onlyPages?: string[];
11
+ header?: string[];
12
+ folder?: string;
11
13
  };
12
14
 
13
15
  export class StaticCommand extends CLICommand<Params> {
@@ -40,6 +42,16 @@ export class StaticCommand extends CLICommand<Params> {
40
42
  transformer: (value: string) => value.split(','),
41
43
  description: 'Specify the comma separated paths list for static HTML generation',
42
44
  },
45
+ {
46
+ name: '--header',
47
+ value: '[header...]',
48
+ description: 'Add extra headers, which will be added to request for application pages',
49
+ },
50
+ {
51
+ name: '--folder',
52
+ value: '[folder]',
53
+ description: 'Subfolder, when generated pages will be placed',
54
+ },
43
55
  {
44
56
  name: '--fileCache',
45
57
  value: '[fileCache]',
@@ -5,20 +5,31 @@ import type { Context } from '../../models/context';
5
5
  import type { ConfigManager } from '../../config/configManager';
6
6
  import type { ApplicationConfigEntry } from '../../typings/configEntry/application';
7
7
  import { appRequest } from '../../utils/dev-app/request';
8
+ import type { Params } from './command';
8
9
 
9
10
  const MAX_CONCURRENT = 10;
10
11
  const DYNAMIC_PAGE_REGEX = /\/:.+\//g;
11
12
 
12
13
  export const generateStatic = async (
13
14
  context: Context,
15
+ params: Params,
14
16
  configManager: ConfigManager<ApplicationConfigEntry>,
15
17
  paths: string[]
16
18
  ) => {
19
+ const { header = [], folder = '' } = params;
17
20
  const q = new PQueue(MAX_CONCURRENT);
18
21
  const promises = [];
22
+ const headers = header.reduce((result, item) => {
23
+ const [key, value] = item.split(':');
24
+
25
+ // eslint-disable-next-line no-param-reassign
26
+ result[key.trim()] = value.trim();
27
+
28
+ return result;
29
+ }, {} as Record<string, string>);
19
30
 
20
31
  const { rootDir, output } = configManager;
21
- const staticPath = resolve(rootDir, output.static);
32
+ const staticPath = resolve(rootDir, output.static, folder);
22
33
 
23
34
  for (const path of paths) {
24
35
  promises.push(
@@ -40,7 +51,7 @@ export const generateStatic = async (
40
51
  message: `path: ${path}, message: start fetching page`,
41
52
  });
42
53
 
43
- const html = await appRequest(configManager, path);
54
+ const html = await appRequest(configManager, path, { headers });
44
55
 
45
56
  await outputFile(join(staticPath, path, 'index.html'), html);
46
57
 
@@ -2,8 +2,9 @@ import type { Context } from '../../models/context';
2
2
  import { staticApp } from './application';
3
3
  import type { CommandResult } from '../../models/command';
4
4
  import type { ApplicationConfigEntry } from '../../typings/configEntry/application';
5
+ import type { Params } from './command';
5
6
 
6
- export default async (context: Context, parameters): Promise<CommandResult> => {
7
+ export default async (context: Context, parameters: Params): Promise<CommandResult> => {
7
8
  const { target } = parameters;
8
9
  const configEntry = context.config.getProject(target);
9
10
 
@@ -36,6 +36,7 @@ export const babelConfigFactory = ({
36
36
  modules = false,
37
37
  generateDataQaTag = true,
38
38
  enableFillActionNamePlugin = false,
39
+ enableFillDeclareActionNamePlugin = false,
39
40
  // for testing only!
40
41
  // @ts-expect-error
41
42
  markCreateTokenAsPure = true,
@@ -120,6 +121,8 @@ export const babelConfigFactory = ({
120
121
  ['@babel/transform-runtime', { useESModules: !(isServer && env === 'development') }],
121
122
  path.resolve(__dirname, './plugins/lazy-component/legacy-universal-replace'), // TODO: удалить плагин после того как отпадёт необходимость поддерживать легаси
122
123
  path.resolve(__dirname, './plugins/lazy-component/lazy-component'),
124
+ enableFillDeclareActionNamePlugin &&
125
+ path.resolve(__dirname, './plugins/fill-declare-action-name'),
123
126
  generateDataQaTag && path.resolve(__dirname, './plugins/react-element-info-unique'), // Собственный плагин. Необходимо удалить в будущем
124
127
  enableFillActionNamePlugin && path.resolve(__dirname, './plugins/fill-action-name'), // Собственный плагин. Необходимо удалить в будущем
125
128
  markCreateTokenAsPure && path.resolve(__dirname, './plugins/create-token-pure'),
@@ -0,0 +1,17 @@
1
+ import { declareAction } from '@tramvai/core';
2
+
3
+ const action = declareAction({
4
+ name: 'action',
5
+ fn: () => {
6
+ console.log('action');
7
+ },
8
+ });
9
+
10
+ const secondAction = declareAction({
11
+ fn: () => {
12
+ console.log('second action');
13
+ },
14
+ conditions: {
15
+ onlyBrowser: true,
16
+ },
17
+ });
@@ -0,0 +1,28 @@
1
+ import { declareAction } from '@tramvai/core';
2
+
3
+ const action = declareAction({
4
+ name: 'action',
5
+ fn: () => {
6
+ console.log('action');
7
+ },
8
+ });
9
+
10
+ const secondAction = declareAction({
11
+ name: 'secondAction',
12
+ fn: () => {
13
+ console.log('second action');
14
+ },
15
+ conditions: {
16
+ onlyBrowser: true,
17
+ },
18
+ });
19
+
20
+ export default declareAction({
21
+ name: 'anonymousAction',
22
+ fn: () => {
23
+ console.log('anonymous action');
24
+ },
25
+ conditions: {
26
+ onlyBrowser: true,
27
+ },
28
+ });
@@ -0,0 +1,25 @@
1
+ import { declareAction } from '@tramvai/core';
2
+
3
+ const action = declareAction({
4
+ fn: () => {
5
+ console.log('action');
6
+ },
7
+ });
8
+
9
+ const secondAction = declareAction({
10
+ fn: () => {
11
+ console.log('second action');
12
+ },
13
+ conditions: {
14
+ onlyBrowser: true,
15
+ },
16
+ });
17
+
18
+ export default declareAction({
19
+ fn: () => {
20
+ console.log('anonymous action');
21
+ },
22
+ conditions: {
23
+ onlyBrowser: true,
24
+ },
25
+ });
@@ -0,0 +1,21 @@
1
+ // @ts-ignore
2
+ const { declareAction } = require('@tramvai/core');
3
+
4
+ // @ts-ignore
5
+ const action = declareAction({
6
+ name: 'action',
7
+ fn: () => {
8
+ console.log('action');
9
+ },
10
+ });
11
+
12
+ // @ts-ignore
13
+ const secondAction = declareAction({
14
+ name: 'secondAction',
15
+ fn: () => {
16
+ console.log('second action');
17
+ },
18
+ conditions: {
19
+ onlyBrowser: true,
20
+ },
21
+ });
@@ -0,0 +1,19 @@
1
+ // @ts-ignore
2
+ const { declareAction } = require('@tramvai/core');
3
+
4
+ // @ts-ignore
5
+ const action = declareAction({
6
+ fn: () => {
7
+ console.log('action');
8
+ },
9
+ });
10
+
11
+ // @ts-ignore
12
+ const secondAction = declareAction({
13
+ fn: () => {
14
+ console.log('second action');
15
+ },
16
+ conditions: {
17
+ onlyBrowser: true,
18
+ },
19
+ });