@skyux/packages 12.22.0 → 13.0.0-alpha.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.
Files changed (60) hide show
  1. package/collection.json +0 -10
  2. package/package.json +62 -62
  3. package/src/schematics/ag-grid-migrate/ag-grid-migrate.schematic.js +1 -1
  4. package/src/schematics/migrations/migration-collection.json +7 -47
  5. package/src/schematics/migrations/{update-12 → update-13}/i18n-resources-module/i18n-resources-module.schematic.js.map +1 -1
  6. package/src/schematics/migrations/{update-12 → update-13}/remove-old-compat-stylesheets/remove-old-compat-stylesheets.schematic.js.map +1 -1
  7. package/src/schematics/migrations/{update-12 → update-13}/workspace-check/workspace-check.schematic.js.map +1 -1
  8. package/src/schematics/rules/add-ag-grid-styles-config.js +3 -1
  9. package/src/schematics/rules/add-ag-grid-styles-config.js.map +1 -1
  10. package/src/schematics/rules/add-commonjs-config.js +1 -0
  11. package/src/schematics/rules/add-commonjs-config.js.map +1 -1
  12. package/src/schematics/rules/add-polyfills-config.js +29 -17
  13. package/src/schematics/rules/add-polyfills-config.js.map +1 -1
  14. package/src/schematics/utility/tree.js +2 -3
  15. package/src/schematics/utility/tree.js.map +1 -1
  16. package/src/version.js +1 -1
  17. package/src/schematics/migrations/update-12/ag-grid/ag-grid.schematic.d.ts +0 -5
  18. package/src/schematics/migrations/update-12/ag-grid/ag-grid.schematic.js +0 -164
  19. package/src/schematics/migrations/update-12/ag-grid/ag-grid.schematic.js.map +0 -1
  20. package/src/schematics/migrations/update-12/ag-grid/schema.json +0 -5
  21. package/src/schematics/migrations/update-12/axe-core/axe-core.schematic.d.ts +0 -7
  22. package/src/schematics/migrations/update-12/axe-core/axe-core.schematic.js +0 -29
  23. package/src/schematics/migrations/update-12/axe-core/axe-core.schematic.js.map +0 -1
  24. package/src/schematics/migrations/update-12/help-inline-import-path/help-inline-import-path.schematic.d.ts +0 -2
  25. package/src/schematics/migrations/update-12/help-inline-import-path/help-inline-import-path.schematic.js +0 -26
  26. package/src/schematics/migrations/update-12/help-inline-import-path/help-inline-import-path.schematic.js.map +0 -1
  27. package/src/schematics/migrations/update-12/icon-name/icon-name-mappings.d.ts +0 -11
  28. package/src/schematics/migrations/update-12/icon-name/icon-name-mappings.js +0 -319
  29. package/src/schematics/migrations/update-12/icon-name/icon-name-mappings.js.map +0 -1
  30. package/src/schematics/migrations/update-12/icon-name/icon-name.schematic.d.ts +0 -5
  31. package/src/schematics/migrations/update-12/icon-name/icon-name.schematic.js +0 -70
  32. package/src/schematics/migrations/update-12/icon-name/icon-name.schematic.js.map +0 -1
  33. package/src/schematics/migrations/update-12/icons-migration/icons-migration.schematic.d.ts +0 -2
  34. package/src/schematics/migrations/update-12/icons-migration/icons-migration.schematic.js +0 -42
  35. package/src/schematics/migrations/update-12/icons-migration/icons-migration.schematic.js.map +0 -1
  36. package/src/schematics/migrations/update-12/icons-size/icons-size.schematic.d.ts +0 -5
  37. package/src/schematics/migrations/update-12/icons-size/icons-size.schematic.js +0 -32
  38. package/src/schematics/migrations/update-12/icons-size/icons-size.schematic.js.map +0 -1
  39. package/src/schematics/migrations/update-12/remove-angular-eslint-prefer-standalone-component/remove-angular-eslint-prefer-standalone-component.schematic.d.ts +0 -2
  40. package/src/schematics/migrations/update-12/remove-angular-eslint-prefer-standalone-component/remove-angular-eslint-prefer-standalone-component.schematic.js +0 -10
  41. package/src/schematics/migrations/update-12/remove-angular-eslint-prefer-standalone-component/remove-angular-eslint-prefer-standalone-component.schematic.js.map +0 -1
  42. package/src/schematics/migrations/update-12/remove-nx-cache/remove-nx-cache.schematic.d.ts +0 -2
  43. package/src/schematics/migrations/update-12/remove-nx-cache/remove-nx-cache.schematic.js +0 -12
  44. package/src/schematics/migrations/update-12/remove-nx-cache/remove-nx-cache.schematic.js.map +0 -1
  45. package/src/schematics/ng-generate/remove-nx-cache/remove-nx-cache.schematic.d.ts +0 -2
  46. package/src/schematics/ng-generate/remove-nx-cache/remove-nx-cache.schematic.js +0 -12
  47. package/src/schematics/ng-generate/remove-nx-cache/remove-nx-cache.schematic.js.map +0 -1
  48. package/src/schematics/ng-generate/remove-nx-cache/schema.json +0 -5
  49. package/src/schematics/rules/remove-eslint-disable-comment/remove-eslint-disable-comment.d.ts +0 -6
  50. package/src/schematics/rules/remove-eslint-disable-comment/remove-eslint-disable-comment.js +0 -53
  51. package/src/schematics/rules/remove-eslint-disable-comment/remove-eslint-disable-comment.js.map +0 -1
  52. package/src/schematics/rules/remove-nx-cache/remove-nx-cache.d.ts +0 -6
  53. package/src/schematics/rules/remove-nx-cache/remove-nx-cache.js +0 -36
  54. package/src/schematics/rules/remove-nx-cache/remove-nx-cache.js.map +0 -1
  55. /package/src/schematics/migrations/{update-12 → update-13}/i18n-resources-module/i18n-resources-module.schematic.d.ts +0 -0
  56. /package/src/schematics/migrations/{update-12 → update-13}/i18n-resources-module/i18n-resources-module.schematic.js +0 -0
  57. /package/src/schematics/migrations/{update-12 → update-13}/remove-old-compat-stylesheets/remove-old-compat-stylesheets.schematic.d.ts +0 -0
  58. /package/src/schematics/migrations/{update-12 → update-13}/remove-old-compat-stylesheets/remove-old-compat-stylesheets.schematic.js +0 -0
  59. /package/src/schematics/migrations/{update-12 → update-13}/workspace-check/workspace-check.schematic.d.ts +0 -0
  60. /package/src/schematics/migrations/{update-12 → update-13}/workspace-check/workspace-check.schematic.js +0 -0
package/collection.json CHANGED
@@ -11,11 +11,6 @@
11
11
  "factory": "./src/schematics/ng-generate/add-ag-grid-styles/add-ag-grid-styles.schematic",
12
12
  "schema": "./src/schematics/ng-generate/add-ag-grid-styles/schema.json"
13
13
  },
14
- "ag-grid-migrate": {
15
- "description": "Run AG Grid code modifications.",
16
- "factory": "./src/schematics/ag-grid-migrate/ag-grid-migrate.schematic",
17
- "schema": "./src/schematics/ag-grid-migrate/schema.json"
18
- },
19
14
  "polyfills": {
20
15
  "description": "Add @skyux/packages/polyfills to project config.",
21
16
  "factory": "./src/schematics/ng-generate/polyfills/polyfills.schematic",
@@ -25,11 +20,6 @@
25
20
  "description": "Remove SKY UX compatibility stylesheets.",
26
21
  "factory": "./src/schematics/ng-generate/remove-compat-stylesheets/remove-compat-stylesheets.schematic",
27
22
  "schema": "./src/schematics/ng-generate/remove-compat-stylesheets/schema.json"
28
- },
29
- "remove-nx-cache": {
30
- "description": "Remove the Nx cache directory from git.",
31
- "factory": "./src/schematics/ng-generate/remove-nx-cache/remove-nx-cache.schematic",
32
- "schema": "./src/schematics/ng-generate/remove-nx-cache/schema.json"
33
23
  }
34
24
  }
35
25
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skyux/packages",
3
- "version": "12.22.0",
3
+ "version": "13.0.0-alpha.0",
4
4
  "author": "Blackbaud, Inc.",
5
5
  "description": "Handles the `ng update` command for SKY UX component libraries.",
6
6
  "keywords": [
@@ -35,74 +35,74 @@
35
35
  "ng-update": {
36
36
  "migrations": "./src/schematics/migrations/migration-collection.json",
37
37
  "packageGroup": {
38
- "@skyux/packages": "12.22.0",
38
+ "@skyux/packages": "13.0.0-alpha.0",
39
39
  "@blackbaud/angular-tree-component": "^1.0.0",
40
- "@skyux-sdk/eslint-config": "12.22.0",
41
- "@skyux-sdk/eslint-schematics": "12.22.0",
42
- "@skyux-sdk/prettier-schematics": "12.22.0",
43
- "@skyux-sdk/stylelint-schematics": "12.22.0",
44
- "@skyux-sdk/testing": "12.22.0",
45
- "@skyux/a11y": "12.22.0",
46
- "@skyux/action-bars": "12.22.0",
47
- "@skyux/ag-grid": "12.22.0",
48
- "@skyux/angular-tree-component": "12.22.0",
49
- "@skyux/animations": "12.22.0",
50
- "@skyux/assets": "12.22.0",
51
- "@skyux/autonumeric": "12.22.0",
52
- "@skyux/avatar": "12.22.0",
53
- "@skyux/code-examples": "12.22.0",
54
- "@skyux/colorpicker": "12.22.0",
55
- "@skyux/config": "12.22.0",
56
- "@skyux/core": "12.22.0",
57
- "@skyux/data-manager": "12.22.0",
58
- "@skyux/datetime": "12.22.0",
59
- "@skyux/docs-tools": "12.22.0",
60
- "@skyux/errors": "12.22.0",
61
- "@skyux/flyout": "12.22.0",
62
- "@skyux/forms": "12.22.0",
63
- "@skyux/grids": "12.22.0",
64
- "@skyux/help-inline": "12.22.0",
65
- "@skyux/i18n": "12.22.0",
66
- "@skyux/icon": "12.22.0",
40
+ "@skyux-sdk/eslint-config": "13.0.0-alpha.0",
41
+ "@skyux-sdk/eslint-schematics": "13.0.0-alpha.0",
42
+ "@skyux-sdk/prettier-schematics": "13.0.0-alpha.0",
43
+ "@skyux-sdk/stylelint-schematics": "13.0.0-alpha.0",
44
+ "@skyux-sdk/testing": "13.0.0-alpha.0",
45
+ "@skyux/a11y": "13.0.0-alpha.0",
46
+ "@skyux/action-bars": "13.0.0-alpha.0",
47
+ "@skyux/ag-grid": "13.0.0-alpha.0",
48
+ "@skyux/angular-tree-component": "13.0.0-alpha.0",
49
+ "@skyux/animations": "13.0.0-alpha.0",
50
+ "@skyux/assets": "13.0.0-alpha.0",
51
+ "@skyux/autonumeric": "13.0.0-alpha.0",
52
+ "@skyux/avatar": "13.0.0-alpha.0",
53
+ "@skyux/code-examples": "13.0.0-alpha.0",
54
+ "@skyux/colorpicker": "13.0.0-alpha.0",
55
+ "@skyux/config": "13.0.0-alpha.0",
56
+ "@skyux/core": "13.0.0-alpha.0",
57
+ "@skyux/data-manager": "13.0.0-alpha.0",
58
+ "@skyux/datetime": "13.0.0-alpha.0",
59
+ "@skyux/docs-tools": "13.0.0-alpha.0",
60
+ "@skyux/errors": "13.0.0-alpha.0",
61
+ "@skyux/flyout": "13.0.0-alpha.0",
62
+ "@skyux/forms": "13.0.0-alpha.0",
63
+ "@skyux/grids": "13.0.0-alpha.0",
64
+ "@skyux/help-inline": "13.0.0-alpha.0",
65
+ "@skyux/i18n": "13.0.0-alpha.0",
66
+ "@skyux/icon": "13.0.0-alpha.0",
67
67
  "@skyux/icons": "^8.2.0",
68
- "@skyux/indicators": "12.22.0",
69
- "@skyux/inline-form": "12.22.0",
70
- "@skyux/layout": "12.22.0",
71
- "@skyux/list-builder": "12.22.0",
72
- "@skyux/list-builder-common": "12.22.0",
73
- "@skyux/list-builder-view-checklist": "12.22.0",
74
- "@skyux/list-builder-view-grids": "12.22.0",
75
- "@skyux/lists": "12.22.0",
76
- "@skyux/lookup": "12.22.0",
77
- "@skyux/manifest": "12.22.0",
78
- "@skyux/modals": "12.22.0",
79
- "@skyux/navbar": "12.22.0",
80
- "@skyux/pages": "12.22.0",
81
- "@skyux/phone-field": "12.22.0",
82
- "@skyux/popovers": "12.22.0",
83
- "@skyux/progress-indicator": "12.22.0",
84
- "@skyux/router": "12.22.0",
85
- "@skyux/select-field": "12.22.0",
86
- "@skyux/split-view": "12.22.0",
87
- "@skyux/tabs": "12.22.0",
88
- "@skyux/text-editor": "12.22.0",
89
- "@skyux/theme": "12.22.0",
90
- "@skyux/tiles": "12.22.0",
91
- "@skyux/toast": "12.22.0",
92
- "@skyux/validation": "12.22.0",
93
- "ag-grid-angular": "^33.2.1",
94
- "ag-grid-community": "^33.2.1",
68
+ "@skyux/indicators": "13.0.0-alpha.0",
69
+ "@skyux/inline-form": "13.0.0-alpha.0",
70
+ "@skyux/layout": "13.0.0-alpha.0",
71
+ "@skyux/list-builder": "13.0.0-alpha.0",
72
+ "@skyux/list-builder-common": "13.0.0-alpha.0",
73
+ "@skyux/list-builder-view-checklist": "13.0.0-alpha.0",
74
+ "@skyux/list-builder-view-grids": "13.0.0-alpha.0",
75
+ "@skyux/lists": "13.0.0-alpha.0",
76
+ "@skyux/lookup": "13.0.0-alpha.0",
77
+ "@skyux/manifest": "13.0.0-alpha.0",
78
+ "@skyux/modals": "13.0.0-alpha.0",
79
+ "@skyux/navbar": "13.0.0-alpha.0",
80
+ "@skyux/pages": "13.0.0-alpha.0",
81
+ "@skyux/phone-field": "13.0.0-alpha.0",
82
+ "@skyux/popovers": "13.0.0-alpha.0",
83
+ "@skyux/progress-indicator": "13.0.0-alpha.0",
84
+ "@skyux/router": "13.0.0-alpha.0",
85
+ "@skyux/select-field": "13.0.0-alpha.0",
86
+ "@skyux/split-view": "13.0.0-alpha.0",
87
+ "@skyux/tabs": "13.0.0-alpha.0",
88
+ "@skyux/text-editor": "13.0.0-alpha.0",
89
+ "@skyux/theme": "13.0.0-alpha.0",
90
+ "@skyux/tiles": "13.0.0-alpha.0",
91
+ "@skyux/toast": "13.0.0-alpha.0",
92
+ "@skyux/validation": "13.0.0-alpha.0",
93
+ "ag-grid-angular": "^33.3.2",
94
+ "ag-grid-community": "^33.3.2",
95
95
  "ag-grid-enterprise": "^32.1.0",
96
96
  "autonumeric": "^4.10.5",
97
- "eslint-config-skyux": "12.22.0",
98
- "skyux-stylelint": "12.22.0",
99
- "stylelint-config-skyux": "12.22.0"
97
+ "eslint-config-skyux": "13.0.0-alpha.0",
98
+ "skyux-stylelint": "13.0.0-alpha.0",
99
+ "stylelint-config-skyux": "13.0.0-alpha.0"
100
100
  }
101
101
  },
102
102
  "peerDependencies": {
103
- "@angular/cdk": "^19.2.10",
104
- "@angular/cli": "^19.2.8",
105
- "@angular/core": "^19.2.7"
103
+ "@angular/cdk": "^20.0.4",
104
+ "@angular/cli": "^20.0.4",
105
+ "@angular/core": "^20.0.5"
106
106
  },
107
107
  "dependencies": {
108
108
  "fs-extra": "11.3.0",
@@ -4,7 +4,7 @@ exports.default = default_1;
4
4
  const child_process_1 = require("child_process");
5
5
  const os_1 = require("os");
6
6
  const AG_GRID_MIGRATION = '33.0.0';
7
- const AG_GRID_VERSION = '33.2.1';
7
+ const AG_GRID_VERSION = '33.3.2';
8
8
  function getStartingVersion(sourceRoot) {
9
9
  try {
10
10
  const content = (0, child_process_1.spawnSync)('git',
@@ -1,63 +1,23 @@
1
1
  {
2
2
  "schematics": {
3
3
  "noop": {
4
- "version": "12.22.0",
4
+ "version": "13.0.0-alpha.0",
5
5
  "factory": "./noop/noop.schematic",
6
6
  "description": "Update all SKY UX component packages"
7
7
  },
8
- "ag-grid": {
9
- "version": "12.0.0",
10
- "factory": "./update-12/ag-grid/ag-grid.schematic",
11
- "description": "Changes to support AG Grid 33."
12
- },
13
- "axe-core": {
14
- "version": "12.0.0",
15
- "factory": "./update-12/axe-core/axe-core.schematic",
16
- "description": "Update axe-core if @skyux-sdk/testing installed."
17
- },
18
- "help-inline-import-path": {
19
- "version": "12.0.0",
20
- "factory": "./update-12/help-inline-import-path/help-inline-import-path.schematic",
21
- "description": "Update help inline import paths to help inline library."
22
- },
23
8
  "i18n-resources-module": {
24
- "version": "12.0.0",
25
- "factory": "./update-12/i18n-resources-module/i18n-resources-module.schematic",
9
+ "version": "13.0.0-alpha.0",
10
+ "factory": "./update-13/i18n-resources-module/i18n-resources-module.schematic",
26
11
  "description": "Regenerate i18n resources modules for libraries."
27
12
  },
28
- "icon-name": {
29
- "version": "12.0.0",
30
- "factory": "./update-12/icon-name/icon-name.schematic",
31
- "description": "Update icon `icon` properties to `iconName`."
32
- },
33
- "icons-migration": {
34
- "version": "12.0.0",
35
- "factory": "./update-12/icons-migration/icons-migration.schematic",
36
- "description": "Update icons import paths to icons library and add new peer."
37
- },
38
- "icons-size": {
39
- "version": "12.0.0",
40
- "factory": "./update-12/icons-size/icons-size.schematic",
41
- "description": "Update icons to include size input."
42
- },
43
- "remove-angular-eslint-prefer-standalone-component": {
44
- "version": "12.0.0",
45
- "factory": "./update-12/remove-angular-eslint-prefer-standalone-component/remove-angular-eslint-prefer-standalone-component.schematic",
46
- "description": "Remove inline eslint ignore comments for @angular-eslint/prefer-standalone-component."
47
- },
48
- "remove-nx-cache": {
49
- "version": "12.0.0",
50
- "factory": "./update-12/remove-nx-cache/remove-nx-cache.schematic",
51
- "description": "Remove `.nx/cache` from git and add `.gitignore` entry."
52
- },
53
13
  "remove-old-compat-stylesheets": {
54
- "version": "12.0.0",
55
- "factory": "./update-12/remove-old-compat-stylesheets/remove-old-compat-stylesheets.schematic",
14
+ "version": "13.0.0-alpha.0",
15
+ "factory": "./update-13/remove-old-compat-stylesheets/remove-old-compat-stylesheets.schematic",
56
16
  "description": "Remove backward compatible stylesheets for older versions of SKY UX."
57
17
  },
58
18
  "workspace-check": {
59
- "version": "12.0.0",
60
- "factory": "./update-12/workspace-check/workspace-check.schematic",
19
+ "version": "13.0.0-alpha.0",
20
+ "factory": "./update-13/workspace-check/workspace-check.schematic",
61
21
  "description": "Log warnings if the workspace is not configured correctly."
62
22
  }
63
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"i18n-resources-module.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-12/i18n-resources-module/i18n-resources-module.schematic.ts"],"names":[],"mappings":";;AAQA,4BAgDC;AAxDD,2DAA4E;AAE5E,gDAAyD;AACzD,8EAAyE;AACzE,0DAA0D;AAE1D,MAAM,uBAAuB,GAAG,sBAAsB,CAAC;AAEvD;IACE,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,KAAK,GAAW,EAAE,CAAC;QAEzB,KAAK,MAAM,CACT,WAAW,EACX,iBAAiB,EAClB,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YAClC,IAAI,iBAAiB,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;gBAExE,MAAM,YAAY,GAAG;oBACnB,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;oBACnC,GAAG,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;iBACvC,CAAC;gBAEF,IAAI,YAAY,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE,CAAC;oBAC9C,SAAS;gBACX,CAAC;gBAED,MAAM,OAAO,GACX,iBAAiB,CAAC,UAAU,IAAI,GAAG,iBAAiB,CAAC,IAAI,MAAM,CAAC;gBAElE,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,KAAK,OAAO,GAAG,CAAC,CAAC;gBAEjD,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE;oBAC5C,IAAI,QAAQ,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;wBAC/C,MAAM,OAAO,GAAG,IAAA,uBAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;wBAEjD,IAAI,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAC,EAAE,CAAC;4BACpD,KAAK,CAAC,IAAI,CACR,IAAA,8BAAiB,EAAC,aAAa,EAAE,sBAAsB,EAAE;gCACvD,OAAO,EAAE,WAAW;gCACpB,IAAI,EAAE,QAAQ;qCACX,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;qCACzB,OAAO,CAAC,yBAAyB,EAAE,EAAE,CAAC;6BAC1C,CAAC,CACH,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"i18n-resources-module.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-13/i18n-resources-module/i18n-resources-module.schematic.ts"],"names":[],"mappings":";;AAQA,4BAgDC;AAxDD,2DAA4E;AAE5E,gDAAyD;AACzD,8EAAyE;AACzE,0DAA0D;AAE1D,MAAM,uBAAuB,GAAG,sBAAsB,CAAC;AAEvD;IACE,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,KAAK,GAAW,EAAE,CAAC;QAEzB,KAAK,MAAM,CACT,WAAW,EACX,iBAAiB,EAClB,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YAClC,IAAI,iBAAiB,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;gBAExE,MAAM,YAAY,GAAG;oBACnB,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;oBACnC,GAAG,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;iBACvC,CAAC;gBAEF,IAAI,YAAY,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE,CAAC;oBAC9C,SAAS;gBACX,CAAC;gBAED,MAAM,OAAO,GACX,iBAAiB,CAAC,UAAU,IAAI,GAAG,iBAAiB,CAAC,IAAI,MAAM,CAAC;gBAElE,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,KAAK,OAAO,GAAG,CAAC,CAAC;gBAEjD,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE;oBAC5C,IAAI,QAAQ,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;wBAC/C,MAAM,OAAO,GAAG,IAAA,uBAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;wBAEjD,IAAI,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAC,EAAE,CAAC;4BACpD,KAAK,CAAC,IAAI,CACR,IAAA,8BAAiB,EAAC,aAAa,EAAE,sBAAsB,EAAE;gCACvD,OAAO,EAAE,WAAW;gCACpB,IAAI,EAAE,QAAQ;qCACX,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;qCACzB,OAAO,CAAC,yBAAyB,EAAE,EAAE,CAAC;6BAC1C,CAAC,CACH,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"remove-old-compat-stylesheets.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-12/remove-old-compat-stylesheets/remove-old-compat-stylesheets.schematic.ts"],"names":[],"mappings":";;AAKA,6CAIC;AARD,8EAAmF;AAEnF,iDAA8C;AAE9C,SAAwB,0BAA0B;IAChD,OAAO,IAAA,6BAAiB,EAAC,iBAAiB,EAAE,2BAA2B,EAAE;QACvE,YAAY,EAAE,QAAQ,CAAC,iBAAO,CAAC,KAAK,CAAC,GAAG,CAAC;KAC1C,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"remove-old-compat-stylesheets.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-13/remove-old-compat-stylesheets/remove-old-compat-stylesheets.schematic.ts"],"names":[],"mappings":";;AAKA,6CAIC;AARD,8EAAmF;AAEnF,iDAA8C;AAE9C,SAAwB,0BAA0B;IAChD,OAAO,IAAA,6BAAiB,EAAC,iBAAiB,EAAE,2BAA2B,EAAE;QACvE,YAAY,EAAE,QAAQ,CAAC,iBAAO,CAAC,KAAK,CAAC,GAAG,CAAC;KAC1C,CAAC,CAAC;AACL,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"workspace-check.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-12/workspace-check/workspace-check.schematic.ts"],"names":[],"mappings":";;AAIA,4BAEC;AAJD,oFAAgF;AAEhF;IACE,OAAO,IAAA,gCAAc,GAAE,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"workspace-check.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-13/workspace-check/workspace-check.schematic.ts"],"names":[],"mappings":";;AAIA,4BAEC;AAJD,oFAAgF;AAEhF;IACE,OAAO,IAAA,gCAAc,GAAE,CAAC;AAC1B,CAAC"}
@@ -2,8 +2,10 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addAgGridStylesConfig = addAgGridStylesConfig;
4
4
  const workspace_1 = require("../utility/workspace");
5
- // List of builders that support allowedCommonJsDependencies.
5
+ // List of builders that support styles.
6
6
  const allowedBuilders = [
7
+ '@angular/build:application',
8
+ '@angular/build:karma',
7
9
  '@angular-devkit/build-angular:application',
8
10
  '@angular-devkit/build-angular:browser',
9
11
  '@angular-devkit/build-angular:karma',
@@ -1 +1 @@
1
- {"version":3,"file":"add-ag-grid-styles-config.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/add-ag-grid-styles-config.ts"],"names":[],"mappings":";;AAgBA,sDA0BC;AAxCD,oDAAuD;AAEvD,6DAA6D;AAC7D,MAAM,eAAe,GAAG;IACtB,2CAA2C;IAC3C,uCAAuC;IACvC,qCAAqC;IACrC,oDAAoD;IACpD,kDAAkD;CACnD,CAAC;AAEF;;GAEG;AACH,SAAgB,qBAAqB,CAAC,WAAmB;IACvD,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,GAAG,EAAE,CACV,IAAA,2BAAe,EAAC,CAAC,SAAS,EAAE,EAAE;QAC5B,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,2BAA2B,WAAW,EAAE,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzD,SAAS;YACX,CAAC;YAED,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAChC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG;gBACzB,GAAG,IAAI,GAAG,CAAC;oBACT,GAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAc;oBACzC,oCAAoC;iBACrC,CAAC;aACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"add-ag-grid-styles-config.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/add-ag-grid-styles-config.ts"],"names":[],"mappings":";;AAkBA,sDA0BC;AA1CD,oDAAuD;AAEvD,wCAAwC;AACxC,MAAM,eAAe,GAAG;IACtB,4BAA4B;IAC5B,sBAAsB;IACtB,2CAA2C;IAC3C,uCAAuC;IACvC,qCAAqC;IACrC,oDAAoD;IACpD,kDAAkD;CACnD,CAAC;AAEF;;GAEG;AACH,SAAgB,qBAAqB,CAAC,WAAmB;IACvD,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,GAAG,EAAE,CACV,IAAA,2BAAe,EAAC,CAAC,SAAS,EAAE,EAAE;QAC5B,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,2BAA2B,WAAW,EAAE,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzD,SAAS;YACX,CAAC;YAED,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAChC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG;gBACzB,GAAG,IAAI,GAAG,CAAC;oBACT,GAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAc;oBACzC,oCAAoC;iBACrC,CAAC;aACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
@@ -4,6 +4,7 @@ exports.addCommonJsConfig = addCommonJsConfig;
4
4
  const workspace_1 = require("../utility/workspace");
5
5
  // List of builders that support allowedCommonJsDependencies.
6
6
  const allowedCommonJsDependenciesBuilders = [
7
+ '@angular/build:application',
7
8
  '@angular-devkit/build-angular:application',
8
9
  '@angular-devkit/build-angular:browser',
9
10
  '@blackbaud-internal/skyux-angular-builders:browser',
@@ -1 +1 @@
1
- {"version":3,"file":"add-commonjs-config.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/add-commonjs-config.ts"],"names":[],"mappings":";;AAcA,8CAwCC;AApDD,oDAAuD;AAEvD,6DAA6D;AAC7D,MAAM,mCAAmC,GAAG;IAC1C,2CAA2C;IAC3C,uCAAuC;IACvC,oDAAoD;CACrD,CAAC;AAEF;;GAEG;AACH,SAAgB,iBAAiB,CAAC,WAAmB;IACnD,MAAM,WAAW,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,GAAG,EAAE,CACV,IAAA,2BAAe,EAAC,CAAC,SAAS,EAAE,EAAE;QAC5B,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEpD,0BAA0B;QAC1B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAE/C,0BAA0B;YAC1B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO;YACT,CAAC;YAED,oCAAoC;YACpC,IAAI,CAAC,mCAAmC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClE,SAAS;YACX,CAAC;YAED,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,KAAK,EAAE,CAAC;YACrD,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,GAAG;gBAC9C,GAAG,IAAI,GAAG,CAAC;oBACT,GAAI,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAc;oBAC9D,cAAc;oBACd,aAAa;oBACb,kBAAkB;oBAClB,SAAS;oBACT,kBAAkB;oBAClB,gBAAgB;oBAChB,QAAQ;iBACT,CAAC;aACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"add-commonjs-config.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/add-commonjs-config.ts"],"names":[],"mappings":";;AAeA,8CAwCC;AArDD,oDAAuD;AAEvD,6DAA6D;AAC7D,MAAM,mCAAmC,GAAG;IAC1C,4BAA4B;IAC5B,2CAA2C;IAC3C,uCAAuC;IACvC,oDAAoD;CACrD,CAAC;AAEF;;GAEG;AACH,SAAgB,iBAAiB,CAAC,WAAmB;IACnD,MAAM,WAAW,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,GAAG,EAAE,CACV,IAAA,2BAAe,EAAC,CAAC,SAAS,EAAE,EAAE;QAC5B,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEpD,0BAA0B;QAC1B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAE/C,0BAA0B;YAC1B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO;YACT,CAAC;YAED,oCAAoC;YACpC,IAAI,CAAC,mCAAmC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClE,SAAS;YACX,CAAC;YAED,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,KAAK,EAAE,CAAC;YACrD,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,GAAG;gBAC9C,GAAG,IAAI,GAAG,CAAC;oBACT,GAAI,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAc;oBAC9D,cAAc;oBACd,aAAa;oBACb,kBAAkB;oBAClB,SAAS;oBACT,kBAAkB;oBAClB,gBAAgB;oBAChB,QAAQ;iBACT,CAAC;aACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
@@ -3,13 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addPolyfillsConfig = addPolyfillsConfig;
4
4
  const workspace_1 = require("../utility/workspace");
5
5
  // List of approved builders the polyfill can be added to.
6
- const polyfillsBuilders = [
6
+ const APPROVED_BUILDERS = [
7
+ '@angular/build:application',
8
+ '@angular/build:karma',
7
9
  '@angular-devkit/build-angular:application',
8
10
  '@angular-devkit/build-angular:browser',
9
11
  '@angular-devkit/build-angular:karma',
10
12
  '@blackbaud-internal/skyux-angular-builders:browser',
11
13
  '@blackbaud-internal/skyux-angular-builders:karma',
12
14
  ];
15
+ const SKYUX_POLYFILLS = '@skyux/packages/polyfills';
16
+ /**
17
+ * Normalizes polyfills configuration to always be an array.
18
+ */
19
+ function normalizePolyfills(polyfills) {
20
+ if (!polyfills) {
21
+ return [];
22
+ }
23
+ if (typeof polyfills === 'string') {
24
+ return [polyfills];
25
+ }
26
+ if (Array.isArray(polyfills)) {
27
+ return polyfills;
28
+ }
29
+ return [];
30
+ }
13
31
  /**
14
32
  * Adds '@skyux/packages/polyfills' to the given targets' configuration.
15
33
  */
@@ -24,26 +42,20 @@ function addPolyfillsConfig(projectName, targetNames) {
24
42
  const target = project.targets.get(targetName);
25
43
  /* istanbul ignore next */
26
44
  if (!target) {
27
- return;
28
- }
29
- // Abort if builder is not approved.
30
- if (!polyfillsBuilders.includes(target.builder)) {
31
- context.logger.warn(`Could not add polyfills to the '${projectName}' project's '${targetName}' target because it does not use an approved builder. (wanted one of ${polyfillsBuilders.join(' | ')})`);
32
45
  continue;
33
46
  }
34
- if (!target.options?.['polyfills']) {
35
- target.options = {
36
- ...(target.options || {}),
37
- polyfills: [],
38
- };
39
- }
40
- else if (typeof target.options['polyfills'] === 'string') {
41
- target.options['polyfills'] = [target.options['polyfills']];
47
+ if (!APPROVED_BUILDERS.includes(target.builder)) {
48
+ context.logger.warn(`Could not add polyfills to '${projectName}:${targetName}' - unsupported builder '${target.builder}'. Supported builders: ${APPROVED_BUILDERS.join(', ')}`);
49
+ continue;
42
50
  }
43
- if (Array.isArray(target.options['polyfills']) &&
44
- !target.options['polyfills'].includes('@skyux/packages/polyfills')) {
45
- target.options['polyfills'].push('@skyux/packages/polyfills');
51
+ const polyfills = normalizePolyfills(target.options?.['polyfills']);
52
+ if (!polyfills.includes(SKYUX_POLYFILLS)) {
53
+ polyfills.push(SKYUX_POLYFILLS);
46
54
  }
55
+ target.options = {
56
+ ...(target.options || {}),
57
+ polyfills,
58
+ };
47
59
  }
48
60
  });
49
61
  }
@@ -1 +1 @@
1
- {"version":3,"file":"add-polyfills-config.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/add-polyfills-config.ts"],"names":[],"mappings":";;AAgBA,gDA+CC;AA7DD,oDAAuD;AAEvD,0DAA0D;AAC1D,MAAM,iBAAiB,GAAG;IACxB,2CAA2C;IAC3C,uCAAuC;IACvC,qCAAqC;IACrC,oDAAoD;IACpD,kDAAkD;CACnD,CAAC;AAEF;;GAEG;AACH,SAAgB,kBAAkB,CAChC,WAAmB,EACnB,WAAqB;IAErB,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CACxB,IAAA,2BAAe,EAAC,CAAC,SAAS,EAAE,EAAE;QAC5B,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEpD,0BAA0B;QAC1B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAE/C,0BAA0B;YAC1B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO;YACT,CAAC;YAED,oCAAoC;YACpC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,mCAAmC,WAAW,gBAAgB,UAAU,wEAAwE,iBAAiB,CAAC,IAAI,CACpK,KAAK,CACN,GAAG,CACL,CAAC;gBACF,SAAS;YACX,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;gBACnC,MAAM,CAAC,OAAO,GAAG;oBACf,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;oBACzB,SAAS,EAAE,EAAE;iBACd,CAAC;YACJ,CAAC;iBAAM,IAAI,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC3D,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;YAC9D,CAAC;YACD,IACE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAC1C,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,2BAA2B,CAAC,EAClE,CAAC;gBACD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"add-polyfills-config.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/add-polyfills-config.ts"],"names":[],"mappings":";;AAuCA,gDAwCC;AA7ED,oDAAuD;AAEvD,0DAA0D;AAC1D,MAAM,iBAAiB,GAAG;IACxB,4BAA4B;IAC5B,sBAAsB;IACtB,2CAA2C;IAC3C,uCAAuC;IACvC,qCAAqC;IACrC,oDAAoD;IACpD,kDAAkD;CACnD,CAAC;AAEF,MAAM,eAAe,GAAG,2BAA2B,CAAC;AAEpD;;GAEG;AACH,SAAS,kBAAkB,CAAC,SAAkB;IAC5C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,CAAC,SAAS,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAChC,WAAmB,EACnB,WAAqB;IAErB,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CACxB,IAAA,2BAAe,EAAC,CAAC,SAAS,EAAE,EAAE;QAC5B,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEpD,0BAA0B;QAC1B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAE/C,0BAA0B;YAC1B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,SAAS;YACX,CAAC;YAED,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,+BAA+B,WAAW,IAAI,UAAU,4BAA4B,MAAM,CAAC,OAAO,0BAA0B,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC3J,CAAC;gBACF,SAAS;YACX,CAAC;YAED,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;YAEpE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;gBACzC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAClC,CAAC;YAED,MAAM,CAAC,OAAO,GAAG;gBACf,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;gBACzB,SAAS;aACV,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.readRequiredFile = readRequiredFile;
4
4
  exports.writeTextFile = writeTextFile;
5
5
  exports.writeJsonFile = writeJsonFile;
6
- const core_1 = require("@angular-devkit/core");
7
6
  /**
8
7
  * Returns the contents of a required file or throws an error if it doesn't exist.
9
8
  */
10
9
  function readRequiredFile(tree, filePath) {
11
- const data = tree.read(filePath);
10
+ const data = tree.exists(filePath) && tree.readText(filePath);
12
11
  if (!data) {
13
12
  throw new Error(`The file '${filePath}' was expected to exist but was not found.`);
14
13
  }
15
- return core_1.virtualFs.fileBufferToString(data);
14
+ return data;
16
15
  }
17
16
  function writeTextFile(tree, path, contents) {
18
17
  if (tree.exists(path)) {
@@ -1 +1 @@
1
- {"version":3,"file":"tree.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/utility/tree.ts"],"names":[],"mappings":";;AAMA,4CASC;AAED,sCAUC;AAED,sCAEC;AA/BD,+CAAiD;AAGjD;;GAEG;AACH,SAAgB,gBAAgB,CAAC,IAAU,EAAE,QAAgB;IAC3D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CACb,aAAa,QAAQ,4CAA4C,CAClE,CAAC;IACJ,CAAC;IAED,OAAO,gBAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAC5C,CAAC;AAED,SAAgB,aAAa,CAC3B,IAAU,EACV,IAAY,EACZ,QAAgB;IAEhB,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACjC,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,SAAgB,aAAa,CAAI,IAAU,EAAE,IAAY,EAAE,QAAW;IACpE,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC"}
1
+ {"version":3,"file":"tree.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/utility/tree.ts"],"names":[],"mappings":";;AAKA,4CASC;AAED,sCAUC;AAED,sCAEC;AA5BD;;GAEG;AACH,SAAgB,gBAAgB,CAAC,IAAU,EAAE,QAAgB;IAC3D,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC9D,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CACb,aAAa,QAAQ,4CAA4C,CAClE,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,aAAa,CAC3B,IAAU,EACV,IAAY,EACZ,QAAgB;IAEhB,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACjC,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,SAAgB,aAAa,CAAI,IAAU,EAAE,IAAY,EAAE,QAAW;IACpE,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC"}
package/src/version.js CHANGED
@@ -19,5 +19,5 @@ exports.Version = Version;
19
19
  /**
20
20
  * Represents the version of @skyux/core.
21
21
  */
22
- exports.VERSION = new Version('12.22.0');
22
+ exports.VERSION = new Version('13.0.0-alpha.0');
23
23
  //# sourceMappingURL=version.js.map
@@ -1,5 +0,0 @@
1
- import { Rule } from '@angular-devkit/schematics';
2
- /**
3
- * Upgrade to AG Grid 33 and address breaking changes:
4
- */
5
- export default function (): Rule;
@@ -1,164 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = default_1;
4
- const tslib_1 = require("tslib");
5
- const tasks_1 = require("@angular-devkit/schematics/tasks");
6
- const schematics_1 = require("@angular/cdk/schematics");
7
- const schematics_2 = require("@angular/cdk/schematics");
8
- const typescript_1 = tslib_1.__importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
9
- const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
10
- const change_1 = require("@schematics/angular/utility/change");
11
- const dependencies_1 = require("@schematics/angular/utility/dependencies");
12
- const visit_project_files_1 = require("../../../utility/visit-project-files");
13
- const workspace_1 = require("../../../utility/workspace");
14
- const ANY_MODULE = '@ag-grid-community/';
15
- const ENT_MODULE = '@ag-grid-enterprise/';
16
- const AG_GRID = 'ag-grid-community';
17
- const AG_GRID_ENT = 'ag-grid-enterprise';
18
- const AG_GRID_NG = 'ag-grid-angular';
19
- const AG_GRID_SKY = '@skyux/ag-grid';
20
- const AG_GRID_VERSION = '^33.2.1';
21
- /**
22
- * Check package.json for AG Grid dependencies.
23
- */
24
- function checkAgGridDependency(tree, context) {
25
- const agGridDependency = (0, dependencies_1.getPackageJsonDependency)(tree, AG_GRID);
26
- const agGridDependencyEnt = (0, dependencies_1.getPackageJsonDependency)(tree, AG_GRID_ENT);
27
- const agGridDependencyNg = (0, dependencies_1.getPackageJsonDependency)(tree, AG_GRID_NG);
28
- if (agGridDependency || agGridDependencyEnt || agGridDependencyNg) {
29
- if (!agGridDependency) {
30
- // Missing peer dependency.
31
- (0, dependencies_1.addPackageJsonDependency)(tree, {
32
- name: AG_GRID,
33
- type: dependencies_1.NodeDependencyType.Default,
34
- version: AG_GRID_VERSION,
35
- });
36
- context.addTask(new tasks_1.NodePackageInstallTask());
37
- }
38
- return true;
39
- }
40
- const packageJson = tree.readJson('package.json');
41
- return ['dependencies', 'devDependencies'].some((dep) => Object.keys((packageJson && packageJson[dep]) || {}).some((dep) => dep.startsWith(ANY_MODULE) || dep.startsWith(ENT_MODULE)));
42
- }
43
- /**
44
- * Anywhere SkyAgGridModule is imported, add `ModuleRegistry.registerModules([AllCommunityModule]);`
45
- * to maintain functionality in AG Grid 33.
46
- */
47
- function addAgGridModuleRegistry(tree, path) {
48
- const content = tree.readText(path);
49
- if (content.includes('SkyAgGridModule') &&
50
- !content.includes('ModuleRegistry')) {
51
- const sourceFile = (0, schematics_2.parseSourceFile)(tree, path);
52
- const changes = [];
53
- if ((0, ast_utils_1.isImported)(sourceFile, 'SkyAgGridModule', AG_GRID_SKY) &&
54
- !(0, ast_utils_1.isImported)(sourceFile, 'ModuleRegistry', AG_GRID) &&
55
- !(0, ast_utils_1.isImported)(sourceFile, 'AllCommunityModule', AG_GRID)) {
56
- changes.push((0, ast_utils_1.insertImport)(sourceFile, path, 'AllCommunityModule, ModuleRegistry', AG_GRID));
57
- changes.push((0, ast_utils_1.insertAfterLastOccurrence)((0, schematics_1.findNodes)(sourceFile, typescript_1.default.SyntaxKind.ImportDeclaration), `\n\n// Added during the SKY UX 12 migration. For details and additional options, see https://www.ag-grid.com/angular-data-grid/modules/\n` +
58
- `ModuleRegistry.registerModules([AllCommunityModule]);`, path, 0));
59
- const recorder = tree.beginUpdate(path);
60
- (0, change_1.applyToUpdateRecorder)(recorder, changes);
61
- tree.commitUpdate(recorder);
62
- }
63
- }
64
- }
65
- /**
66
- * Update grid API calls to match AG Grid 33 changes.
67
- */
68
- function swapGridApiCalls(tree, path) {
69
- const content = tree.readText(path);
70
- const recorder = tree.beginUpdate(path);
71
- let instances;
72
- if (content.includes('this.gridApi')) {
73
- instances = content.matchAll(/\bthis\.gridOptions[?]?\.api\b/g);
74
- for (const instance of instances) {
75
- recorder.remove(instance.index, instance[0].length);
76
- recorder.insertRight(instance.index, 'this.gridApi');
77
- }
78
- }
79
- instances = content.matchAll(/(?<=api[?]?)\.getLastDisplayedRow\(\)/gi);
80
- for (const instance of instances) {
81
- recorder.remove(instance.index, instance[0].length);
82
- recorder.insertRight(instance.index, `.getLastDisplayedRowIndex()`);
83
- }
84
- instances = content.matchAll(/(?<=api[?]?\.setColumn)Visible\(([^,]+),/gi);
85
- for (const instance of instances) {
86
- recorder.remove(instance.index, instance[0].length);
87
- recorder.insertRight(instance.index, `sVisible([${instance[1]}],`);
88
- }
89
- instances = content.matchAll(/(?<=\bsuppress)Menu(?=:)/gi);
90
- for (const instance of instances) {
91
- recorder.remove(instance.index, instance[0].length);
92
- recorder.insertRight(instance.index, `HeaderMenuButton`);
93
- }
94
- instances = content.matchAll(/(?<=options = {[^}]+)enableCellChangeFlash(?=:)/gi);
95
- for (const instance of instances) {
96
- recorder.insertLeft(instance.index, `// todo: move enableCellChangeFlash to defaultColumnDef (added by SKY UX 12 migration)\n // `);
97
- }
98
- tree.commitUpdate(recorder);
99
- }
100
- /**
101
- * Check if the file includes any AG Grid imports.
102
- */
103
- function includesAgGrid(updatedContent) {
104
- return (updatedContent.includes(AG_GRID) ||
105
- updatedContent.includes(AG_GRID_ENT) ||
106
- updatedContent.includes(AG_GRID_SKY));
107
- }
108
- /**
109
- * Visit all files and apply the changes.
110
- */
111
- async function updateSourceFiles(tree, context) {
112
- const warned = [];
113
- function warnOnce(message) {
114
- if (!warned.includes(message)) {
115
- warned.push(message);
116
- context.logger.warn(message);
117
- }
118
- }
119
- const { workspace } = await (0, workspace_1.getWorkspace)(tree);
120
- workspace.projects.forEach((project) => {
121
- context.logger.debug(`Running SKY UX AG Grid updates within ${project.sourceRoot || project.root}.`);
122
- (0, visit_project_files_1.visitProjectFiles)(tree, project.sourceRoot || project.root, (filePath) => {
123
- // If the file is not a TypeScript file, we can skip it.
124
- if (!filePath.endsWith('.ts') || filePath.includes('schematics')) {
125
- return;
126
- }
127
- const content = tree.readText(filePath);
128
- if (!content || !includesAgGrid(content)) {
129
- return;
130
- }
131
- // Prompt the user to moderate the use of AG Grid modules
132
- if (content.includes(ANY_MODULE) || content.includes(ENT_MODULE)) {
133
- warnOnce(`\n
134
- Beginning with AG Grid 33, ESM modules are now included in their packages.
135
- https://ag-grid.com/angular-data-grid/modules/\n\n`);
136
- }
137
- addAgGridModuleRegistry(tree, filePath);
138
- swapGridApiCalls(tree, filePath);
139
- });
140
- });
141
- }
142
- /**
143
- * Upgrade to AG Grid 33 and address breaking changes:
144
- */
145
- function default_1() {
146
- return async (tree, context) => {
147
- const hasAgGrid = checkAgGridDependency(tree, context);
148
- // AG Grid is not installed, so we don't need to do anything.
149
- if (!hasAgGrid) {
150
- context.logger.debug(`AG Grid is not installed.`);
151
- return;
152
- }
153
- await updateSourceFiles(tree, context);
154
- const { workspace } = await (0, workspace_1.getWorkspace)(tree);
155
- for (const project of workspace.projects.values()) {
156
- const sourceRoot = project.sourceRoot || `${project.root}/src`;
157
- context.logger.debug(`Scheduling AG Grid code modifications for ${sourceRoot}.`);
158
- context.addTask(new tasks_1.RunSchematicTask('@skyux/packages', 'ag-grid-migrate', {
159
- sourceRoot,
160
- }));
161
- }
162
- };
163
- }
164
- //# sourceMappingURL=ag-grid.schematic.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"ag-grid.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-12/ag-grid/ag-grid.schematic.ts"],"names":[],"mappings":"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"}