@skyux/packages 7.0.0-beta.8 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyux/packages",
-  "version": "7.0.0-beta.8",
+  "version": "7.0.0",
   "author": "Blackbaud, Inc.",
   "description": "Handles the `ng update` command for SKY UX component libraries.",
   "keywords": [
@@ -27,66 +27,66 @@
       "@blackbaud/skyux-lib-code-block": "^7.0.0-beta.0",
       "@blackbaud/skyux-lib-media": "^7.0.0-beta.0",
       "@blackbaud/skyux-lib-stache": "^7.0.0-beta.0",
-      "@skyux-sdk/prettier-schematics": "7.0.0-beta.8",
-      "@skyux-sdk/testing": "7.0.0-beta.8",
-      "@skyux/a11y": "7.0.0-beta.8",
-      "@skyux/action-bars": "7.0.0-beta.8",
-      "@skyux/ag-grid": "7.0.0-beta.8",
-      "@skyux/angular-tree-component": "7.0.0-beta.8",
-      "@skyux/animations": "7.0.0-beta.8",
-      "@skyux/assets": "7.0.0-beta.8",
-      "@skyux/autonumeric": "7.0.0-beta.8",
-      "@skyux/avatar": "7.0.0-beta.8",
-      "@skyux/colorpicker": "7.0.0-beta.8",
-      "@skyux/config": "7.0.0-beta.8",
-      "@skyux/core": "7.0.0-beta.8",
-      "@skyux/data-manager": "7.0.0-beta.8",
-      "@skyux/datetime": "7.0.0-beta.8",
+      "@skyux-sdk/prettier-schematics": "7.0.0",
+      "@skyux-sdk/testing": "7.0.0",
+      "@skyux/a11y": "7.0.0",
+      "@skyux/action-bars": "7.0.0",
+      "@skyux/ag-grid": "7.0.0",
+      "@skyux/angular-tree-component": "7.0.0",
+      "@skyux/animations": "7.0.0",
+      "@skyux/assets": "7.0.0",
+      "@skyux/autonumeric": "7.0.0",
+      "@skyux/avatar": "7.0.0",
+      "@skyux/colorpicker": "7.0.0",
+      "@skyux/config": "7.0.0",
+      "@skyux/core": "7.0.0",
+      "@skyux/data-manager": "7.0.0",
+      "@skyux/datetime": "7.0.0",
       "@skyux/docs-tools": "^7.0.0-beta.0",
-      "@skyux/errors": "7.0.0-beta.8",
-      "@skyux/flyout": "7.0.0-beta.8",
-      "@skyux/forms": "7.0.0-beta.8",
-      "@skyux/grids": "7.0.0-beta.8",
-      "@skyux/http": "7.0.0-beta.8",
-      "@skyux/i18n": "7.0.0-beta.8",
+      "@skyux/errors": "7.0.0",
+      "@skyux/flyout": "7.0.0",
+      "@skyux/forms": "7.0.0",
+      "@skyux/grids": "7.0.0",
+      "@skyux/http": "7.0.0",
+      "@skyux/i18n": "7.0.0",
       "@skyux/icons": "^5.1.1",
-      "@skyux/indicators": "7.0.0-beta.8",
-      "@skyux/inline-form": "7.0.0-beta.8",
-      "@skyux/layout": "7.0.0-beta.8",
-      "@skyux/list-builder": "7.0.0-beta.8",
-      "@skyux/list-builder-common": "7.0.0-beta.8",
-      "@skyux/list-builder-view-checklist": "7.0.0-beta.8",
-      "@skyux/list-builder-view-grids": "7.0.0-beta.8",
-      "@skyux/lists": "7.0.0-beta.8",
-      "@skyux/lookup": "7.0.0-beta.8",
-      "@skyux/modals": "7.0.0-beta.8",
-      "@skyux/navbar": "7.0.0-beta.8",
-      "@skyux/omnibar-interop": "7.0.0-beta.8",
-      "@skyux/pages": "7.0.0-beta.8",
-      "@skyux/phone-field": "7.0.0-beta.8",
-      "@skyux/popovers": "7.0.0-beta.8",
-      "@skyux/progress-indicator": "7.0.0-beta.8",
-      "@skyux/router": "7.0.0-beta.8",
-      "@skyux/select-field": "7.0.0-beta.8",
-      "@skyux/split-view": "7.0.0-beta.8",
-      "@skyux/tabs": "7.0.0-beta.8",
-      "@skyux/text-editor": "7.0.0-beta.8",
-      "@skyux/theme": "7.0.0-beta.8",
-      "@skyux/tiles": "7.0.0-beta.8",
-      "@skyux/toast": "7.0.0-beta.8",
-      "@skyux/validation": "7.0.0-beta.8",
-      "ag-grid-angular": "^27.2.0",
-      "ag-grid-community": "^27.2.0",
-      "ag-grid-enterprise": "^27.2.0"
+      "@skyux/indicators": "7.0.0",
+      "@skyux/inline-form": "7.0.0",
+      "@skyux/layout": "7.0.0",
+      "@skyux/list-builder": "7.0.0",
+      "@skyux/list-builder-common": "7.0.0",
+      "@skyux/list-builder-view-checklist": "7.0.0",
+      "@skyux/list-builder-view-grids": "7.0.0",
+      "@skyux/lists": "7.0.0",
+      "@skyux/lookup": "7.0.0",
+      "@skyux/modals": "7.0.0",
+      "@skyux/navbar": "7.0.0",
+      "@skyux/omnibar-interop": "7.0.0",
+      "@skyux/pages": "7.0.0",
+      "@skyux/phone-field": "7.0.0",
+      "@skyux/popovers": "7.0.0",
+      "@skyux/progress-indicator": "7.0.0",
+      "@skyux/router": "7.0.0",
+      "@skyux/select-field": "7.0.0",
+      "@skyux/split-view": "7.0.0",
+      "@skyux/tabs": "7.0.0",
+      "@skyux/text-editor": "7.0.0",
+      "@skyux/theme": "7.0.0",
+      "@skyux/tiles": "7.0.0",
+      "@skyux/toast": "7.0.0",
+      "@skyux/validation": "7.0.0",
+      "ag-grid-angular": "^28.2.1",
+      "ag-grid-community": "^28.2.1",
+      "ag-grid-enterprise": "^28.2.1"
     }
   },
   "peerDependencies": {
-    "@angular/cli": "^14.2.0"
+    "@angular/cli": "^14.2.10"
   },
   "dependencies": {
-    "fs-extra": "10.0.0",
-    "jsonc-parser": "3.0.0"
+    "fs-extra": "10.1.0",
+    "jsonc-parser": "3.2.0"
   },
   "main": "./src/index.js",
-  "typings": "./src/index.d.ts"
+  "types": "./src/index.d.ts"
 }

package/src/schematics/migrations/migration-collection.json

@@ -1,10 +1,25 @@
 {
   "schematics": {
     "noop": {
-      "version": "7.0.0-beta.8",
+      "version": "7.0.0",
       "factory": "./noop/noop.schematic",
       "description": "Update all SKY UX component packages"
     },
+    "ag-grid-28": {
+      "version": "7.0.0-beta.0",
+      "factory": "./update-7/ag-grid-28.schematic",
+      "description": "Update ag-grid to version 28"
+    },
+    "add-autonumeric-dependency": {
+      "version": "7.0.0-beta.0",
+      "factory": "./update-7/add-autonumeric-dependency",
+      "description": "Add autonumeric as a dependency since @skyux/autonumeric@7 references autonumeric as a peer."
+    },
+    "add-axe-core-dependency": {
+      "version": "7.0.0-beta.0",
+      "factory": "./update-7/add-axe-core-dependency",
+      "description": "Add axe-core as a dependency since @skyux-sdk/testing@7 references axe-core as a peer."
+    },
     "add-moment-dependency": {
       "version": "7.0.0-beta.0",
       "factory": "./update-7/add-moment-dependency",
@@ -24,6 +39,11 @@
       "version": "7.0.0-beta.0",
       "factory": "./update-7/fix-scss-imports",
       "description": "Fix SCSS imports"
+    },
+    "fix-imports": {
+      "version": "7.0.0-beta.0",
+      "factory": "./update-7/fix-imports",
+      "description": "Fix import and export statements where the file case does not match the filesystem, and fix or warn about core-js imports"
     }
   }
 }

package/src/schematics/migrations/update-7/add-autonumeric-dependency.d.ts

@@ -0,0 +1,2 @@
+import { Rule } from '@angular-devkit/schematics';
+export default function (): Rule;

package/src/schematics/migrations/update-7/add-autonumeric-dependency.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const ensure_peers_installed_1 = require("../../rules/ensure-peers-installed");
+function default_1() {
+    return (0, ensure_peers_installed_1.ensurePeersInstalled)('@skyux/autonumeric', [
+        { name: 'autonumeric', version: '4.6.0', type: dependencies_1.NodeDependencyType.Default },
+    ]);
+}
+exports.default = default_1;
+//# sourceMappingURL=add-autonumeric-dependency.js.map

package/src/schematics/migrations/update-7/add-autonumeric-dependency.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-autonumeric-dependency.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-autonumeric-dependency.ts"],"names":[],"mappings":";;AACA,2EAA8E;AAE9E,+EAA0E;AAE1E;IACE,OAAO,IAAA,6CAAoB,EAAC,oBAAoB,EAAE;QAChD,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,iCAAkB,CAAC,OAAO,EAAE;KAC5E,CAAC,CAAC;AACL,CAAC;AAJD,4BAIC"}

package/src/schematics/migrations/update-7/add-axe-core-dependency.d.ts

@@ -0,0 +1,2 @@
+import { Rule } from '@angular-devkit/schematics';
+export default function (): Rule;

package/src/schematics/migrations/update-7/add-axe-core-dependency.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const ensure_peers_installed_1 = require("../../rules/ensure-peers-installed");
+function default_1() {
+    return (0, ensure_peers_installed_1.ensurePeersInstalled)('@skyux-sdk/testing', [
+        { name: 'axe-core', version: '3.5.6', type: dependencies_1.NodeDependencyType.Dev },
+    ]);
+}
+exports.default = default_1;
+//# sourceMappingURL=add-axe-core-dependency.js.map

package/src/schematics/migrations/update-7/add-axe-core-dependency.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-axe-core-dependency.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-axe-core-dependency.ts"],"names":[],"mappings":";;AACA,2EAA8E;AAE9E,+EAA0E;AAE1E;IACE,OAAO,IAAA,6CAAoB,EAAC,oBAAoB,EAAE;QAChD,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,iCAAkB,CAAC,GAAG,EAAE;KACrE,CAAC,CAAC;AACL,CAAC;AAJD,4BAIC"}

package/src/schematics/migrations/update-7/add-compat-stylesheets.js

@@ -24,6 +24,33 @@ The preset bottom margin has been removed from alert components. To implement th
                 },
             ],
         },
+        {
+            name: '@skyux/layout',
+            components: [
+                {
+                    name: 'description list',
+                    styles: [
+                        {
+                            css: `
+.sky-description-list-vertical-mode .sky-description-list-content:last-child {
+  margin-bottom: 15px;
+}
+
+.sky-theme-modern .sky-description-list-vertical-mode .sky-description-list-content:last-child {
+  margin-bottom: 20px;
+}
+
+:root {
+  --sky-compat-description-list-margin-bottom: 0;
+}
+`,
+                            instructions: `
+The preset bottom margin has been removed from description list components in horizontal and vertical modes in default theme and vertical mode in modern. To implement the newly-recommended spacing, add the \`sky-margin-stacked-lg\` CSS class to each \`sky-description-list\` component in your application, then remove this block.`,
+                        },
+                    ],
+                },
+            ],
+        },
     ],
 };
 function getProjectSourcePath(projectDefinition) {

package/src/schematics/migrations/update-7/add-compat-stylesheets.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-compat-stylesheets.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-compat-stylesheets.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-compat-stylesheets.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-compat-stylesheets.ts"],"names":[],"mappings":"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"}

package/src/schematics/migrations/update-7/add-moment-dependency.js

@@ -1,22 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tasks_1 = require("@angular-devkit/schematics/tasks");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
-const tree_1 = require("../../utility/tree");
+const ensure_peers_installed_1 = require("../../rules/ensure-peers-installed");
 function default_1() {
-    return async (tree, context) => {
-        const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
-        if (!packageJson.dependencies?.moment &&
-            !packageJson.devDependencies?.moment) {
-            context.addTask(new tasks_1.NodePackageInstallTask());
-            (0, dependencies_1.addPackageJsonDependency)(tree, {
-                type: dependencies_1.NodeDependencyType.Default,
-                name: 'moment',
-                version: '2.29.4',
-                overwrite: false,
-            });
-        }
-    };
+    return (0, ensure_peers_installed_1.ensurePeersInstalled)('@skyux/datetime', [
+        { name: 'moment', version: '2.29.4', type: dependencies_1.NodeDependencyType.Default },
+    ]);
 }
 exports.default = default_1;
 //# sourceMappingURL=add-moment-dependency.js.map

package/src/schematics/migrations/update-7/add-moment-dependency.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-moment-dependency.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-moment-dependency.ts"],"names":[],"mappings":";;AACA,4DAA0E;AAC1E,2EAGkD;AAElD,6CAAsD;AAEtD;IACE,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,WAAW,GAGb,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAExD,IACE,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM;YACjC,CAAC,WAAW,CAAC,eAAe,EAAE,MAAM,EACpC;YACA,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;YAE9C,IAAA,uCAAwB,EAAC,IAAI,EAAE;gBAC7B,IAAI,EAAE,iCAAkB,CAAC,OAAO;gBAChC,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,QAAQ;gBACjB,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AArBD,4BAqBC"}
+{"version":3,"file":"add-moment-dependency.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-moment-dependency.ts"],"names":[],"mappings":";;AACA,2EAA8E;AAE9E,+EAA0E;AAE1E;IACE,OAAO,IAAA,6CAAoB,EAAC,iBAAiB,EAAE;QAC7C,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,iCAAkB,CAAC,OAAO,EAAE;KACxE,CAAC,CAAC;AACL,CAAC;AAJD,4BAIC"}

package/src/schematics/migrations/update-7/ag-grid-28.schematic.d.ts

@@ -0,0 +1,12 @@
+import { Rule } from '@angular-devkit/schematics';
+export declare const UPDATE_TO_VERSION = "28.2.1";
+/**
+ * Upgrade to AG Grid 28 and address three breaking changes:
+ *
+ * - No longer support `@ag-grid-community/all-modules` -- just use the package
+ * - Remove `AgGridModule.withComponents` in module import
+ * - Column API renamed getSecondaryColumns / setSecondaryColumns
+ *
+ * Also advise against mixing modules and packages.
+ */
+export default function (): Rule;

package/src/schematics/migrations/update-7/ag-grid-28.schematic.js

@@ -0,0 +1,201 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UPDATE_TO_VERSION = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const workspace_1 = require("../../utility/workspace");
+exports.UPDATE_TO_VERSION = '28.2.1';
+const ANY_MODULE = '@ag-grid-community/';
+const ENT_MODULE = '@ag-grid-enterprise/';
+const AG_GRID = 'ag-grid-community';
+const AG_GRID_ENT = 'ag-grid-enterprise';
+const withComponents = 'AgGridModule.withComponents';
+const forRoot = 'AgGridModule.withComponents';
+/**
+ * Check package.json for AG Grid dependencies.
+ */
+function readDependencies(tree) {
+    const agGridAllModules = (0, dependencies_1.getPackageJsonDependency)(tree, `${ANY_MODULE}all-modules`);
+    const agGridDependency = (0, dependencies_1.getPackageJsonDependency)(tree, AG_GRID);
+    const agGridAllModulesEnt = (0, dependencies_1.getPackageJsonDependency)(tree, `${ENT_MODULE}all-modules`);
+    const agGridDependencyEnt = (0, dependencies_1.getPackageJsonDependency)(tree, AG_GRID_ENT);
+    return {
+        agGridAllModules,
+        agGridDependency,
+        agGridAllModulesEnt,
+        agGridDependencyEnt,
+    };
+}
+/**
+ * Remove `@ag-grid-community/all-modules` and `@ag-grid-enterprise/all-modules` from package.json.
+ */
+function swapModulesWithPackageDependencies() {
+    return (tree, context) => {
+        const { agGridAllModules, agGridDependency, agGridAllModulesEnt, agGridDependencyEnt, } = readDependencies(tree);
+        // AG Grid is not installed, so we don't need to do anything.
+        if (!agGridAllModules &&
+            !agGridDependency &&
+            !agGridAllModulesEnt &&
+            !agGridDependencyEnt) {
+            return;
+        }
+        let type = dependencies_1.NodeDependencyType.Default;
+        const overwrite = true;
+        const version = exports.UPDATE_TO_VERSION;
+        // Determine if there are any community packages that need to be updated.
+        if (!agGridDependency && agGridAllModules) {
+            type = agGridAllModules.type;
+            [AG_GRID, 'ag-grid-angular'].forEach((name) => {
+                (0, dependencies_1.addPackageJsonDependency)(tree, { name, overwrite, type, version });
+            });
+        }
+        if (agGridAllModules) {
+            (0, dependencies_1.removePackageJsonDependency)(tree, `${ANY_MODULE}all-modules`);
+            (0, dependencies_1.removePackageJsonDependency)(tree, `${ANY_MODULE}angular`);
+        }
+        // Determine if there are any enterprise packages that need to be updated.
+        if (!agGridDependencyEnt && agGridAllModulesEnt) {
+            type = agGridAllModulesEnt.type;
+            (0, dependencies_1.addPackageJsonDependency)(tree, {
+                name: AG_GRID_ENT,
+                overwrite,
+                type,
+                version,
+            });
+        }
+        if (agGridAllModulesEnt) {
+            (0, dependencies_1.removePackageJsonDependency)(tree, `${ENT_MODULE}all-modules`);
+        }
+        // Install the new packages.
+        if (agGridAllModules || agGridAllModulesEnt) {
+            context.addTask(new tasks_1.NodePackageInstallTask());
+        }
+    };
+}
+/**
+ * Replace `@ag-grid-community/all-modules` with `ag-grid-community`/`ag-grid-angular`,
+ * and replace `@ag-grid-enterprise/all-modules` with `ag-grid-enterprise`.
+ */
+function swapModulesWithPackageInCode(updatedContent, agGridAllModules, agGridAllModulesEnt) {
+    // Replace `@ag-grid-community/all-modules` with `ag-grid-community`
+    if (agGridAllModules && updatedContent.includes(`${ANY_MODULE}all-modules`)) {
+        updatedContent = updatedContent.replace(/@ag-grid-community\/all-modules/g, AG_GRID);
+    }
+    // Replace `@ag-grid-enterprise/all-modules` with `ag-grid-enterprise`
+    if (agGridAllModulesEnt &&
+        updatedContent.includes(`${ENT_MODULE}all-modules`)) {
+        updatedContent = updatedContent.replace(/@ag-grid-enterprise\/all-modules/g, AG_GRID_ENT);
+    }
+    // Replace `@ag-grid-community/angular` with `ag-grid-angular`
+    if (agGridAllModules && updatedContent.includes(`${ANY_MODULE}angular`)) {
+        updatedContent = updatedContent.replace(/@ag-grid-community\/angular/g, 'ag-grid-angular');
+    }
+    return updatedContent;
+}
+/**
+ * Remove `AgGridModule.withComponents` and `AgGridModule.forRoot` in module imports.
+ */
+function removeWithComponentsStaticImportsCall(filePath, updatedContent) {
+    [withComponents, forRoot].forEach((staticModule) => {
+        if ((filePath.endsWith('module.ts') || filePath.endsWith('spec.ts')) &&
+            updatedContent.includes(staticModule)) {
+            let pos;
+            while ((pos = updatedContent.indexOf(staticModule)) !== -1) {
+                // Find closing parenthesis after `AgGridModule.withComponents`
+                const end = updatedContent.indexOf(')', pos);
+                // Leave `AgGridModule`, drop `.withComponents` and `.forRoot`.
+                updatedContent = [
+                    updatedContent.substring(0, pos + 12),
+                    updatedContent.substring(end + 1),
+                ].join('');
+            }
+        }
+    });
+    return updatedContent;
+}
+/**
+ * Column API renamed getSecondaryColumns / setSecondaryColumns to getSecondaryPivotColumns / setSecondaryPivotColumns.
+ */
+function renameColumnApiFunctionsInCode(updatedContent) {
+    if (updatedContent.includes(AG_GRID) &&
+        updatedContent.includes('etSecondaryColumns(')) {
+        updatedContent = updatedContent.replace(/(?<=columnApi\s*)\.(get|set)SecondaryColumns\(/g, (_, x) => `.${x}PivotResultColumns(`);
+    }
+    return updatedContent;
+}
+/**
+ * Grid option renamed suppressCellSelection to suppressCellFocus.
+ */
+function renameSuppressCellSelectionGridOptionInCode(updatedContent) {
+    if (updatedContent.includes(AG_GRID) &&
+        updatedContent.match(/gridOptions/i) &&
+        updatedContent.includes('suppressCellSelection')) {
+        updatedContent = updatedContent.replace(/\bsuppressCellSelection\b/g, 'suppressCellFocus');
+    }
+    return updatedContent;
+}
+/**
+ * Visit all files and apply the changes.
+ */
+function updateSourceFiles() {
+    return async (tree, context) => {
+        const warned = [];
+        function warnOnce(message) {
+            if (!warned.includes(message)) {
+                warned.push(message);
+                context.logger.warn(message);
+            }
+        }
+        const { agGridAllModules, agGridDependency, agGridAllModulesEnt, agGridDependencyEnt, } = readDependencies(tree);
+        // AG Grid is not installed, so we don't need to do anything.
+        if (!agGridAllModules &&
+            !agGridDependency &&
+            !agGridAllModulesEnt &&
+            !agGridDependencyEnt) {
+            return;
+        }
+        const { workspace } = await (0, workspace_1.getWorkspace)(tree);
+        workspace.projects.forEach((project) => {
+            tree
+                .getDir(project.sourceRoot || project.root)
+                .visit((filePath) => {
+                // If the file is not a TypeScript file, we can skip it.
+                if (!filePath.endsWith('.ts')) {
+                    return;
+                }
+                const content = tree.readText(filePath);
+                let updatedContent = content;
+                // Prompt the user to moderate the use of AG Grid modules
+                if (updatedContent.includes(ANY_MODULE) ||
+                    updatedContent.includes(ENT_MODULE)) {
+                    warnOnce(`\n
+          AG Grid recommends not mixing module and package imports.
+          https://ag-grid.com/angular-data-grid/modules/\n\n`);
+                }
+                updatedContent = swapModulesWithPackageInCode(updatedContent, agGridAllModules, agGridAllModulesEnt);
+                updatedContent = removeWithComponentsStaticImportsCall(filePath, updatedContent);
+                updatedContent = renameColumnApiFunctionsInCode(updatedContent);
+                updatedContent =
+                    renameSuppressCellSelectionGridOptionInCode(updatedContent);
+                if (updatedContent !== content) {
+                    tree.overwrite(filePath, updatedContent);
+                }
+            });
+        });
+    };
+}
+/**
+ * Upgrade to AG Grid 28 and address three breaking changes:
+ *
+ * - No longer support `@ag-grid-community/all-modules` -- just use the package
+ * - Remove `AgGridModule.withComponents` in module import
+ * - Column API renamed getSecondaryColumns / setSecondaryColumns
+ *
+ * Also advise against mixing modules and packages.
+ */
+function default_1() {
+    return (0, schematics_1.chain)([updateSourceFiles(), swapModulesWithPackageDependencies()]);
+}
+exports.default = default_1;
+//# sourceMappingURL=ag-grid-28.schematic.js.map

package/src/schematics/migrations/update-7/ag-grid-28.schematic.js.map

@@ -0,0 +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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"}

package/src/schematics/migrations/update-7/fix-imports.d.ts

@@ -0,0 +1,2 @@
+import { Rule } from '@angular-devkit/schematics';
+export default function (): Rule;

package/src/schematics/migrations/update-7/fix-imports.js

@@ -0,0 +1,172 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@angular-devkit/core");
+const path_1 = require("@angular-devkit/core/src/virtual-fs/path");
+const ts = tslib_1.__importStar(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const workspace_1 = require("../../utility/workspace");
+// Obfuscate the import statement regexp to avoid flagging by the missing peer dependency check.
+const CORE_JS_UNNECESSARY = /imp[o]rt \{[^}]+} from 'core-js';\r?\n/;
+const CORE_JS_OBJECT_VALUES = /imp[o]rt values from 'core-js\/features\/object\/values';\r?\n/;
+const CORE_JS_OBJECT_VALUES_REQUIRE = `require('core-js/library/fn/object/values')`;
+function findChangesForLocalImports(localModulePaths, filePath, tree, context) {
+    const transformers = [];
+    localModulePaths.forEach((modulePath) => {
+        const endsWithSlash = !!modulePath.match(/[/\\]$/);
+        const normalizedModulePath = endsWithSlash
+            ? (0, core_1.normalize)(modulePath)
+            : (0, core_1.normalize)(modulePath + '.ts');
+        const absolutePath = (0, path_1.resolve)((0, core_1.dirname)(filePath), normalizedModulePath);
+        context.logger.debug(`Looking for local module ${modulePath} at ${absolutePath}...`);
+        const pathFragments = (0, core_1.split)(absolutePath).slice(1);
+        const newPath = [];
+        let dir = tree.root;
+        // Walk the path fragments and check if the case is correct. This approach works on both case-sensitive and case-insensitive file systems.
+        for (let i = 0; i < pathFragments.length; i++) {
+            const pathFragment = pathFragments[i];
+            if (pathFragment.endsWith('.ts')) {
+                if (dir.subfiles.includes(pathFragment)) {
+                    // File exists. We're done.
+                    newPath.push(pathFragment.replace(/\.ts$/, ''));
+                    break;
+                }
+                // File does not exist. Try to find a file with the same name but different casing.
+                const matchingFile = dir.subfiles.find((subFile) => subFile.toLowerCase() === pathFragment.toLowerCase());
+                if (matchingFile) {
+                    // Found a matching file. Use it.
+                    newPath.push(matchingFile.replace(/\.ts$/, ''));
+                    break;
+                }
+            }
+            else {
+                if (dir.subdirs.includes(pathFragment)) {
+                    // Sub dir exists. Continue.
+                    dir = dir.dir(pathFragment);
+                    newPath.push(pathFragment);
+                    continue;
+                }
+                // Dir does not exist. Try to find a dir with the same name but different casing.
+                const matchingDir = dir.subdirs.find((subdir) => subdir.toLowerCase() === pathFragment.toLowerCase());
+                if (matchingDir) {
+                    // Found a matching dir. Use it.
+                    dir = dir.dir(matchingDir);
+                    newPath.push(matchingDir);
+                    continue;
+                }
+            }
+            // Nothing found. Can't fix this.
+            return;
+        }
+        const newPathAbsolute = (0, core_1.join)(tree.root.path, ...newPath);
+        let newPathRelative = `${(0, path_1.relative)((0, core_1.dirname)(filePath), newPathAbsolute)}`;
+        if (!newPathRelative.startsWith('.')) {
+            newPathRelative = `./${newPathRelative}`;
+        }
+        if (endsWithSlash) {
+            newPathRelative = `${newPathRelative}/`;
+        }
+        if (newPathRelative !== modulePath) {
+            context.logger.debug(`Updating ${filePath} :: ${modulePath} -> ${newPathRelative}`);
+            transformers.push({
+                find: modulePath,
+                replace: newPathRelative,
+            });
+        }
+    });
+    return transformers;
+}
+function findChangesForCoreJs(sourceFile, coreJsImportDeclarations, context, filePath, fileContent) {
+    const transformers = [];
+    context.logger.debug(`Updating core-js imports in ${filePath}...`);
+    // Remove core-js imports that are not necessary.
+    const coreJsUnnecessaryImport = `${CORE_JS_UNNECESSARY.exec(fileContent)?.[0]}`;
+    if (coreJsUnnecessaryImport !== 'undefined') {
+        transformers.push({
+            find: coreJsUnnecessaryImport,
+            replace: '',
+        });
+    }
+    // Replace direct import from core-js/features/object/values with Object.values in some very specific cases.
+    const coreJsObjectValuesImport = `${CORE_JS_OBJECT_VALUES.exec(fileContent)?.[0]}`;
+    if (coreJsObjectValuesImport !== 'undefined') {
+        transformers.push({
+            find: coreJsObjectValuesImport,
+            replace: '',
+        });
+        transformers.push({
+            find: 'values: values,',
+            replace: 'values: Object.values,',
+        });
+    }
+    if (fileContent.includes(CORE_JS_OBJECT_VALUES_REQUIRE)) {
+        transformers.push({
+            find: CORE_JS_OBJECT_VALUES_REQUIRE,
+            replace: 'Object.values',
+        });
+    }
+    // Comment out polyfill core-js imports like `'core-js/es6';` or `'core-js/es7/reflect';`.
+    coreJsImportDeclarations
+        .filter((importDeclaration) => !importDeclaration.importClause)
+        .forEach((importDeclaration) => {
+        const importCode = fileContent.substring(importDeclaration.getStart(sourceFile, false), importDeclaration.getEnd());
+        transformers.push({
+            find: importCode,
+            replace: `// ${importCode}`,
+        });
+    });
+    return transformers;
+}
+function updateTypescriptImportsAndExports(filePath, tree, context) {
+    const fileContent = tree.read(filePath)?.toString();
+    if (!fileContent) {
+        return;
+    }
+    context.logger.debug(`Checking imports and exports in ${filePath}...`);
+    const source = ts.createSourceFile(filePath, fileContent, ts.ScriptTarget.Latest, false, ts.ScriptKind.TS);
+    // Get all import declarations
+    const importDeclarations = source.statements.filter((statement) => statement.kind === ts.SyntaxKind.ImportDeclaration);
+    // Get all export declarations
+    const exportDeclarations = source.statements.filter((statement) => statement.kind === ts.SyntaxKind.ExportDeclaration &&
+        statement.moduleSpecifier);
+    const transformers = [];
+    // Just local module targets, without quotes
+    const localModulePaths = [...importDeclarations, ...exportDeclarations]
+        .map((declaration) => `${declaration.moduleSpecifier?.getText(source)}`)
+        .map((moduleSpecifier) => moduleSpecifier.replace(/['"]/g, ''))
+        .filter((moduleSpecifier) => moduleSpecifier.startsWith('.'));
+    if (localModulePaths.length > 0) {
+        transformers.push(...findChangesForLocalImports(localModulePaths, filePath, tree, context));
+    }
+    const coreJsImportDeclarations = importDeclarations.filter((declaration) => {
+        const moduleSpecifier = `${declaration.moduleSpecifier?.getText(source)}`.replace(/['"]/g, '');
+        return moduleSpecifier.startsWith('core-js');
+    });
+    if (coreJsImportDeclarations.length > 0) {
+        transformers.push(...findChangesForCoreJs(source, coreJsImportDeclarations, context, filePath, fileContent));
+    }
+    if (transformers.length > 0) {
+        let newContent = fileContent;
+        transformers.forEach((transformer) => {
+            newContent = newContent.replace(transformer.find, transformer.replace);
+        });
+        tree.overwrite(filePath, newContent);
+    }
+}
+async function visitTypescriptFiles(tree, context) {
+    const { workspace } = await (0, workspace_1.getWorkspace)(tree);
+    workspace.projects.forEach((project, projectName) => {
+        context.logger.debug(`Looking for typescript files in project ${projectName}...`);
+        tree.getDir(project.sourceRoot || project.root).visit((filePath) => {
+            if (filePath.endsWith('.ts') && !filePath.includes('node_modules')) {
+                updateTypescriptImportsAndExports(filePath, tree, context);
+            }
+        });
+    });
+}
+function default_1() {
+    return async (tree, context) => {
+        await visitTypescriptFiles(tree, context);
+    };
+}
+exports.default = default_1;
+//# sourceMappingURL=fix-imports.js.map

package/src/schematics/migrations/update-7/fix-imports.js.map

@@ -0,0 +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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"}

package/src/schematics/migrations/update-7/fix-scss-imports.js

@@ -7,11 +7,11 @@ const workspace_1 = require("../../utility/workspace");
  * Replaces any @blackbaud/skyux-design-tokens imports with their @skyux/theme equivalents.
  */
 function replaceDesignTokensImports(contents) {
-    const matches = contents.matchAll(/@import\s+['"]?node_modules\/@blackbaud\/skyux-design-tokens\/scss\/_?(mixins|variables)(?:\.scss)?['"]?;?\s+/g);
+    const matches = contents.matchAll(/@import\s+['"]?[~]?(?:(?:\.|\/)+)?(?:node_modules\/)?@blackbaud\/skyux-design-tokens\/scss\/_?(mixins|variables)(?:\.scss)?['"]?;?\s+/g);
     for (const match of matches) {
         const importPath = match[0];
         const importType = match[1]; // mixins or variables
-        const replacementTemplate = new RegExp(`@import\\s+['"]?node_modules\\/@skyux\\/theme\\/scss\\/_?${importType}(?:\\.scss)?['"]?;?`);
+        const replacementTemplate = new RegExp(`@import\\s+['"]?[~]?(?:(?:\\.|\\/)+)?(?:node_modules\\/)?@skyux\\/theme\\/scss\\/_?${importType}(?:\\.scss)?['"]?;?`);
         // If the equivalent default import is already found, just remove the design tokens import.
         if (replacementTemplate.test(contents)) {
             contents = contents.replace(importPath, '');
@@ -27,7 +27,7 @@ function replaceDesignTokensImports(contents) {
  * this created a circular reference, hence the fix.)
  */
 function addVariablesScssImports(contents) {
-    const matches = contents.matchAll(/@import\s+['"]?node_modules\/@skyux\/theme\/scss\/(_compat\/|themes\/modern\/_compat\/)?_?mixins(?:\.scss)?['"]?;?/g);
+    const matches = contents.matchAll(/@import\s+['"]?[~]?(?:(?:\.|\/)+)?(?:node_modules\/)?@skyux\/theme\/scss\/(_compat\/|themes\/modern\/_compat\/)?_?mixins(?:\.scss)?['"]?;?/g);
     for (const match of matches) {
         const mixinsImport = match[0];
         const variablesImport = mixinsImport.replace('mixins', 'variables');

package/src/schematics/migrations/update-7/fix-scss-imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"fix-scss-imports.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/fix-scss-imports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fix-scss-imports.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/fix-scss-imports.ts"],"names":[],"mappings":"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"}

package/src/schematics/rules/ensure-peers-installed.d.ts

@@ -0,0 +1,15 @@
+import { Rule } from '@angular-devkit/schematics';
+import { NodeDependencyType } from '@schematics/angular/utility/dependencies';
+declare type PackageDetails = {
+    name: string;
+    version: string;
+    type: NodeDependencyType;
+};
+/**
+ * Ensures peer dependencies for a given package are installed on the client's workspace.
+ * If the client does not use the target package, this function is skipped.
+ * @param targetPackageName The name of the package that has peer dependencies.
+ * @param peers The target package's peer dependencies to install on the client's workspace.
+ */
+export declare function ensurePeersInstalled(targetPackageName: string, peers: PackageDetails[]): Rule;
+export {};

package/src/schematics/rules/ensure-peers-installed.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensurePeersInstalled = void 0;
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const tree_1 = require("../utility/tree");
+function installPackages(packages) {
+    return (tree, context) => {
+        for (const details of packages) {
+            // Remove the package (if it exists) so we can ensure it's added to the appropriate section.
+            (0, dependencies_1.removePackageJsonDependency)(tree, details.name, '/package.json');
+            (0, dependencies_1.addPackageJsonDependency)(tree, {
+                type: details.type,
+                name: details.name,
+                version: details.version,
+            });
+        }
+        context.addTask(new tasks_1.NodePackageInstallTask());
+    };
+}
+/**
+ * Ensures peer dependencies for a given package are installed on the client's workspace.
+ * If the client does not use the target package, this function is skipped.
+ * @param targetPackageName The name of the package that has peer dependencies.
+ * @param peers The target package's peer dependencies to install on the client's workspace.
+ */
+function ensurePeersInstalled(targetPackageName, peers) {
+    return (tree) => {
+        const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
+        const dependencies = {
+            ...(packageJson.dependencies || {}),
+            ...(packageJson.devDependencies || {}),
+        };
+        return dependencies[targetPackageName] ? installPackages(peers) : undefined;
+    };
+}
+exports.ensurePeersInstalled = ensurePeersInstalled;
+//# sourceMappingURL=ensure-peers-installed.js.map

package/src/schematics/rules/ensure-peers-installed.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ensure-peers-installed.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/ensure-peers-installed.ts"],"names":[],"mappings":";;;AACA,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;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,iBAAyB,EACzB,KAAuB;IAEvB,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,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,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9E,CAAC,CAAC;AACJ,CAAC;AAjBD,oDAiBC"}