@o3r/application 10.0.0-next.14 → 10.0.0-next.17
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/README.md +1 -1
- package/package.json +8 -8
- package/schematics/ng-add/helpers/devtools-registration.d.ts +10 -0
- package/schematics/ng-add/helpers/devtools-registration.d.ts.map +1 -0
- package/schematics/ng-add/helpers/devtools-registration.js +24 -0
- package/schematics/ng-add/helpers/devtools-registration.js.map +1 -0
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +8 -4
- package/schematics/ng-add/index.js.map +1 -1
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<h1 align="center">Otter application</h1>
|
|
2
2
|
<p align="center">
|
|
3
|
-
<img src="https://raw.githubusercontent.com/AmadeusITGroup/otter/main
|
|
3
|
+
<img src="https://raw.githubusercontent.com/AmadeusITGroup/otter/main/assets/logo/otter.png" alt="Super cute Otter!" width="40%"/>
|
|
4
4
|
</p>
|
|
5
5
|
|
|
6
6
|
This package is an [Otter Framework Module](https://github.com/AmadeusITGroup/otter/tree/main/docs/core/MODULE.md).
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/application",
|
|
3
|
-
"version": "10.0.0-next.
|
|
3
|
+
"version": "10.0.0-next.17",
|
|
4
4
|
"description": "This module provides development help to monitor your Otter Application",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"application",
|
|
@@ -25,12 +25,12 @@
|
|
|
25
25
|
"@angular-devkit/schematics": "~16.2.0",
|
|
26
26
|
"@angular/common": "~16.2.0",
|
|
27
27
|
"@angular/core": "~16.2.0",
|
|
28
|
-
"@o3r/core": "^10.0.0-next.
|
|
29
|
-
"@o3r/dev-tools": "^10.0.0-next.
|
|
30
|
-
"@o3r/logger": "^10.0.0-next.
|
|
31
|
-
"@o3r/routing": "^10.0.0-next.
|
|
32
|
-
"@o3r/schematics": "^10.0.0-next.
|
|
33
|
-
"@o3r/testing": "^10.0.0-next.
|
|
28
|
+
"@o3r/core": "^10.0.0-next.17",
|
|
29
|
+
"@o3r/dev-tools": "^10.0.0-next.17",
|
|
30
|
+
"@o3r/logger": "^10.0.0-next.17",
|
|
31
|
+
"@o3r/routing": "^10.0.0-next.17",
|
|
32
|
+
"@o3r/schematics": "^10.0.0-next.17",
|
|
33
|
+
"@o3r/testing": "^10.0.0-next.17",
|
|
34
34
|
"@schematics/angular": "~16.2.0",
|
|
35
35
|
"rxjs": "^7.8.1",
|
|
36
36
|
"typescript": "~5.1.6"
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"tslib": "^2.5.3"
|
|
51
51
|
},
|
|
52
52
|
"engines": {
|
|
53
|
-
"node": ">=
|
|
53
|
+
"node": ">=18.0.0"
|
|
54
54
|
},
|
|
55
55
|
"schematics": "./collection.json",
|
|
56
56
|
"module": "fesm2022/o3r-application.mjs",
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Rule } from '@angular-devkit/schematics';
|
|
2
|
+
import type { NgAddSchematicsSchema } from '../schema';
|
|
3
|
+
/**
|
|
4
|
+
* Register Devtools to the application
|
|
5
|
+
* @param tree
|
|
6
|
+
* @param context
|
|
7
|
+
* @param options
|
|
8
|
+
*/
|
|
9
|
+
export declare const registerDevtools: (options: NgAddSchematicsSchema) => Promise<Rule>;
|
|
10
|
+
//# sourceMappingURL=devtools-registration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"devtools-registration.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/devtools-registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAMvD;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,YAAmB,qBAAqB,KAAG,QAAQ,IAAI,CAQnF,CAAC"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.registerDevtools = void 0;
|
|
4
|
+
const path = require("node:path");
|
|
5
|
+
const DEVTOOL_MODULE_NAME = 'ApplicationDevtoolsModule';
|
|
6
|
+
const DEVTOOL_SERVICE_NAME = 'ApplicationDevtoolsService';
|
|
7
|
+
const PACKAGE_NAME = require(path.resolve(__dirname, '..', '..', '..', 'package.json')).name;
|
|
8
|
+
/**
|
|
9
|
+
* Register Devtools to the application
|
|
10
|
+
* @param tree
|
|
11
|
+
* @param context
|
|
12
|
+
* @param options
|
|
13
|
+
*/
|
|
14
|
+
const registerDevtools = async (options) => {
|
|
15
|
+
const { registerDevtoolsToApplication } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
16
|
+
return registerDevtoolsToApplication({
|
|
17
|
+
moduleName: DEVTOOL_MODULE_NAME,
|
|
18
|
+
packageName: PACKAGE_NAME,
|
|
19
|
+
serviceName: DEVTOOL_SERVICE_NAME,
|
|
20
|
+
projectName: options.projectName
|
|
21
|
+
});
|
|
22
|
+
};
|
|
23
|
+
exports.registerDevtools = registerDevtools;
|
|
24
|
+
//# sourceMappingURL=devtools-registration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"devtools-registration.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/devtools-registration.ts"],"names":[],"mappings":";;;AACA,kCAAkC;AAGlC,MAAM,mBAAmB,GAAG,2BAA2B,CAAC;AACxD,MAAM,oBAAoB,GAAG,4BAA4B,CAAC;AAC1D,MAAM,YAAY,GAAW,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC;AAErG;;;;;GAKG;AACI,MAAM,gBAAgB,GAAG,KAAK,EAAE,OAA8B,EAAiB,EAAE;IACtF,MAAM,EAAE,6BAA6B,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;IAC1E,OAAO,6BAA6B,CAAC;QACnC,UAAU,EAAE,mBAAmB;QAC/B,WAAW,EAAE,YAAY;QACzB,WAAW,EAAE,oBAAoB;QACjC,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC,CAAC;AACL,CAAC,CAAC;AARW,QAAA,gBAAgB,oBAQ3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAG/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAG/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAItD;;;GAGG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAmF1D"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ngAdd = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const path = require("node:path");
|
|
6
|
+
const devtools_registration_1 = require("./helpers/devtools-registration");
|
|
6
7
|
/**
|
|
7
8
|
* Add Otter application to an Angular Project
|
|
8
9
|
* @param options The options to pass to ng-add execution
|
|
@@ -11,11 +12,12 @@ function ngAdd(options) {
|
|
|
11
12
|
/* ng add rules */
|
|
12
13
|
return async (tree, context) => {
|
|
13
14
|
try {
|
|
14
|
-
const { addImportToModuleFile, getAppModuleFilePath,
|
|
15
|
+
const { addImportToModuleFile, getAppModuleFilePath, getWorkspaceConfig, insertImportToModuleFile, ngAddPackages, getO3rPeerDeps, getProjectNewDependenciesType } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
15
16
|
const { getDecoratorMetadata, isImported } = await Promise.resolve().then(() => require('@schematics/angular/utility/ast-utils'));
|
|
16
17
|
const ts = await Promise.resolve().then(() => require('typescript'));
|
|
17
18
|
const depsInfo = getO3rPeerDeps(path.resolve(__dirname, '..', '..', 'package.json'));
|
|
18
|
-
const
|
|
19
|
+
const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
|
|
20
|
+
const workingDirectory = workspaceProject?.root;
|
|
19
21
|
const addAngularAnimationPreferences = () => {
|
|
20
22
|
const moduleFilePath = getAppModuleFilePath(tree, context, options.projectName);
|
|
21
23
|
if (!moduleFilePath) {
|
|
@@ -35,7 +37,8 @@ function ngAdd(options) {
|
|
|
35
37
|
tree.commitUpdate(recorder);
|
|
36
38
|
return tree;
|
|
37
39
|
};
|
|
38
|
-
const dependencyType =
|
|
40
|
+
const dependencyType = getProjectNewDependenciesType(workspaceProject);
|
|
41
|
+
const registerDevtoolRule = await (0, devtools_registration_1.registerDevtools)(options);
|
|
39
42
|
return () => (0, schematics_1.chain)([
|
|
40
43
|
ngAddPackages(depsInfo.o3rPeerDeps, {
|
|
41
44
|
skipConfirmation: true,
|
|
@@ -45,7 +48,8 @@ function ngAdd(options) {
|
|
|
45
48
|
dependencyType,
|
|
46
49
|
workingDirectory
|
|
47
50
|
}),
|
|
48
|
-
addAngularAnimationPreferences
|
|
51
|
+
addAngularAnimationPreferences,
|
|
52
|
+
registerDevtoolRule
|
|
49
53
|
])(tree, context);
|
|
50
54
|
}
|
|
51
55
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AACA,2DAAmD;AACnD,kCAAkC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|