@o3r/workspace 9.5.0-alpha.41 → 9.5.0-alpha.44
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": "9.5.0-alpha.
|
|
3
|
+
"version": "9.5.0-alpha.44",
|
|
4
4
|
"description": "Workspace tooling of the Otter Framework",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"workspace",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
}
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@o3r/schematics": "^9.5.0-alpha.
|
|
38
|
+
"@o3r/schematics": "^9.5.0-alpha.44",
|
|
39
39
|
"commander": "^11.0.0",
|
|
40
40
|
"globby": "^11.1.0",
|
|
41
41
|
"semver": "^7.5.2",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"winston": "^3.8.2"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@ama-sdk/schematics": "^9.5.0-alpha.
|
|
47
|
+
"@ama-sdk/schematics": "^9.5.0-alpha.44",
|
|
48
48
|
"@angular-devkit/architect": "~0.1602.0",
|
|
49
49
|
"@angular-devkit/build-angular": "~16.2.0",
|
|
50
50
|
"@angular-devkit/core": "~16.2.0",
|
|
@@ -66,12 +66,12 @@
|
|
|
66
66
|
"@nx/jest": "~16.10.0",
|
|
67
67
|
"@nx/js": "~16.10.0",
|
|
68
68
|
"@nx/linter": "~16.10.0",
|
|
69
|
-
"@o3r/build-helpers": "^9.5.0-alpha.
|
|
70
|
-
"@o3r/core": "^9.5.0-alpha.
|
|
71
|
-
"@o3r/dev-tools": "^9.5.0-alpha.
|
|
72
|
-
"@o3r/eslint-plugin": "^9.5.0-alpha.
|
|
73
|
-
"@o3r/schematics": "^9.5.0-alpha.
|
|
74
|
-
"@o3r/test-helpers": "^9.5.0-alpha.
|
|
69
|
+
"@o3r/build-helpers": "^9.5.0-alpha.44",
|
|
70
|
+
"@o3r/core": "^9.5.0-alpha.44",
|
|
71
|
+
"@o3r/dev-tools": "^9.5.0-alpha.44",
|
|
72
|
+
"@o3r/eslint-plugin": "^9.5.0-alpha.44",
|
|
73
|
+
"@o3r/schematics": "^9.5.0-alpha.44",
|
|
74
|
+
"@o3r/test-helpers": "^9.5.0-alpha.44",
|
|
75
75
|
"@schematics/angular": "~16.2.0",
|
|
76
76
|
"@types/jest": "~29.5.2",
|
|
77
77
|
"@types/minimist": "^1.2.2",
|
|
@@ -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;AAG9L,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAQ/C;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8F,IAAI,EAAkD,MAAM,4BAA4B,CAAC;AAG9L,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAQ/C;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CA4D9D"}
|
package/schematics/sdk/index.js
CHANGED
|
@@ -36,8 +36,6 @@ function generateSdk(options) {
|
|
|
36
36
|
(0, schematics_1.renameTemplateFiles)()
|
|
37
37
|
]), schematics_1.MergeStrategy.Overwrite);
|
|
38
38
|
const packageManager = (0, schematics_2.getPackageManager)({ workspaceConfig });
|
|
39
|
-
const yarnrcPath = '.yarnrc.yml';
|
|
40
|
-
const yarnrcBeforeSdkGeneration = tree.exists(yarnrcPath) ? tree.readText(yarnrcPath) : '';
|
|
41
39
|
return (0, schematics_1.chain)([
|
|
42
40
|
(0, schematics_1.externalSchematic)('@ama-sdk/schematics', 'typescript-shell', {
|
|
43
41
|
...options,
|
|
@@ -48,13 +46,10 @@ function generateSdk(options) {
|
|
|
48
46
|
skipInstall: !!options.specPath || options.skipInstall
|
|
49
47
|
}),
|
|
50
48
|
packageManager === 'yarn' ? (t) => {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
else {
|
|
56
|
-
// delete yarnrc created by sdk shell generator standalone
|
|
57
|
-
t.delete(yarnrcPath);
|
|
49
|
+
const yarnrcPath = path.posix.join(targetPath, '.yarnrc.yml');
|
|
50
|
+
// delete yarnrc created by sdk shell generator standalone
|
|
51
|
+
if (tree.exists(yarnrcPath)) {
|
|
52
|
+
tree.delete(yarnrcPath);
|
|
58
53
|
}
|
|
59
54
|
return t;
|
|
60
55
|
} : schematics_1.noop,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":";;;AAAA,2DAA8L;AAC9L,kCAAkC;AAClC,gDAA6H;AAG7H,+CAA0D;AAC1D,+CAA0D;AAC1D,uEAA8D;AAC9D,yEAAqE;AACrE,4DAA4F;AAE5F;;;GAGG;AACH,SAAgB,WAAW,CAAC,OAA4B;IACtD,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzE,MAAM,WAAW,GAAG,oBAAO,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7F,MAAM,SAAS,GAAG,oBAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE3F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,IAAA,wBAAW,EAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,eAAe,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,wBAAW,CAAC,uCAAuC,CAAC,CAAC;SAChE;QACD,MAAM,WAAW,GAAG,IAAA,sCAAyB,EAAC,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;QAEzF,oDAAoD;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,WAAW,EAAE,SAAS,CAAC,CAAC;QAE3E,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,aAAa,CAAC,EAAE;YACvE,IAAA,qBAAQ,EAAC;gBACP,GAAG,OAAO;gBACV,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;aACvF,CAAC;YACF,IAAA,iBAAI,EAAC,UAAU,CAAC;YAChB,IAAA,gCAAmB,GAAE;SACtB,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;QAE7B,MAAM,cAAc,GAAG,IAAA,8BAAiB,EAAC,EAAE,eAAe,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"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"}
|