vovk-cli 0.0.1-draft.322 → 0.0.1-draft.325

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.
@@ -65,27 +65,27 @@ export default async function getClientTemplateFiles({ config, cwd, log, configK
65
65
  }
66
66
  if (templateDef.requires) {
67
67
  for (const [tName, reqRelativeDir] of Object.entries(templateDef.requires)) {
68
- const def = config.clientTemplateDefs[tName];
68
+ let def = config.clientTemplateDefs[tName];
69
69
  if (!def) {
70
70
  throw new Error(`Template "${tName}" required by "${templateName}" not found`);
71
71
  }
72
- /* def = {
73
- ...def,
74
- ...templateDef,
75
- composedClient: {
76
- ...def.composedClient,
77
- ...templateDef.composedClient,
78
- },
79
- segmentedClient: {
80
- ...def.segmentedClient,
81
- ...templateDef.segmentedClient,
82
- },
83
- segmentConfig: {
84
- ...def.segmentConfig,
85
- ...templateDef.segmentConfig,
86
- },
87
- // 'requires' and other props will be overridden
88
- }; */
72
+ def = {
73
+ ...def,
74
+ ...templateDef,
75
+ composedClient: {
76
+ ...def.composedClient,
77
+ ...templateDef.composedClient,
78
+ },
79
+ segmentedClient: {
80
+ ...def.segmentedClient,
81
+ ...templateDef.segmentedClient,
82
+ },
83
+ segmentConfig: {
84
+ ...def.segmentConfig,
85
+ ...templateDef.segmentConfig,
86
+ },
87
+ requires: def.requires,
88
+ };
89
89
  entries.push([tName, def, path.join(outCwdRelativeDir, reqRelativeDir)]);
90
90
  }
91
91
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vovk-cli",
3
- "version": "0.0.1-draft.322",
3
+ "version": "0.0.1-draft.325",
4
4
  "bin": {
5
5
  "vovk": "./dist/index.mjs"
6
6
  },