@o3r/core 12.0.0-next.21 → 12.0.0-next.23
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 +4 -4
- package/schematics/ng-add-create/index.d.ts.map +1 -1
- package/schematics/ng-add-create/index.js +2 -3
- package/schematics/ng-add-create/index.js.map +1 -1
- package/schematics/ng-add-create/templates/schematics/ng-add/index.ts.template +8 -7
- package/schematics/rule-factories/otter-environment/index.d.ts.map +1 -1
- package/schematics/rule-factories/otter-environment/index.js +10 -5
- package/schematics/rule-factories/otter-environment/index.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/core",
|
|
3
|
-
"version": "12.0.0-next.
|
|
3
|
+
"version": "12.0.0-next.23",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"@ngrx/entity": "^19.0.0",
|
|
26
26
|
"@ngrx/store": "^19.0.0",
|
|
27
27
|
"@nx/angular": "~20.2.0",
|
|
28
|
-
"@o3r/telemetry": "^12.0.0-next.
|
|
28
|
+
"@o3r/telemetry": "^12.0.0-next.23",
|
|
29
29
|
"@schematics/angular": "^19.0.0",
|
|
30
30
|
"chokidar": "^4.0.3",
|
|
31
31
|
"globby": "^11.1.0",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
}
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@o3r/schematics": "^12.0.0-next.
|
|
67
|
+
"@o3r/schematics": "^12.0.0-next.23",
|
|
68
68
|
"tslib": "^2.6.2",
|
|
69
69
|
"uuid": "^11.0.5"
|
|
70
70
|
},
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"@ngrx/store": "~19.0.0",
|
|
78
78
|
"@ngrx/store-devtools": "~19.0.0",
|
|
79
79
|
"@nx/eslint-plugin": "~20.2.0",
|
|
80
|
-
"@o3r/store-sync": "^12.0.0-next.
|
|
80
|
+
"@o3r/store-sync": "^12.0.0-next.23",
|
|
81
81
|
"@stylistic/eslint-plugin": "~3.0.0",
|
|
82
82
|
"@types/jest": "~29.5.2",
|
|
83
83
|
"@typescript-eslint/eslint-plugin": "~8.21.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add-create/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EACL,gCAAgC,EACjC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add-create/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EACL,gCAAgC,EACjC,MAAM,UAAU,CAAC;AA4DlB;;;GAGG;AACH,eAAO,MAAM,eAAe,qDAA2D,CAAC;AAYxF;;;GAGG;AACH,eAAO,MAAM,WAAW,qDAAuD,CAAC"}
|
|
@@ -25,10 +25,9 @@ function updateTemplatesFn(options) {
|
|
|
25
25
|
// prepare needed deps for schematics
|
|
26
26
|
const angularVersion = packageJson.devDependencies?.['@angular/cli'] || packageJson.devDependencies?.['@angular/core'];
|
|
27
27
|
const otterVersion = o3rCorePackageJson.dependencies['@o3r/schematics'];
|
|
28
|
-
const
|
|
28
|
+
const exec = (0, schematics_2.getPackageManagerExecutor)();
|
|
29
29
|
packageJson.scripts ||= {};
|
|
30
|
-
|
|
31
|
-
packageJson.scripts['build:schematics'] = `tsc -b tsconfig.builders.json --pretty && ${packageManagerRunner} cpy 'schematics/**/*.json' dist/schematics && ${packageManagerRunner} cpy 'collection.json' dist`;
|
|
30
|
+
packageJson.scripts['build:schematics'] = `tsc -b tsconfig.builders.json --pretty && ${exec} cpy 'schematics/**/*.json' dist/schematics && ${exec} cpy collection.json dist`;
|
|
32
31
|
packageJson.schematics = './collection.json';
|
|
33
32
|
packageJson.peerDependencies ||= {};
|
|
34
33
|
packageJson.peerDependencies['@angular-devkit/schematics'] = angularVersion;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add-create/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAYoC;AACpC,gDAIyB;AAQzB;;;GAGG;AACH,SAAS,iBAAiB,CAAC,OAAyC;IAClE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC3E,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAEpE,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,mBAAmB;QACnB,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,MAAM,WAAW,GAAgB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpF,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;gBACtG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAC;gBAC5F,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;YACnF,MAAM,kBAAkB,GAAqE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5J,qCAAqC;YACrC,MAAM,cAAc,GAAG,WAAW,CAAC,eAAe,EAAE,CAAC,cAAc,CAAC,IAAI,WAAW,CAAC,eAAe,EAAE,CAAC,eAAe,CAAC,CAAC;YACvH,MAAM,YAAY,GAAG,kBAAkB,CAAC,YAAa,CAAC,iBAAiB,CAAC,CAAC;YACzE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add-create/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import { chain, noop, Rule } from '@angular-devkit/schematics';
|
|
2
2
|
import type { NgAddSchematicsSchema } from './schema';
|
|
3
|
+
import * as fs from 'node:fs';
|
|
3
4
|
import * as path from 'node:path';
|
|
4
|
-
import type { DependencyToAdd } from '@o3r/schematics';
|
|
5
5
|
|
|
6
6
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
7
7
|
|
|
8
|
-
const doCustomAction: Rule = (tree
|
|
8
|
+
const doCustomAction: Rule = (tree) => {
|
|
9
9
|
// your custom code here
|
|
10
10
|
return tree;
|
|
11
11
|
};
|
|
12
12
|
|
|
13
|
-
const dependenciesToInstall = [
|
|
13
|
+
const dependenciesToInstall: string[] = [
|
|
14
14
|
// Add the dependencies to install here
|
|
15
15
|
];
|
|
16
16
|
|
|
17
|
-
const dependenciesToNgAdd = [
|
|
17
|
+
const dependenciesToNgAdd: string[] = [
|
|
18
18
|
// Add the dependencies to install with NgAdd here
|
|
19
19
|
];
|
|
20
20
|
|
|
@@ -31,11 +31,12 @@ Otherwise, use the error message as guidance.`);
|
|
|
31
31
|
* @param options
|
|
32
32
|
*/
|
|
33
33
|
function ngAddFn(options: NgAddSchematicsSchema): Rule {
|
|
34
|
-
return async (tree
|
|
34
|
+
return async (tree) => {
|
|
35
35
|
// use dynamic import to properly raise an exception if it is not an Otter project.
|
|
36
|
-
const { getProjectNewDependenciesTypes, getPackageInstallConfig, applyEsLintFix,
|
|
36
|
+
const { getProjectNewDependenciesTypes, getPackageInstallConfig, applyEsLintFix, getWorkspaceConfig, setupDependencies } = await import('@o3r/schematics');
|
|
37
37
|
// current package version
|
|
38
|
-
const version = JSON.
|
|
38
|
+
const version = JSON.parse(fs.readFileSync(packageJsonPath, {encoding: 'utf8'})).version;
|
|
39
|
+
const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
|
|
39
40
|
const dependencies = [...dependenciesToInstall, ...dependenciesToNgAdd].reduce((acc, dep) => {
|
|
40
41
|
acc[dep] = {
|
|
41
42
|
inManifest: [{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AA8BpC;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE;IACP,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,EACD,SAAS,EAAE,MAAM,GAChB,IAAI,CAqHN"}
|
|
@@ -7,12 +7,17 @@ const schematics_2 = require("@o3r/schematics");
|
|
|
7
7
|
const index_1 = require("@schematics/angular/environments/index");
|
|
8
8
|
const ts = require("typescript");
|
|
9
9
|
const editTsConfigJson = (tree) => {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
const tsConfigPath = '/tsconfig.json';
|
|
11
|
+
if (tree.exists(tsConfigPath)) {
|
|
12
|
+
const tsConfig = ts.parseConfigFileTextToJson(tsConfigPath, tree.readText(tsConfigPath)).config;
|
|
13
|
+
if (tsConfig.compilerOptions) {
|
|
14
|
+
if (tsConfig.compilerOptions.noPropertyAccessFromIndexSignature) {
|
|
15
|
+
delete tsConfig.compilerOptions.noPropertyAccessFromIndexSignature;
|
|
16
|
+
}
|
|
17
|
+
tsConfig.compilerOptions.moduleResolution = 'node';
|
|
18
|
+
tsConfig.compilerOptions.declaration = true;
|
|
14
19
|
}
|
|
15
|
-
tree.overwrite(
|
|
20
|
+
tree.overwrite(tsConfigPath, JSON.stringify(tsConfig, null, 2));
|
|
16
21
|
}
|
|
17
22
|
return tree;
|
|
18
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"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"}
|