@skyux/packages 7.0.0-beta.12 → 7.0.0-beta.13
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 +47 -47
- package/src/schematics/migrations/migration-collection.json +6 -1
- package/src/schematics/migrations/update-7/ag-grid-28.schematic.js +30 -14
- package/src/schematics/migrations/update-7/ag-grid-28.schematic.js.map +1 -1
- package/src/schematics/migrations/update-7/fix-mixed-case-imports.d.ts +2 -0
- package/src/schematics/migrations/update-7/fix-mixed-case-imports.js +104 -0
- package/src/schematics/migrations/update-7/fix-mixed-case-imports.js.map +1 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@skyux/packages",
|
|
3
|
-
"version": "7.0.0-beta.
|
|
3
|
+
"version": "7.0.0-beta.13",
|
|
4
4
|
"author": "Blackbaud, Inc.",
|
|
5
5
|
"description": "Handles the `ng update` command for SKY UX component libraries.",
|
|
6
6
|
"keywords": [
|
|
@@ -27,54 +27,54 @@
|
|
|
27
27
|
"@blackbaud/skyux-lib-code-block": "^7.0.0-beta.0",
|
|
28
28
|
"@blackbaud/skyux-lib-media": "^7.0.0-beta.0",
|
|
29
29
|
"@blackbaud/skyux-lib-stache": "^7.0.0-beta.0",
|
|
30
|
-
"@skyux-sdk/prettier-schematics": "7.0.0-beta.
|
|
31
|
-
"@skyux-sdk/testing": "7.0.0-beta.
|
|
32
|
-
"@skyux/a11y": "7.0.0-beta.
|
|
33
|
-
"@skyux/action-bars": "7.0.0-beta.
|
|
34
|
-
"@skyux/ag-grid": "7.0.0-beta.
|
|
35
|
-
"@skyux/angular-tree-component": "7.0.0-beta.
|
|
36
|
-
"@skyux/animations": "7.0.0-beta.
|
|
37
|
-
"@skyux/assets": "7.0.0-beta.
|
|
38
|
-
"@skyux/autonumeric": "7.0.0-beta.
|
|
39
|
-
"@skyux/avatar": "7.0.0-beta.
|
|
40
|
-
"@skyux/colorpicker": "7.0.0-beta.
|
|
41
|
-
"@skyux/config": "7.0.0-beta.
|
|
42
|
-
"@skyux/core": "7.0.0-beta.
|
|
43
|
-
"@skyux/data-manager": "7.0.0-beta.
|
|
44
|
-
"@skyux/datetime": "7.0.0-beta.
|
|
30
|
+
"@skyux-sdk/prettier-schematics": "7.0.0-beta.13",
|
|
31
|
+
"@skyux-sdk/testing": "7.0.0-beta.13",
|
|
32
|
+
"@skyux/a11y": "7.0.0-beta.13",
|
|
33
|
+
"@skyux/action-bars": "7.0.0-beta.13",
|
|
34
|
+
"@skyux/ag-grid": "7.0.0-beta.13",
|
|
35
|
+
"@skyux/angular-tree-component": "7.0.0-beta.13",
|
|
36
|
+
"@skyux/animations": "7.0.0-beta.13",
|
|
37
|
+
"@skyux/assets": "7.0.0-beta.13",
|
|
38
|
+
"@skyux/autonumeric": "7.0.0-beta.13",
|
|
39
|
+
"@skyux/avatar": "7.0.0-beta.13",
|
|
40
|
+
"@skyux/colorpicker": "7.0.0-beta.13",
|
|
41
|
+
"@skyux/config": "7.0.0-beta.13",
|
|
42
|
+
"@skyux/core": "7.0.0-beta.13",
|
|
43
|
+
"@skyux/data-manager": "7.0.0-beta.13",
|
|
44
|
+
"@skyux/datetime": "7.0.0-beta.13",
|
|
45
45
|
"@skyux/docs-tools": "^7.0.0-beta.0",
|
|
46
|
-
"@skyux/errors": "7.0.0-beta.
|
|
47
|
-
"@skyux/flyout": "7.0.0-beta.
|
|
48
|
-
"@skyux/forms": "7.0.0-beta.
|
|
49
|
-
"@skyux/grids": "7.0.0-beta.
|
|
50
|
-
"@skyux/http": "7.0.0-beta.
|
|
51
|
-
"@skyux/i18n": "7.0.0-beta.
|
|
46
|
+
"@skyux/errors": "7.0.0-beta.13",
|
|
47
|
+
"@skyux/flyout": "7.0.0-beta.13",
|
|
48
|
+
"@skyux/forms": "7.0.0-beta.13",
|
|
49
|
+
"@skyux/grids": "7.0.0-beta.13",
|
|
50
|
+
"@skyux/http": "7.0.0-beta.13",
|
|
51
|
+
"@skyux/i18n": "7.0.0-beta.13",
|
|
52
52
|
"@skyux/icons": "^5.1.1",
|
|
53
|
-
"@skyux/indicators": "7.0.0-beta.
|
|
54
|
-
"@skyux/inline-form": "7.0.0-beta.
|
|
55
|
-
"@skyux/layout": "7.0.0-beta.
|
|
56
|
-
"@skyux/list-builder": "7.0.0-beta.
|
|
57
|
-
"@skyux/list-builder-common": "7.0.0-beta.
|
|
58
|
-
"@skyux/list-builder-view-checklist": "7.0.0-beta.
|
|
59
|
-
"@skyux/list-builder-view-grids": "7.0.0-beta.
|
|
60
|
-
"@skyux/lists": "7.0.0-beta.
|
|
61
|
-
"@skyux/lookup": "7.0.0-beta.
|
|
62
|
-
"@skyux/modals": "7.0.0-beta.
|
|
63
|
-
"@skyux/navbar": "7.0.0-beta.
|
|
64
|
-
"@skyux/omnibar-interop": "7.0.0-beta.
|
|
65
|
-
"@skyux/pages": "7.0.0-beta.
|
|
66
|
-
"@skyux/phone-field": "7.0.0-beta.
|
|
67
|
-
"@skyux/popovers": "7.0.0-beta.
|
|
68
|
-
"@skyux/progress-indicator": "7.0.0-beta.
|
|
69
|
-
"@skyux/router": "7.0.0-beta.
|
|
70
|
-
"@skyux/select-field": "7.0.0-beta.
|
|
71
|
-
"@skyux/split-view": "7.0.0-beta.
|
|
72
|
-
"@skyux/tabs": "7.0.0-beta.
|
|
73
|
-
"@skyux/text-editor": "7.0.0-beta.
|
|
74
|
-
"@skyux/theme": "7.0.0-beta.
|
|
75
|
-
"@skyux/tiles": "7.0.0-beta.
|
|
76
|
-
"@skyux/toast": "7.0.0-beta.
|
|
77
|
-
"@skyux/validation": "7.0.0-beta.
|
|
53
|
+
"@skyux/indicators": "7.0.0-beta.13",
|
|
54
|
+
"@skyux/inline-form": "7.0.0-beta.13",
|
|
55
|
+
"@skyux/layout": "7.0.0-beta.13",
|
|
56
|
+
"@skyux/list-builder": "7.0.0-beta.13",
|
|
57
|
+
"@skyux/list-builder-common": "7.0.0-beta.13",
|
|
58
|
+
"@skyux/list-builder-view-checklist": "7.0.0-beta.13",
|
|
59
|
+
"@skyux/list-builder-view-grids": "7.0.0-beta.13",
|
|
60
|
+
"@skyux/lists": "7.0.0-beta.13",
|
|
61
|
+
"@skyux/lookup": "7.0.0-beta.13",
|
|
62
|
+
"@skyux/modals": "7.0.0-beta.13",
|
|
63
|
+
"@skyux/navbar": "7.0.0-beta.13",
|
|
64
|
+
"@skyux/omnibar-interop": "7.0.0-beta.13",
|
|
65
|
+
"@skyux/pages": "7.0.0-beta.13",
|
|
66
|
+
"@skyux/phone-field": "7.0.0-beta.13",
|
|
67
|
+
"@skyux/popovers": "7.0.0-beta.13",
|
|
68
|
+
"@skyux/progress-indicator": "7.0.0-beta.13",
|
|
69
|
+
"@skyux/router": "7.0.0-beta.13",
|
|
70
|
+
"@skyux/select-field": "7.0.0-beta.13",
|
|
71
|
+
"@skyux/split-view": "7.0.0-beta.13",
|
|
72
|
+
"@skyux/tabs": "7.0.0-beta.13",
|
|
73
|
+
"@skyux/text-editor": "7.0.0-beta.13",
|
|
74
|
+
"@skyux/theme": "7.0.0-beta.13",
|
|
75
|
+
"@skyux/tiles": "7.0.0-beta.13",
|
|
76
|
+
"@skyux/toast": "7.0.0-beta.13",
|
|
77
|
+
"@skyux/validation": "7.0.0-beta.13",
|
|
78
78
|
"ag-grid-angular": "^28.2.1",
|
|
79
79
|
"ag-grid-community": "^28.2.1",
|
|
80
80
|
"ag-grid-enterprise": "^28.2.1"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schematics": {
|
|
3
3
|
"noop": {
|
|
4
|
-
"version": "7.0.0-beta.
|
|
4
|
+
"version": "7.0.0-beta.13",
|
|
5
5
|
"factory": "./noop/noop.schematic",
|
|
6
6
|
"description": "Update all SKY UX component packages"
|
|
7
7
|
},
|
|
@@ -39,6 +39,11 @@
|
|
|
39
39
|
"version": "7.0.0-beta.0",
|
|
40
40
|
"factory": "./update-7/fix-scss-imports",
|
|
41
41
|
"description": "Fix SCSS imports"
|
|
42
|
+
},
|
|
43
|
+
"fix-mixed-case-imports": {
|
|
44
|
+
"version": "7.0.0-beta.0",
|
|
45
|
+
"factory": "./update-7/fix-mixed-case-imports",
|
|
46
|
+
"description": "Fix import statements where the file case does not match the filesystem"
|
|
42
47
|
}
|
|
43
48
|
}
|
|
44
49
|
}
|
|
@@ -11,6 +11,7 @@ const ENT_MODULE = '@ag-grid-enterprise/';
|
|
|
11
11
|
const AG_GRID = 'ag-grid-community';
|
|
12
12
|
const AG_GRID_ENT = 'ag-grid-enterprise';
|
|
13
13
|
const withComponents = 'AgGridModule.withComponents';
|
|
14
|
+
const forRoot = 'AgGridModule.withComponents';
|
|
14
15
|
/**
|
|
15
16
|
* Check package.json for AG Grid dependencies.
|
|
16
17
|
*/
|
|
@@ -93,22 +94,24 @@ function swapModulesWithPackageInCode(updatedContent, agGridAllModules, agGridAl
|
|
|
93
94
|
return updatedContent;
|
|
94
95
|
}
|
|
95
96
|
/**
|
|
96
|
-
* Remove `AgGridModule.withComponents` in module imports.
|
|
97
|
+
* Remove `AgGridModule.withComponents` and `AgGridModule.forRoot` in module imports.
|
|
97
98
|
*/
|
|
98
99
|
function removeWithComponentsStaticImportsCall(filePath, updatedContent) {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
updatedContent
|
|
108
|
-
|
|
109
|
-
|
|
100
|
+
[withComponents, forRoot].forEach((staticModule) => {
|
|
101
|
+
if ((filePath.endsWith('module.ts') || filePath.endsWith('spec.ts')) &&
|
|
102
|
+
updatedContent.includes(staticModule)) {
|
|
103
|
+
let pos;
|
|
104
|
+
while ((pos = updatedContent.indexOf(staticModule)) !== -1) {
|
|
105
|
+
// Find closing parenthesis after `AgGridModule.withComponents`
|
|
106
|
+
const end = updatedContent.indexOf(')', pos);
|
|
107
|
+
// Leave `AgGridModule`, drop `.withComponents` and `.forRoot`.
|
|
108
|
+
updatedContent = [
|
|
109
|
+
updatedContent.substring(0, pos + 12),
|
|
110
|
+
updatedContent.substring(end + 1),
|
|
111
|
+
].join('');
|
|
112
|
+
}
|
|
110
113
|
}
|
|
111
|
-
}
|
|
114
|
+
});
|
|
112
115
|
return updatedContent;
|
|
113
116
|
}
|
|
114
117
|
/**
|
|
@@ -117,7 +120,18 @@ function removeWithComponentsStaticImportsCall(filePath, updatedContent) {
|
|
|
117
120
|
function renameColumnApiFunctionsInCode(updatedContent) {
|
|
118
121
|
if (updatedContent.includes(AG_GRID) &&
|
|
119
122
|
updatedContent.includes('etSecondaryColumns(')) {
|
|
120
|
-
updatedContent = updatedContent.replace(/(?<=columnApi)\.(get|set)SecondaryColumns\(/g, (_, x) => `.${x}PivotResultColumns(`);
|
|
123
|
+
updatedContent = updatedContent.replace(/(?<=columnApi\s*)\.(get|set)SecondaryColumns\(/g, (_, x) => `.${x}PivotResultColumns(`);
|
|
124
|
+
}
|
|
125
|
+
return updatedContent;
|
|
126
|
+
}
|
|
127
|
+
/**
|
|
128
|
+
* Grid option renamed suppressCellSelection to suppressCellFocus.
|
|
129
|
+
*/
|
|
130
|
+
function renameSuppressCellSelectionGridOptionInCode(updatedContent) {
|
|
131
|
+
if (updatedContent.includes(AG_GRID) &&
|
|
132
|
+
updatedContent.match(/gridOptions/i) &&
|
|
133
|
+
updatedContent.includes('suppressCellSelection')) {
|
|
134
|
+
updatedContent = updatedContent.replace(/\bsuppressCellSelection\b/g, 'suppressCellFocus');
|
|
121
135
|
}
|
|
122
136
|
return updatedContent;
|
|
123
137
|
}
|
|
@@ -162,6 +176,8 @@ function updateSourceFiles() {
|
|
|
162
176
|
updatedContent = swapModulesWithPackageInCode(updatedContent, agGridAllModules, agGridAllModulesEnt);
|
|
163
177
|
updatedContent = removeWithComponentsStaticImportsCall(filePath, updatedContent);
|
|
164
178
|
updatedContent = renameColumnApiFunctionsInCode(updatedContent);
|
|
179
|
+
updatedContent =
|
|
180
|
+
renameSuppressCellSelectionGridOptionInCode(updatedContent);
|
|
165
181
|
if (updatedContent !== content) {
|
|
166
182
|
tree.overwrite(filePath, updatedContent);
|
|
167
183
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ag-grid-28.schematic.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/ag-grid-28.schematic.ts"],"names":[],"mappings":";;;AACA,2DAKoC;AACpC,4DAA0E;AAC1E,2EAMkD;AAElD,uDAAuD;AAE1C,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAE1C,MAAM,UAAU,GAAG,qBAAqB,CAAC;AACzC,MAAM,UAAU,GAAG,sBAAsB,CAAC;AAC1C,MAAM,OAAO,GAAG,mBAAmB,CAAC;AACpC,MAAM,WAAW,GAAG,oBAAoB,CAAC;AACzC,MAAM,cAAc,GAAG,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"ag-grid-28.schematic.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/ag-grid-28.schematic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const core_1 = require("@angular-devkit/core");
|
|
5
|
+
const ts = tslib_1.__importStar(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
|
|
6
|
+
const path = tslib_1.__importStar(require("path"));
|
|
7
|
+
const workspace_1 = require("../../utility/workspace");
|
|
8
|
+
function updateTypescriptImports(filePath, tree, context) {
|
|
9
|
+
const fileContent = tree.read(filePath)?.toString();
|
|
10
|
+
if (!fileContent) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
context.logger.debug(`Checking imports in ${filePath}...`);
|
|
14
|
+
const source = ts.createSourceFile(filePath, fileContent, ts.ScriptTarget.Latest, true);
|
|
15
|
+
// Get all import declarations
|
|
16
|
+
const importDeclarations = source.statements.filter((statement) => statement.kind === ts.SyntaxKind.ImportDeclaration);
|
|
17
|
+
// Just local import targets
|
|
18
|
+
const localImportDeclarations = importDeclarations.filter((importDeclaration) => {
|
|
19
|
+
const importPath = importDeclaration.moduleSpecifier.getText(source);
|
|
20
|
+
const importPathWithoutQuotes = importPath.substring(1, importPath.length - 1);
|
|
21
|
+
return importPathWithoutQuotes.startsWith('.');
|
|
22
|
+
});
|
|
23
|
+
const transformers = [];
|
|
24
|
+
localImportDeclarations.forEach((importDeclaration) => {
|
|
25
|
+
const importPath = importDeclaration.moduleSpecifier.getText(source);
|
|
26
|
+
const importPathWithoutQuotes = importPath.substring(1, importPath.length - 1);
|
|
27
|
+
const absoluteImportPath = path.join(path.dirname(filePath), `${importPathWithoutQuotes}.ts`.replace(/\\/g, '/'));
|
|
28
|
+
const pathFragments = (0, core_1.split)(absoluteImportPath).slice(1);
|
|
29
|
+
const newPath = [];
|
|
30
|
+
let dir = tree.root;
|
|
31
|
+
// Walk the path fragments and check if the case is correct. This approach works on both case-sensitive and case-insensitive file systems.
|
|
32
|
+
for (const pathFragment of pathFragments) {
|
|
33
|
+
if (pathFragment.endsWith('.ts')) {
|
|
34
|
+
if (dir.subfiles.includes(pathFragment)) {
|
|
35
|
+
// File exists. We're done.
|
|
36
|
+
newPath.push(pathFragment.replace(/\.ts$/, ''));
|
|
37
|
+
break;
|
|
38
|
+
}
|
|
39
|
+
// File does not exist. Try to find a file with the same name but different casing.
|
|
40
|
+
const matchingFile = dir.subfiles.find((subFile) => subFile.toLowerCase().includes(pathFragment.toLowerCase()));
|
|
41
|
+
if (matchingFile) {
|
|
42
|
+
// Found a matching file. Use it.
|
|
43
|
+
newPath.push(matchingFile.replace(/\.ts$/, ''));
|
|
44
|
+
break;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
if (dir.subdirs.includes(pathFragment)) {
|
|
49
|
+
// Sub dir exists. Continue.
|
|
50
|
+
dir = dir.dir(pathFragment);
|
|
51
|
+
newPath.push(pathFragment);
|
|
52
|
+
continue;
|
|
53
|
+
}
|
|
54
|
+
// Dir does not exist. Try to find a dir with the same name but different casing.
|
|
55
|
+
const matchingDir = dir.subdirs.find((subdir) => subdir.toLowerCase().includes(pathFragment.toLowerCase()));
|
|
56
|
+
if (matchingDir) {
|
|
57
|
+
// Found a matching dir. Use it.
|
|
58
|
+
dir = dir.dir(matchingDir);
|
|
59
|
+
newPath.push(matchingDir);
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
// Nothing found. Can't fix this.
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
const newImportPathAbsolute = (0, core_1.join)(tree.root.path, ...newPath);
|
|
67
|
+
let newImportPathRelative = path.relative((0, core_1.dirname)(filePath), newImportPathAbsolute);
|
|
68
|
+
if (!newImportPathRelative.startsWith('.')) {
|
|
69
|
+
newImportPathRelative = `./${newImportPathRelative}`;
|
|
70
|
+
}
|
|
71
|
+
if (newImportPathRelative !== importPathWithoutQuotes) {
|
|
72
|
+
context.logger.debug(`Updating ${filePath} :: ${importPathWithoutQuotes} -> ${newImportPathRelative}`);
|
|
73
|
+
transformers.push({
|
|
74
|
+
find: importPathWithoutQuotes,
|
|
75
|
+
replace: newImportPathRelative,
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
if (transformers.length > 0) {
|
|
80
|
+
let newContent = fileContent;
|
|
81
|
+
transformers.forEach((transformer) => {
|
|
82
|
+
newContent = newContent.replace(transformer.find, transformer.replace);
|
|
83
|
+
});
|
|
84
|
+
tree.overwrite(filePath, newContent);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
async function visitTypescriptFiles(tree, context) {
|
|
88
|
+
const { workspace } = await (0, workspace_1.getWorkspace)(tree);
|
|
89
|
+
workspace.projects.forEach((project, projectName) => {
|
|
90
|
+
context.logger.debug(`Looking for typescript files in project ${projectName}...`);
|
|
91
|
+
tree.getDir(project.root).visit((filePath) => {
|
|
92
|
+
if (filePath.endsWith('.ts')) {
|
|
93
|
+
updateTypescriptImports(filePath, tree, context);
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
function default_1() {
|
|
99
|
+
return async (tree, context) => {
|
|
100
|
+
await visitTypescriptFiles(tree, context);
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
exports.default = default_1;
|
|
104
|
+
//# sourceMappingURL=fix-mixed-case-imports.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fix-mixed-case-imports.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/fix-mixed-case-imports.ts"],"names":[],"mappings":"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"}
|