@diia-inhouse/genproto 3.3.0 → 3.3.2
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.
|
@@ -111,9 +111,9 @@ class TsCommandBuilder extends index_1.CommandBuilder {
|
|
|
111
111
|
let designSystemProtoPath = '';
|
|
112
112
|
switch (projectPlatform) {
|
|
113
113
|
case index_1.Platform.java: {
|
|
114
|
-
typesProtoPath = '
|
|
115
|
-
typesSubPaths = ['build', 'extracted-protos', 'main'];
|
|
116
|
-
dependenciesPattern = 'build/extracted-protos/main/**/*.proto
|
|
114
|
+
typesProtoPath = `./${this.javaModule ?? '.'}/build/extracted-protos/main/`;
|
|
115
|
+
typesSubPaths = [`${this.javaModule ?? '.'}`, 'build', 'extracted-protos', 'main'];
|
|
116
|
+
dependenciesPattern = `${this.javaModule ?? '.'}/build/extracted-protos/main/**/*.proto`;
|
|
117
117
|
(0, node_child_process_1.execSync)(`./gradlew ${this.javaModule ?? ''}:extractProto`, { stdio: 'pipe' });
|
|
118
118
|
break;
|
|
119
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsCommandBuilder.js","sourceRoot":"","sources":["../../src/command/tsCommandBuilder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tsCommandBuilder.js","sourceRoot":"","sources":["../../src/command/tsCommandBuilder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@diia-inhouse/genproto",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.2",
|
|
4
4
|
"description": "JS codegen from proto with imports from @diia-inhouse/types",
|
|
5
5
|
"bin": {
|
|
6
6
|
"genproto": "./dist/genproto.js"
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@diia-inhouse/configs": "6.1.1",
|
|
41
|
-
"@diia-inhouse/eslint-config": "8.8.
|
|
41
|
+
"@diia-inhouse/eslint-config": "8.8.3",
|
|
42
42
|
"@types/lodash": "4.17.24",
|
|
43
43
|
"@types/node": "20.17.1",
|
|
44
44
|
"@types/yargs": "17.0.33",
|
|
@@ -114,9 +114,9 @@ export default class TsCommandBuilder extends CommandBuilder {
|
|
|
114
114
|
|
|
115
115
|
switch (projectPlatform) {
|
|
116
116
|
case Platform.java: {
|
|
117
|
-
typesProtoPath = '
|
|
118
|
-
typesSubPaths = ['build', 'extracted-protos', 'main']
|
|
119
|
-
dependenciesPattern = 'build/extracted-protos/main/**/*.proto
|
|
117
|
+
typesProtoPath = `./${this.javaModule ?? '.'}/build/extracted-protos/main/`
|
|
118
|
+
typesSubPaths = [`${this.javaModule ?? '.'}`, 'build', 'extracted-protos', 'main']
|
|
119
|
+
dependenciesPattern = `${this.javaModule ?? '.'}/build/extracted-protos/main/**/*.proto`
|
|
120
120
|
execSync(`./gradlew ${this.javaModule ?? ''}:extractProto`, { stdio: 'pipe' })
|
|
121
121
|
break
|
|
122
122
|
}
|