@o3r/components 10.2.0-prerelease.13 → 10.2.0-prerelease.15
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/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +56 -57
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/components",
|
|
3
|
-
"version": "10.2.0-prerelease.
|
|
3
|
+
"version": "10.2.0-prerelease.15",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -43,16 +43,16 @@
|
|
|
43
43
|
"@ngrx/effects": "~17.1.0",
|
|
44
44
|
"@ngrx/entity": "~17.1.0",
|
|
45
45
|
"@ngrx/store": "~17.1.0",
|
|
46
|
-
"@o3r/analytics": "^10.2.0-prerelease.
|
|
47
|
-
"@o3r/configuration": "^10.2.0-prerelease.
|
|
48
|
-
"@o3r/core": "^10.2.0-prerelease.
|
|
49
|
-
"@o3r/dynamic-content": "^10.2.0-prerelease.
|
|
50
|
-
"@o3r/extractors": "^10.2.0-prerelease.
|
|
51
|
-
"@o3r/localization": "^10.2.0-prerelease.
|
|
52
|
-
"@o3r/logger": "^10.2.0-prerelease.
|
|
53
|
-
"@o3r/rules-engine": "^10.2.0-prerelease.
|
|
54
|
-
"@o3r/schematics": "^10.2.0-prerelease.
|
|
55
|
-
"@o3r/testing": "^10.2.0-prerelease.
|
|
46
|
+
"@o3r/analytics": "^10.2.0-prerelease.15",
|
|
47
|
+
"@o3r/configuration": "^10.2.0-prerelease.15",
|
|
48
|
+
"@o3r/core": "^10.2.0-prerelease.15",
|
|
49
|
+
"@o3r/dynamic-content": "^10.2.0-prerelease.15",
|
|
50
|
+
"@o3r/extractors": "^10.2.0-prerelease.15",
|
|
51
|
+
"@o3r/localization": "^10.2.0-prerelease.15",
|
|
52
|
+
"@o3r/logger": "^10.2.0-prerelease.15",
|
|
53
|
+
"@o3r/rules-engine": "^10.2.0-prerelease.15",
|
|
54
|
+
"@o3r/schematics": "^10.2.0-prerelease.15",
|
|
55
|
+
"@o3r/testing": "^10.2.0-prerelease.15",
|
|
56
56
|
"@schematics/angular": "~17.2.0",
|
|
57
57
|
"chokidar": "^3.5.2",
|
|
58
58
|
"globby": "^11.1.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAIjF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA+EtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}
|
|
@@ -3,12 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ngAdd = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
|
-
const schematics_2 = require("@o3r/schematics");
|
|
7
6
|
const path = tslib_1.__importStar(require("node:path"));
|
|
8
7
|
const fs = tslib_1.__importStar(require("node:fs"));
|
|
9
8
|
const cms_adapter_1 = require("../cms-adapter");
|
|
10
9
|
const devtools_registration_1 = require("./helpers/devtools-registration");
|
|
11
|
-
const
|
|
10
|
+
const reportMissingSchematicsDep = (logger) => (reason) => {
|
|
11
|
+
logger.error(`[ERROR]: Adding @o3r/components has failed.
|
|
12
|
+
If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the components package. Please run 'ng add @o3r/core' .
|
|
13
|
+
Otherwise, use the error message as guidance.`);
|
|
14
|
+
throw reason;
|
|
15
|
+
};
|
|
12
16
|
/**
|
|
13
17
|
* Add Otter components to an Angular Project
|
|
14
18
|
* @param options
|
|
@@ -16,66 +20,61 @@ const schematics_3 = require("@o3r/schematics");
|
|
|
16
20
|
function ngAddFn(options) {
|
|
17
21
|
/* ng add rules */
|
|
18
22
|
return async (tree, context) => {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
|
|
29
|
-
}
|
|
30
|
-
const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
|
|
31
|
-
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
32
|
-
acc[dep] = {
|
|
33
|
-
inManifest: [{
|
|
34
|
-
range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
|
|
35
|
-
types: getProjectNewDependenciesTypes(workspaceProject)
|
|
36
|
-
}],
|
|
37
|
-
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
38
|
-
};
|
|
39
|
-
return acc;
|
|
40
|
-
}, (0, schematics_3.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
|
|
41
|
-
const devDependencies = {
|
|
42
|
-
chokidar: {
|
|
43
|
-
inManifest: [{
|
|
44
|
-
range: packageJson.peerDependencies.chokidar,
|
|
45
|
-
types: [NodeDependencyType.Dev]
|
|
46
|
-
}]
|
|
47
|
-
}
|
|
48
|
-
};
|
|
49
|
-
const rule = (0, schematics_1.chain)([
|
|
50
|
-
removePackages(['@otter/components']),
|
|
51
|
-
setupDependencies({
|
|
52
|
-
projectName: options.projectName,
|
|
53
|
-
dependencies: {
|
|
54
|
-
...dependencies,
|
|
55
|
-
...devDependencies
|
|
56
|
-
},
|
|
57
|
-
ngAddToRun: depsInfo.o3rPeerDeps
|
|
58
|
-
}),
|
|
59
|
-
registerPackageCollectionSchematics(packageJson),
|
|
60
|
-
...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
|
|
61
|
-
await (0, devtools_registration_1.registerDevtools)(options)
|
|
62
|
-
]);
|
|
63
|
-
context.logger.info(`The package ${depsInfo.packageName} comes with a debug mechanism`);
|
|
64
|
-
context.logger.info('Get more information on the following page: https://github.com/AmadeusITGroup/otter/tree/main/docs/components/COMPONENT_STRUCTURE.md#Runtime-debugging');
|
|
65
|
-
return () => rule(tree, context);
|
|
66
|
-
}
|
|
67
|
-
catch (e) {
|
|
68
|
-
// components needs o3r/core as peer dep. o3r/core will install o3r/schematics
|
|
69
|
-
context.logger.error(`[ERROR]: Adding @o3r/components has failed.
|
|
70
|
-
If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the components package. Please run 'ng add @o3r/core' .
|
|
71
|
-
Otherwise, use the error message as guidance.`);
|
|
72
|
-
throw (e);
|
|
23
|
+
const { getDefaultOptionsForSchematic, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, setupDependencies, removePackages, registerPackageCollectionSchematics, getPackageInstallConfig } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics')));
|
|
24
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
25
|
+
const { NodeDependencyType } = await Promise.resolve().then(() => tslib_1.__importStar(require('@schematics/angular/utility/dependencies')));
|
|
26
|
+
options = { ...getDefaultOptionsForSchematic(getWorkspaceConfig(tree), '@o3r/components', 'ng-add', options), ...options };
|
|
27
|
+
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
28
|
+
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf-8' }));
|
|
29
|
+
const depsInfo = getO3rPeerDeps(packageJsonPath);
|
|
30
|
+
if (options.enableMetadataExtract) {
|
|
31
|
+
depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
|
|
73
32
|
}
|
|
33
|
+
const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
|
|
34
|
+
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
35
|
+
acc[dep] = {
|
|
36
|
+
inManifest: [{
|
|
37
|
+
range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
|
|
38
|
+
types: getProjectNewDependenciesTypes(workspaceProject)
|
|
39
|
+
}],
|
|
40
|
+
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
41
|
+
};
|
|
42
|
+
return acc;
|
|
43
|
+
}, getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
|
|
44
|
+
const devDependencies = {
|
|
45
|
+
chokidar: {
|
|
46
|
+
inManifest: [{
|
|
47
|
+
range: packageJson.peerDependencies.chokidar,
|
|
48
|
+
types: [NodeDependencyType.Dev]
|
|
49
|
+
}]
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
const rule = (0, schematics_1.chain)([
|
|
53
|
+
removePackages(['@otter/components']),
|
|
54
|
+
setupDependencies({
|
|
55
|
+
projectName: options.projectName,
|
|
56
|
+
dependencies: {
|
|
57
|
+
...dependencies,
|
|
58
|
+
...devDependencies
|
|
59
|
+
},
|
|
60
|
+
ngAddToRun: depsInfo.o3rPeerDeps
|
|
61
|
+
}),
|
|
62
|
+
registerPackageCollectionSchematics(packageJson),
|
|
63
|
+
...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
|
|
64
|
+
await (0, devtools_registration_1.registerDevtools)(options)
|
|
65
|
+
]);
|
|
66
|
+
context.logger.info(`The package ${depsInfo.packageName} comes with a debug mechanism`);
|
|
67
|
+
context.logger.info('Get more information on the following page: https://github.com/AmadeusITGroup/otter/tree/main/docs/components/COMPONENT_STRUCTURE.md#Runtime-debugging');
|
|
68
|
+
return () => rule(tree, context);
|
|
74
69
|
};
|
|
75
70
|
}
|
|
76
71
|
/**
|
|
77
72
|
* Add Otter components to an Angular Project
|
|
78
73
|
* @param options
|
|
79
74
|
*/
|
|
80
|
-
|
|
75
|
+
const ngAdd = (options) => async (_, { logger }) => {
|
|
76
|
+
const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics'))).catch(reportMissingSchematicsDep(logger));
|
|
77
|
+
return createSchematicWithMetricsIfInstalled(ngAddFn)(options);
|
|
78
|
+
};
|
|
79
|
+
exports.ngAdd = ngAdd;
|
|
81
80
|
//# sourceMappingURL=index.js.map
|