@skyux/packages 13.0.0-alpha.10 → 13.0.0-alpha.11
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/migrations.json +7 -7
- package/package.json +56 -56
- package/src/schematics/migrations/update-13/fix-imports/fix-imports.schematic.js +52 -9
- package/src/schematics/migrations/update-13/fix-imports/fix-imports.schematic.js.map +1 -1
- package/src/schematics/migrations/update-13/icon-name/icon-name.schematic.js +29 -6
- package/src/schematics/migrations/update-13/icon-name/icon-name.schematic.js.map +1 -1
- package/src/schematics/rules/convert-page-summary-to-page-header/convert-page-summary-to-page-header.js +26 -2
- package/src/schematics/rules/convert-page-summary-to-page-header/convert-page-summary-to-page-header.js.map +1 -1
- package/src/schematics/rules/convert-progress-indicator-wizard-to-tab-wizard/convert-progress-indicator-wizard-to-tab-wizard.js +1 -1
- package/src/version.js +1 -1
package/migrations.json
CHANGED
|
@@ -1,37 +1,37 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schematics": {
|
|
3
3
|
"noop": {
|
|
4
|
-
"version": "13.0.0-alpha.
|
|
4
|
+
"version": "13.0.0-alpha.11",
|
|
5
5
|
"factory": "./src/schematics/migrations/noop/noop.schematic",
|
|
6
6
|
"description": "Update all SKY UX component packages"
|
|
7
7
|
},
|
|
8
8
|
"fix-imports": {
|
|
9
|
-
"version": "13.0.0-alpha.
|
|
9
|
+
"version": "13.0.0-alpha.11",
|
|
10
10
|
"factory": "./src/schematics/migrations/update-13/fix-imports/fix-imports.schematic",
|
|
11
11
|
"description": "Update typescript imports for SKY UX packages."
|
|
12
12
|
},
|
|
13
13
|
"i18n-resources-module": {
|
|
14
|
-
"version": "13.0.0-alpha.
|
|
14
|
+
"version": "13.0.0-alpha.11",
|
|
15
15
|
"factory": "./src/schematics/migrations/update-13/i18n-resources-module/i18n-resources-module.schematic",
|
|
16
16
|
"description": "Regenerate i18n resources modules for libraries."
|
|
17
17
|
},
|
|
18
18
|
"icon-name": {
|
|
19
|
-
"version": "13.0.0-alpha.
|
|
19
|
+
"version": "13.0.0-alpha.11",
|
|
20
20
|
"factory": "./src/schematics/migrations/update-13/icon-name/icon-name.schematic",
|
|
21
21
|
"description": "Update icon `icon` properties to `iconName` and remove other obsolete properties."
|
|
22
22
|
},
|
|
23
23
|
"remove-old-compat-stylesheets": {
|
|
24
|
-
"version": "13.0.0-alpha.
|
|
24
|
+
"version": "13.0.0-alpha.11",
|
|
25
25
|
"factory": "./src/schematics/migrations/update-13/remove-old-compat-stylesheets/remove-old-compat-stylesheets.schematic",
|
|
26
26
|
"description": "Remove backward compatible stylesheets for older versions of SKY UX."
|
|
27
27
|
},
|
|
28
28
|
"workspace-check": {
|
|
29
|
-
"version": "13.0.0-alpha.
|
|
29
|
+
"version": "13.0.0-alpha.11",
|
|
30
30
|
"factory": "./src/schematics/migrations/update-13/workspace-check/workspace-check.schematic",
|
|
31
31
|
"description": "Log warnings if the workspace is not configured correctly."
|
|
32
32
|
},
|
|
33
33
|
"replace-light-blue-custom-property": {
|
|
34
|
-
"version": "13.0.0-alpha.
|
|
34
|
+
"version": "13.0.0-alpha.11",
|
|
35
35
|
"factory": "./src/schematics/migrations/update-13/replace-light-blue-custom-property/replace-light-blue-custom-property.schematic",
|
|
36
36
|
"description": "Replace --sky-category-color-light-blue custom property with --sky-category-color-green."
|
|
37
37
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@skyux/packages",
|
|
3
|
-
"version": "13.0.0-alpha.
|
|
3
|
+
"version": "13.0.0-alpha.11",
|
|
4
4
|
"author": "Blackbaud, Inc.",
|
|
5
5
|
"description": "Handles the `ng update` command for SKY UX component libraries.",
|
|
6
6
|
"keywords": [
|
|
@@ -35,67 +35,67 @@
|
|
|
35
35
|
"ng-update": {
|
|
36
36
|
"migrations": "./migrations.json",
|
|
37
37
|
"packageGroup": {
|
|
38
|
-
"@skyux/packages": "13.0.0-alpha.
|
|
38
|
+
"@skyux/packages": "13.0.0-alpha.11",
|
|
39
39
|
"@blackbaud/angular-tree-component": "^1.0.0",
|
|
40
|
-
"@skyux-sdk/eslint-schematics": "13.0.0-alpha.
|
|
41
|
-
"@skyux-sdk/stylelint-schematics": "13.0.0-alpha.
|
|
42
|
-
"@skyux-sdk/testing": "13.0.0-alpha.
|
|
43
|
-
"@skyux/a11y": "13.0.0-alpha.
|
|
44
|
-
"@skyux/action-bars": "13.0.0-alpha.
|
|
45
|
-
"@skyux/ag-grid": "13.0.0-alpha.
|
|
46
|
-
"@skyux/angular-tree-component": "13.0.0-alpha.
|
|
47
|
-
"@skyux/animations": "13.0.0-alpha.
|
|
48
|
-
"@skyux/assets": "13.0.0-alpha.
|
|
49
|
-
"@skyux/autonumeric": "13.0.0-alpha.
|
|
50
|
-
"@skyux/avatar": "13.0.0-alpha.
|
|
51
|
-
"@skyux/code-examples": "13.0.0-alpha.
|
|
52
|
-
"@skyux/colorpicker": "13.0.0-alpha.
|
|
53
|
-
"@skyux/config": "13.0.0-alpha.
|
|
54
|
-
"@skyux/core": "13.0.0-alpha.
|
|
55
|
-
"@skyux/data-manager": "13.0.0-alpha.
|
|
56
|
-
"@skyux/datetime": "13.0.0-alpha.
|
|
57
|
-
"@skyux/docs-tools": "13.0.0-alpha.
|
|
58
|
-
"@skyux/errors": "13.0.0-alpha.
|
|
59
|
-
"@skyux/flyout": "13.0.0-alpha.
|
|
60
|
-
"@skyux/forms": "13.0.0-alpha.
|
|
61
|
-
"@skyux/grids": "13.0.0-alpha.
|
|
62
|
-
"@skyux/help-inline": "13.0.0-alpha.
|
|
63
|
-
"@skyux/i18n": "13.0.0-alpha.
|
|
64
|
-
"@skyux/icon": "13.0.0-alpha.
|
|
40
|
+
"@skyux-sdk/eslint-schematics": "13.0.0-alpha.11",
|
|
41
|
+
"@skyux-sdk/stylelint-schematics": "13.0.0-alpha.11",
|
|
42
|
+
"@skyux-sdk/testing": "13.0.0-alpha.11",
|
|
43
|
+
"@skyux/a11y": "13.0.0-alpha.11",
|
|
44
|
+
"@skyux/action-bars": "13.0.0-alpha.11",
|
|
45
|
+
"@skyux/ag-grid": "13.0.0-alpha.11",
|
|
46
|
+
"@skyux/angular-tree-component": "13.0.0-alpha.11",
|
|
47
|
+
"@skyux/animations": "13.0.0-alpha.11",
|
|
48
|
+
"@skyux/assets": "13.0.0-alpha.11",
|
|
49
|
+
"@skyux/autonumeric": "13.0.0-alpha.11",
|
|
50
|
+
"@skyux/avatar": "13.0.0-alpha.11",
|
|
51
|
+
"@skyux/code-examples": "13.0.0-alpha.11",
|
|
52
|
+
"@skyux/colorpicker": "13.0.0-alpha.11",
|
|
53
|
+
"@skyux/config": "13.0.0-alpha.11",
|
|
54
|
+
"@skyux/core": "13.0.0-alpha.11",
|
|
55
|
+
"@skyux/data-manager": "13.0.0-alpha.11",
|
|
56
|
+
"@skyux/datetime": "13.0.0-alpha.11",
|
|
57
|
+
"@skyux/docs-tools": "13.0.0-alpha.11",
|
|
58
|
+
"@skyux/errors": "13.0.0-alpha.11",
|
|
59
|
+
"@skyux/flyout": "13.0.0-alpha.11",
|
|
60
|
+
"@skyux/forms": "13.0.0-alpha.11",
|
|
61
|
+
"@skyux/grids": "13.0.0-alpha.11",
|
|
62
|
+
"@skyux/help-inline": "13.0.0-alpha.11",
|
|
63
|
+
"@skyux/i18n": "13.0.0-alpha.11",
|
|
64
|
+
"@skyux/icon": "13.0.0-alpha.11",
|
|
65
65
|
"@skyux/icons": "^9.0.0",
|
|
66
|
-
"@skyux/indicators": "13.0.0-alpha.
|
|
67
|
-
"@skyux/inline-form": "13.0.0-alpha.
|
|
68
|
-
"@skyux/layout": "13.0.0-alpha.
|
|
69
|
-
"@skyux/list-builder": "13.0.0-alpha.
|
|
70
|
-
"@skyux/list-builder-common": "13.0.0-alpha.
|
|
71
|
-
"@skyux/list-builder-view-checklist": "13.0.0-alpha.
|
|
72
|
-
"@skyux/list-builder-view-grids": "13.0.0-alpha.
|
|
73
|
-
"@skyux/lists": "13.0.0-alpha.
|
|
74
|
-
"@skyux/lookup": "13.0.0-alpha.
|
|
75
|
-
"@skyux/manifest": "13.0.0-alpha.
|
|
76
|
-
"@skyux/modals": "13.0.0-alpha.
|
|
77
|
-
"@skyux/navbar": "13.0.0-alpha.
|
|
78
|
-
"@skyux/pages": "13.0.0-alpha.
|
|
79
|
-
"@skyux/phone-field": "13.0.0-alpha.
|
|
80
|
-
"@skyux/popovers": "13.0.0-alpha.
|
|
81
|
-
"@skyux/progress-indicator": "13.0.0-alpha.
|
|
82
|
-
"@skyux/router": "13.0.0-alpha.
|
|
83
|
-
"@skyux/select-field": "13.0.0-alpha.
|
|
84
|
-
"@skyux/split-view": "13.0.0-alpha.
|
|
85
|
-
"@skyux/tabs": "13.0.0-alpha.
|
|
86
|
-
"@skyux/text-editor": "13.0.0-alpha.
|
|
87
|
-
"@skyux/theme": "13.0.0-alpha.
|
|
88
|
-
"@skyux/tiles": "13.0.0-alpha.
|
|
89
|
-
"@skyux/toast": "13.0.0-alpha.
|
|
90
|
-
"@skyux/validation": "13.0.0-alpha.
|
|
66
|
+
"@skyux/indicators": "13.0.0-alpha.11",
|
|
67
|
+
"@skyux/inline-form": "13.0.0-alpha.11",
|
|
68
|
+
"@skyux/layout": "13.0.0-alpha.11",
|
|
69
|
+
"@skyux/list-builder": "13.0.0-alpha.11",
|
|
70
|
+
"@skyux/list-builder-common": "13.0.0-alpha.11",
|
|
71
|
+
"@skyux/list-builder-view-checklist": "13.0.0-alpha.11",
|
|
72
|
+
"@skyux/list-builder-view-grids": "13.0.0-alpha.11",
|
|
73
|
+
"@skyux/lists": "13.0.0-alpha.11",
|
|
74
|
+
"@skyux/lookup": "13.0.0-alpha.11",
|
|
75
|
+
"@skyux/manifest": "13.0.0-alpha.11",
|
|
76
|
+
"@skyux/modals": "13.0.0-alpha.11",
|
|
77
|
+
"@skyux/navbar": "13.0.0-alpha.11",
|
|
78
|
+
"@skyux/pages": "13.0.0-alpha.11",
|
|
79
|
+
"@skyux/phone-field": "13.0.0-alpha.11",
|
|
80
|
+
"@skyux/popovers": "13.0.0-alpha.11",
|
|
81
|
+
"@skyux/progress-indicator": "13.0.0-alpha.11",
|
|
82
|
+
"@skyux/router": "13.0.0-alpha.11",
|
|
83
|
+
"@skyux/select-field": "13.0.0-alpha.11",
|
|
84
|
+
"@skyux/split-view": "13.0.0-alpha.11",
|
|
85
|
+
"@skyux/tabs": "13.0.0-alpha.11",
|
|
86
|
+
"@skyux/text-editor": "13.0.0-alpha.11",
|
|
87
|
+
"@skyux/theme": "13.0.0-alpha.11",
|
|
88
|
+
"@skyux/tiles": "13.0.0-alpha.11",
|
|
89
|
+
"@skyux/toast": "13.0.0-alpha.11",
|
|
90
|
+
"@skyux/validation": "13.0.0-alpha.11",
|
|
91
91
|
"ag-grid-angular": "^34.1.1",
|
|
92
92
|
"ag-grid-community": "^34.1.1",
|
|
93
93
|
"ag-grid-enterprise": "^34.1.1",
|
|
94
94
|
"autonumeric": "^4.10.8",
|
|
95
|
-
"eslint-config-skyux": "13.0.0-alpha.
|
|
96
|
-
"skyux-eslint": "13.0.0-alpha.
|
|
97
|
-
"skyux-stylelint": "13.0.0-alpha.
|
|
98
|
-
"stylelint-config-skyux": "13.0.0-alpha.
|
|
95
|
+
"eslint-config-skyux": "13.0.0-alpha.11",
|
|
96
|
+
"skyux-eslint": "13.0.0-alpha.11",
|
|
97
|
+
"skyux-stylelint": "13.0.0-alpha.11",
|
|
98
|
+
"stylelint-config-skyux": "13.0.0-alpha.11"
|
|
99
99
|
}
|
|
100
100
|
},
|
|
101
101
|
"peerDependencies": {
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const schematics_1 = require("@angular/cdk/schematics");
|
|
6
6
|
const typescript_1 = tslib_1.__importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
|
|
7
7
|
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
8
|
+
const change_1 = require("@schematics/angular/utility/change");
|
|
8
9
|
const visit_project_files_1 = require("../../../utility/visit-project-files");
|
|
9
10
|
const knownDeepImportUpdates = {
|
|
10
11
|
'@skyux/ag-grid/lib/modules/ag-grid/types/cell-editor-lookup-params': '@skyux/ag-grid',
|
|
@@ -13,22 +14,64 @@ const knownDeepImportUpdates = {
|
|
|
13
14
|
'@skyux/modals/lib/modules/modal/modal.interface': '@skyux/modals',
|
|
14
15
|
'@skyux/pages/lib/modules/action-hub/types/action-hub-needs-attention-input': '@skyux/pages',
|
|
15
16
|
};
|
|
17
|
+
function updateDeepImports(sourceFile, recorder) {
|
|
18
|
+
const importSpecifiers = (0, ast_utils_1.findNodes)(sourceFile, (node) => typescript_1.default.isStringLiteral(node) &&
|
|
19
|
+
typescript_1.default.isImportDeclaration(node.parent) &&
|
|
20
|
+
node.text in knownDeepImportUpdates);
|
|
21
|
+
importSpecifiers.forEach((importSpecifier) => {
|
|
22
|
+
const shallowImportPath = knownDeepImportUpdates[importSpecifier.text];
|
|
23
|
+
recorder.remove(importSpecifier.getStart(sourceFile) + 1, importSpecifier.text.length);
|
|
24
|
+
recorder.insertLeft(importSpecifier.getStart(sourceFile) + 1, shallowImportPath);
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
function updateLayoutPageModuleImport(filePath, sourceFile, recorder) {
|
|
28
|
+
const layoutPageModuleImport = (0, ast_utils_1.findNodes)(sourceFile, (node) => typescript_1.default.isImportDeclaration(node) &&
|
|
29
|
+
typescript_1.default.isStringLiteral(node.moduleSpecifier) &&
|
|
30
|
+
node.moduleSpecifier.text === '@skyux/layout' &&
|
|
31
|
+
!!node.importClause?.namedBindings &&
|
|
32
|
+
typescript_1.default.isNamedImports(node.importClause.namedBindings) &&
|
|
33
|
+
node.importClause.namedBindings.elements.some((element) => element.name.text === 'SkyPageModule')).shift();
|
|
34
|
+
if (layoutPageModuleImport) {
|
|
35
|
+
const namedImports = layoutPageModuleImport.importClause
|
|
36
|
+
?.namedBindings;
|
|
37
|
+
if (namedImports.elements.length === 1) {
|
|
38
|
+
// Only `SkyPageModule` is imported, so switch to '@skyux/pages'.
|
|
39
|
+
recorder.remove(layoutPageModuleImport.moduleSpecifier.end - 'layout"'.length, 'layout'.length);
|
|
40
|
+
recorder.insertLeft(layoutPageModuleImport.moduleSpecifier.end - 'layout"'.length, 'pages');
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
// Remove only `SkyPageModule` from the named imports.
|
|
44
|
+
const pageModuleImportSpecifier = namedImports.elements.find((element) => element.name.text === 'SkyPageModule');
|
|
45
|
+
let removeStart = pageModuleImportSpecifier.getStart(sourceFile);
|
|
46
|
+
let removeEnd = pageModuleImportSpecifier.getEnd();
|
|
47
|
+
const index = namedImports.elements.findIndex((element) => element.name.text === 'SkyPageModule');
|
|
48
|
+
if (index > 0) {
|
|
49
|
+
// Include the preceding comma and collapse any whitespace.
|
|
50
|
+
removeStart = namedImports.elements[index - 1].getEnd();
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
// Include the following comma and collapse any whitespace.
|
|
54
|
+
removeEnd = namedImports.elements[1].getStart(sourceFile);
|
|
55
|
+
}
|
|
56
|
+
recorder.remove(removeStart, removeEnd - removeStart);
|
|
57
|
+
(0, change_1.applyToUpdateRecorder)(recorder, [
|
|
58
|
+
(0, ast_utils_1.insertImport)(sourceFile, filePath, 'SkyPageModule', '@skyux/pages'),
|
|
59
|
+
]);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
16
63
|
function fixImports() {
|
|
17
64
|
return (tree) => {
|
|
18
65
|
(0, visit_project_files_1.visitProjectFiles)(tree, '', (filePath) => {
|
|
19
66
|
if (filePath.endsWith('.ts')) {
|
|
20
67
|
const fileContent = tree.readText(filePath);
|
|
21
|
-
if (
|
|
68
|
+
if ((fileContent.includes('SkyPageModule') &&
|
|
69
|
+
fileContent.includes('@skyux/layout')) ||
|
|
70
|
+
Object.keys(knownDeepImportUpdates).some((u) => fileContent.includes(u))) {
|
|
22
71
|
const sourceFile = (0, schematics_1.parseSourceFile)(tree, filePath);
|
|
23
|
-
const importSpecifiers = (0, ast_utils_1.findNodes)(sourceFile, (node) => typescript_1.default.isStringLiteral(node) &&
|
|
24
|
-
typescript_1.default.isImportDeclaration(node.parent) &&
|
|
25
|
-
node.text in knownDeepImportUpdates);
|
|
26
72
|
const recorder = tree.beginUpdate(filePath);
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
recorder.remove(importSpecifier.getStart(sourceFile) + 1, importSpecifier.text.length);
|
|
30
|
-
recorder.insertLeft(importSpecifier.getStart(sourceFile) + 1, shallowImportPath);
|
|
31
|
-
});
|
|
73
|
+
updateDeepImports(sourceFile, recorder);
|
|
74
|
+
updateLayoutPageModuleImport(filePath, sourceFile, recorder);
|
|
32
75
|
tree.commitUpdate(recorder);
|
|
33
76
|
}
|
|
34
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-imports.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-13/fix-imports/fix-imports.schematic.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"fix-imports.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-13/fix-imports/fix-imports.schematic.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,20 +65,43 @@ function updateIcon(doc, componentInfo, offset, recorder) {
|
|
|
65
65
|
}
|
|
66
66
|
});
|
|
67
67
|
}
|
|
68
|
+
function objectIsAssignedToDataViewConfigVariableOrProperty(node, source) {
|
|
69
|
+
return ((typescript_1.default.isVariableDeclaration(node.parent) ||
|
|
70
|
+
typescript_1.default.isPropertyDeclaration(node.parent)) &&
|
|
71
|
+
node.parent.type?.getText(source) === 'SkyDataViewConfig');
|
|
72
|
+
}
|
|
73
|
+
function objectIsInitDataViewParameter(node) {
|
|
74
|
+
return (typescript_1.default.isCallExpression(node.parent) &&
|
|
75
|
+
typescript_1.default.isPropertyAccessExpression(node.parent.expression) &&
|
|
76
|
+
node.parent.expression.name.text === 'initDataView');
|
|
77
|
+
}
|
|
78
|
+
function objectIsAssignedToDataViewConfigProperty(node, uninitializedDataViewConfigs) {
|
|
79
|
+
return (typescript_1.default.isBinaryExpression(node.parent) &&
|
|
80
|
+
typescript_1.default.isPropertyAccessExpression(node.parent.left) &&
|
|
81
|
+
node.parent.left.expression.kind === typescript_1.default.SyntaxKind.ThisKeyword &&
|
|
82
|
+
uninitializedDataViewConfigs.includes(node.parent.left.name.text) &&
|
|
83
|
+
node.parent.operatorToken.kind === typescript_1.default.SyntaxKind.EqualsToken);
|
|
84
|
+
}
|
|
68
85
|
function updateDataViewConfig(source, recorder) {
|
|
69
86
|
const checkSkyDataViewConfig = (0, schematics_1.isImported)(source, 'SkyDataViewConfig', '@skyux/data-manager') ||
|
|
70
87
|
(0, schematics_1.isImported)(source, 'SkyDataManagerService', '@skyux/data-manager');
|
|
71
88
|
if (checkSkyDataViewConfig) {
|
|
89
|
+
const uninitializedDataViewConfigs = (0, ast_utils_1.findNodes)(source, (node) => typescript_1.default.isPropertyDeclaration(node) &&
|
|
90
|
+
!!node.type &&
|
|
91
|
+
(node.type.getText(source) === 'SkyDataViewConfig' ||
|
|
92
|
+
// Find e.g., SkyDataViewConfig | undefined
|
|
93
|
+
(typescript_1.default.isUnionTypeNode(node.type) &&
|
|
94
|
+
node.type.types.some((type) => typescript_1.default.isTypeReferenceNode(type) &&
|
|
95
|
+
type.typeName.getText(source) === 'SkyDataViewConfig'))) &&
|
|
96
|
+
!node.initializer).map((node) => node.name.getText(source));
|
|
72
97
|
const dataViewConfig = (0, ast_utils_1.findNodes)(source, (node) => !!node.parent &&
|
|
73
98
|
typescript_1.default.isObjectLiteralExpression(node) &&
|
|
74
99
|
// Object typed as SkyDataViewConfig via variable or property declaration.
|
|
75
|
-
((
|
|
76
|
-
typescript_1.default.isPropertyDeclaration(node.parent)) &&
|
|
77
|
-
node.parent.type?.getText(source) === 'SkyDataViewConfig') ||
|
|
100
|
+
(objectIsAssignedToDataViewConfigVariableOrProperty(node, source) ||
|
|
78
101
|
// Object parameter to SkyDataManagerService.initDataView(), inferred type.
|
|
79
|
-
(
|
|
80
|
-
|
|
81
|
-
|
|
102
|
+
objectIsInitDataViewParameter(node) ||
|
|
103
|
+
// Object assigned to a property previously typed as SkyDataViewConfig.
|
|
104
|
+
objectIsAssignedToDataViewConfigProperty(node, uninitializedDataViewConfigs)));
|
|
82
105
|
dataViewConfig.forEach((node) => {
|
|
83
106
|
const iconProperty = node.properties.find((prop) => typescript_1.default.isPropertyAssignment(prop) && prop.name.getText(source) === 'icon');
|
|
84
107
|
if (iconProperty && typescript_1.default.isStringLiteral(iconProperty.initializer)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"icon-name.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-13/icon-name/icon-name.schematic.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"icon-name.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-13/icon-name/icon-name.schematic.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertPageSummaryToPageHeader = convertPageSummaryToPageHeader;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
+
const static_1 = require("@angular-devkit/schematics/src/tree/static");
|
|
5
6
|
const schematics_2 = require("@angular/cdk/schematics");
|
|
6
7
|
const utility_1 = require("@schematics/angular/utility");
|
|
7
8
|
const eol_1 = require("@schematics/angular/utility/eol");
|
|
@@ -61,7 +62,7 @@ function moveDetails(pageSummary, recorder, content, offset) {
|
|
|
61
62
|
detailsContents
|
|
62
63
|
.map((detailsContent) => [
|
|
63
64
|
`${indent} <div class="${['sky-page-summary-subtitle'].includes(detailsContent.tag) ? 'sky-margin-stacked-sm sky-emphasized' : 'sky-margin-stacked-md'}">`,
|
|
64
|
-
`${indent} ${detailsContent
|
|
65
|
+
`${indent} ${modifyDetailsContent(detailsContent)}`,
|
|
65
66
|
`${indent} </div>`,
|
|
66
67
|
].join(eol))
|
|
67
68
|
.join(eol),
|
|
@@ -70,6 +71,29 @@ function moveDetails(pageSummary, recorder, content, offset) {
|
|
|
70
71
|
].join(eol));
|
|
71
72
|
}
|
|
72
73
|
}
|
|
74
|
+
function modifyDetailsContent(detailsContent) {
|
|
75
|
+
if (detailsContent.tag === 'sky-page-summary-key-info') {
|
|
76
|
+
// Add class="sky-margin-inline-xxl" and remove layout input from sky-key-info.
|
|
77
|
+
const content = detailsContent.content.trim();
|
|
78
|
+
const tree = (0, static_1.empty)();
|
|
79
|
+
tree.create('template.html', content);
|
|
80
|
+
const recorder = tree.beginUpdate('template.html');
|
|
81
|
+
const partial = (0, template_1.parseTemplate)(content);
|
|
82
|
+
const keyInfoElements = (0, template_1.getElementsByTagName)('sky-key-info', partial);
|
|
83
|
+
keyInfoElements.forEach((element) => {
|
|
84
|
+
recorder.insertRight(element.sourceCodeLocation.startTag.startOffset +
|
|
85
|
+
'<sky-key-info'.length, ` class="sky-margin-inline-xxl"`);
|
|
86
|
+
const layoutAttr = element.sourceCodeLocation.attrs?.['layout'] ||
|
|
87
|
+
element.sourceCodeLocation.attrs?.['[layout]'];
|
|
88
|
+
if (layoutAttr) {
|
|
89
|
+
recorder.remove(layoutAttr.startOffset, layoutAttr.endOffset - layoutAttr.startOffset);
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
tree.commitUpdate(recorder);
|
|
93
|
+
return tree.readText('template.html');
|
|
94
|
+
}
|
|
95
|
+
return detailsContent.content.trim();
|
|
96
|
+
}
|
|
73
97
|
/**
|
|
74
98
|
* Removes title and detail elements from the page summary, including
|
|
75
99
|
* <sky-page-summary-title>, <sky-page-summary-subtitle>, <sky-page-summary-status>,
|
|
@@ -175,7 +199,7 @@ function convertPageSummaryToPageHeader(projectPath) {
|
|
|
175
199
|
}
|
|
176
200
|
});
|
|
177
201
|
},
|
|
178
|
-
(0, utility_1.addDependency)('@skyux/pages', `13.0.0-alpha.
|
|
202
|
+
(0, utility_1.addDependency)('@skyux/pages', `13.0.0-alpha.11`, {
|
|
179
203
|
existing: utility_1.ExistingBehavior.Skip,
|
|
180
204
|
}),
|
|
181
205
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-page-summary-to-page-header.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/rules/convert-page-summary-to-page-header/convert-page-summary-to-page-header.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"convert-page-summary-to-page-header.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/rules/convert-page-summary-to-page-header/convert-page-summary-to-page-header.ts"],"names":[],"mappings":"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"}
|
|
@@ -297,7 +297,7 @@ function convertProgressIndicatorWizardToTabWizard(options) {
|
|
|
297
297
|
});
|
|
298
298
|
}
|
|
299
299
|
},
|
|
300
|
-
(0, utility_1.addDependency)('@skyux/tabs', `13.0.0-alpha.
|
|
300
|
+
(0, utility_1.addDependency)('@skyux/tabs', `13.0.0-alpha.11`, {
|
|
301
301
|
existing: utility_1.ExistingBehavior.Skip,
|
|
302
302
|
}),
|
|
303
303
|
]);
|
package/src/version.js
CHANGED