@ama-sdk/schematics 10.4.0-prerelease.25 → 10.4.0-prerelease.27
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.
- package/package.json +9 -8
- package/schematics/java/client-core/swagger-codegen-java-client/target/javaClient-swagger-codegen-tests.jar +0 -0
- package/schematics/java/client-core/swagger-codegen-java-client/target/javaClient-swagger-codegen.jar +0 -0
- package/schematics/typescript/core/openapi-codegen-typescript/target/typescriptFetch-openapi-generator-tests.jar +0 -0
- package/schematics/typescript/core/openapi-codegen-typescript/target/typescriptFetch-openapi-generator.jar +0 -0
- package/schematics/typescript/shell/index.d.ts.map +1 -1
- package/schematics/typescript/shell/index.js +2 -1
- package/schematics/typescript/shell/index.js.map +1 -1
- package/schematics/typescript/shell/templates/base/package.json.template +2 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ama-sdk/schematics",
|
|
3
|
-
"version": "10.4.0-prerelease.
|
|
3
|
+
"version": "10.4.0-prerelease.27",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -48,12 +48,12 @@
|
|
|
48
48
|
}
|
|
49
49
|
},
|
|
50
50
|
"peerDependencies": {
|
|
51
|
-
"@ama-sdk/core": "^10.4.0-prerelease.
|
|
51
|
+
"@ama-sdk/core": "^10.4.0-prerelease.27",
|
|
52
52
|
"@angular-devkit/core": "~17.3.0",
|
|
53
53
|
"@angular-devkit/schematics": "~17.3.0",
|
|
54
54
|
"@angular-devkit/schematics-cli": "^17.0.1",
|
|
55
55
|
"@angular/cli": "^17.0.1",
|
|
56
|
-
"@o3r/schematics": "^10.4.0-prerelease.
|
|
56
|
+
"@o3r/schematics": "^10.4.0-prerelease.27",
|
|
57
57
|
"@openapitools/openapi-generator-cli": "~2.13.0",
|
|
58
58
|
"@schematics/angular": "~17.3.0"
|
|
59
59
|
},
|
|
@@ -67,16 +67,16 @@
|
|
|
67
67
|
"tslib": "^2.6.2"
|
|
68
68
|
},
|
|
69
69
|
"devDependencies": {
|
|
70
|
-
"@ama-sdk/core": "^10.4.0-prerelease.
|
|
70
|
+
"@ama-sdk/core": "^10.4.0-prerelease.27",
|
|
71
71
|
"@angular-devkit/schematics-cli": "~17.3.0",
|
|
72
72
|
"@angular-eslint/eslint-plugin": "~17.3.0",
|
|
73
73
|
"@angular/cli": "~17.3.0",
|
|
74
74
|
"@nx/eslint-plugin": "~18.3.0",
|
|
75
75
|
"@nx/jest": "~18.3.0",
|
|
76
|
-
"@o3r/build-helpers": "^10.4.0-prerelease.
|
|
77
|
-
"@o3r/eslint-plugin": "^10.4.0-prerelease.
|
|
78
|
-
"@o3r/schematics": "^10.4.0-prerelease.
|
|
79
|
-
"@o3r/test-helpers": "^10.4.0-prerelease.
|
|
76
|
+
"@o3r/build-helpers": "^10.4.0-prerelease.27",
|
|
77
|
+
"@o3r/eslint-plugin": "^10.4.0-prerelease.27",
|
|
78
|
+
"@o3r/schematics": "^10.4.0-prerelease.27",
|
|
79
|
+
"@o3r/test-helpers": "^10.4.0-prerelease.27",
|
|
80
80
|
"@openapitools/openapi-generator-cli": "~2.13.0",
|
|
81
81
|
"@schematics/angular": "~17.3.0",
|
|
82
82
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
@@ -88,6 +88,7 @@
|
|
|
88
88
|
"@types/semver": "^7.3.13",
|
|
89
89
|
"@typescript-eslint/eslint-plugin": "^7.2.0",
|
|
90
90
|
"@typescript-eslint/parser": "^7.2.0",
|
|
91
|
+
"commit-and-tag-version": "^9.5.0",
|
|
91
92
|
"copyfiles": "^2.4.1",
|
|
92
93
|
"cpy-cli": "^5.0.0",
|
|
93
94
|
"eslint": "^8.57.0",
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,KAAK,EAAC,4CAA4C,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,KAAK,EAAC,4CAA4C,EAAC,MAAM,UAAU,CAAC;AA0H3E;;;GAGG;AACH,eAAO,MAAM,uBAAuB,YAAa,4CAA4C,wBAG5F,CAAC"}
|
|
@@ -38,7 +38,8 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
38
38
|
'typescript': amaSdkSchematicsPackageJson.devDependencies.typescript,
|
|
39
39
|
'@openapitools/openapi-generator-cli': amaSdkSchematicsPackageJson.devDependencies['@openapitools/openapi-generator-cli'],
|
|
40
40
|
'@stylistic/eslint-plugin-ts': amaSdkSchematicsPackageJson.devDependencies['@stylistic/eslint-plugin-ts'],
|
|
41
|
-
'rxjs': amaSdkSchematicsPackageJson.dependencies.rxjs
|
|
41
|
+
'rxjs': amaSdkSchematicsPackageJson.dependencies.rxjs,
|
|
42
|
+
'commit-and-tag-version': amaSdkSchematicsPackageJson.devDependencies['commit-and-tag-version']
|
|
42
43
|
};
|
|
43
44
|
const openApiSupportedVersion = typeof amaSdkSchematicsPackageJson.openApiSupportedVersion === 'string' &&
|
|
44
45
|
amaSdkSchematicsPackageJson.openApiSupportedVersion.replace(/\^|~/, '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":";;;AAAA,2DAWoC;AACpC,qCAAmC;AACnC,yCAAsD;AACtD,6DAA6E;AAC7E,6DAA2D;AAG3D;;;GAGG;AACH,SAAS,yBAAyB,CAAC,OAAqD;IAEtF,MAAM,WAAW,GAAG,CAAC,KAAW,EAAE,OAAyB,EAAE,EAAE;QAC7D,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,sBAAU,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,oBAAQ,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACpJ,MAAM,WAAW,GAAG,IAAI,yBAAU,CAAC,EAAC,gBAAgB,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,YAAY,EAAE,KAAK,EAAC,CAAC,CAAC;QACpH,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QAChE,MAAM,2BAA2B,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC;QAE5D,yDAAyD;QACzD,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,2BAA2B,CAAC,YAAa,CAAC,KAAK;YACxD,aAAa,EAAE,2BAA2B,CAAC,eAAgB,CAAC,aAAa,CAAC;YAC1E,aAAa,EAAE,2BAA2B,CAAC,eAAgB,CAAC,aAAa,CAAC;YAC1E,kCAAkC,EAAE,2BAA2B,CAAC,eAAgB,CAAC,kCAAkC,CAAC;YACpH,2BAA2B,EAAE,2BAA2B,CAAC,eAAgB,CAAC,2BAA2B,CAAC;YACtG,QAAQ,EAAE,2BAA2B,CAAC,eAAgB,CAAC,MAAM;YAC7D,oBAAoB,EAAE,2BAA2B,CAAC,eAAgB,CAAC,oBAAoB,CAAC;YACxF,qBAAqB,EAAE,2BAA2B,CAAC,eAAgB,CAAC,qBAAqB,CAAC;YAC1F,4BAA4B,EAAE,2BAA2B,CAAC,eAAgB,CAAC,4BAA4B,CAAC;YACxG,uBAAuB,EAAE,2BAA2B,CAAC,eAAgB,CAAC,uBAAuB,CAAC;YAC9F,kBAAkB,EAAE,2BAA2B,CAAC,eAAgB,CAAC,kBAAkB,CAAC;YACpF,SAAS,EAAE,2BAA2B,CAAC,eAAgB,CAAC,SAAS,CAAC;YAClE,MAAM,EAAE,2BAA2B,CAAC,eAAgB,CAAC,IAAI;YACzD,SAAS,EAAE,2BAA2B,CAAC,eAAgB,CAAC,SAAS,CAAC;YAClE,QAAQ,EAAE,2BAA2B,CAAC,eAAgB,CAAC,MAAM;YAC7D,YAAY,EAAE,2BAA2B,CAAC,eAAgB,CAAC,UAAU;YACrE,qCAAqC,EAAE,2BAA2B,CAAC,eAAgB,CAAC,qCAAqC,CAAC;YAC1H,6BAA6B,EAAE,2BAA2B,CAAC,eAAgB,CAAC,6BAA6B,CAAC;YAC1G,MAAM,EAAE,2BAA2B,CAAC,YAAa,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"publish:package": "npm publish ./dist",
|
|
48
48
|
"generate:mock": "schematics @ama-sdk/schematics:mock",
|
|
49
49
|
"doc:generate": "typedoc",
|
|
50
|
-
"tools:changelog": "
|
|
50
|
+
"tools:changelog": "commit-and-tag-version"
|
|
51
51
|
},
|
|
52
52
|
"lint-staged": {
|
|
53
53
|
"**/*.(js|ts)": [
|
|
@@ -103,7 +103,7 @@
|
|
|
103
103
|
"minimist": "^1.2.6",
|
|
104
104
|
"rimraf": "^5.0.1",
|
|
105
105
|
"rxjs": "<%= versions['rxjs'] %>",
|
|
106
|
-
"
|
|
106
|
+
"commit-and-tag-version": "<%= versions['commit-and-tag-version'] %>",
|
|
107
107
|
"ts-jest": "<%= versions['ts-jest'] %>",
|
|
108
108
|
"typedoc": "~0.25.0",
|
|
109
109
|
"tsc-watch": "^6.0.0",
|