@o3r/design 11.1.0-prerelease.39 → 11.1.0-prerelease.40
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/design",
|
|
3
|
-
"version": "11.1.0-prerelease.
|
|
3
|
+
"version": "11.1.0-prerelease.40",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -52,9 +52,9 @@
|
|
|
52
52
|
"tslib": "^2.6.2"
|
|
53
53
|
},
|
|
54
54
|
"peerDependencies": {
|
|
55
|
-
"@o3r/core": "^11.1.0-prerelease.
|
|
56
|
-
"@o3r/schematics": "^11.1.0-prerelease.
|
|
57
|
-
"@o3r/styling": "^11.1.0-prerelease.
|
|
55
|
+
"@o3r/core": "^11.1.0-prerelease.40",
|
|
56
|
+
"@o3r/schematics": "^11.1.0-prerelease.40",
|
|
57
|
+
"@o3r/styling": "^11.1.0-prerelease.40",
|
|
58
58
|
"chokidar": "^3.5.2",
|
|
59
59
|
"globby": "^11.1.0",
|
|
60
60
|
"sass": "~1.77.0"
|
|
@@ -100,12 +100,12 @@
|
|
|
100
100
|
"@nx/eslint-plugin": "~19.3.0",
|
|
101
101
|
"@nx/jest": "~19.3.0",
|
|
102
102
|
"@nx/js": "~19.3.0",
|
|
103
|
-
"@o3r/build-helpers": "^11.1.0-prerelease.
|
|
104
|
-
"@o3r/core": "^11.1.0-prerelease.
|
|
105
|
-
"@o3r/eslint-plugin": "^11.1.0-prerelease.
|
|
106
|
-
"@o3r/schematics": "^11.1.0-prerelease.
|
|
107
|
-
"@o3r/styling": "^11.1.0-prerelease.
|
|
108
|
-
"@o3r/test-helpers": "^11.1.0-prerelease.
|
|
103
|
+
"@o3r/build-helpers": "^11.1.0-prerelease.40",
|
|
104
|
+
"@o3r/core": "^11.1.0-prerelease.40",
|
|
105
|
+
"@o3r/eslint-plugin": "^11.1.0-prerelease.40",
|
|
106
|
+
"@o3r/schematics": "^11.1.0-prerelease.40",
|
|
107
|
+
"@o3r/styling": "^11.1.0-prerelease.40",
|
|
108
|
+
"@o3r/test-helpers": "^11.1.0-prerelease.40",
|
|
109
109
|
"@schematics/angular": "~18.0.0",
|
|
110
110
|
"@stylistic/eslint-plugin-ts": "^2.0.0",
|
|
111
111
|
"@types/jest": "~29.5.2",
|
|
@@ -11,15 +11,16 @@ const node_path_1 = require("node:path");
|
|
|
11
11
|
const registerGenerateCssBuilder = (projectName, taskName = 'generate-css') => {
|
|
12
12
|
const registerBuilderRule = async (tree, { logger }) => {
|
|
13
13
|
const { getWorkspaceConfig, registerBuilder } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const
|
|
14
|
+
const workspace = getWorkspaceConfig(tree);
|
|
15
|
+
const workspaceProject = projectName ? workspace?.projects[projectName] : undefined;
|
|
16
|
+
const srcBasePath = workspaceProject?.sourceRoot || (workspaceProject?.root ? node_path_1.posix.join(workspaceProject.root, 'src') : './src');
|
|
17
|
+
const themeFile = node_path_1.posix.join(srcBasePath, 'style', 'theme.scss');
|
|
17
18
|
const taskOptions = {
|
|
18
19
|
defaultStyleFile: themeFile,
|
|
19
20
|
renderPrivateVariableTo: 'sass',
|
|
20
21
|
designTokenFilePatterns: [
|
|
21
|
-
`${node_path_1.posix.
|
|
22
|
-
`${node_path_1.posix.
|
|
22
|
+
`${node_path_1.posix.join(srcBasePath, 'style', '*.json')}`,
|
|
23
|
+
`${node_path_1.posix.join(srcBasePath, '**', '*.theme.json')}`
|
|
23
24
|
]
|
|
24
25
|
};
|
|
25
26
|
const taskParameters = {
|
|
@@ -33,24 +34,24 @@ const registerGenerateCssBuilder = (projectName, taskName = 'generate-css') => {
|
|
|
33
34
|
return;
|
|
34
35
|
}
|
|
35
36
|
registerBuilder(workspaceProject, taskName, taskParameters);
|
|
37
|
+
tree.overwrite('/angular.json', JSON.stringify(workspace, null, 2));
|
|
36
38
|
};
|
|
37
39
|
const generateTemplateRule = async (tree) => {
|
|
38
40
|
const { getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
39
41
|
const workspaceProject = projectName ? getWorkspaceConfig(tree)?.projects[projectName] : undefined;
|
|
40
|
-
const srcBasePath = workspaceProject?.sourceRoot || (workspaceProject?.root ? node_path_1.posix.
|
|
41
|
-
const themeFolder = node_path_1.posix.
|
|
42
|
-
|
|
42
|
+
const srcBasePath = workspaceProject?.sourceRoot || (workspaceProject?.root ? node_path_1.posix.join(workspaceProject.root, 'src') : './src');
|
|
43
|
+
const themeFolder = node_path_1.posix.join(srcBasePath, 'style');
|
|
44
|
+
return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./register-generate-css/templates'), [
|
|
43
45
|
(0, schematics_1.template)({}),
|
|
44
|
-
(0, schematics_1.
|
|
45
|
-
(0, schematics_1.
|
|
46
|
+
(0, schematics_1.renameTemplateFiles)(),
|
|
47
|
+
(0, schematics_1.move)(themeFolder)
|
|
46
48
|
]), schematics_1.MergeStrategy.Overwrite);
|
|
47
|
-
return rule;
|
|
48
49
|
};
|
|
49
50
|
const importTheme = async (tree, context) => {
|
|
50
51
|
const { getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
51
52
|
const workspaceProject = projectName ? getWorkspaceConfig(tree)?.projects[projectName] : undefined;
|
|
52
|
-
const srcBasePath = workspaceProject?.sourceRoot || (workspaceProject?.root ? node_path_1.posix.
|
|
53
|
-
const styleFile = node_path_1.posix.
|
|
53
|
+
const srcBasePath = workspaceProject?.sourceRoot || (workspaceProject?.root ? node_path_1.posix.join(workspaceProject.root, 'src') : './src');
|
|
54
|
+
const styleFile = node_path_1.posix.join(srcBasePath, 'styles.scss');
|
|
54
55
|
if (!tree.exists(styleFile)) {
|
|
55
56
|
context.logger.warn(`The theme was not updated as ${styleFile} was not found`);
|
|
56
57
|
return;
|