@o3r/styling 11.6.14 → 11.6.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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/styling",
|
|
3
|
-
"version": "11.6.
|
|
3
|
+
"version": "11.6.15",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -40,11 +40,11 @@
|
|
|
40
40
|
"@angular/common": "^18.2.0",
|
|
41
41
|
"@angular/core": "^18.2.0",
|
|
42
42
|
"@angular/material": "^18.2.0",
|
|
43
|
-
"@o3r/core": "^11.6.
|
|
44
|
-
"@o3r/dynamic-content": "^11.6.
|
|
45
|
-
"@o3r/extractors": "^11.6.
|
|
46
|
-
"@o3r/logger": "^11.6.
|
|
47
|
-
"@o3r/schematics": "^11.6.
|
|
43
|
+
"@o3r/core": "^11.6.15",
|
|
44
|
+
"@o3r/dynamic-content": "^11.6.15",
|
|
45
|
+
"@o3r/extractors": "^11.6.15",
|
|
46
|
+
"@o3r/logger": "^11.6.15",
|
|
47
|
+
"@o3r/schematics": "^11.6.15",
|
|
48
48
|
"@schematics/angular": "^18.2.0",
|
|
49
49
|
"@yarnpkg/cli": "^4.3.1",
|
|
50
50
|
"@yarnpkg/core": "^4.1.1",
|
|
@@ -57,6 +57,7 @@
|
|
|
57
57
|
"sass": "^1.81.0",
|
|
58
58
|
"sass-embedded": "^1.81.0",
|
|
59
59
|
"semver": "^7.5.2",
|
|
60
|
+
"type-fest": "^4.30.1",
|
|
60
61
|
"typescript": "^5.5.4"
|
|
61
62
|
},
|
|
62
63
|
"peerDependenciesMeta": {
|
|
@@ -123,6 +124,9 @@
|
|
|
123
124
|
"semver": {
|
|
124
125
|
"optional": true
|
|
125
126
|
},
|
|
127
|
+
"type-fest": {
|
|
128
|
+
"optional": true
|
|
129
|
+
},
|
|
126
130
|
"typescript": {
|
|
127
131
|
"optional": true
|
|
128
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAuGlB;;;;GAIG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}
|
|
@@ -5,14 +5,22 @@ const fs = require("node:fs");
|
|
|
5
5
|
const path = require("node:path");
|
|
6
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
7
|
const cms_adapter_1 = require("../cms-adapter");
|
|
8
|
+
/**
|
|
9
|
+
* List of external dependencies to be added to the project as peer dependencies
|
|
10
|
+
*/
|
|
11
|
+
const dependenciesToInstall = [
|
|
12
|
+
'@angular/cdk',
|
|
13
|
+
'@angular/material'
|
|
14
|
+
];
|
|
15
|
+
/**
|
|
16
|
+
* List of external dependencies to be added to the project as dev dependencies
|
|
17
|
+
*/
|
|
8
18
|
const devDependenciesToInstall = [
|
|
19
|
+
'@angular-devkit/schematics',
|
|
20
|
+
'@schematics/angular',
|
|
9
21
|
'chokidar',
|
|
10
22
|
'sass-loader'
|
|
11
23
|
];
|
|
12
|
-
const dependenciesToInstall = [
|
|
13
|
-
'@angular/material',
|
|
14
|
-
'@angular/cdk'
|
|
15
|
-
];
|
|
16
24
|
const reportMissingSchematicsDep = (logger) => (reason) => {
|
|
17
25
|
logger.error(`[ERROR]: Adding @o3r/styling has failed.
|
|
18
26
|
If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the styling package. Please run 'ng add @o3r/core' .
|
|
@@ -27,15 +35,16 @@ Otherwise, use the error message as guidance.`);
|
|
|
27
35
|
function ngAddFn(options) {
|
|
28
36
|
return async (tree, context) => {
|
|
29
37
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
30
|
-
const { getDefaultOptionsForSchematic, getPackageInstallConfig, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, setupDependencies, removePackages, registerPackageCollectionSchematics, setupSchematicsParamsForProject, updateSassImports,
|
|
38
|
+
const { getDefaultOptionsForSchematic, getPackageInstallConfig, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, setupDependencies, removePackages, registerPackageCollectionSchematics, setupSchematicsParamsForProject, updateSassImports, getExternalDependenciesInfo } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
31
39
|
options = { ...getDefaultOptionsForSchematic(getWorkspaceConfig(tree), '@o3r/styling', 'ng-add', options), ...options };
|
|
32
40
|
const { updateThemeFiles, removeV7OtterAssetsInAngularJson } = await Promise.resolve().then(() => require('./theme-files'));
|
|
33
|
-
const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
|
|
34
41
|
const depsInfo = getO3rPeerDeps(packageJsonPath);
|
|
35
42
|
if (options.enableMetadataExtract) {
|
|
36
43
|
depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
|
|
37
44
|
}
|
|
38
45
|
const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
|
|
46
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
47
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
39
48
|
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
40
49
|
acc[dep] = {
|
|
41
50
|
inManifest: [{
|
|
@@ -46,24 +55,13 @@ function ngAddFn(options) {
|
|
|
46
55
|
};
|
|
47
56
|
return acc;
|
|
48
57
|
}, getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
};
|
|
57
|
-
});
|
|
58
|
-
Object.entries(getExternalDependenciesVersionRange(dependenciesToInstall, packageJsonPath, context.logger))
|
|
59
|
-
.forEach(([dep, range]) => {
|
|
60
|
-
dependencies[dep] = {
|
|
61
|
-
inManifest: [{
|
|
62
|
-
range,
|
|
63
|
-
types: getProjectNewDependenciesTypes(workspaceProject)
|
|
64
|
-
}]
|
|
65
|
-
};
|
|
66
|
-
});
|
|
58
|
+
const externalDependenciesInfo = getExternalDependenciesInfo({
|
|
59
|
+
devDependenciesToInstall,
|
|
60
|
+
dependenciesToInstall,
|
|
61
|
+
projectType: workspaceProject?.projectType,
|
|
62
|
+
projectPackageJson,
|
|
63
|
+
o3rPackageJsonPath: packageJsonPath
|
|
64
|
+
}, context.logger);
|
|
67
65
|
const schematicsDefaultOptions = {
|
|
68
66
|
useOtterTheming: undefined
|
|
69
67
|
};
|
|
@@ -74,7 +72,10 @@ function ngAddFn(options) {
|
|
|
74
72
|
removeV7OtterAssetsInAngularJson(options),
|
|
75
73
|
setupDependencies({
|
|
76
74
|
projectName: options.projectName,
|
|
77
|
-
dependencies
|
|
75
|
+
dependencies: {
|
|
76
|
+
...dependencies,
|
|
77
|
+
...externalDependenciesInfo
|
|
78
|
+
},
|
|
78
79
|
ngAddToRun: depsInfo.o3rPeerDeps
|
|
79
80
|
}),
|
|
80
81
|
registerPackageCollectionSchematics(JSON.parse(fs.readFileSync(packageJsonPath).toString())),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAGoC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|