@skyux/packages 15.0.0-alpha.3 → 15.0.0-alpha.5
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 +15 -5
- package/package.json +66 -67
- package/src/schematics/migrations/update-15/add-compat-stylesheets/add-compat-stylesheet.schematic.d.ts +2 -0
- package/src/schematics/migrations/update-15/add-compat-stylesheets/add-compat-stylesheet.schematic.js +140 -0
- package/src/schematics/migrations/update-15/add-compat-stylesheets/add-compat-stylesheet.schematic.js.map +1 -0
- package/src/schematics/migrations/update-15/remove-timepicker-retain-invalid-values/remove-timepicker-retain-invalid-values.schematic.d.ts +6 -0
- package/src/schematics/migrations/update-15/remove-timepicker-retain-invalid-values/remove-timepicker-retain-invalid-values.schematic.js +71 -0
- package/src/schematics/migrations/update-15/remove-timepicker-retain-invalid-values/remove-timepicker-retain-invalid-values.schematic.js.map +1 -0
- package/src/schematics/rules/convert-grid-to-data-grid/convert-grid-to-data-grid.js +235 -38
- package/src/schematics/rules/convert-grid-to-data-grid/convert-grid-to-data-grid.js.map +1 -1
- package/src/schematics/rules/convert-page-summary-to-page-header/convert-page-summary-to-page-header.js +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/schematics/utility/typescript/ng-ast.d.ts +1 -1
- package/src/schematics/utility/typescript/ng-ast.js +2 -1
- package/src/schematics/utility/typescript/ng-ast.js.map +1 -1
- package/src/schematics/utility/typescript/remove-class-reference.d.ts +4 -1
- package/src/schematics/utility/typescript/remove-class-reference.js +4 -0
- package/src/schematics/utility/typescript/remove-class-reference.js.map +1 -1
- package/src/version.js +1 -1
package/migrations.json
CHANGED
|
@@ -1,29 +1,39 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schematics": {
|
|
3
3
|
"noop": {
|
|
4
|
-
"version": "15.0.0-alpha.
|
|
4
|
+
"version": "15.0.0-alpha.5",
|
|
5
5
|
"factory": "./src/schematics/migrations/all/noop/noop.schematic",
|
|
6
6
|
"description": "Update all SKY UX component packages"
|
|
7
7
|
},
|
|
8
8
|
"i18n-resources-module": {
|
|
9
|
-
"version": "15.0.0-alpha.
|
|
9
|
+
"version": "15.0.0-alpha.5",
|
|
10
10
|
"factory": "./src/schematics/migrations/all/i18n-resources-module/i18n-resources-module.schematic",
|
|
11
11
|
"description": "Regenerate i18n resources modules for libraries."
|
|
12
12
|
},
|
|
13
13
|
"remove-old-compat-stylesheets": {
|
|
14
|
-
"version": "15.0.0-alpha.
|
|
14
|
+
"version": "15.0.0-alpha.5",
|
|
15
15
|
"factory": "./src/schematics/migrations/all/remove-old-compat-stylesheets/remove-old-compat-stylesheets.schematic",
|
|
16
16
|
"description": "Remove backward compatible stylesheets for older versions of SKY UX."
|
|
17
17
|
},
|
|
18
18
|
"workspace-check": {
|
|
19
|
-
"version": "15.0.0-alpha.
|
|
19
|
+
"version": "15.0.0-alpha.5",
|
|
20
20
|
"factory": "./src/schematics/migrations/all/workspace-check/workspace-check.schematic",
|
|
21
21
|
"description": "Log warnings if the workspace is not configured correctly."
|
|
22
22
|
},
|
|
23
23
|
"migrate-dragula-polyfill": {
|
|
24
|
-
"version": "15.0.0-alpha.
|
|
24
|
+
"version": "15.0.0-alpha.5",
|
|
25
25
|
"factory": "./src/schematics/migrations/all/migrate-dragula-polyfill/migrate-dragula-polyfill.schematic",
|
|
26
26
|
"description": "Remove the @skyux/packages/polyfills entry from project config, replacing it with a local copy when Dragula is still installed."
|
|
27
|
+
},
|
|
28
|
+
"remove-timepicker-retain-invalid-values": {
|
|
29
|
+
"version": "15.0.0-alpha.5",
|
|
30
|
+
"factory": "./src/schematics/migrations/update-15/remove-timepicker-retain-invalid-values/remove-timepicker-retain-invalid-values.schematic",
|
|
31
|
+
"description": "Remove the skyTimepickerRetainInvalidValues input from timepicker inputs since retaining invalid values is now the default behavior."
|
|
32
|
+
},
|
|
33
|
+
"add-compat-stylesheets": {
|
|
34
|
+
"version": "15.0.0-alpha.5",
|
|
35
|
+
"factory": "./src/schematics/migrations/update-15/add-compat-stylesheets/add-compat-stylesheet.schematic",
|
|
36
|
+
"description": "Add a backwards-compatible stylesheet with styles that have been removed from components in SKY UX 15."
|
|
27
37
|
}
|
|
28
38
|
}
|
|
29
39
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@skyux/packages",
|
|
3
|
-
"version": "15.0.0-alpha.
|
|
3
|
+
"version": "15.0.0-alpha.5",
|
|
4
4
|
"author": "Blackbaud, Inc.",
|
|
5
5
|
"description": "Handles the `ng update` command for SKY UX component libraries.",
|
|
6
6
|
"keywords": [
|
|
@@ -32,80 +32,79 @@
|
|
|
32
32
|
"ng-update": {
|
|
33
33
|
"migrations": "./migrations.json",
|
|
34
34
|
"packageGroup": {
|
|
35
|
-
"@skyux/packages": "15.0.0-alpha.
|
|
35
|
+
"@skyux/packages": "15.0.0-alpha.5",
|
|
36
36
|
"@blackbaud/angular-tree-component": "^1.0.0",
|
|
37
|
-
"@skyux-sdk/eslint-schematics": "15.0.0-alpha.
|
|
38
|
-
"@skyux-sdk/stylelint-schematics": "15.0.0-alpha.
|
|
39
|
-
"@skyux-sdk/testing": "15.0.0-alpha.
|
|
40
|
-
"@skyux-sdk/testing-schematics": "15.0.0-alpha.
|
|
41
|
-
"@skyux/a11y": "15.0.0-alpha.
|
|
42
|
-
"@skyux/action-bars": "15.0.0-alpha.
|
|
43
|
-
"@skyux/ag-grid": "15.0.0-alpha.
|
|
44
|
-
"@skyux/angular-tree-component": "15.0.0-alpha.
|
|
45
|
-
"@skyux/animations": "15.0.0-alpha.
|
|
46
|
-
"@skyux/assets": "15.0.0-alpha.
|
|
47
|
-
"@skyux/autonumeric": "15.0.0-alpha.
|
|
48
|
-
"@skyux/avatar": "15.0.0-alpha.
|
|
49
|
-
"@skyux/charts": "15.0.0-alpha.
|
|
50
|
-
"@skyux/code-examples": "15.0.0-alpha.
|
|
51
|
-
"@skyux/colorpicker": "15.0.0-alpha.
|
|
52
|
-
"@skyux/config": "15.0.0-alpha.
|
|
53
|
-
"@skyux/core": "15.0.0-alpha.
|
|
54
|
-
"@skyux/data-grid": "15.0.0-alpha.
|
|
55
|
-
"@skyux/data-manager": "15.0.0-alpha.
|
|
56
|
-
"@skyux/datetime": "15.0.0-alpha.
|
|
57
|
-
"@skyux/docs-tools": "15.0.0-alpha.
|
|
58
|
-
"@skyux/errors": "15.0.0-alpha.
|
|
59
|
-
"@skyux/filter-bar": "15.0.0-alpha.
|
|
60
|
-
"@skyux/flyout": "15.0.0-alpha.
|
|
61
|
-
"@skyux/forms": "15.0.0-alpha.
|
|
62
|
-
"@skyux/grids": "15.0.0-alpha.
|
|
63
|
-
"@skyux/help-inline": "15.0.0-alpha.
|
|
64
|
-
"@skyux/i18n": "15.0.0-alpha.
|
|
65
|
-
"@skyux/icon": "15.0.0-alpha.
|
|
66
|
-
"@skyux/icons": "^11.
|
|
67
|
-
"@skyux/indicators": "15.0.0-alpha.
|
|
68
|
-
"@skyux/inline-form": "15.0.0-alpha.
|
|
69
|
-
"@skyux/layout": "15.0.0-alpha.
|
|
70
|
-
"@skyux/list-builder": "15.0.0-alpha.
|
|
71
|
-
"@skyux/list-builder-common": "15.0.0-alpha.
|
|
72
|
-
"@skyux/list-builder-view-checklist": "15.0.0-alpha.
|
|
73
|
-
"@skyux/list-builder-view-grids": "15.0.0-alpha.
|
|
74
|
-
"@skyux/lists": "15.0.0-alpha.
|
|
75
|
-
"@skyux/lookup": "15.0.0-alpha.
|
|
76
|
-
"@skyux/manifest": "15.0.0-alpha.
|
|
77
|
-
"@skyux/modals": "15.0.0-alpha.
|
|
78
|
-
"@skyux/navbar": "15.0.0-alpha.
|
|
79
|
-
"@skyux/pages": "15.0.0-alpha.
|
|
80
|
-
"@skyux/phone-field": "15.0.0-alpha.
|
|
81
|
-
"@skyux/popovers": "15.0.0-alpha.
|
|
82
|
-
"@skyux/progress-indicator": "15.0.0-alpha.
|
|
83
|
-
"@skyux/router": "15.0.0-alpha.
|
|
84
|
-
"@skyux/
|
|
85
|
-
"@skyux/
|
|
86
|
-
"@skyux/
|
|
87
|
-
"@skyux/
|
|
88
|
-
"@skyux/
|
|
89
|
-
"@skyux/
|
|
90
|
-
"@skyux/
|
|
91
|
-
"
|
|
92
|
-
"ag-grid-
|
|
93
|
-
"ag-grid-
|
|
94
|
-
"ag-grid-enterprise": "^35.1.0",
|
|
37
|
+
"@skyux-sdk/eslint-schematics": "15.0.0-alpha.5",
|
|
38
|
+
"@skyux-sdk/stylelint-schematics": "15.0.0-alpha.5",
|
|
39
|
+
"@skyux-sdk/testing": "15.0.0-alpha.5",
|
|
40
|
+
"@skyux-sdk/testing-schematics": "15.0.0-alpha.5",
|
|
41
|
+
"@skyux/a11y": "15.0.0-alpha.5",
|
|
42
|
+
"@skyux/action-bars": "15.0.0-alpha.5",
|
|
43
|
+
"@skyux/ag-grid": "15.0.0-alpha.5",
|
|
44
|
+
"@skyux/angular-tree-component": "15.0.0-alpha.5",
|
|
45
|
+
"@skyux/animations": "15.0.0-alpha.5",
|
|
46
|
+
"@skyux/assets": "15.0.0-alpha.5",
|
|
47
|
+
"@skyux/autonumeric": "15.0.0-alpha.5",
|
|
48
|
+
"@skyux/avatar": "15.0.0-alpha.5",
|
|
49
|
+
"@skyux/charts": "15.0.0-alpha.5",
|
|
50
|
+
"@skyux/code-examples": "15.0.0-alpha.5",
|
|
51
|
+
"@skyux/colorpicker": "15.0.0-alpha.5",
|
|
52
|
+
"@skyux/config": "15.0.0-alpha.5",
|
|
53
|
+
"@skyux/core": "15.0.0-alpha.5",
|
|
54
|
+
"@skyux/data-grid": "15.0.0-alpha.5",
|
|
55
|
+
"@skyux/data-manager": "15.0.0-alpha.5",
|
|
56
|
+
"@skyux/datetime": "15.0.0-alpha.5",
|
|
57
|
+
"@skyux/docs-tools": "15.0.0-alpha.5",
|
|
58
|
+
"@skyux/errors": "15.0.0-alpha.5",
|
|
59
|
+
"@skyux/filter-bar": "15.0.0-alpha.5",
|
|
60
|
+
"@skyux/flyout": "15.0.0-alpha.5",
|
|
61
|
+
"@skyux/forms": "15.0.0-alpha.5",
|
|
62
|
+
"@skyux/grids": "15.0.0-alpha.5",
|
|
63
|
+
"@skyux/help-inline": "15.0.0-alpha.5",
|
|
64
|
+
"@skyux/i18n": "15.0.0-alpha.5",
|
|
65
|
+
"@skyux/icon": "15.0.0-alpha.5",
|
|
66
|
+
"@skyux/icons": "^11.4.0",
|
|
67
|
+
"@skyux/indicators": "15.0.0-alpha.5",
|
|
68
|
+
"@skyux/inline-form": "15.0.0-alpha.5",
|
|
69
|
+
"@skyux/layout": "15.0.0-alpha.5",
|
|
70
|
+
"@skyux/list-builder": "15.0.0-alpha.5",
|
|
71
|
+
"@skyux/list-builder-common": "15.0.0-alpha.5",
|
|
72
|
+
"@skyux/list-builder-view-checklist": "15.0.0-alpha.5",
|
|
73
|
+
"@skyux/list-builder-view-grids": "15.0.0-alpha.5",
|
|
74
|
+
"@skyux/lists": "15.0.0-alpha.5",
|
|
75
|
+
"@skyux/lookup": "15.0.0-alpha.5",
|
|
76
|
+
"@skyux/manifest": "15.0.0-alpha.5",
|
|
77
|
+
"@skyux/modals": "15.0.0-alpha.5",
|
|
78
|
+
"@skyux/navbar": "15.0.0-alpha.5",
|
|
79
|
+
"@skyux/pages": "15.0.0-alpha.5",
|
|
80
|
+
"@skyux/phone-field": "15.0.0-alpha.5",
|
|
81
|
+
"@skyux/popovers": "15.0.0-alpha.5",
|
|
82
|
+
"@skyux/progress-indicator": "15.0.0-alpha.5",
|
|
83
|
+
"@skyux/router": "15.0.0-alpha.5",
|
|
84
|
+
"@skyux/split-view": "15.0.0-alpha.5",
|
|
85
|
+
"@skyux/tabs": "15.0.0-alpha.5",
|
|
86
|
+
"@skyux/text-editor": "15.0.0-alpha.5",
|
|
87
|
+
"@skyux/theme": "15.0.0-alpha.5",
|
|
88
|
+
"@skyux/tiles": "15.0.0-alpha.5",
|
|
89
|
+
"@skyux/toast": "15.0.0-alpha.5",
|
|
90
|
+
"@skyux/validation": "15.0.0-alpha.5",
|
|
91
|
+
"ag-grid-angular": "^36.1.0",
|
|
92
|
+
"ag-grid-community": "^36.1.0",
|
|
93
|
+
"ag-grid-enterprise": "^36.0.2",
|
|
95
94
|
"autonumeric": "^4.10.10",
|
|
96
|
-
"eslint-config-skyux": "15.0.0-alpha.
|
|
97
|
-
"skyux-eslint": "15.0.0-alpha.
|
|
98
|
-
"skyux-stylelint": "15.0.0-alpha.
|
|
99
|
-
"stylelint-config-skyux": "15.0.0-alpha.
|
|
95
|
+
"eslint-config-skyux": "15.0.0-alpha.5",
|
|
96
|
+
"skyux-eslint": "15.0.0-alpha.5",
|
|
97
|
+
"skyux-stylelint": "15.0.0-alpha.5",
|
|
98
|
+
"stylelint-config-skyux": "15.0.0-alpha.5"
|
|
100
99
|
}
|
|
101
100
|
},
|
|
102
101
|
"peerDependencies": {
|
|
103
|
-
"@angular/cli": "^22.
|
|
104
|
-
"@angular/core": "^22.
|
|
102
|
+
"@angular/cli": "^22.1.4",
|
|
103
|
+
"@angular/core": "^22.1.2",
|
|
105
104
|
"typescript": "^6.0.3"
|
|
106
105
|
},
|
|
107
106
|
"dependencies": {
|
|
108
|
-
"@blackbaud/skyux-design-tokens": "7.0.0-alpha.
|
|
107
|
+
"@blackbaud/skyux-design-tokens": "7.0.0-alpha.1",
|
|
109
108
|
"fs-extra": "11.3.6",
|
|
110
109
|
"jsonc-parser": "3.3.1",
|
|
111
110
|
"parse5": "7.3.0",
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = default_1;
|
|
4
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
+
const utility_1 = require("@schematics/angular/utility");
|
|
6
|
+
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
7
|
+
const version_1 = require("../../../../version");
|
|
8
|
+
const tree_1 = require("../../../utility/tree");
|
|
9
|
+
const workspace_2 = require("../../../utility/workspace");
|
|
10
|
+
const COMPAT_CSS_FILE_NAME = `skyux${version_1.VERSION.major}-compat.css`;
|
|
11
|
+
const compatStyles = {
|
|
12
|
+
libraries: [
|
|
13
|
+
{
|
|
14
|
+
name: '@skyux/theme',
|
|
15
|
+
components: [
|
|
16
|
+
{
|
|
17
|
+
name: 'button',
|
|
18
|
+
styles: [
|
|
19
|
+
{
|
|
20
|
+
css: `
|
|
21
|
+
:root {
|
|
22
|
+
--sky-compat-btn-disabled-pointer-events: none;
|
|
23
|
+
}
|
|
24
|
+
`,
|
|
25
|
+
instructions: `
|
|
26
|
+
Pointer events are no longer disabled on elements with the "sky-btn-disabled" class or the "disabled" attribute. To address this change, remove this block of code, then either add the "disabled" attribute to the element (preferred) or update any click and keyboard handlers to ignore interaction while the element is disabled.`,
|
|
27
|
+
},
|
|
28
|
+
],
|
|
29
|
+
},
|
|
30
|
+
],
|
|
31
|
+
},
|
|
32
|
+
],
|
|
33
|
+
};
|
|
34
|
+
function getProjectAppPath(project) {
|
|
35
|
+
return `${(0, workspace_2.getSourceRoot)(project)}/app`;
|
|
36
|
+
}
|
|
37
|
+
function buildCommentBlock(message) {
|
|
38
|
+
return `/${'*'.repeat(79)}
|
|
39
|
+
* ${message.replace(/(?![^\n]{1,75}$)([^\n]{1,75})\s/g, '$1\n * ')}
|
|
40
|
+
${'*'.repeat(79)}/`;
|
|
41
|
+
}
|
|
42
|
+
function buildComponentCss(component) {
|
|
43
|
+
let contents = buildCommentBlock(`COMPONENT: ${component.name.toUpperCase()}`);
|
|
44
|
+
for (const style of component.styles) {
|
|
45
|
+
contents += `
|
|
46
|
+
|
|
47
|
+
${buildCommentBlock(style.instructions.trim())}
|
|
48
|
+
|
|
49
|
+
${style.css.trim()}
|
|
50
|
+
`;
|
|
51
|
+
}
|
|
52
|
+
return contents;
|
|
53
|
+
}
|
|
54
|
+
function writeStylesheet(sourceRoot, contents) {
|
|
55
|
+
const filePath = `${sourceRoot}/${COMPAT_CSS_FILE_NAME}`;
|
|
56
|
+
return (tree) => {
|
|
57
|
+
if (tree.exists(filePath)) {
|
|
58
|
+
tree.overwrite(filePath, contents);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
tree.create(filePath, contents);
|
|
62
|
+
}
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
function addStylesheetToStylesArray(styles, filePath) {
|
|
66
|
+
if (styles && !styles.includes(filePath)) {
|
|
67
|
+
styles.push(filePath);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
function addStylesheetToWorkspace() {
|
|
71
|
+
return () => (0, utility_1.updateWorkspace)((workspace) => {
|
|
72
|
+
for (const project of workspace.projects.values()) {
|
|
73
|
+
for (const targetName of ['build', 'test']) {
|
|
74
|
+
if (project.extensions['projectType'] === 'application') {
|
|
75
|
+
const target = project.targets.get(targetName);
|
|
76
|
+
const sourceRoot = getProjectAppPath(project);
|
|
77
|
+
const filePath = `${sourceRoot}/${COMPAT_CSS_FILE_NAME}`;
|
|
78
|
+
/* istanbul ignore else */
|
|
79
|
+
if (target && target.options) {
|
|
80
|
+
target.options['styles'] ??= [];
|
|
81
|
+
addStylesheetToStylesArray(target.options['styles'], filePath);
|
|
82
|
+
// A configuration's `styles` array replaces (rather than
|
|
83
|
+
// merges with) the target's base `styles` array, so any
|
|
84
|
+
// configuration that already declares its own `styles` needs
|
|
85
|
+
// the compatibility stylesheet appended too.
|
|
86
|
+
for (const configuration of Object.values(target.configurations ?? {})) {
|
|
87
|
+
addStylesheetToStylesArray(configuration?.['styles'], filePath);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
function getCompatStyles(tree) {
|
|
96
|
+
let contents = '';
|
|
97
|
+
const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
|
|
98
|
+
for (const library of compatStyles.libraries) {
|
|
99
|
+
if (packageJson.dependencies?.[library.name] ||
|
|
100
|
+
packageJson.devDependencies?.[library.name]) {
|
|
101
|
+
for (const component of library.components) {
|
|
102
|
+
contents += `
|
|
103
|
+
${buildComponentCss(component)}`;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
return contents
|
|
108
|
+
? `${buildCommentBlock(`TODO: The following component libraries introduced visual breaking ` +
|
|
109
|
+
`changes in SKY UX ${version_1.VERSION.major}. Each block of CSS reintroduces ` +
|
|
110
|
+
`the styles that were changed or removed for backward compatibility. ` +
|
|
111
|
+
`You will need to do the following before migrating to the next major ` +
|
|
112
|
+
`version of SKY UX:
|
|
113
|
+
- Address each of the changes by following the instructions
|
|
114
|
+
in each block of CSS, then remove the block.
|
|
115
|
+
- Delete this file after all blocks have been addressed.
|
|
116
|
+
- Remove each occurrence of this file in your project's
|
|
117
|
+
angular.json file.`)}
|
|
118
|
+
${contents}`
|
|
119
|
+
: undefined;
|
|
120
|
+
}
|
|
121
|
+
function default_1() {
|
|
122
|
+
return async (tree) => {
|
|
123
|
+
const workspace = await (0, workspace_1.getWorkspace)(tree);
|
|
124
|
+
const styles = getCompatStyles(tree);
|
|
125
|
+
const rules = [];
|
|
126
|
+
for (const [, projectDefinition] of workspace.projects.entries()) {
|
|
127
|
+
if (projectDefinition.extensions['projectType'] === 'application') {
|
|
128
|
+
if (styles) {
|
|
129
|
+
const sourcePath = getProjectAppPath(projectDefinition);
|
|
130
|
+
rules.push(writeStylesheet(sourcePath, styles));
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
if (styles) {
|
|
135
|
+
rules.push(addStylesheetToWorkspace());
|
|
136
|
+
}
|
|
137
|
+
return (0, schematics_1.chain)(rules);
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
//# sourceMappingURL=add-compat-stylesheet.schematic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-compat-stylesheet.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-15/add-compat-stylesheets/add-compat-stylesheet.schematic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = default_1;
|
|
4
|
+
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
5
|
+
const template_1 = require("../../../utility/template");
|
|
6
|
+
const ng_ast_1 = require("../../../utility/typescript/ng-ast");
|
|
7
|
+
const visit_project_files_1 = require("../../../utility/visit-project-files");
|
|
8
|
+
// parse5 lowercases attribute names.
|
|
9
|
+
const RETAIN_ATTRIBUTES = [
|
|
10
|
+
'skytimepickerretaininvalidvalues',
|
|
11
|
+
'[skytimepickerretaininvalidvalues]',
|
|
12
|
+
];
|
|
13
|
+
function isElement(node) {
|
|
14
|
+
return 'tagName' in node;
|
|
15
|
+
}
|
|
16
|
+
function removeRetainAttributes(content, offset, recorder) {
|
|
17
|
+
const nodeQueue = [(0, template_1.parseTemplate)(content)];
|
|
18
|
+
while (nodeQueue.length) {
|
|
19
|
+
const node = nodeQueue.shift();
|
|
20
|
+
if (isElement(node)) {
|
|
21
|
+
node.attrs
|
|
22
|
+
.filter((attr) => RETAIN_ATTRIBUTES.includes(attr.name))
|
|
23
|
+
.forEach((attr) => {
|
|
24
|
+
const location = node.sourceCodeLocation.attrs[attr.name];
|
|
25
|
+
// Also remove the whitespace preceding the attribute.
|
|
26
|
+
let start = location.startOffset;
|
|
27
|
+
while (/\s/.test(content.charAt(start - 1))) {
|
|
28
|
+
start--;
|
|
29
|
+
}
|
|
30
|
+
recorder.remove(offset + start, location.endOffset - start);
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
if ((0, template_1.isParentNode)(node)) {
|
|
34
|
+
nodeQueue.push(...node.childNodes);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
async function updateSourceFiles(tree) {
|
|
39
|
+
const workspace = await (0, workspace_1.getWorkspace)(tree);
|
|
40
|
+
workspace.projects.forEach((project) => {
|
|
41
|
+
(0, visit_project_files_1.visitProjectFiles)(tree, project.sourceRoot || project.root, (filePath) => {
|
|
42
|
+
if (filePath.endsWith('.html') || filePath.endsWith('.ts')) {
|
|
43
|
+
const content = tree.readText(filePath);
|
|
44
|
+
if (!content.toLowerCase().includes('skytimepickerretaininvalidvalues')) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
const recorder = tree.beginUpdate(filePath);
|
|
48
|
+
if (filePath.endsWith('.html')) {
|
|
49
|
+
removeRetainAttributes(content, 0, recorder);
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
const templates = (0, ng_ast_1.getInlineTemplates)((0, ng_ast_1.parseSourceFile)(tree, filePath));
|
|
53
|
+
templates.forEach((template) => {
|
|
54
|
+
removeRetainAttributes(content.substring(template.start, template.end), template.start, recorder);
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
tree.commitUpdate(recorder);
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Remove the `skyTimepickerRetainInvalidValues` input from timepicker inputs
|
|
64
|
+
* since retaining invalid values is now the default and only behavior.
|
|
65
|
+
*/
|
|
66
|
+
function default_1() {
|
|
67
|
+
return async (tree) => {
|
|
68
|
+
await updateSourceFiles(tree);
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
//# sourceMappingURL=remove-timepicker-retain-invalid-values.schematic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-timepicker-retain-invalid-values.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-15/remove-timepicker-retain-invalid-values/remove-timepicker-retain-invalid-values.schematic.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertGridToDataGrid = convertGridToDataGrid;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const core_1 = require("@angular-devkit/core");
|
|
4
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
7
|
const utility_1 = require("@schematics/angular/utility");
|
|
8
|
+
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
9
|
+
const change_1 = require("@schematics/angular/utility/change");
|
|
10
|
+
const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
6
11
|
const log_once_1 = require("../../utility/log-once");
|
|
7
12
|
const template_1 = require("../../utility/template");
|
|
8
13
|
const ng_ast_1 = require("../../utility/typescript/ng-ast");
|
|
@@ -14,6 +19,12 @@ const SKY_GRID_MODULE = 'SkyGridModule';
|
|
|
14
19
|
const SKY_GRID_MODULE_PACKAGE = '@skyux/grids';
|
|
15
20
|
const SKY_LIST_VIEW_GRID_MODULE = 'SkyListViewGridModule';
|
|
16
21
|
const SKY_LIST_VIEW_GRID_MODULE_PACKAGE = '@skyux/list-builder-view-grids';
|
|
22
|
+
/**
|
|
23
|
+
* `SkyDataGrid`/`SkyDataGridColumn` are standalone components that replace
|
|
24
|
+
* `SkyGridModule`. Unlike an NgModule, they must be present in an NgModule's
|
|
25
|
+
* `imports` array to also appear in that NgModule's `exports` array.
|
|
26
|
+
*/
|
|
27
|
+
const DATA_GRID_CLASS_NAMES = ['SkyDataGrid', 'SkyDataGridColumn'];
|
|
17
28
|
const GRID_TAG = ['sky-grid'];
|
|
18
29
|
const COLUMN_TAG = ['sky-grid-column'];
|
|
19
30
|
const LIST_VIEW_GRID_TAG = 'sky-list-view-grid';
|
|
@@ -156,6 +167,9 @@ function gridTagSwap(context) {
|
|
|
156
167
|
if (hasAttribute(node, inputForms('fit'))) {
|
|
157
168
|
(0, log_once_1.logOnce)(context, 'warn', 'The "fit" input on <sky-grid> was renamed to "columnFit" on <sky-data-grid>, with values "width"/"scroll" renamed to "container"/"content". A bound "[fit]" value could not be translated automatically; review it.');
|
|
158
169
|
}
|
|
170
|
+
if (hasAttribute(node, inputForms('data'))) {
|
|
171
|
+
(0, log_once_1.logOnce)(context, 'warn', 'The "data" binding on <sky-grid> was copied to <sky-data-grid>, whose "data" input is typed as SkyDataGridRowData[]: each row object must have a unique string "id" property. Update the bound array if template type checking reports an assignment error.');
|
|
172
|
+
}
|
|
159
173
|
for (const label of GRID_REMOVED_INPUTS) {
|
|
160
174
|
if (hasAttribute(node, inputForms(label))) {
|
|
161
175
|
(0, log_once_1.logOnce)(context, 'warn', gridRemovedMessage(label));
|
|
@@ -241,10 +255,12 @@ function convertTemplate(recorder, content, context, offset = 0) {
|
|
|
241
255
|
const skippedColumns = new Set();
|
|
242
256
|
let converted = 0;
|
|
243
257
|
let listViewGridSkipped = 0;
|
|
258
|
+
let columnsSkipped = 0;
|
|
244
259
|
for (const grid of grids) {
|
|
245
260
|
if (hasAttribute(grid, ['columns', '[columns]'])) {
|
|
246
261
|
(0, log_once_1.logOnce)(context, 'warn', 'A <sky-grid> using the "columns" input was left unchanged. The data grid has no "columns" input; define columns with <sky-data-grid-column> elements and migrate this usage manually.');
|
|
247
262
|
(0, template_1.getElementsByTagName)('sky-grid-column', grid).forEach((column) => skippedColumns.add(column));
|
|
263
|
+
columnsSkipped++;
|
|
248
264
|
continue;
|
|
249
265
|
}
|
|
250
266
|
// Each grid is swapped on its own so traversal never has to descend into
|
|
@@ -273,76 +289,257 @@ function convertTemplate(recorder, content, context, offset = 0) {
|
|
|
273
289
|
(0, log_once_1.logOnce)(context, 'info', 'Data grid columns default to dataType="text". Review numeric and date columns and set "dataType" so sorting and formatting behave correctly.');
|
|
274
290
|
(0, log_once_1.logOnce)(context, 'warn', 'Some <sky-grid> features have no <sky-data-grid> equivalent (toolbar, text and row highlighting, custom per-column search, message-stream commands such as row delete, settingsKey persistence, and explicit width/height). Reimplement these manually as needed.');
|
|
275
291
|
}
|
|
276
|
-
return { converted, listViewGridSkipped };
|
|
292
|
+
return { converted, listViewGridSkipped, columnsSkipped };
|
|
277
293
|
}
|
|
278
294
|
function convertHtmlFile(tree, filePath, context) {
|
|
279
295
|
const content = tree.readText(filePath);
|
|
296
|
+
// The `<sky-grid` substring also matches `<sky-grid-column`, so templates
|
|
297
|
+
// whose only grid usage is columns inside `<sky-list-view-grid>` still get
|
|
298
|
+
// counted as evidence for the import decisions.
|
|
280
299
|
if (content.includes('<sky-grid')) {
|
|
281
300
|
const recorder = tree.beginUpdate(filePath);
|
|
282
|
-
convertTemplate(recorder, content, context);
|
|
301
|
+
const result = convertTemplate(recorder, content, context);
|
|
283
302
|
tree.commitUpdate(recorder);
|
|
303
|
+
return result;
|
|
284
304
|
}
|
|
305
|
+
return undefined;
|
|
306
|
+
}
|
|
307
|
+
function emptyResult() {
|
|
308
|
+
return { converted: 0, listViewGridSkipped: 0, columnsSkipped: 0 };
|
|
309
|
+
}
|
|
310
|
+
function addResults(target, source) {
|
|
311
|
+
target.converted += source.converted;
|
|
312
|
+
target.listViewGridSkipped += source.listViewGridSkipped;
|
|
313
|
+
target.columnsSkipped += source.columnsSkipped;
|
|
314
|
+
}
|
|
315
|
+
function hasEvidence(result) {
|
|
316
|
+
return (result.converted > 0 ||
|
|
317
|
+
result.listViewGridSkipped > 0 ||
|
|
318
|
+
result.columnsSkipped > 0);
|
|
319
|
+
}
|
|
320
|
+
function getClassNames(source) {
|
|
321
|
+
return (0, ast_utils_1.findNodes)(source, typescript_1.default.isClassDeclaration)
|
|
322
|
+
.map((declaration) => declaration.name?.text)
|
|
323
|
+
.filter((name) => !!name);
|
|
285
324
|
}
|
|
286
|
-
|
|
325
|
+
/**
|
|
326
|
+
* First pass: converts the file's inline templates and returns the template
|
|
327
|
+
* evidence for the import pass. Imports are not touched here. Returns
|
|
328
|
+
* `undefined` when the file has no template evidence at all, keeping the
|
|
329
|
+
* evidence map small and avoiding class-name associations from files that
|
|
330
|
+
* can't influence any import decision.
|
|
331
|
+
*/
|
|
332
|
+
function convertTypescriptTemplates(tree, filePath, context) {
|
|
287
333
|
const source = (0, ng_ast_1.parseSourceFile)(tree, filePath);
|
|
288
334
|
const templates = (0, ng_ast_1.getInlineTemplates)(source);
|
|
289
|
-
const
|
|
290
|
-
let converted = 0;
|
|
291
|
-
let listViewGridSkipped = 0;
|
|
335
|
+
const inline = emptyResult();
|
|
292
336
|
if (templates.length > 0) {
|
|
293
337
|
const content = tree.readText(filePath);
|
|
338
|
+
const recorder = tree.beginUpdate(filePath);
|
|
294
339
|
for (const template of templates) {
|
|
295
|
-
|
|
296
|
-
converted += result.converted;
|
|
297
|
-
listViewGridSkipped += result.listViewGridSkipped;
|
|
340
|
+
addResults(inline, convertTemplate(recorder, content.slice(template.start, template.end), context, template.start));
|
|
298
341
|
}
|
|
342
|
+
tree.commitUpdate(recorder);
|
|
343
|
+
}
|
|
344
|
+
const templateUrls = (0, ng_ast_1.getTemplateUrls)(source).map((url) => (0, core_1.join)((0, core_1.dirname)((0, core_1.normalize)(filePath)), url));
|
|
345
|
+
if (templateUrls.length === 0 && !hasEvidence(inline)) {
|
|
346
|
+
return undefined;
|
|
347
|
+
}
|
|
348
|
+
return { classNames: getClassNames(source), templateUrls, inline };
|
|
349
|
+
}
|
|
350
|
+
/**
|
|
351
|
+
* Sums the template evidence associated with a `.ts` file: its own aggregate
|
|
352
|
+
* plus the aggregates of the defining files of every class the file
|
|
353
|
+
* references (declarations, TestBed imports, etc.).
|
|
354
|
+
*
|
|
355
|
+
* Association is intentionally approximate. It matches identifier text, so a
|
|
356
|
+
* class name shared by two files pools evidence from both, and it is one
|
|
357
|
+
* level deep, so a file only inherits evidence from classes it references
|
|
358
|
+
* directly — a spec that imports SkyGridModule for a modal launched by the
|
|
359
|
+
* component under test sees no evidence from the modal. A false match can
|
|
360
|
+
* only add evidence (an unnecessary swap that still compiles), and a missing
|
|
361
|
+
* link can only withhold it (the import is left in place with a warning);
|
|
362
|
+
* neither produces a silent compile break.
|
|
363
|
+
*/
|
|
364
|
+
function getAssociatedEvidence(source, filePath, fileAggregates, classToFiles) {
|
|
365
|
+
const contributingFiles = new Set([filePath]);
|
|
366
|
+
if (classToFiles.size > 0) {
|
|
367
|
+
const identifiers = new Set((0, ast_utils_1.findNodes)(source, typescript_1.default.SyntaxKind.Identifier).map((node) => node.text));
|
|
368
|
+
for (const [className, definingFiles] of classToFiles) {
|
|
369
|
+
if (identifiers.has(className)) {
|
|
370
|
+
definingFiles.forEach((definingFile) => contributingFiles.add(definingFile));
|
|
371
|
+
}
|
|
372
|
+
}
|
|
373
|
+
}
|
|
374
|
+
const total = emptyResult();
|
|
375
|
+
for (const contributingFile of contributingFiles) {
|
|
376
|
+
const aggregate = fileAggregates.get(contributingFile);
|
|
377
|
+
if (aggregate) {
|
|
378
|
+
addResults(total, aggregate);
|
|
379
|
+
}
|
|
380
|
+
}
|
|
381
|
+
return total;
|
|
382
|
+
}
|
|
383
|
+
/**
|
|
384
|
+
* True for an `@NgModule` object literal that exports `SkyGridModule`
|
|
385
|
+
* without also importing it. `SkyDataGrid`/`SkyDataGridColumn` need to be
|
|
386
|
+
* added to that NgModule's `imports` array as well, since a standalone class
|
|
387
|
+
* must be imported before it can be exported. A source file may declare more
|
|
388
|
+
* than one `@NgModule`, so this must be checked per-node rather than
|
|
389
|
+
* file-wide to avoid touching NgModules that already import `SkyGridModule`
|
|
390
|
+
* or that don't reference it at all.
|
|
391
|
+
*/
|
|
392
|
+
function ngModuleExportsGridModuleWithoutImportingIt(node) {
|
|
393
|
+
return ((0, ng_ast_1.isSymbolInClassMetadataFieldArray)(node, 'exports', SKY_GRID_MODULE) &&
|
|
394
|
+
!(0, ng_ast_1.isSymbolInClassMetadataFieldArray)(node, 'imports', SKY_GRID_MODULE));
|
|
395
|
+
}
|
|
396
|
+
/**
|
|
397
|
+
* All `@NgModule` metadata objects in `source` that export `SkyGridModule`
|
|
398
|
+
* without also importing it.
|
|
399
|
+
*/
|
|
400
|
+
function getNgModulesExportingGridModuleWithoutImportingIt(source) {
|
|
401
|
+
if (!(0, ng_ast_1.isImportedFromPackage)(source, 'NgModule', '@angular/core')) {
|
|
402
|
+
return [];
|
|
403
|
+
}
|
|
404
|
+
return (0, ast_utils_1.getDecoratorMetadata)(source, 'NgModule', '@angular/core').filter((node) => typescript_1.default.isObjectLiteralExpression(node) &&
|
|
405
|
+
ngModuleExportsGridModuleWithoutImportingIt(node));
|
|
406
|
+
}
|
|
407
|
+
/**
|
|
408
|
+
* Second pass: decides what to do with a file's `SkyGridModule` import based
|
|
409
|
+
* on the template evidence associated with the file — its own inline and
|
|
410
|
+
* `templateUrl` templates plus, for NgModule and spec files, the templates of
|
|
411
|
+
* every referenced class (declarations, TestBed imports, etc.) recorded in
|
|
412
|
+
* `classToFiles`.
|
|
413
|
+
*/
|
|
414
|
+
function updateTypescriptImports(tree, filePath, context, fileAggregates, classToFiles) {
|
|
415
|
+
if (!tree.readText(filePath).includes(SKY_GRID_MODULE)) {
|
|
416
|
+
return;
|
|
417
|
+
}
|
|
418
|
+
const source = (0, ng_ast_1.parseSourceFile)(tree, filePath);
|
|
419
|
+
if (!(0, ng_ast_1.isImportedFromPackage)(source, SKY_GRID_MODULE, SKY_GRID_MODULE_PACKAGE)) {
|
|
420
|
+
return;
|
|
299
421
|
}
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
422
|
+
const total = getAssociatedEvidence(source, filePath, fileAggregates, classToFiles);
|
|
423
|
+
if (total.converted > 0) {
|
|
424
|
+
if (total.columnsSkipped > 0) {
|
|
425
|
+
(0, log_once_1.logOnce)(context, 'warn', 'The "SkyGridModule" import was replaced, but a <sky-grid> using the "columns" input was left unchanged and still requires "SkyGridModule". Restore the import or complete the manual migration of that grid.');
|
|
426
|
+
}
|
|
427
|
+
// A real conversion needs SkyDataGrid/SkyDataGridColumn. Any list-view-grid
|
|
428
|
+
// skip stays safe because <sky-list-view-grid> requires
|
|
429
|
+
// SkyListViewGridModule, which re-exports SkyGridModule.
|
|
430
|
+
const modulesNeedingGridImportForExport = getNgModulesExportingGridModuleWithoutImportingIt(source);
|
|
431
|
+
const recorder = tree.beginUpdate(filePath);
|
|
432
|
+
(0, swap_imported_class_1.swapImportedClass)(recorder, filePath, source, [
|
|
433
|
+
{
|
|
434
|
+
classNames: {
|
|
435
|
+
[SKY_GRID_MODULE]: DATA_GRID_CLASS_NAMES,
|
|
436
|
+
},
|
|
437
|
+
moduleName: {
|
|
438
|
+
old: SKY_GRID_MODULE_PACKAGE,
|
|
439
|
+
new: '@skyux/data-grid',
|
|
440
|
+
},
|
|
441
|
+
},
|
|
442
|
+
]);
|
|
443
|
+
for (const moduleNode of modulesNeedingGridImportForExport) {
|
|
444
|
+
// The import is already added by swapImportedClass above, so only the
|
|
445
|
+
// metadata array needs the symbols (importPath: null). Restrict the
|
|
446
|
+
// edit to this NgModule, since a file can declare more than one, and
|
|
447
|
+
// only add whichever class names its `imports` array is missing (it
|
|
448
|
+
// may already reference SkyDataGrid/SkyDataGridColumn directly).
|
|
449
|
+
const missingClassNames = DATA_GRID_CLASS_NAMES.filter((className) => !(0, ng_ast_1.isSymbolInClassMetadataFieldArray)(moduleNode, 'imports', className));
|
|
450
|
+
if (!missingClassNames.length) {
|
|
451
|
+
continue;
|
|
307
452
|
}
|
|
308
|
-
|
|
309
|
-
|
|
453
|
+
(0, change_1.applyToUpdateRecorder)(recorder, (0, ng_ast_1.addSymbolToClassMetadata)(source, 'NgModule', filePath, 'imports', missingClassNames.join(', '), null, (node) => node === moduleNode));
|
|
454
|
+
}
|
|
455
|
+
tree.commitUpdate(recorder);
|
|
456
|
+
}
|
|
457
|
+
else if (total.columnsSkipped > 0) {
|
|
458
|
+
(0, log_once_1.logOnce)(context, 'warn', 'The "SkyGridModule" import was left unchanged because a <sky-grid> using the "columns" input still depends on it. Migrate that grid manually before removing the import.');
|
|
459
|
+
}
|
|
460
|
+
else if (total.listViewGridSkipped > 0) {
|
|
461
|
+
const listViewGridModuleImported = (0, ng_ast_1.isImportedFromPackage)(source, SKY_LIST_VIEW_GRID_MODULE, SKY_LIST_VIEW_GRID_MODULE_PACKAGE);
|
|
462
|
+
if (listViewGridModuleImported) {
|
|
463
|
+
// SkyListViewGridModule already re-exports SkyGridModule, and nothing
|
|
464
|
+
// associated with this file needs SkyDataGrid/SkyDataGridColumn; it's
|
|
465
|
+
// redundant.
|
|
466
|
+
const recorder = tree.beginUpdate(filePath);
|
|
467
|
+
const removed = (0, remove_class_reference_1.removeClassReference)(recorder, source, SKY_GRID_MODULE, SKY_GRID_MODULE_PACKAGE);
|
|
468
|
+
tree.commitUpdate(recorder);
|
|
469
|
+
if (!removed) {
|
|
470
|
+
// removeClassReference only edits decorator `imports` arrays; a
|
|
471
|
+
// reference elsewhere (e.g. a TestBed configuration) keeps the import.
|
|
472
|
+
(0, log_once_1.logOnce)(context, 'warn', 'The redundant "SkyGridModule" import was kept because it is referenced outside a decorator "imports" array (for example in a TestBed configuration). "SkyListViewGridModule" re-exports "SkyGridModule", so remove the import manually if nothing else needs it.');
|
|
310
473
|
}
|
|
311
474
|
}
|
|
312
475
|
else {
|
|
313
|
-
|
|
314
|
-
// any list-view-grid skip in the same file, so this always runs when
|
|
315
|
-
// something was actually converted.
|
|
316
|
-
(0, swap_imported_class_1.swapImportedClass)(recorder, filePath, source, [
|
|
317
|
-
{
|
|
318
|
-
classNames: {
|
|
319
|
-
[SKY_GRID_MODULE]: ['SkyDataGrid', 'SkyDataGridColumn'],
|
|
320
|
-
},
|
|
321
|
-
moduleName: {
|
|
322
|
-
old: SKY_GRID_MODULE_PACKAGE,
|
|
323
|
-
new: '@skyux/data-grid',
|
|
324
|
-
},
|
|
325
|
-
},
|
|
326
|
-
]);
|
|
476
|
+
(0, log_once_1.logOnce)(context, 'warn', 'The "SkyGridModule" import was left unchanged because a <sky-grid-column> inside <sky-list-view-grid> still depends on it and "SkyListViewGridModule" could not be found in this file\'s imports. If "SkyGridModule" is now unused, review it manually.');
|
|
327
477
|
}
|
|
328
478
|
}
|
|
329
|
-
|
|
479
|
+
else {
|
|
480
|
+
(0, log_once_1.logOnce)(context, 'warn', 'The "SkyGridModule" import was left unchanged because no <sky-grid> usage associated with this file was converted. If the import is unused, or this file re-exports "SkyGridModule" for use elsewhere, update it manually.');
|
|
481
|
+
}
|
|
330
482
|
}
|
|
331
483
|
function convertGridToDataGrid(projectPath) {
|
|
484
|
+
let anyConverted = false;
|
|
332
485
|
return (0, schematics_1.chain)([
|
|
333
486
|
(tree, context) => {
|
|
487
|
+
const htmlResults = new Map();
|
|
488
|
+
const tsEvidence = new Map();
|
|
334
489
|
(0, visit_project_files_1.visitProjectFiles)(tree, projectPath, (filePath) => {
|
|
335
490
|
if (filePath.endsWith('.html')) {
|
|
336
|
-
convertHtmlFile(tree, filePath, context);
|
|
491
|
+
const result = convertHtmlFile(tree, filePath, context);
|
|
492
|
+
if (result) {
|
|
493
|
+
htmlResults.set(filePath, result);
|
|
494
|
+
}
|
|
337
495
|
}
|
|
338
496
|
else if (filePath.endsWith('.ts')) {
|
|
339
|
-
|
|
497
|
+
const evidence = convertTypescriptTemplates(tree, filePath, context);
|
|
498
|
+
if (evidence) {
|
|
499
|
+
tsEvidence.set(filePath, evidence);
|
|
500
|
+
}
|
|
340
501
|
}
|
|
341
502
|
});
|
|
503
|
+
// Fold each .ts file's external template results into a per-file
|
|
504
|
+
// aggregate, and index the file's class names so NgModule and spec
|
|
505
|
+
// files can be associated with it in the import pass.
|
|
506
|
+
const fileAggregates = new Map();
|
|
507
|
+
const classToFiles = new Map();
|
|
508
|
+
for (const [tsPath, evidence] of tsEvidence) {
|
|
509
|
+
const aggregate = emptyResult();
|
|
510
|
+
addResults(aggregate, evidence.inline);
|
|
511
|
+
for (const templateUrl of evidence.templateUrls) {
|
|
512
|
+
const htmlResult = htmlResults.get(templateUrl);
|
|
513
|
+
if (htmlResult) {
|
|
514
|
+
addResults(aggregate, htmlResult);
|
|
515
|
+
}
|
|
516
|
+
}
|
|
517
|
+
if (!hasEvidence(aggregate)) {
|
|
518
|
+
continue;
|
|
519
|
+
}
|
|
520
|
+
fileAggregates.set(tsPath, aggregate);
|
|
521
|
+
for (const className of evidence.classNames) {
|
|
522
|
+
const definingFiles = classToFiles.get(className) ?? [];
|
|
523
|
+
definingFiles.push(tsPath);
|
|
524
|
+
classToFiles.set(className, definingFiles);
|
|
525
|
+
}
|
|
526
|
+
}
|
|
527
|
+
anyConverted =
|
|
528
|
+
[...htmlResults.values()].some((result) => result.converted > 0) ||
|
|
529
|
+
[...tsEvidence.values()].some((evidence) => evidence.inline.converted > 0);
|
|
530
|
+
(0, visit_project_files_1.visitProjectFiles)(tree, projectPath, (filePath) => {
|
|
531
|
+
if (filePath.endsWith('.ts')) {
|
|
532
|
+
updateTypescriptImports(tree, filePath, context, fileAggregates, classToFiles);
|
|
533
|
+
}
|
|
534
|
+
});
|
|
535
|
+
},
|
|
536
|
+
() => {
|
|
537
|
+
if (anyConverted) {
|
|
538
|
+
return (0, utility_1.addDependency)('@skyux/data-grid', `15.0.0-alpha.5`, {
|
|
539
|
+
existing: utility_1.ExistingBehavior.Skip,
|
|
540
|
+
});
|
|
541
|
+
}
|
|
342
542
|
},
|
|
343
|
-
(0, utility_1.addDependency)('@skyux/data-grid', `15.0.0-alpha.3`, {
|
|
344
|
-
existing: utility_1.ExistingBehavior.Skip,
|
|
345
|
-
}),
|
|
346
543
|
]);
|
|
347
544
|
}
|
|
348
545
|
//# sourceMappingURL=convert-grid-to-data-grid.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-grid-to-data-grid.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/rules/convert-grid-to-data-grid/convert-grid-to-data-grid.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"convert-grid-to-data-grid.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/rules/convert-grid-to-data-grid/convert-grid-to-data-grid.ts"],"names":[],"mappings":"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"}
|
|
@@ -198,7 +198,7 @@ function convertPageSummaryToPageHeader(projectPath) {
|
|
|
198
198
|
}
|
|
199
199
|
});
|
|
200
200
|
},
|
|
201
|
-
(0, utility_1.addDependency)('@skyux/pages', `15.0.0-alpha.
|
|
201
|
+
(0, utility_1.addDependency)('@skyux/pages', `15.0.0-alpha.5`, {
|
|
202
202
|
existing: utility_1.ExistingBehavior.Skip,
|
|
203
203
|
}),
|
|
204
204
|
]);
|
|
@@ -296,7 +296,7 @@ function convertProgressIndicatorWizardToTabWizard(options) {
|
|
|
296
296
|
});
|
|
297
297
|
}
|
|
298
298
|
},
|
|
299
|
-
(0, utility_1.addDependency)('@skyux/tabs', `15.0.0-alpha.
|
|
299
|
+
(0, utility_1.addDependency)('@skyux/tabs', `15.0.0-alpha.5`, {
|
|
300
300
|
existing: utility_1.ExistingBehavior.Skip,
|
|
301
301
|
}),
|
|
302
302
|
]);
|
|
@@ -28,7 +28,7 @@ export declare function isStandaloneComponent(metadata: ts.ObjectLiteralExpressi
|
|
|
28
28
|
*
|
|
29
29
|
* Derived from https://github.com/angular/angular-cli/blob/20.1.x/packages/schematics/angular/utility/ast-utils.ts
|
|
30
30
|
*/
|
|
31
|
-
export declare function addSymbolToClassMetadata(source: ts.SourceFile, decorator: 'NgModule' | 'Component' | 'Directive' | 'TestBed.configureTestingModule', filePath: string, metadataField: string, symbolName: string, importPath?: string | null): Change[];
|
|
31
|
+
export declare function addSymbolToClassMetadata(source: ts.SourceFile, decorator: 'NgModule' | 'Component' | 'Directive' | 'TestBed.configureTestingModule', filePath: string, metadataField: string, symbolName: string, importPath?: string | null, nodeFilter?: (node: ts.ObjectLiteralExpression) => boolean): Change[];
|
|
32
32
|
/**
|
|
33
33
|
* Checks if a symbol is present in a class metadata field array.
|
|
34
34
|
*/
|
|
@@ -119,13 +119,14 @@ function isStandaloneComponent(metadata) {
|
|
|
119
119
|
*
|
|
120
120
|
* Derived from https://github.com/angular/angular-cli/blob/20.1.x/packages/schematics/angular/utility/ast-utils.ts
|
|
121
121
|
*/
|
|
122
|
-
function addSymbolToClassMetadata(source, decorator, filePath, metadataField, symbolName, importPath = null) {
|
|
122
|
+
function addSymbolToClassMetadata(source, decorator, filePath, metadataField, symbolName, importPath = null, nodeFilter) {
|
|
123
123
|
const nodes = 'TestBed.configureTestingModule' === decorator
|
|
124
124
|
? getTestingModuleMetadata(source)
|
|
125
125
|
: (0, ast_utils_1.getDecoratorMetadata)(source, decorator, '@angular/core');
|
|
126
126
|
let insertedImport = false;
|
|
127
127
|
return nodes
|
|
128
128
|
.filter((node) => !!node && typescript_1.default.isObjectLiteralExpression(node))
|
|
129
|
+
.filter((node) => !nodeFilter || nodeFilter(node))
|
|
129
130
|
.flatMap((node) => {
|
|
130
131
|
if (importPath === '@angular/common' &&
|
|
131
132
|
isSymbolInClassMetadataFieldArray(node, metadataField, 'CommonModule')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ng-ast.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/ng-ast.ts"],"names":[],"mappings":";;AAcA,0CAYC;AAMD,sDAsCC;AAED,gDA4BC;AAED,0CAwBC;AAKD,4DAWC;AAKD,sDASC;AAOD,
|
|
1
|
+
{"version":3,"file":"ng-ast.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/ng-ast.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,5 +8,8 @@ import ts from 'typescript';
|
|
|
8
8
|
* References outside a decorator's `imports` array (unrelated arrays, a
|
|
9
9
|
* parameter that shadows the import, direct assignments, etc.) are left
|
|
10
10
|
* untouched, and the import is kept if any of those remain.
|
|
11
|
+
*
|
|
12
|
+
* Returns `true` when the import statement was removed, `false` when
|
|
13
|
+
* unhandled references kept it in place.
|
|
11
14
|
*/
|
|
12
|
-
export declare function removeClassReference(recorder: UpdateRecorder, sourceFile: ts.SourceFile, className: string, moduleName: string):
|
|
15
|
+
export declare function removeClassReference(recorder: UpdateRecorder, sourceFile: ts.SourceFile, className: string, moduleName: string): boolean;
|
|
@@ -28,6 +28,9 @@ function isDecoratorImportsArray(array) {
|
|
|
28
28
|
* References outside a decorator's `imports` array (unrelated arrays, a
|
|
29
29
|
* parameter that shadows the import, direct assignments, etc.) are left
|
|
30
30
|
* untouched, and the import is kept if any of those remain.
|
|
31
|
+
*
|
|
32
|
+
* Returns `true` when the import statement was removed, `false` when
|
|
33
|
+
* unhandled references kept it in place.
|
|
31
34
|
*/
|
|
32
35
|
function removeClassReference(recorder, sourceFile, className, moduleName) {
|
|
33
36
|
const endOfImports = (0, ast_utils_1.findNodes)(sourceFile, typescript_1.default.SyntaxKind.ImportDeclaration).reduce((max, node) => Math.max(max, node.getEnd()), 0);
|
|
@@ -59,5 +62,6 @@ function removeClassReference(recorder, sourceFile, className, moduleName) {
|
|
|
59
62
|
moduleName,
|
|
60
63
|
});
|
|
61
64
|
}
|
|
65
|
+
return !hasUnhandledReference;
|
|
62
66
|
}
|
|
63
67
|
//# sourceMappingURL=remove-class-reference.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-class-reference.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/remove-class-reference.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"remove-class-reference.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/remove-class-reference.ts"],"names":[],"mappings":"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"}
|
package/src/version.js
CHANGED