@o3r/workspace 11.3.0-prerelease.4 → 11.3.0-prerelease.40
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "11.3.0-prerelease.
|
|
3
|
+
"version": "11.3.0-prerelease.40",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@o3r/schematics": "^11.3.0-prerelease.
|
|
41
|
+
"@o3r/schematics": "^11.3.0-prerelease.40",
|
|
42
42
|
"commander": "^12.0.0",
|
|
43
43
|
"globby": "^11.1.0",
|
|
44
44
|
"semver": "^7.5.2",
|
|
@@ -71,11 +71,11 @@
|
|
|
71
71
|
"@nx/jest": "~19.5.0",
|
|
72
72
|
"@nx/js": "~19.5.0",
|
|
73
73
|
"@nx/workspace": "~19.5.0",
|
|
74
|
-
"@o3r/build-helpers": "^11.3.0-prerelease.
|
|
75
|
-
"@o3r/core": "^11.3.0-prerelease.
|
|
76
|
-
"@o3r/eslint-plugin": "^11.3.0-prerelease.
|
|
77
|
-
"@o3r/schematics": "^11.3.0-prerelease.
|
|
78
|
-
"@o3r/test-helpers": "^11.3.0-prerelease.
|
|
74
|
+
"@o3r/build-helpers": "^11.3.0-prerelease.40",
|
|
75
|
+
"@o3r/core": "^11.3.0-prerelease.40",
|
|
76
|
+
"@o3r/eslint-plugin": "^11.3.0-prerelease.40",
|
|
77
|
+
"@o3r/schematics": "^11.3.0-prerelease.40",
|
|
78
|
+
"@o3r/test-helpers": "^11.3.0-prerelease.40",
|
|
79
79
|
"@schematics/angular": "~18.2.0",
|
|
80
80
|
"@stylistic/eslint-plugin-ts": "~2.4.0",
|
|
81
81
|
"@types/jest": "~29.5.2",
|
|
@@ -27,7 +27,7 @@ function ngAddFn(options) {
|
|
|
27
27
|
c.addTask(new tasks_1.RepositoryInitializerTask(undefined, commit));
|
|
28
28
|
}
|
|
29
29
|
},
|
|
30
|
-
// Schematics
|
|
30
|
+
// Schematics advertising
|
|
31
31
|
(t, c) => {
|
|
32
32
|
const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(t);
|
|
33
33
|
c.logger.info('Your project is now ready, you can start to generate your first packages with one of the following commands:');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8F,IAAI,EAAkD,MAAM,4BAA4B,CAAC;AAW9L,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8F,IAAI,EAAkD,MAAM,4BAA4B,CAAC;AAW9L,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAoF/C;;;GAGG;AACH,eAAO,MAAM,WAAW,wCAAuD,CAAC"}
|
package/schematics/sdk/index.js
CHANGED
|
@@ -9,6 +9,7 @@ const rules_nx_1 = require("./rules/rules.nx");
|
|
|
9
9
|
const update_ts_paths_rule_1 = require("./rules/update-ts-paths.rule");
|
|
10
10
|
const clean_standalone_rule_1 = require("./rules/clean-standalone.rule");
|
|
11
11
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
12
|
+
const node_fs_1 = require("node:fs");
|
|
12
13
|
/**
|
|
13
14
|
* Add an Otter compatible SDK to a monorepo
|
|
14
15
|
* @param options Schematic options
|
|
@@ -37,6 +38,13 @@ function generateSdkFn(options) {
|
|
|
37
38
|
]), schematics_1.MergeStrategy.Overwrite);
|
|
38
39
|
const packageManager = (0, schematics_2.getPackageManager)({ workspaceConfig });
|
|
39
40
|
const specExtension = options.specPackagePath ? path.extname(options.specPackagePath) : '.yaml';
|
|
41
|
+
// If spec path is relative to process.cwd, we need to make it relative to the project root
|
|
42
|
+
if (options.specPath && !path.isAbsolute(options.specPath)) {
|
|
43
|
+
const resolvedPath = path.resolve(process.cwd(), options.specPath);
|
|
44
|
+
if ((0, node_fs_1.existsSync)(resolvedPath)) {
|
|
45
|
+
options.specPath = path.relative(path.resolve(targetPath), resolvedPath);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
40
48
|
const specPath = options.specPackageName ? `openapi${specExtension}` : options.specPath;
|
|
41
49
|
return (0, schematics_1.chain)([
|
|
42
50
|
(0, schematics_1.externalSchematic)('@ama-sdk/schematics', 'typescript-shell', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":";;;AAAA,2DAA8L;AAC9L,kCAAkC;AAClC,gDAQyB;AAEzB,+CAA0D;AAC1D,+CAA0D;AAC1D,uEAA8D;AAC9D,yEAAqE;AACrE,4DAA4F;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"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"}
|