@o3r/workspace 13.0.0-next.28 → 13.0.0-next.31
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 +11 -11
- package/schematics/sdk/index.d.ts.map +1 -1
- package/schematics/sdk/index.js +12 -10
- package/schematics/sdk/index.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "13.0.0-next.
|
|
3
|
+
"version": "13.0.0-next.31",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -41,8 +41,8 @@
|
|
|
41
41
|
"@angular/common": "^20.0.0",
|
|
42
42
|
"@angular/compiler-cli": "^20.0.0",
|
|
43
43
|
"@angular/core": "^20.0.0",
|
|
44
|
-
"@o3r/schematics": "^13.0.0-next.
|
|
45
|
-
"@o3r/telemetry": "^13.0.0-next.
|
|
44
|
+
"@o3r/schematics": "^13.0.0-next.31",
|
|
45
|
+
"@o3r/telemetry": "^13.0.0-next.31",
|
|
46
46
|
"@schematics/angular": "^20.0.0",
|
|
47
47
|
"ts-node": "~10.9.2",
|
|
48
48
|
"type-fest": "^4.30.1",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
}
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@o3r/schematics": "^13.0.0-next.
|
|
66
|
+
"@o3r/schematics": "^13.0.0-next.31",
|
|
67
67
|
"commander": "^14.0.0",
|
|
68
68
|
"globby": "^11.1.0",
|
|
69
69
|
"semver": "^7.5.2",
|
|
@@ -96,11 +96,11 @@
|
|
|
96
96
|
"@nx/jest": "~21.3.11",
|
|
97
97
|
"@nx/js": "~21.3.11",
|
|
98
98
|
"@nx/workspace": "~21.3.11",
|
|
99
|
-
"@o3r/build-helpers": "^13.0.0-next.
|
|
100
|
-
"@o3r/core": "^13.0.0-next.
|
|
101
|
-
"@o3r/eslint-plugin": "^13.0.0-next.
|
|
102
|
-
"@o3r/telemetry": "^13.0.0-next.
|
|
103
|
-
"@o3r/test-helpers": "^13.0.0-next.
|
|
99
|
+
"@o3r/build-helpers": "^13.0.0-next.31",
|
|
100
|
+
"@o3r/core": "^13.0.0-next.31",
|
|
101
|
+
"@o3r/eslint-plugin": "^13.0.0-next.31",
|
|
102
|
+
"@o3r/telemetry": "^13.0.0-next.31",
|
|
103
|
+
"@o3r/test-helpers": "^13.0.0-next.31",
|
|
104
104
|
"@schematics/angular": "~20.0.0",
|
|
105
105
|
"@stylistic/eslint-plugin": "~5.2.0",
|
|
106
106
|
"@types/jest": "~29.5.2",
|
|
@@ -110,14 +110,14 @@
|
|
|
110
110
|
"@types/semver": "^7.3.13",
|
|
111
111
|
"@typescript-eslint/parser": "~8.39.0",
|
|
112
112
|
"angular-eslint": "~20.1.0",
|
|
113
|
-
"cpy-cli": "^
|
|
113
|
+
"cpy-cli": "^6.0.0",
|
|
114
114
|
"eslint": "~9.33.0",
|
|
115
115
|
"eslint-import-resolver-node": "~0.3.9",
|
|
116
116
|
"eslint-import-resolver-typescript": "~4.4.0",
|
|
117
117
|
"eslint-plugin-import": "~2.32.0",
|
|
118
118
|
"eslint-plugin-import-newlines": "~1.4.0",
|
|
119
119
|
"eslint-plugin-jest": "~29.0.0",
|
|
120
|
-
"eslint-plugin-jsdoc": "~
|
|
120
|
+
"eslint-plugin-jsdoc": "~54.1.0",
|
|
121
121
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
122
122
|
"eslint-plugin-unicorn": "~60.0.0",
|
|
123
123
|
"eslint-plugin-unused-imports": "~4.1.4",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"AAKA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"AAKA,OAAO,EASL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAqJpC;;;GAGG;AACH,eAAO,MAAM,WAAW,wBAAsC,CAAC"}
|
package/schematics/sdk/index.js
CHANGED
|
@@ -48,14 +48,16 @@ function generateSdkFn(options) {
|
|
|
48
48
|
const defaultRoot = (0, schematics_2.getPackagesBaseRootFolder)(tree, context, workspaceConfig, 'library');
|
|
49
49
|
/** Path to the folder where generate the new SDK */
|
|
50
50
|
const targetPath = path.posix.join(options.path || defaultRoot, cleanName);
|
|
51
|
-
const
|
|
52
|
-
(0, schematics_1.
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
51
|
+
const overrideFilesIfRootJestConfigUTExists = tree.exists('jest.config.ut.js')
|
|
52
|
+
? (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
|
|
53
|
+
(0, schematics_1.template)({
|
|
54
|
+
...options,
|
|
55
|
+
rootRelativePath: path.posix.relative(targetPath, tree.root.path.replace(/^\//, './'))
|
|
56
|
+
}),
|
|
57
|
+
(0, schematics_1.move)(targetPath),
|
|
58
|
+
(0, schematics_1.renameTemplateFiles)()
|
|
59
|
+
]), schematics_1.MergeStrategy.Overwrite)
|
|
60
|
+
: (0, schematics_1.noop)();
|
|
59
61
|
const packageManager = (0, schematics_2.getPackageManager)({ workspaceConfig });
|
|
60
62
|
const specExtension = options.specPackagePath ? path.extname(options.specPackagePath) : '.yaml';
|
|
61
63
|
// If spec path is relative to process.cwd, we need to make it relative to the project root
|
|
@@ -100,7 +102,7 @@ function generateSdkFn(options) {
|
|
|
100
102
|
isNx ? (0, rules_nx_1.nxRegisterProjectTasks)(options, targetPath, cleanName) : (0, rules_ng_1.ngRegisterProjectTasks)(options, targetPath, cleanName),
|
|
101
103
|
(0, update_ts_paths_rule_1.updateTsConfig)(targetPath, projectName, scope),
|
|
102
104
|
(0, clean_standalone_rule_1.cleanStandaloneFiles)(targetPath),
|
|
103
|
-
|
|
105
|
+
overrideFilesIfRootJestConfigUTExists,
|
|
104
106
|
(0, schematics_2.setupDependencies)({
|
|
105
107
|
dependencies,
|
|
106
108
|
skipInstall: options.skipInstall,
|
|
@@ -108,7 +110,7 @@ function generateSdkFn(options) {
|
|
|
108
110
|
projectName: cleanName,
|
|
109
111
|
runAfterTasks: sdkGenerationTasks
|
|
110
112
|
})
|
|
111
|
-
])
|
|
113
|
+
]);
|
|
112
114
|
};
|
|
113
115
|
}
|
|
114
116
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":";;;AAAA,qCAGiB;AACjB,kCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"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"}
|