@o3r/styling 12.3.7 → 12.3.8
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": "12.3.
|
|
3
|
+
"version": "12.3.8",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -38,11 +38,11 @@
|
|
|
38
38
|
"@angular/common": "^19.0.0",
|
|
39
39
|
"@angular/core": "^19.0.0",
|
|
40
40
|
"@angular/material": "^19.0.0",
|
|
41
|
-
"@o3r/core": "^12.3.
|
|
42
|
-
"@o3r/dynamic-content": "^12.3.
|
|
43
|
-
"@o3r/extractors": "^12.3.
|
|
44
|
-
"@o3r/logger": "^12.3.
|
|
45
|
-
"@o3r/schematics": "^12.3.
|
|
41
|
+
"@o3r/core": "^12.3.8",
|
|
42
|
+
"@o3r/dynamic-content": "^12.3.8",
|
|
43
|
+
"@o3r/extractors": "^12.3.8",
|
|
44
|
+
"@o3r/logger": "^12.3.8",
|
|
45
|
+
"@o3r/schematics": "^12.3.8",
|
|
46
46
|
"@schematics/angular": "^19.0.0",
|
|
47
47
|
"@yarnpkg/cli": "^4.3.1",
|
|
48
48
|
"@yarnpkg/core": "^4.1.1",
|
|
@@ -56,6 +56,7 @@
|
|
|
56
56
|
"sass-embedded": "^1.81.0",
|
|
57
57
|
"semver": "^7.5.2",
|
|
58
58
|
"ts-node": "~10.9.2",
|
|
59
|
+
"type-fest": "^4.30.1",
|
|
59
60
|
"typescript": "^5.5.4"
|
|
60
61
|
},
|
|
61
62
|
"peerDependenciesMeta": {
|
|
@@ -122,12 +123,15 @@
|
|
|
122
123
|
"semver": {
|
|
123
124
|
"optional": true
|
|
124
125
|
},
|
|
126
|
+
"type-fest": {
|
|
127
|
+
"optional": true
|
|
128
|
+
},
|
|
125
129
|
"typescript": {
|
|
126
130
|
"optional": true
|
|
127
131
|
}
|
|
128
132
|
},
|
|
129
133
|
"dependencies": {
|
|
130
|
-
"@o3r/schematics": "^12.3.
|
|
134
|
+
"@o3r/schematics": "^12.3.8",
|
|
131
135
|
"tslib": "^2.6.2"
|
|
132
136
|
},
|
|
133
137
|
"generatorDependencies": {
|
|
@@ -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;AAqBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAqFlB;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
|
|
@@ -6,14 +6,24 @@ const path = require("node:path");
|
|
|
6
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
7
|
const schematics_2 = require("@o3r/schematics");
|
|
8
8
|
const cms_adapter_1 = require("../cms-adapter");
|
|
9
|
+
/**
|
|
10
|
+
* List of external dependencies to be added to the project as peer dependencies
|
|
11
|
+
*/
|
|
12
|
+
const dependenciesToInstall = [
|
|
13
|
+
'@angular/common',
|
|
14
|
+
'@angular/core',
|
|
15
|
+
'@angular/cdk',
|
|
16
|
+
'@angular/material'
|
|
17
|
+
];
|
|
18
|
+
/**
|
|
19
|
+
* List of external dependencies to be added to the project as dev dependencies
|
|
20
|
+
*/
|
|
9
21
|
const devDependenciesToInstall = [
|
|
22
|
+
'@angular-devkit/schematics',
|
|
23
|
+
'@schematics/angular',
|
|
10
24
|
'chokidar',
|
|
11
25
|
'sass-loader'
|
|
12
26
|
];
|
|
13
|
-
const dependenciesToInstall = [
|
|
14
|
-
'@angular/material',
|
|
15
|
-
'@angular/cdk'
|
|
16
|
-
];
|
|
17
27
|
/**
|
|
18
28
|
* Add Otter styling to an Angular Project
|
|
19
29
|
* Update the styling if the app/lib used otter v7
|
|
@@ -24,12 +34,13 @@ function ngAddFn(options) {
|
|
|
24
34
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
25
35
|
options = { ...(0, schematics_2.getDefaultOptionsForSchematic)((0, schematics_2.getWorkspaceConfig)(tree), '@o3r/styling', 'ng-add', options), ...options };
|
|
26
36
|
const { updateThemeFiles, removeV7OtterAssetsInAngularJson } = await Promise.resolve().then(() => require('./theme-files'));
|
|
27
|
-
const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
|
|
28
37
|
const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
|
|
29
38
|
if (options.enableMetadataExtract) {
|
|
30
39
|
depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
|
|
31
40
|
}
|
|
32
41
|
const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
|
|
42
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
43
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
33
44
|
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
34
45
|
acc[dep] = {
|
|
35
46
|
inManifest: [{
|
|
@@ -40,24 +51,13 @@ function ngAddFn(options) {
|
|
|
40
51
|
};
|
|
41
52
|
return acc;
|
|
42
53
|
}, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
};
|
|
51
|
-
});
|
|
52
|
-
Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesToInstall, packageJsonPath, context.logger))
|
|
53
|
-
.forEach(([dep, range]) => {
|
|
54
|
-
dependencies[dep] = {
|
|
55
|
-
inManifest: [{
|
|
56
|
-
range,
|
|
57
|
-
types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
|
|
58
|
-
}]
|
|
59
|
-
};
|
|
60
|
-
});
|
|
54
|
+
const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
|
|
55
|
+
devDependenciesToInstall,
|
|
56
|
+
dependenciesToInstall,
|
|
57
|
+
projectType: workspaceProject?.projectType,
|
|
58
|
+
projectPackageJson,
|
|
59
|
+
o3rPackageJsonPath: packageJsonPath
|
|
60
|
+
}, context.logger);
|
|
61
61
|
const schematicsDefaultOptions = {
|
|
62
62
|
useOtterTheming: undefined
|
|
63
63
|
};
|
|
@@ -68,7 +68,10 @@ function ngAddFn(options) {
|
|
|
68
68
|
removeV7OtterAssetsInAngularJson(options),
|
|
69
69
|
(0, schematics_2.setupDependencies)({
|
|
70
70
|
projectName: options.projectName,
|
|
71
|
-
dependencies
|
|
71
|
+
dependencies: {
|
|
72
|
+
...dependencies,
|
|
73
|
+
...externalDependenciesInfo
|
|
74
|
+
},
|
|
72
75
|
ngAddToRun: depsInfo.o3rPeerDeps
|
|
73
76
|
}),
|
|
74
77
|
(0, schematics_2.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;AACpC,gDAayB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|