@skyux/packages 7.0.0-beta.12 → 7.0.0-beta.15
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-imports.d.ts +2 -0
- package/src/schematics/migrations/update-7/fix-imports.js +172 -0
- package/src/schematics/migrations/update-7/fix-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.15",
|
|
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.15",
|
|
31
|
+
"@skyux-sdk/testing": "7.0.0-beta.15",
|
|
32
|
+
"@skyux/a11y": "7.0.0-beta.15",
|
|
33
|
+
"@skyux/action-bars": "7.0.0-beta.15",
|
|
34
|
+
"@skyux/ag-grid": "7.0.0-beta.15",
|
|
35
|
+
"@skyux/angular-tree-component": "7.0.0-beta.15",
|
|
36
|
+
"@skyux/animations": "7.0.0-beta.15",
|
|
37
|
+
"@skyux/assets": "7.0.0-beta.15",
|
|
38
|
+
"@skyux/autonumeric": "7.0.0-beta.15",
|
|
39
|
+
"@skyux/avatar": "7.0.0-beta.15",
|
|
40
|
+
"@skyux/colorpicker": "7.0.0-beta.15",
|
|
41
|
+
"@skyux/config": "7.0.0-beta.15",
|
|
42
|
+
"@skyux/core": "7.0.0-beta.15",
|
|
43
|
+
"@skyux/data-manager": "7.0.0-beta.15",
|
|
44
|
+
"@skyux/datetime": "7.0.0-beta.15",
|
|
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.15",
|
|
47
|
+
"@skyux/flyout": "7.0.0-beta.15",
|
|
48
|
+
"@skyux/forms": "7.0.0-beta.15",
|
|
49
|
+
"@skyux/grids": "7.0.0-beta.15",
|
|
50
|
+
"@skyux/http": "7.0.0-beta.15",
|
|
51
|
+
"@skyux/i18n": "7.0.0-beta.15",
|
|
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.15",
|
|
54
|
+
"@skyux/inline-form": "7.0.0-beta.15",
|
|
55
|
+
"@skyux/layout": "7.0.0-beta.15",
|
|
56
|
+
"@skyux/list-builder": "7.0.0-beta.15",
|
|
57
|
+
"@skyux/list-builder-common": "7.0.0-beta.15",
|
|
58
|
+
"@skyux/list-builder-view-checklist": "7.0.0-beta.15",
|
|
59
|
+
"@skyux/list-builder-view-grids": "7.0.0-beta.15",
|
|
60
|
+
"@skyux/lists": "7.0.0-beta.15",
|
|
61
|
+
"@skyux/lookup": "7.0.0-beta.15",
|
|
62
|
+
"@skyux/modals": "7.0.0-beta.15",
|
|
63
|
+
"@skyux/navbar": "7.0.0-beta.15",
|
|
64
|
+
"@skyux/omnibar-interop": "7.0.0-beta.15",
|
|
65
|
+
"@skyux/pages": "7.0.0-beta.15",
|
|
66
|
+
"@skyux/phone-field": "7.0.0-beta.15",
|
|
67
|
+
"@skyux/popovers": "7.0.0-beta.15",
|
|
68
|
+
"@skyux/progress-indicator": "7.0.0-beta.15",
|
|
69
|
+
"@skyux/router": "7.0.0-beta.15",
|
|
70
|
+
"@skyux/select-field": "7.0.0-beta.15",
|
|
71
|
+
"@skyux/split-view": "7.0.0-beta.15",
|
|
72
|
+
"@skyux/tabs": "7.0.0-beta.15",
|
|
73
|
+
"@skyux/text-editor": "7.0.0-beta.15",
|
|
74
|
+
"@skyux/theme": "7.0.0-beta.15",
|
|
75
|
+
"@skyux/tiles": "7.0.0-beta.15",
|
|
76
|
+
"@skyux/toast": "7.0.0-beta.15",
|
|
77
|
+
"@skyux/validation": "7.0.0-beta.15",
|
|
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.15",
|
|
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-imports": {
|
|
44
|
+
"version": "7.0.0-beta.0",
|
|
45
|
+
"factory": "./update-7/fix-imports",
|
|
46
|
+
"description": "Fix import and export statements where the file case does not match the filesystem, and fix or warn about core-js imports"
|
|
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,172 @@
|
|
|
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
|
+
// Obfuscate the import statement regexp to avoid flagging by the missing peer dependency check.
|
|
9
|
+
const CORE_JS_UNNECESSARY = /imp[o]rt \{[^}]+} from 'core-js';\r?\n/;
|
|
10
|
+
const CORE_JS_OBJECT_VALUES = /imp[o]rt values from 'core-js\/features\/object\/values';\r?\n/;
|
|
11
|
+
const CORE_JS_OBJECT_VALUES_REQUIRE = `require('core-js/library/fn/object/values')`;
|
|
12
|
+
function findChangesForLocalImports(localModulePaths, filePath, tree, context) {
|
|
13
|
+
const transformers = [];
|
|
14
|
+
localModulePaths.forEach((modulePath) => {
|
|
15
|
+
const endsWithSlash = !!modulePath.match(/[/\\]$/);
|
|
16
|
+
const normalizedModulePath = endsWithSlash
|
|
17
|
+
? (0, core_1.normalize)(modulePath)
|
|
18
|
+
: (0, core_1.normalize)(modulePath + '.ts');
|
|
19
|
+
const absolutePath = (0, core_1.normalize)((0, core_1.join)((0, core_1.dirname)((0, core_1.normalize)(filePath)), normalizedModulePath));
|
|
20
|
+
context.logger.debug(`Looking for local module ${modulePath} at ${absolutePath}...`);
|
|
21
|
+
const pathFragments = (0, core_1.split)(absolutePath).slice(1);
|
|
22
|
+
const newPath = [];
|
|
23
|
+
let dir = tree.root;
|
|
24
|
+
// Walk the path fragments and check if the case is correct. This approach works on both case-sensitive and case-insensitive file systems.
|
|
25
|
+
for (let i = 0; i < pathFragments.length; i++) {
|
|
26
|
+
const pathFragment = pathFragments[i];
|
|
27
|
+
if (pathFragment.endsWith('.ts')) {
|
|
28
|
+
if (dir.subfiles.includes(pathFragment)) {
|
|
29
|
+
// File exists. We're done.
|
|
30
|
+
newPath.push(pathFragment.replace(/\.ts$/, ''));
|
|
31
|
+
break;
|
|
32
|
+
}
|
|
33
|
+
// File does not exist. Try to find a file with the same name but different casing.
|
|
34
|
+
const matchingFile = dir.subfiles.find((subFile) => subFile.toLowerCase() === pathFragment.toLowerCase());
|
|
35
|
+
if (matchingFile) {
|
|
36
|
+
// Found a matching file. Use it.
|
|
37
|
+
newPath.push(matchingFile.replace(/\.ts$/, ''));
|
|
38
|
+
break;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
if (dir.subdirs.includes(pathFragment)) {
|
|
43
|
+
// Sub dir exists. Continue.
|
|
44
|
+
dir = dir.dir(pathFragment);
|
|
45
|
+
newPath.push(pathFragment);
|
|
46
|
+
continue;
|
|
47
|
+
}
|
|
48
|
+
// Dir does not exist. Try to find a dir with the same name but different casing.
|
|
49
|
+
const matchingDir = dir.subdirs.find((subdir) => subdir.toLowerCase() === pathFragment.toLowerCase());
|
|
50
|
+
if (matchingDir) {
|
|
51
|
+
// Found a matching dir. Use it.
|
|
52
|
+
dir = dir.dir(matchingDir);
|
|
53
|
+
newPath.push(matchingDir);
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
// Nothing found. Can't fix this.
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
const newPathAbsolute = (0, core_1.join)(tree.root.path, ...newPath);
|
|
61
|
+
let newPathRelative = path.relative((0, core_1.dirname)(filePath), newPathAbsolute);
|
|
62
|
+
if (!newPathRelative.startsWith('.')) {
|
|
63
|
+
newPathRelative = `./${newPathRelative}`;
|
|
64
|
+
}
|
|
65
|
+
if (endsWithSlash) {
|
|
66
|
+
newPathRelative = `${newPathRelative}/`;
|
|
67
|
+
}
|
|
68
|
+
if (newPathRelative !== modulePath) {
|
|
69
|
+
context.logger.debug(`Updating ${filePath} :: ${modulePath} -> ${newPathRelative}`);
|
|
70
|
+
transformers.push({
|
|
71
|
+
find: modulePath,
|
|
72
|
+
replace: newPathRelative,
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
return transformers;
|
|
77
|
+
}
|
|
78
|
+
function findChangesForCoreJs(sourceFile, coreJsImportDeclarations, context, filePath, fileContent) {
|
|
79
|
+
const transformers = [];
|
|
80
|
+
context.logger.debug(`Updating core-js imports in ${filePath}...`);
|
|
81
|
+
// Remove core-js imports that are not necessary.
|
|
82
|
+
const coreJsUnnecessaryImport = `${CORE_JS_UNNECESSARY.exec(fileContent)?.[0]}`;
|
|
83
|
+
if (coreJsUnnecessaryImport !== 'undefined') {
|
|
84
|
+
transformers.push({
|
|
85
|
+
find: coreJsUnnecessaryImport,
|
|
86
|
+
replace: '',
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
// Replace direct import from core-js/features/object/values with Object.values in some very specific cases.
|
|
90
|
+
const coreJsObjectValuesImport = `${CORE_JS_OBJECT_VALUES.exec(fileContent)?.[0]}`;
|
|
91
|
+
if (coreJsObjectValuesImport !== 'undefined') {
|
|
92
|
+
transformers.push({
|
|
93
|
+
find: coreJsObjectValuesImport,
|
|
94
|
+
replace: '',
|
|
95
|
+
});
|
|
96
|
+
transformers.push({
|
|
97
|
+
find: 'values: values,',
|
|
98
|
+
replace: 'values: Object.values,',
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
if (fileContent.includes(CORE_JS_OBJECT_VALUES_REQUIRE)) {
|
|
102
|
+
transformers.push({
|
|
103
|
+
find: CORE_JS_OBJECT_VALUES_REQUIRE,
|
|
104
|
+
replace: 'Object.values',
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
// Comment out polyfill core-js imports like `'core-js/es6';` or `'core-js/es7/reflect';`.
|
|
108
|
+
coreJsImportDeclarations
|
|
109
|
+
.filter((importDeclaration) => !importDeclaration.importClause)
|
|
110
|
+
.forEach((importDeclaration) => {
|
|
111
|
+
const importCode = fileContent.substring(importDeclaration.getStart(sourceFile, false), importDeclaration.getEnd());
|
|
112
|
+
transformers.push({
|
|
113
|
+
find: importCode,
|
|
114
|
+
replace: `// ${importCode}`,
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
return transformers;
|
|
118
|
+
}
|
|
119
|
+
function updateTypescriptImportsAndExports(filePath, tree, context) {
|
|
120
|
+
const fileContent = tree.read(filePath)?.toString();
|
|
121
|
+
if (!fileContent) {
|
|
122
|
+
return;
|
|
123
|
+
}
|
|
124
|
+
context.logger.debug(`Checking imports and exports in ${filePath}...`);
|
|
125
|
+
const source = ts.createSourceFile(filePath, fileContent, ts.ScriptTarget.Latest, false, ts.ScriptKind.TS);
|
|
126
|
+
// Get all import declarations
|
|
127
|
+
const importDeclarations = source.statements.filter((statement) => statement.kind === ts.SyntaxKind.ImportDeclaration);
|
|
128
|
+
// Get all export declarations
|
|
129
|
+
const exportDeclarations = source.statements.filter((statement) => statement.kind === ts.SyntaxKind.ExportDeclaration &&
|
|
130
|
+
statement.moduleSpecifier);
|
|
131
|
+
const transformers = [];
|
|
132
|
+
// Just local module targets, without quotes
|
|
133
|
+
const localModulePaths = [...importDeclarations, ...exportDeclarations]
|
|
134
|
+
.map((declaration) => `${declaration.moduleSpecifier?.getText(source)}`)
|
|
135
|
+
.map((moduleSpecifier) => moduleSpecifier.replace(/['"]/g, ''))
|
|
136
|
+
.filter((moduleSpecifier) => moduleSpecifier.startsWith('.'));
|
|
137
|
+
if (localModulePaths.length > 0) {
|
|
138
|
+
transformers.push(...findChangesForLocalImports(localModulePaths, filePath, tree, context));
|
|
139
|
+
}
|
|
140
|
+
const coreJsImportDeclarations = importDeclarations.filter((declaration) => {
|
|
141
|
+
const moduleSpecifier = `${declaration.moduleSpecifier?.getText(source)}`.replace(/['"]/g, '');
|
|
142
|
+
return moduleSpecifier.startsWith('core-js');
|
|
143
|
+
});
|
|
144
|
+
if (coreJsImportDeclarations.length > 0) {
|
|
145
|
+
transformers.push(...findChangesForCoreJs(source, coreJsImportDeclarations, context, filePath, fileContent));
|
|
146
|
+
}
|
|
147
|
+
if (transformers.length > 0) {
|
|
148
|
+
let newContent = fileContent;
|
|
149
|
+
transformers.forEach((transformer) => {
|
|
150
|
+
newContent = newContent.replace(transformer.find, transformer.replace);
|
|
151
|
+
});
|
|
152
|
+
tree.overwrite(filePath, newContent);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
async function visitTypescriptFiles(tree, context) {
|
|
156
|
+
const { workspace } = await (0, workspace_1.getWorkspace)(tree);
|
|
157
|
+
workspace.projects.forEach((project, projectName) => {
|
|
158
|
+
context.logger.debug(`Looking for typescript files in project ${projectName}...`);
|
|
159
|
+
tree.getDir(project.sourceRoot || project.root).visit((filePath) => {
|
|
160
|
+
if (filePath.endsWith('.ts') && !filePath.includes('node_modules')) {
|
|
161
|
+
updateTypescriptImportsAndExports(filePath, tree, context);
|
|
162
|
+
}
|
|
163
|
+
});
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
function default_1() {
|
|
167
|
+
return async (tree, context) => {
|
|
168
|
+
await visitTypescriptFiles(tree, context);
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
exports.default = default_1;
|
|
172
|
+
//# sourceMappingURL=fix-imports.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fix-imports.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/fix-imports.ts"],"names":[],"mappings":"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"}
|