@skyux/packages 5.1007.1 → 6.0.0-beta.0
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 +48 -52
- package/src/index.js +1 -1
- package/src/index.js.map +1 -1
- package/src/schematics/migrations/migration-collection.json +1 -21
- package/src/schematics/ng-add/ng-add.schematic.js +7 -7
- package/src/schematics/ng-add/ng-add.schematic.js.map +1 -1
- package/src/schematics/testing/scaffold.js +4 -5
- package/src/schematics/testing/scaffold.js.map +1 -1
- package/src/schematics/utility/workspace.js +8 -8
- package/src/schematics/utility/workspace.js.map +1 -1
- package/src/schematics/migrations/add-cdk/add-cdk.schematic.d.ts +0 -2
- package/src/schematics/migrations/add-cdk/add-cdk.schematic.js +0 -32
- package/src/schematics/migrations/add-cdk/add-cdk.schematic.js.map +0 -1
- package/src/schematics/migrations/remove-package-json-scripts/remove-package-json-scripts.schematic.d.ts +0 -2
- package/src/schematics/migrations/remove-package-json-scripts/remove-package-json-scripts.schematic.js +0 -16
- package/src/schematics/migrations/remove-package-json-scripts/remove-package-json-scripts.schematic.js.map +0 -1
- package/src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.d.ts +0 -2
- package/src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.js +0 -51
- package/src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.js.map +0 -1
- package/src/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.d.ts +0 -2
- package/src/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.js +0 -39
- package/src/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@skyux/packages",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0-beta.0",
|
|
4
4
|
"author": "Blackbaud, Inc.",
|
|
5
5
|
"description": "Handles the `ng update` command for SKY UX component libraries.",
|
|
6
6
|
"keywords": [
|
|
@@ -27,62 +27,58 @@
|
|
|
27
27
|
"@blackbaud/skyux-lib-code-block": "^5.0.0-beta.0",
|
|
28
28
|
"@blackbaud/skyux-lib-media": "^5.0.0-beta.0",
|
|
29
29
|
"@blackbaud/skyux-lib-stache": "^5.0.0-beta.0",
|
|
30
|
-
"@skyux-sdk/
|
|
31
|
-
"@skyux-sdk/
|
|
32
|
-
"@skyux
|
|
33
|
-
"@skyux-
|
|
34
|
-
"@skyux-
|
|
35
|
-
"@skyux/
|
|
36
|
-
"@skyux/
|
|
37
|
-
"@skyux/
|
|
38
|
-
"@skyux/
|
|
39
|
-
"@skyux/
|
|
40
|
-
"@skyux/
|
|
41
|
-
"@skyux/
|
|
42
|
-
"@skyux/
|
|
43
|
-
"@skyux/
|
|
44
|
-
"@skyux/
|
|
45
|
-
"@skyux/core": "5.7.1",
|
|
46
|
-
"@skyux/data-manager": "5.7.1",
|
|
47
|
-
"@skyux/datetime": "5.7.1",
|
|
30
|
+
"@skyux-sdk/prettier-schematics": "6.0.0-beta.0",
|
|
31
|
+
"@skyux-sdk/testing": "6.0.0-beta.0",
|
|
32
|
+
"@skyux/a11y": "6.0.0-beta.0",
|
|
33
|
+
"@skyux/action-bars": "6.0.0-beta.0",
|
|
34
|
+
"@skyux/ag-grid": "6.0.0-beta.0",
|
|
35
|
+
"@skyux/angular-tree-component": "6.0.0-beta.0",
|
|
36
|
+
"@skyux/animations": "6.0.0-beta.0",
|
|
37
|
+
"@skyux/assets": "6.0.0-beta.0",
|
|
38
|
+
"@skyux/autonumeric": "6.0.0-beta.0",
|
|
39
|
+
"@skyux/avatar": "6.0.0-beta.0",
|
|
40
|
+
"@skyux/colorpicker": "6.0.0-beta.0",
|
|
41
|
+
"@skyux/config": "6.0.0-beta.0",
|
|
42
|
+
"@skyux/core": "6.0.0-beta.0",
|
|
43
|
+
"@skyux/data-manager": "6.0.0-beta.0",
|
|
44
|
+
"@skyux/datetime": "6.0.0-beta.0",
|
|
48
45
|
"@skyux/docs-tools": "^5.0.0-beta.0",
|
|
49
|
-
"@skyux/
|
|
50
|
-
"@skyux/
|
|
51
|
-
"@skyux/
|
|
52
|
-
"@skyux/
|
|
53
|
-
"@skyux/
|
|
54
|
-
"@skyux/
|
|
55
|
-
"@skyux/i18n": "5.7.1",
|
|
46
|
+
"@skyux/errors": "6.0.0-beta.0",
|
|
47
|
+
"@skyux/flyout": "6.0.0-beta.0",
|
|
48
|
+
"@skyux/forms": "6.0.0-beta.0",
|
|
49
|
+
"@skyux/grids": "6.0.0-beta.0",
|
|
50
|
+
"@skyux/http": "6.0.0-beta.0",
|
|
51
|
+
"@skyux/i18n": "6.0.0-beta.0",
|
|
56
52
|
"@skyux/icons": "^5.0.0",
|
|
57
|
-
"@skyux/indicators": "
|
|
58
|
-
"@skyux/inline-form": "
|
|
59
|
-
"@skyux/layout": "
|
|
60
|
-
"@skyux/list-builder": "
|
|
61
|
-
"@skyux/list-builder-common": "
|
|
62
|
-
"@skyux/list-builder-view-checklist": "
|
|
63
|
-
"@skyux/list-builder-view-grids": "
|
|
64
|
-
"@skyux/lists": "
|
|
65
|
-
"@skyux/lookup": "
|
|
66
|
-
"@skyux/modals": "
|
|
67
|
-
"@skyux/navbar": "
|
|
68
|
-
"@skyux/omnibar-interop": "
|
|
69
|
-
"@skyux/pages": "
|
|
70
|
-
"@skyux/phone-field": "
|
|
71
|
-
"@skyux/popovers": "
|
|
72
|
-
"@skyux/progress-indicator": "
|
|
73
|
-
"@skyux/router": "
|
|
74
|
-
"@skyux/select-field": "
|
|
75
|
-
"@skyux/split-view": "
|
|
76
|
-
"@skyux/tabs": "
|
|
77
|
-
"@skyux/text-editor": "
|
|
78
|
-
"@skyux/theme": "
|
|
79
|
-
"@skyux/tiles": "
|
|
80
|
-
"@skyux/toast": "
|
|
81
|
-
"@skyux/validation": "
|
|
53
|
+
"@skyux/indicators": "6.0.0-beta.0",
|
|
54
|
+
"@skyux/inline-form": "6.0.0-beta.0",
|
|
55
|
+
"@skyux/layout": "6.0.0-beta.0",
|
|
56
|
+
"@skyux/list-builder": "6.0.0-beta.0",
|
|
57
|
+
"@skyux/list-builder-common": "6.0.0-beta.0",
|
|
58
|
+
"@skyux/list-builder-view-checklist": "6.0.0-beta.0",
|
|
59
|
+
"@skyux/list-builder-view-grids": "6.0.0-beta.0",
|
|
60
|
+
"@skyux/lists": "6.0.0-beta.0",
|
|
61
|
+
"@skyux/lookup": "6.0.0-beta.0",
|
|
62
|
+
"@skyux/modals": "6.0.0-beta.0",
|
|
63
|
+
"@skyux/navbar": "6.0.0-beta.0",
|
|
64
|
+
"@skyux/omnibar-interop": "6.0.0-beta.0",
|
|
65
|
+
"@skyux/pages": "6.0.0-beta.0",
|
|
66
|
+
"@skyux/phone-field": "6.0.0-beta.0",
|
|
67
|
+
"@skyux/popovers": "6.0.0-beta.0",
|
|
68
|
+
"@skyux/progress-indicator": "6.0.0-beta.0",
|
|
69
|
+
"@skyux/router": "6.0.0-beta.0",
|
|
70
|
+
"@skyux/select-field": "6.0.0-beta.0",
|
|
71
|
+
"@skyux/split-view": "6.0.0-beta.0",
|
|
72
|
+
"@skyux/tabs": "6.0.0-beta.0",
|
|
73
|
+
"@skyux/text-editor": "6.0.0-beta.0",
|
|
74
|
+
"@skyux/theme": "6.0.0-beta.0",
|
|
75
|
+
"@skyux/tiles": "6.0.0-beta.0",
|
|
76
|
+
"@skyux/toast": "6.0.0-beta.0",
|
|
77
|
+
"@skyux/validation": "6.0.0-beta.0"
|
|
82
78
|
}
|
|
83
79
|
},
|
|
84
80
|
"peerDependencies": {
|
|
85
|
-
"@angular/cli": "^
|
|
81
|
+
"@angular/cli": "^13.2.6"
|
|
86
82
|
},
|
|
87
83
|
"dependencies": {
|
|
88
84
|
"fs-extra": "10.0.0",
|
package/src/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./schematics/ng-add/ng-add.schematic"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./schematics/ng-add/ng-add.schematic"), exports);
|
|
5
5
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/components/packages/src/index.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/components/packages/src/index.ts"],"names":[],"mappings":";;;AAAA,oFAAqD"}
|
|
@@ -1,29 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schematics": {
|
|
3
3
|
"noop": {
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "6.0.0-beta.0",
|
|
5
5
|
"factory": "./noop/noop.schematic",
|
|
6
6
|
"description": "Update all SKY UX component packages"
|
|
7
|
-
},
|
|
8
|
-
"update-peer-dependencies": {
|
|
9
|
-
"version": "5.0.0-beta.177",
|
|
10
|
-
"factory": "./update-peer-dependencies/update-peer-dependencies.schematic",
|
|
11
|
-
"description": "Update library peer dependencies"
|
|
12
|
-
},
|
|
13
|
-
"setup-coverage-for-testing-module": {
|
|
14
|
-
"version": "5.0.0-beta.0",
|
|
15
|
-
"factory": "./setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic",
|
|
16
|
-
"description": "Setup coverage for the testing module"
|
|
17
|
-
},
|
|
18
|
-
"remove-package-json-scripts": {
|
|
19
|
-
"version": "5.0.0-beta.0",
|
|
20
|
-
"factory": "./remove-package-json-scripts/remove-package-json-scripts.schematic",
|
|
21
|
-
"description": "Remove SKY UX scripts from package.json"
|
|
22
|
-
},
|
|
23
|
-
"add-cdk": {
|
|
24
|
-
"version": "5.144.0",
|
|
25
|
-
"factory": "./add-cdk/add-cdk.schematic",
|
|
26
|
-
"description": "Add Angular CDK"
|
|
27
7
|
}
|
|
28
8
|
}
|
|
29
9
|
}
|
|
@@ -2,17 +2,17 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
5
|
-
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
6
|
-
const latest_version_1 = tslib_1.__importDefault(require("latest-version"));
|
|
7
|
-
const path_1 = tslib_1.__importDefault(require("path"));
|
|
5
|
+
const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
|
|
6
|
+
const latest_version_1 = (0, tslib_1.__importDefault)(require("latest-version"));
|
|
7
|
+
const path_1 = (0, tslib_1.__importDefault)(require("path"));
|
|
8
8
|
const tree_1 = require("../utility/tree");
|
|
9
9
|
function ensureLatestVersions(context, dependencies, packageGroup) {
|
|
10
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
11
11
|
for (const packageName in dependencies) {
|
|
12
12
|
const version = packageGroup[packageName];
|
|
13
13
|
if (version) {
|
|
14
14
|
// Get the latest version from NPM.
|
|
15
|
-
const latestVersion = yield latest_version_1.default(packageName, { version });
|
|
15
|
+
const latestVersion = yield (0, latest_version_1.default)(packageName, { version });
|
|
16
16
|
if (latestVersion !== dependencies[packageName]) {
|
|
17
17
|
context.logger.info(`Updated "${packageName}" from version (${dependencies[packageName]}) to (${latestVersion}).`);
|
|
18
18
|
dependencies[packageName] = latestVersion;
|
|
@@ -25,9 +25,9 @@ function ensureLatestVersions(context, dependencies, packageGroup) {
|
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
function ngAdd() {
|
|
28
|
-
return (tree, context) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
return (tree, context) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
29
29
|
const packageJsonPath = 'package.json';
|
|
30
|
-
const packageJson = JSON.parse(tree_1.readRequiredFile(tree, packageJsonPath));
|
|
30
|
+
const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, packageJsonPath));
|
|
31
31
|
const { packageGroup } = fs_extra_1.default.readJsonSync(path_1.default.resolve(__dirname, '../../../package.json'))['ng-update'];
|
|
32
32
|
yield ensureLatestVersions(context, packageJson.dependencies, packageGroup);
|
|
33
33
|
yield ensureLatestVersions(context, packageJson.devDependencies, packageGroup);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ng-add.schematic.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/ng-add/ng-add.schematic.ts"],"names":[],"mappings":";;;AACA,4DAA0E;AAE1E,
|
|
1
|
+
{"version":3,"file":"ng-add.schematic.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/ng-add/ng-add.schematic.ts"],"names":[],"mappings":";;;AACA,4DAA0E;AAE1E,qEAA0B;AAC1B,iFAA8C;AAC9C,6DAAwB;AAExB,0CAAmD;AAEnD,SAAe,oBAAoB,CACjC,OAAyB,EACzB,YAEC,EACD,YAEC;;QAED,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;YAE1C,IAAI,OAAO,EAAE;gBACX,mCAAmC;gBACnC,MAAM,aAAa,GAAG,MAAM,IAAA,wBAAgB,EAAC,WAAW,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;gBAEvE,IAAI,aAAa,KAAK,YAAY,CAAC,WAAW,CAAC,EAAE;oBAC/C,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,YAAY,WAAW,mBAAmB,YAAY,CAAC,WAAW,CAAC,SAAS,aAAa,IAAI,CAC9F,CAAC;oBAEF,YAAY,CAAC,WAAW,CAAC,GAAG,aAAa,CAAC;iBAC3C;qBAAM;oBACL,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,YAAY,WAAW,gDAAgD,CACxE,CAAC;iBACH;aACF;SACF;IACH,CAAC;CAAA;AAED,SAAwB,KAAK;IAC3B,OAAO,CAAO,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,eAAe,GAAG,cAAc,CAAC;QACvC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAExE,MAAM,EAAE,YAAY,EAAE,GAAG,kBAAE,CAAC,YAAY,CACtC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,uBAAuB,CAAC,CACjD,CAAC,WAAW,CAAC,CAAC;QAEf,MAAM,oBAAoB,CAAC,OAAO,EAAE,WAAW,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC5E,MAAM,oBAAoB,CACxB,OAAO,EACP,WAAW,CAAC,eAAe,EAC3B,YAAY,CACb,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;QAE3E,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;IAChD,CAAC,CAAA,CAAC;AACJ,CAAC;AApBD,wBAoBC"}
|
|
@@ -6,16 +6,15 @@ const tslib_1 = require("tslib");
|
|
|
6
6
|
* Creates a new Angular CLI application.
|
|
7
7
|
*/
|
|
8
8
|
function createTestApp(runner, appOptions) {
|
|
9
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
10
10
|
return yield runner
|
|
11
11
|
.runExternalSchematicAsync('@schematics/angular', 'ng-new', {
|
|
12
12
|
directory: '/',
|
|
13
|
-
legacyBrowsers: true,
|
|
14
13
|
name: appOptions.defaultProjectName,
|
|
15
14
|
routing: true,
|
|
16
15
|
strict: true,
|
|
17
16
|
style: 'scss',
|
|
18
|
-
version: '
|
|
17
|
+
version: '13',
|
|
19
18
|
})
|
|
20
19
|
.toPromise();
|
|
21
20
|
});
|
|
@@ -25,14 +24,14 @@ exports.createTestApp = createTestApp;
|
|
|
25
24
|
* Create a test workspace with a library as the default project.
|
|
26
25
|
*/
|
|
27
26
|
function createTestLibrary(runner, libOptions) {
|
|
28
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
27
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
29
28
|
const workspaceTree = yield runner
|
|
30
29
|
.runExternalSchematicAsync('@schematics/angular', 'ng-new', {
|
|
31
30
|
directory: '/',
|
|
32
31
|
name: `${libOptions.name}-workspace`,
|
|
33
32
|
createApplication: false,
|
|
34
33
|
strict: true,
|
|
35
|
-
version: '
|
|
34
|
+
version: '13',
|
|
36
35
|
})
|
|
37
36
|
.toPromise();
|
|
38
37
|
yield runner
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/testing/scaffold.ts"],"names":[],"mappings":";;;;AAKA;;GAEG;AACH,SAAsB,aAAa,CACjC,MAA2B,EAC3B,UAEC;;QAED,OAAO,MAAM,MAAM;aAChB,yBAAyB,CAAC,qBAAqB,EAAE,QAAQ,EAAE;YAC1D,SAAS,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/testing/scaffold.ts"],"names":[],"mappings":";;;;AAKA;;GAEG;AACH,SAAsB,aAAa,CACjC,MAA2B,EAC3B,UAEC;;QAED,OAAO,MAAM,MAAM;aAChB,yBAAyB,CAAC,qBAAqB,EAAE,QAAQ,EAAE;YAC1D,SAAS,EAAE,GAAG;YAEd,IAAI,EAAE,UAAU,CAAC,kBAAkB;YACnC,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,MAAM;YACb,OAAO,EAAE,IAAI;SACd,CAAC;aACD,SAAS,EAAE,CAAC;IACjB,CAAC;CAAA;AAjBD,sCAiBC;AAED;;GAEG;AACH,SAAsB,iBAAiB,CACrC,MAA2B,EAC3B,UAEC;;QAED,MAAM,aAAa,GAAG,MAAM,MAAM;aAC/B,yBAAyB,CAAC,qBAAqB,EAAE,QAAQ,EAAE;YAC1D,SAAS,EAAE,GAAG;YACd,IAAI,EAAE,GAAG,UAAU,CAAC,IAAI,YAAY;YACpC,iBAAiB,EAAE,KAAK;YACxB,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,IAAI;SACd,CAAC;aACD,SAAS,EAAE,CAAC;QAEf,MAAM,MAAM;aACT,yBAAyB,CACxB,qBAAqB,EACrB,SAAS,EACT;YACE,IAAI,EAAE,UAAU,CAAC,IAAI;SACtB,EACD,aAAa,CACd;aACA,SAAS,EAAE,CAAC;QAEf,OAAO,aAAa,CAAC;IACvB,CAAC;CAAA;AA5BD,8CA4BC"}
|
|
@@ -13,24 +13,24 @@ function createHost(tree) {
|
|
|
13
13
|
return {
|
|
14
14
|
/* istanbul ignore next */
|
|
15
15
|
readFile(path) {
|
|
16
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
|
-
return tree_1.readRequiredFile(tree, path);
|
|
16
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
17
|
+
return (0, tree_1.readRequiredFile)(tree, path);
|
|
18
18
|
});
|
|
19
19
|
},
|
|
20
20
|
/* istanbul ignore next */
|
|
21
21
|
writeFile(path, data) {
|
|
22
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
23
23
|
return tree.overwrite(path, data);
|
|
24
24
|
});
|
|
25
25
|
},
|
|
26
26
|
isDirectory(path) {
|
|
27
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
27
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
28
28
|
// approximate a directory check
|
|
29
29
|
return !tree.exists(path) && tree.getDir(path).subfiles.length > 0;
|
|
30
30
|
});
|
|
31
31
|
},
|
|
32
32
|
isFile(path) {
|
|
33
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
33
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
34
34
|
return tree.exists(path);
|
|
35
35
|
});
|
|
36
36
|
},
|
|
@@ -40,7 +40,7 @@ function createHost(tree) {
|
|
|
40
40
|
* Returns the workspace host and project config (angular.json).
|
|
41
41
|
*/
|
|
42
42
|
function getWorkspace(tree) {
|
|
43
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
43
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
44
44
|
const host = createHost(tree);
|
|
45
45
|
const { workspace } = yield core_1.workspaces.readWorkspace('/', host);
|
|
46
46
|
return { host, workspace };
|
|
@@ -48,7 +48,7 @@ function getWorkspace(tree) {
|
|
|
48
48
|
}
|
|
49
49
|
exports.getWorkspace = getWorkspace;
|
|
50
50
|
function getProject(workspace, projectName) {
|
|
51
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
51
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
52
52
|
const project = workspace.projects.get(projectName);
|
|
53
53
|
if (!project) {
|
|
54
54
|
throw new schematics_1.SchematicsException(`The "${projectName}" project is not defined in angular.json. Provide a valid project name.`);
|
|
@@ -61,7 +61,7 @@ exports.getProject = getProject;
|
|
|
61
61
|
* Allows updates to the Angular project config (angular.json).
|
|
62
62
|
*/
|
|
63
63
|
function updateWorkspace(updater) {
|
|
64
|
-
return (tree) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
64
|
+
return (tree) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
65
65
|
const { host, workspace } = yield getWorkspace(tree);
|
|
66
66
|
// Send the workspace to the callback to allow it to be modified.
|
|
67
67
|
yield updater(workspace);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/utility/workspace.ts"],"names":[],"mappings":";;;;AAAA,+CAAkD;AAClD,2DAA6E;AAE7E,iCAA0C;AAE1C;;;GAGG;AACH,SAAS,UAAU,CAAC,IAAU;IAC5B,OAAO;QACL,0BAA0B;QACpB,QAAQ,CAAC,IAAY;;gBACzB,OAAO,uBAAgB,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/utility/workspace.ts"],"names":[],"mappings":";;;;AAAA,+CAAkD;AAClD,2DAA6E;AAE7E,iCAA0C;AAE1C;;;GAGG;AACH,SAAS,UAAU,CAAC,IAAU;IAC5B,OAAO;QACL,0BAA0B;QACpB,QAAQ,CAAC,IAAY;;gBACzB,OAAO,IAAA,uBAAgB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACtC,CAAC;SAAA;QACD,0BAA0B;QACpB,SAAS,CAAC,IAAY,EAAE,IAAY;;gBACxC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACpC,CAAC;SAAA;QACK,WAAW,CAAC,IAAY;;gBAC5B,gCAAgC;gBAChC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YACrE,CAAC;SAAA;QACK,MAAM,CAAC,IAAY;;gBACvB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC;SAAA;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAsB,YAAY,CAAC,IAAU;;QAI3C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9B,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,iBAAU,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAChE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC;CAAA;AAPD,oCAOC;AAED,SAAsB,UAAU,CAC9B,SAAyC,EACzC,WAAmB;;QAEnB,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,gCAAmB,CAC3B,QAAQ,WAAW,yEAAyE,CAC7F,CAAC;SACH;QAED,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAClC,CAAC;CAAA;AAZD,gCAYC;AAED;;GAEG;AACH,SAAgB,eAAe,CAC7B,OAA4D;IAE5D,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;QAErD,iEAAiE;QACjE,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;QAEzB,gDAAgD;QAChD,MAAM,iBAAU,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC,CAAA,CAAC;AACJ,CAAC;AAZD,0CAYC"}
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
5
|
-
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
6
|
-
const tree_1 = require("../../utility/tree");
|
|
7
|
-
function default_1() {
|
|
8
|
-
return (tree, context) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
const filePath = 'package.json';
|
|
10
|
-
const relevantPackages = ['@skyux/flyout'];
|
|
11
|
-
const packageJson = JSON.parse(tree_1.readRequiredFile(tree, filePath));
|
|
12
|
-
let packageFound = false;
|
|
13
|
-
for (const relevantPackage of relevantPackages) {
|
|
14
|
-
if (packageJson.dependencies[relevantPackage]) {
|
|
15
|
-
packageFound = true;
|
|
16
|
-
break;
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
if (packageFound) {
|
|
20
|
-
// Run Thing
|
|
21
|
-
context.addTask(new tasks_1.NodePackageInstallTask());
|
|
22
|
-
dependencies_1.addPackageJsonDependency(tree, {
|
|
23
|
-
type: dependencies_1.NodeDependencyType.Default,
|
|
24
|
-
name: '@angular/cdk',
|
|
25
|
-
version: '^12.0.0',
|
|
26
|
-
overwrite: true,
|
|
27
|
-
});
|
|
28
|
-
}
|
|
29
|
-
});
|
|
30
|
-
}
|
|
31
|
-
exports.default = default_1;
|
|
32
|
-
//# sourceMappingURL=add-cdk.schematic.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"add-cdk.schematic.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/add-cdk/add-cdk.schematic.ts"],"names":[],"mappings":";;;AACA,4DAA0E;AAC1E,2EAGkD;AAElD,6CAAsD;AAEtD;IACE,OAAO,CAAO,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,QAAQ,GAAG,cAAc,CAAC;QAChC,MAAM,gBAAgB,GAAG,CAAC,eAAe,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QACjE,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE;YAC9C,IAAI,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE;gBAC7C,YAAY,GAAG,IAAI,CAAC;gBACpB,MAAM;aACP;SACF;QAED,IAAI,YAAY,EAAE;YAChB,YAAY;YACZ,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;YAE9C,uCAAwB,CAAC,IAAI,EAAE;gBAC7B,IAAI,EAAE,iCAAkB,CAAC,OAAO;gBAChC,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,SAAS;gBAClB,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;SACJ;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AA1BD,4BA0BC"}
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const tree_1 = require("../../utility/tree");
|
|
5
|
-
function default_1() {
|
|
6
|
-
return (tree) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
-
const filePath = 'package.json';
|
|
8
|
-
const packageJson = JSON.parse(tree_1.readRequiredFile(tree, filePath));
|
|
9
|
-
delete packageJson.scripts['skyux:update'];
|
|
10
|
-
delete packageJson.scripts['skyux:update-angular'];
|
|
11
|
-
delete packageJson.scripts['skyux:update-skyux'];
|
|
12
|
-
tree.overwrite(filePath, JSON.stringify(packageJson, undefined, 2));
|
|
13
|
-
});
|
|
14
|
-
}
|
|
15
|
-
exports.default = default_1;
|
|
16
|
-
//# sourceMappingURL=remove-package-json-scripts.schematic.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"remove-package-json-scripts.schematic.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/remove-package-json-scripts/remove-package-json-scripts.schematic.ts"],"names":[],"mappings":";;;AAEA,6CAAsD;AAEtD;IACE,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,MAAM,QAAQ,GAAG,cAAc,CAAC;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEjE,OAAO,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC3C,OAAO,WAAW,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QACnD,OAAO,WAAW,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAEjD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC,CAAA,CAAC;AACJ,CAAC;AAXD,4BAWC"}
|
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
-
const tree_1 = require("../../utility/tree");
|
|
6
|
-
const workspace_1 = require("../../utility/workspace");
|
|
7
|
-
function updateSpecsEntryPoint(projectName) {
|
|
8
|
-
return (tree) => {
|
|
9
|
-
const filePath = `projects/${projectName}/src/test.ts`;
|
|
10
|
-
let contents = tree_1.readRequiredFile(tree, filePath);
|
|
11
|
-
if (!contents.includes('const testingContext')) {
|
|
12
|
-
contents += `
|
|
13
|
-
// Find any tests included in the "testing" entry point.
|
|
14
|
-
try {
|
|
15
|
-
const testingContext = require.context('../testing/', true, /\\.spec\\.ts$/);
|
|
16
|
-
testingContext.keys().map(testingContext);
|
|
17
|
-
} catch (err) {}
|
|
18
|
-
`;
|
|
19
|
-
tree.overwrite(filePath, contents);
|
|
20
|
-
}
|
|
21
|
-
};
|
|
22
|
-
}
|
|
23
|
-
function addEntryPointToCodeCoverageIgnore(projectName) {
|
|
24
|
-
return workspace_1.updateWorkspace((workspace) => {
|
|
25
|
-
const project = workspace.projects.get(projectName);
|
|
26
|
-
const testTarget = project.targets.get('test');
|
|
27
|
-
const options = testTarget.options;
|
|
28
|
-
options.codeCoverageExclude = (options.codeCoverageExclude ||
|
|
29
|
-
[]);
|
|
30
|
-
const ignorePattern = `projects/${projectName}/src/test.ts`;
|
|
31
|
-
if (!options.codeCoverageExclude.includes(ignorePattern)) {
|
|
32
|
-
options.codeCoverageExclude.push(ignorePattern);
|
|
33
|
-
}
|
|
34
|
-
});
|
|
35
|
-
}
|
|
36
|
-
function updatePackages() {
|
|
37
|
-
return (tree) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
38
|
-
const { workspace } = yield workspace_1.getWorkspace(tree);
|
|
39
|
-
const { project, projectName } = yield workspace_1.getProject(workspace, workspace.extensions.defaultProject);
|
|
40
|
-
// Only run for libraries.
|
|
41
|
-
if (project.extensions.projectType !== 'library') {
|
|
42
|
-
return;
|
|
43
|
-
}
|
|
44
|
-
return schematics_1.chain([
|
|
45
|
-
updateSpecsEntryPoint(projectName),
|
|
46
|
-
addEntryPointToCodeCoverageIgnore(projectName),
|
|
47
|
-
]);
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
|
-
exports.default = updatePackages;
|
|
51
|
-
//# sourceMappingURL=setup-coverage-for-testing-module.schematic.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"setup-coverage-for-testing-module.schematic.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AAEzD,6CAAsD;AACtD,uDAIiC;AAEjC,SAAS,qBAAqB,CAAC,WAAmB;IAChD,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,QAAQ,GAAG,YAAY,WAAW,cAAc,CAAC;QACvD,IAAI,QAAQ,GAAG,uBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE;YAC9C,QAAQ,IAAI;;;;;;CAMjB,CAAC;YACI,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;SACpC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iCAAiC,CAAC,WAAmB;IAC5D,OAAO,2BAAe,CAAC,CAAC,SAAS,EAAE,EAAE;QACnC,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC;QACrD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;QAChD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAQ,CAAC;QAEpC,OAAO,CAAC,mBAAmB,GAAG,CAAC,OAAO,CAAC,mBAAmB;YACxD,EAAE,CAAa,CAAC;QAElB,MAAM,aAAa,GAAG,YAAY,WAAW,cAAc,CAAC;QAC5D,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YACxD,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACjD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAwB,cAAc;IACpC,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,wBAAY,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,sBAAU,CAC/C,SAAS,EACT,SAAS,CAAC,UAAU,CAAC,cAAwB,CAC9C,CAAC;QAEF,0BAA0B;QAC1B,IAAI,OAAO,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YAChD,OAAO;SACR;QAED,OAAO,kBAAK,CAAC;YACX,qBAAqB,CAAC,WAAW,CAAC;YAClC,iCAAiC,CAAC,WAAW,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;AACJ,CAAC;AAnBD,iCAmBC"}
|
package/src/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.js
DELETED
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const tree_1 = require("../../utility/tree");
|
|
5
|
-
const workspace_1 = require("../../utility/workspace");
|
|
6
|
-
function updateDependencySection(context, project, tree, section) {
|
|
7
|
-
const libraryPackageJsonPath = `${project.root}/package.json`;
|
|
8
|
-
const libraryPackageJson = JSON.parse(tree_1.readRequiredFile(tree, libraryPackageJsonPath));
|
|
9
|
-
const rootPackageJson = JSON.parse(tree_1.readRequiredFile(tree, 'package.json'));
|
|
10
|
-
if (libraryPackageJson[section]) {
|
|
11
|
-
for (const packageName in libraryPackageJson[section]) {
|
|
12
|
-
const rootVersion = rootPackageJson.dependencies[packageName];
|
|
13
|
-
if (rootVersion.match(/^(\^|~)/)) {
|
|
14
|
-
context.logger.warn(`Package "${packageName}@${rootVersion}" was not set to a specific version in the root 'package.json'. Skipping update to library 'package.json'.`);
|
|
15
|
-
break;
|
|
16
|
-
}
|
|
17
|
-
const rangeMatch = libraryPackageJson[section][packageName].match(/^(\^|~)/);
|
|
18
|
-
const rangeCharacter = rangeMatch ? rangeMatch[0] : '';
|
|
19
|
-
libraryPackageJson[section][packageName] = `${rangeCharacter}${rootVersion}`;
|
|
20
|
-
}
|
|
21
|
-
tree.overwrite(libraryPackageJsonPath, JSON.stringify(libraryPackageJson, undefined, 2));
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
function updateLibraryDependencies() {
|
|
25
|
-
return (tree, context) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
const { workspace } = yield workspace_1.getWorkspace(tree);
|
|
27
|
-
const { project } = yield workspace_1.getProject(workspace, workspace.extensions.defaultProject);
|
|
28
|
-
// Only run for libraries.
|
|
29
|
-
/* istanbul ignore if */
|
|
30
|
-
if (project.extensions.projectType !== 'library') {
|
|
31
|
-
context.logger.info('The default project is of type "application". Skipping.');
|
|
32
|
-
return;
|
|
33
|
-
}
|
|
34
|
-
updateDependencySection(context, project, tree, 'peerDependencies');
|
|
35
|
-
updateDependencySection(context, project, tree, 'dependencies');
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
exports.default = updateLibraryDependencies;
|
|
39
|
-
//# sourceMappingURL=update-peer-dependencies.schematic.js.map
|
package/src/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update-peer-dependencies.schematic.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-peer-dependencies/update-peer-dependencies.schematic.ts"],"names":[],"mappings":";;;AAGA,6CAAsD;AACtD,uDAAmE;AAEnE,SAAS,uBAAuB,CAC9B,OAAyB,EACzB,OAAqC,EACrC,IAAU,EACV,OAAe;IAEf,MAAM,sBAAsB,GAAG,GAAG,OAAO,CAAC,IAAI,eAAe,CAAC;IAE9D,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CACnC,uBAAgB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAC/C,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAgB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;IAE3E,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE;QAC/B,KAAK,MAAM,WAAW,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE;YACrD,MAAM,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC9D,IAAI,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;gBAChC,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,YAAY,WAAW,IAAI,WAAW,4GAA4G,CACnJ,CAAC;gBACF,MAAM;aACP;YAED,MAAM,UAAU,GACd,kBAAkB,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC5D,MAAM,cAAc,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAEvD,kBAAkB,CAAC,OAAO,CAAC,CACzB,WAAW,CACZ,GAAG,GAAG,cAAc,GAAG,WAAW,EAAE,CAAC;SACvC;QAED,IAAI,CAAC,SAAS,CACZ,sBAAsB,EACtB,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,SAAS,EAAE,CAAC,CAAC,CACjD,CAAC;KACH;AACH,CAAC;AAED,SAAwB,yBAAyB;IAC/C,OAAO,CAAO,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,wBAAY,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,sBAAU,CAClC,SAAS,EACT,SAAS,CAAC,UAAU,CAAC,cAAwB,CAC9C,CAAC;QAEF,0BAA0B;QAC1B,wBAAwB;QACxB,IAAI,OAAO,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YAChD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,yDAAyD,CAC1D,CAAC;YACF,OAAO;SACR;QAED,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;QACpE,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IAClE,CAAC,CAAA,CAAC;AACJ,CAAC;AArBD,4CAqBC"}
|