@skyux/packages 9.0.0-alpha.0 → 9.0.0-alpha.1

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.
Files changed (8) hide show
  1. package/package.json +48 -48
  2. package/src/schematics/migrations/migration-collection.json +8 -3
  3. package/src/schematics/migrations/update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic.d.ts +2 -0
  4. package/src/schematics/migrations/update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic.js +15 -0
  5. package/src/schematics/migrations/update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic.js.map +1 -0
  6. package/src/schematics/rules/ensure-peers-installed.d.ts +2 -1
  7. package/src/schematics/rules/ensure-peers-installed.js +17 -7
  8. package/src/schematics/rules/ensure-peers-installed.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skyux/packages",
3
- "version": "9.0.0-alpha.0",
3
+ "version": "9.0.0-alpha.1",
4
4
  "author": "Blackbaud, Inc.",
5
5
  "description": "Handles the `ng update` command for SKY UX component libraries.",
6
6
  "keywords": [
@@ -37,54 +37,54 @@
37
37
  "ng-update": {
38
38
  "migrations": "./src/schematics/migrations/migration-collection.json",
39
39
  "packageGroup": {
40
- "@skyux-sdk/eslint-config": "9.0.0-alpha.0",
41
- "@skyux-sdk/prettier-schematics": "9.0.0-alpha.0",
42
- "@skyux-sdk/testing": "9.0.0-alpha.0",
43
- "@skyux/a11y": "9.0.0-alpha.0",
44
- "@skyux/action-bars": "9.0.0-alpha.0",
45
- "@skyux/ag-grid": "9.0.0-alpha.0",
46
- "@skyux/angular-tree-component": "9.0.0-alpha.0",
47
- "@skyux/animations": "9.0.0-alpha.0",
48
- "@skyux/assets": "9.0.0-alpha.0",
49
- "@skyux/autonumeric": "9.0.0-alpha.0",
50
- "@skyux/avatar": "9.0.0-alpha.0",
51
- "@skyux/colorpicker": "9.0.0-alpha.0",
52
- "@skyux/config": "9.0.0-alpha.0",
53
- "@skyux/core": "9.0.0-alpha.0",
54
- "@skyux/data-manager": "9.0.0-alpha.0",
55
- "@skyux/datetime": "9.0.0-alpha.0",
56
- "@skyux/errors": "9.0.0-alpha.0",
57
- "@skyux/flyout": "9.0.0-alpha.0",
58
- "@skyux/forms": "9.0.0-alpha.0",
59
- "@skyux/grids": "9.0.0-alpha.0",
60
- "@skyux/http": "9.0.0-alpha.0",
61
- "@skyux/i18n": "9.0.0-alpha.0",
40
+ "@skyux-sdk/eslint-config": "9.0.0-alpha.1",
41
+ "@skyux-sdk/prettier-schematics": "9.0.0-alpha.1",
42
+ "@skyux-sdk/testing": "9.0.0-alpha.1",
43
+ "@skyux/a11y": "9.0.0-alpha.1",
44
+ "@skyux/action-bars": "9.0.0-alpha.1",
45
+ "@skyux/ag-grid": "9.0.0-alpha.1",
46
+ "@skyux/angular-tree-component": "9.0.0-alpha.1",
47
+ "@skyux/animations": "9.0.0-alpha.1",
48
+ "@skyux/assets": "9.0.0-alpha.1",
49
+ "@skyux/autonumeric": "9.0.0-alpha.1",
50
+ "@skyux/avatar": "9.0.0-alpha.1",
51
+ "@skyux/colorpicker": "9.0.0-alpha.1",
52
+ "@skyux/config": "9.0.0-alpha.1",
53
+ "@skyux/core": "9.0.0-alpha.1",
54
+ "@skyux/data-manager": "9.0.0-alpha.1",
55
+ "@skyux/datetime": "9.0.0-alpha.1",
56
+ "@skyux/errors": "9.0.0-alpha.1",
57
+ "@skyux/flyout": "9.0.0-alpha.1",
58
+ "@skyux/forms": "9.0.0-alpha.1",
59
+ "@skyux/grids": "9.0.0-alpha.1",
60
+ "@skyux/http": "9.0.0-alpha.1",
61
+ "@skyux/i18n": "9.0.0-alpha.1",
62
62
  "@skyux/icons": "^6.0.0",
63
- "@skyux/indicators": "9.0.0-alpha.0",
64
- "@skyux/inline-form": "9.0.0-alpha.0",
65
- "@skyux/layout": "9.0.0-alpha.0",
66
- "@skyux/list-builder": "9.0.0-alpha.0",
67
- "@skyux/list-builder-common": "9.0.0-alpha.0",
68
- "@skyux/list-builder-view-checklist": "9.0.0-alpha.0",
69
- "@skyux/list-builder-view-grids": "9.0.0-alpha.0",
70
- "@skyux/lists": "9.0.0-alpha.0",
71
- "@skyux/lookup": "9.0.0-alpha.0",
72
- "@skyux/modals": "9.0.0-alpha.0",
73
- "@skyux/navbar": "9.0.0-alpha.0",
74
- "@skyux/omnibar-interop": "9.0.0-alpha.0",
75
- "@skyux/pages": "9.0.0-alpha.0",
76
- "@skyux/phone-field": "9.0.0-alpha.0",
77
- "@skyux/popovers": "9.0.0-alpha.0",
78
- "@skyux/progress-indicator": "9.0.0-alpha.0",
79
- "@skyux/router": "9.0.0-alpha.0",
80
- "@skyux/select-field": "9.0.0-alpha.0",
81
- "@skyux/split-view": "9.0.0-alpha.0",
82
- "@skyux/tabs": "9.0.0-alpha.0",
83
- "@skyux/text-editor": "9.0.0-alpha.0",
84
- "@skyux/theme": "9.0.0-alpha.0",
85
- "@skyux/tiles": "9.0.0-alpha.0",
86
- "@skyux/toast": "9.0.0-alpha.0",
87
- "@skyux/validation": "9.0.0-alpha.0",
63
+ "@skyux/indicators": "9.0.0-alpha.1",
64
+ "@skyux/inline-form": "9.0.0-alpha.1",
65
+ "@skyux/layout": "9.0.0-alpha.1",
66
+ "@skyux/list-builder": "9.0.0-alpha.1",
67
+ "@skyux/list-builder-common": "9.0.0-alpha.1",
68
+ "@skyux/list-builder-view-checklist": "9.0.0-alpha.1",
69
+ "@skyux/list-builder-view-grids": "9.0.0-alpha.1",
70
+ "@skyux/lists": "9.0.0-alpha.1",
71
+ "@skyux/lookup": "9.0.0-alpha.1",
72
+ "@skyux/modals": "9.0.0-alpha.1",
73
+ "@skyux/navbar": "9.0.0-alpha.1",
74
+ "@skyux/omnibar-interop": "9.0.0-alpha.1",
75
+ "@skyux/pages": "9.0.0-alpha.1",
76
+ "@skyux/phone-field": "9.0.0-alpha.1",
77
+ "@skyux/popovers": "9.0.0-alpha.1",
78
+ "@skyux/progress-indicator": "9.0.0-alpha.1",
79
+ "@skyux/router": "9.0.0-alpha.1",
80
+ "@skyux/select-field": "9.0.0-alpha.1",
81
+ "@skyux/split-view": "9.0.0-alpha.1",
82
+ "@skyux/tabs": "9.0.0-alpha.1",
83
+ "@skyux/text-editor": "9.0.0-alpha.1",
84
+ "@skyux/theme": "9.0.0-alpha.1",
85
+ "@skyux/tiles": "9.0.0-alpha.1",
86
+ "@skyux/toast": "9.0.0-alpha.1",
87
+ "@skyux/validation": "9.0.0-alpha.1",
88
88
  "ag-grid-angular": "^28.2.1",
89
89
  "ag-grid-community": "^28.2.1",
90
90
  "ag-grid-enterprise": "^28.2.1"
package/src/schematics/migrations/migration-collection.json CHANGED
@@ -1,14 +1,19 @@
1
1
  {
2
2
  "schematics": {
3
3
  "noop": {
4
- "version": "9.0.0-alpha.0",
4
+ "version": "9.0.0-alpha.1",
5
5
  "factory": "./noop/noop.schematic",
6
6
  "description": "Update all SKY UX component packages"
7
7
  },
8
8
  "update-angular-tree-component": {
9
- "version": "8.0.0-alpha.0",
9
+ "version": "9.0.0-0",
10
10
  "factory": "./update-9/update-angular-tree-component/update-angular-tree-component.schematic",
11
- "description": "Update the angular tree component package to point to the Blackbaud forked version"
11
+ "description": "Update the Angular tree component package to point to the Blackbaud forked version"
12
+ },
13
+ "add-forms-popovers-peer-dependency": {
14
+ "version": "9.0.0-0",
15
+ "factory": "./update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic",
16
+ "description": "Add @skyux/popovers peer dependency for @skyux/forms"
12
17
  }
13
18
  }
14
19
  }
package/src/schematics/migrations/update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ import { Rule } from '@angular-devkit/schematics';
2
+ export default function (): Rule;
package/src/schematics/migrations/update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic.js ADDED
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const dependencies_1 = require("@schematics/angular/utility/dependencies");
4
+ const ensure_peers_installed_1 = require("../../../rules/ensure-peers-installed");
5
+ function default_1() {
6
+ return (0, ensure_peers_installed_1.ensurePeersInstalled)('@skyux/forms', [
7
+ {
8
+ matchVersion: true,
9
+ name: '@skyux/popovers',
10
+ type: dependencies_1.NodeDependencyType.Default,
11
+ },
12
+ ]);
13
+ }
14
+ exports.default = default_1;
15
+ //# sourceMappingURL=add-forms-popovers-peer-dependency.schematic.js.map
package/src/schematics/migrations/update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"add-forms-popovers-peer-dependency.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic.ts"],"names":[],"mappings":";;AACA,2EAA8E;AAE9E,kFAA6E;AAE7E;IACE,OAAO,IAAA,6CAAoB,EAAC,cAAc,EAAE;QAC1C;YACE,YAAY,EAAE,IAAI;YAClB,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,iCAAkB,CAAC,OAAO;SACjC;KACF,CAAC,CAAC;AACL,CAAC;AARD,4BAQC"}
package/src/schematics/rules/ensure-peers-installed.d.ts CHANGED
@@ -1,8 +1,9 @@
1
1
  import { Rule } from '@angular-devkit/schematics';
2
2
  import { NodeDependencyType } from '@schematics/angular/utility/dependencies';
3
3
  type PackageDetails = {
4
+ matchVersion?: boolean;
4
5
  name: string;
5
- version: string;
6
+ version?: string;
6
7
  type: NodeDependencyType;
7
8
  };
8
9
  /**
package/src/schematics/rules/ensure-peers-installed.js CHANGED
@@ -5,16 +5,21 @@ const schematics_1 = require("@angular-devkit/schematics");
5
5
  const tasks_1 = require("@angular-devkit/schematics/tasks");
6
6
  const dependencies_1 = require("@schematics/angular/utility/dependencies");
7
7
  const tree_1 = require("../utility/tree");
8
- function installPackages(packages) {
8
+ function installPackages(packages, targetPackageVersion) {
9
9
  return (tree, context) => {
10
10
  for (const details of packages) {
11
11
  // Remove the package (if it exists) so we can ensure it's added to the appropriate section.
12
12
  (0, dependencies_1.removePackageJsonDependency)(tree, details.name, '/package.json');
13
- (0, dependencies_1.addPackageJsonDependency)(tree, {
14
- type: details.type,
15
- name: details.name,
16
- version: details.version,
17
- });
13
+ const version = details.matchVersion
14
+ ? targetPackageVersion
15
+ : details.version;
16
+ if (version) {
17
+ (0, dependencies_1.addPackageJsonDependency)(tree, {
18
+ type: details.type,
19
+ name: details.name,
20
+ version,
21
+ });
22
+ }
18
23
  }
19
24
  context.addTask(new tasks_1.NodePackageInstallTask());
20
25
  };
@@ -40,12 +45,17 @@ function uninstallPackages(packages) {
40
45
  function ensurePeersInstalled(targetPackageName, peers, peersToRemove) {
41
46
  return async (tree) => {
42
47
  const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
48
+ const targetPackageVersion = packageJson.dependencies?.[targetPackageName] ??
49
+ packageJson.devDependencies?.[targetPackageName];
43
50
  const dependencies = {
44
51
  ...(packageJson.dependencies || {}),
45
52
  ...(packageJson.devDependencies || {}),
46
53
  };
47
54
  return dependencies[targetPackageName]
48
- ? (0, schematics_1.chain)([uninstallPackages(peersToRemove), installPackages(peers)])
55
+ ? (0, schematics_1.chain)([
56
+ uninstallPackages(peersToRemove),
57
+ installPackages(peers, targetPackageVersion),
58
+ ])
49
59
  : undefined;
50
60
  };
51
61
  }
package/src/schematics/rules/ensure-peers-installed.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ensure-peers-installed.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/ensure-peers-installed.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AACzD,4DAA0E;AAC1E,2EAIkD;AAElD,0CAAmD;AAQnD,SAAS,eAAe,CAAC,QAA0B;IACjD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,4FAA4F;YAC5F,IAAA,0CAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YACjE,IAAA,uCAAwB,EAAC,IAAI,EAAE;gBAC7B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;SACJ;QAED,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAyC;IAClE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,0BAA0B;QAC1B,IAAI,QAAQ,EAAE;YACZ,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC9B,IAAA,0CAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;aAClE;YAED,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;SAC/C;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAClC,iBAAyB,EACzB,KAAuB,EACvB,aAA8C;IAE9C,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,WAAW,GAGb,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAExD,MAAM,YAAY,GAA2B;YAC3C,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;YACnC,GAAG,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;SACvC,CAAC;QAEF,OAAO,YAAY,CAAC,iBAAiB,CAAC;YACpC,CAAC,CAAC,IAAA,kBAAK,EAAC,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;YACnE,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AApBD,oDAoBC"}
1
+ {"version":3,"file":"ensure-peers-installed.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/ensure-peers-installed.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AACzD,4DAA0E;AAC1E,2EAIkD;AAElD,0CAAmD;AAcnD,SAAS,eAAe,CACtB,QAA0B,EAC1B,oBAA6B;IAE7B,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,4FAA4F;YAC5F,IAAA,0CAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YAEjE,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY;gBAClC,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;YAEpB,IAAI,OAAO,EAAE;gBACX,IAAA,uCAAwB,EAAC,IAAI,EAAE;oBAC7B,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,OAAO;iBACR,CAAC,CAAC;aACJ;SACF;QAED,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAyC;IAClE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,0BAA0B;QAC1B,IAAI,QAAQ,EAAE;YACZ,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC9B,IAAA,0CAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;aAClE;YAED,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;SAC/C;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAClC,iBAAyB,EACzB,KAAuB,EACvB,aAA8C;IAE9C,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,WAAW,GAAgB,IAAI,CAAC,KAAK,CACzC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CACxC,CAAC;QACF,MAAM,oBAAoB,GACxB,WAAW,CAAC,YAAY,EAAE,CAAC,iBAAiB,CAAC;YAC7C,WAAW,CAAC,eAAe,EAAE,CAAC,iBAAiB,CAAC,CAAC;QAEnD,MAAM,YAAY,GAA2B;YAC3C,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;YACnC,GAAG,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;SACvC,CAAC;QAEF,OAAO,YAAY,CAAC,iBAAiB,CAAC;YACpC,CAAC,CAAC,IAAA,kBAAK,EAAC;gBACJ,iBAAiB,CAAC,aAAa,CAAC;gBAChC,eAAe,CAAC,KAAK,EAAE,oBAAoB,CAAC;aAC7C,CAAC;YACJ,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAzBD,oDAyBC"}