@skyux/packages 7.0.0-beta.2 → 7.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyux/packages",
-  "version": "7.0.0-beta.2",
+  "version": "7.0.0-beta.4",
   "author": "Blackbaud, Inc.",
   "description": "Handles the `ng update` command for SKY UX component libraries.",
   "keywords": [
@@ -27,54 +27,54 @@
       "@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.2",
-      "@skyux-sdk/testing": "7.0.0-beta.2",
-      "@skyux/a11y": "7.0.0-beta.2",
-      "@skyux/action-bars": "7.0.0-beta.2",
-      "@skyux/ag-grid": "7.0.0-beta.2",
-      "@skyux/angular-tree-component": "7.0.0-beta.2",
-      "@skyux/animations": "7.0.0-beta.2",
-      "@skyux/assets": "7.0.0-beta.2",
-      "@skyux/autonumeric": "7.0.0-beta.2",
-      "@skyux/avatar": "7.0.0-beta.2",
-      "@skyux/colorpicker": "7.0.0-beta.2",
-      "@skyux/config": "7.0.0-beta.2",
-      "@skyux/core": "7.0.0-beta.2",
-      "@skyux/data-manager": "7.0.0-beta.2",
-      "@skyux/datetime": "7.0.0-beta.2",
+      "@skyux-sdk/prettier-schematics": "7.0.0-beta.4",
+      "@skyux-sdk/testing": "7.0.0-beta.4",
+      "@skyux/a11y": "7.0.0-beta.4",
+      "@skyux/action-bars": "7.0.0-beta.4",
+      "@skyux/ag-grid": "7.0.0-beta.4",
+      "@skyux/angular-tree-component": "7.0.0-beta.4",
+      "@skyux/animations": "7.0.0-beta.4",
+      "@skyux/assets": "7.0.0-beta.4",
+      "@skyux/autonumeric": "7.0.0-beta.4",
+      "@skyux/avatar": "7.0.0-beta.4",
+      "@skyux/colorpicker": "7.0.0-beta.4",
+      "@skyux/config": "7.0.0-beta.4",
+      "@skyux/core": "7.0.0-beta.4",
+      "@skyux/data-manager": "7.0.0-beta.4",
+      "@skyux/datetime": "7.0.0-beta.4",
       "@skyux/docs-tools": "^7.0.0-beta.0",
-      "@skyux/errors": "7.0.0-beta.2",
-      "@skyux/flyout": "7.0.0-beta.2",
-      "@skyux/forms": "7.0.0-beta.2",
-      "@skyux/grids": "7.0.0-beta.2",
-      "@skyux/http": "7.0.0-beta.2",
-      "@skyux/i18n": "7.0.0-beta.2",
+      "@skyux/errors": "7.0.0-beta.4",
+      "@skyux/flyout": "7.0.0-beta.4",
+      "@skyux/forms": "7.0.0-beta.4",
+      "@skyux/grids": "7.0.0-beta.4",
+      "@skyux/http": "7.0.0-beta.4",
+      "@skyux/i18n": "7.0.0-beta.4",
       "@skyux/icons": "^5.1.1",
-      "@skyux/indicators": "7.0.0-beta.2",
-      "@skyux/inline-form": "7.0.0-beta.2",
-      "@skyux/layout": "7.0.0-beta.2",
-      "@skyux/list-builder": "7.0.0-beta.2",
-      "@skyux/list-builder-common": "7.0.0-beta.2",
-      "@skyux/list-builder-view-checklist": "7.0.0-beta.2",
-      "@skyux/list-builder-view-grids": "7.0.0-beta.2",
-      "@skyux/lists": "7.0.0-beta.2",
-      "@skyux/lookup": "7.0.0-beta.2",
-      "@skyux/modals": "7.0.0-beta.2",
-      "@skyux/navbar": "7.0.0-beta.2",
-      "@skyux/omnibar-interop": "7.0.0-beta.2",
-      "@skyux/pages": "7.0.0-beta.2",
-      "@skyux/phone-field": "7.0.0-beta.2",
-      "@skyux/popovers": "7.0.0-beta.2",
-      "@skyux/progress-indicator": "7.0.0-beta.2",
-      "@skyux/router": "7.0.0-beta.2",
-      "@skyux/select-field": "7.0.0-beta.2",
-      "@skyux/split-view": "7.0.0-beta.2",
-      "@skyux/tabs": "7.0.0-beta.2",
-      "@skyux/text-editor": "7.0.0-beta.2",
-      "@skyux/theme": "7.0.0-beta.2",
-      "@skyux/tiles": "7.0.0-beta.2",
-      "@skyux/toast": "7.0.0-beta.2",
-      "@skyux/validation": "7.0.0-beta.2",
+      "@skyux/indicators": "7.0.0-beta.4",
+      "@skyux/inline-form": "7.0.0-beta.4",
+      "@skyux/layout": "7.0.0-beta.4",
+      "@skyux/list-builder": "7.0.0-beta.4",
+      "@skyux/list-builder-common": "7.0.0-beta.4",
+      "@skyux/list-builder-view-checklist": "7.0.0-beta.4",
+      "@skyux/list-builder-view-grids": "7.0.0-beta.4",
+      "@skyux/lists": "7.0.0-beta.4",
+      "@skyux/lookup": "7.0.0-beta.4",
+      "@skyux/modals": "7.0.0-beta.4",
+      "@skyux/navbar": "7.0.0-beta.4",
+      "@skyux/omnibar-interop": "7.0.0-beta.4",
+      "@skyux/pages": "7.0.0-beta.4",
+      "@skyux/phone-field": "7.0.0-beta.4",
+      "@skyux/popovers": "7.0.0-beta.4",
+      "@skyux/progress-indicator": "7.0.0-beta.4",
+      "@skyux/router": "7.0.0-beta.4",
+      "@skyux/select-field": "7.0.0-beta.4",
+      "@skyux/split-view": "7.0.0-beta.4",
+      "@skyux/tabs": "7.0.0-beta.4",
+      "@skyux/text-editor": "7.0.0-beta.4",
+      "@skyux/theme": "7.0.0-beta.4",
+      "@skyux/tiles": "7.0.0-beta.4",
+      "@skyux/toast": "7.0.0-beta.4",
+      "@skyux/validation": "7.0.0-beta.4",
       "ag-grid-angular": "^27.2.0",
       "ag-grid-community": "^27.2.0",
       "ag-grid-enterprise": "^27.2.0"

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

@@ -1,7 +1,7 @@
 {
   "schematics": {
     "noop": {
-      "version": "7.0.0-beta.2",
+      "version": "7.0.0-beta.4",
       "factory": "./noop/noop.schematic",
       "description": "Update all SKY UX component packages"
     },
@@ -11,9 +11,14 @@
       "description": "Add moment.js as a dependency since SKY UX 7 references moment.js as a peer."
     },
     "rename-mutation-observer-service": {
-      "version": "",
+      "version": "7.0.0-beta.0",
       "factory": "./update-7/rename-mutation-observer-service",
       "description": "Replace all instances of 'MutationObserverService' with 'SkyMutationObserverService'"
+    },
+    "add-compat-stylesheets": {
+      "version": "7.0.0-beta.0",
+      "factory": "./update-7/add-compat-stylesheets",
+      "description": "Add a backwards-compatible stylesheet with styles that have been removed from components in SKY UX 7."
     }
   }
 }

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

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

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

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schematics_1 = require("@angular-devkit/schematics");
+const tree_1 = require("../../utility/tree");
+const workspace_1 = require("../../utility/workspace");
+const SKYUX7_COMPAT_CSS_PATH = 'src/app/skyux7-compat.css';
+const compatStyles = {
+    libraries: [
+        {
+            name: '@skyux/indicators',
+            components: [
+                {
+                    name: 'alert',
+                    styles: [
+                        {
+                            css: `
+.sky-alert {
+  margin-bottom: 20px;
+}`,
+                            instructions: `
+The preset bottom margin has been removed from alert components. To implement the newly-recommended spacing, add the \`sky-margin-stacked-lg\` CSS class to each \`sky-alert\` component in your application, then remove this block.`,
+                        },
+                    ],
+                },
+            ],
+        },
+    ],
+};
+function buildCommentBlock(message) {
+    return `/${'*'.repeat(79)}
+ * ${message.replace(/(?![^\n]{1,75}$)([^\n]{1,75})\s/g, '$1\n * ')}
+${'*'.repeat(79)}/`;
+}
+function buildComponentCss(component) {
+    let contents = buildCommentBlock(`COMPONENT: ${component.name.toUpperCase()}`);
+    for (const style of component.styles) {
+        contents += `
+
+${buildCommentBlock(style.instructions.trim())}
+
+${style.css.trim()}
+`;
+    }
+    return contents;
+}
+function writeStylesheet(contents) {
+    return (tree) => {
+        if (tree.exists(SKYUX7_COMPAT_CSS_PATH)) {
+            tree.overwrite(SKYUX7_COMPAT_CSS_PATH, contents);
+        }
+        else {
+            tree.create(SKYUX7_COMPAT_CSS_PATH, contents);
+        }
+    };
+}
+function addStylesheetToWorkspace() {
+    return () => (0, workspace_1.updateWorkspace)((workspace) => {
+        for (const project of workspace.projects.values()) {
+            for (const targetName of ['build', 'test']) {
+                // Ignore build target for libraries.
+                if (!(targetName === 'build' &&
+                    project.extensions.projectType === 'library')) {
+                    const target = project.targets.get(targetName);
+                    /* istanbul ignore else */
+                    if (target && target.options) {
+                        const styles = (target.options.styles = (target.options.styles ||
+                            []));
+                        if (!styles.includes(SKYUX7_COMPAT_CSS_PATH)) {
+                            styles.push(SKYUX7_COMPAT_CSS_PATH);
+                        }
+                    }
+                }
+            }
+        }
+    });
+}
+function default_1() {
+    return (tree) => {
+        const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
+        let contents = '';
+        for (const library of compatStyles.libraries) {
+            if (packageJson.dependencies?.[library.name] ||
+                packageJson.devDependencies?.[library.name]) {
+                for (const component of library.components) {
+                    contents += buildComponentCss(component);
+                }
+            }
+        }
+        const rules = [];
+        if (contents) {
+            contents = `${buildCommentBlock(`TODO: The following component libraries introduced visual breaking changes in SKY UX 7. Each block of CSS reintroduces the styles that were changed or removed for backwards compatibility. You will need to do the following before migrating to the next major version of SKY UX:
+- Address each of the changes by following the instructions
+  in each block of CSS, then remove the block.
+- Delete this file after all blocks have been addressed.
+- Remove each occurrence of this file in your project's
+  angular.json file.`)}
+
+${contents}`;
+            rules.push(writeStylesheet(contents), addStylesheetToWorkspace());
+        }
+        return (0, schematics_1.chain)(rules);
+    };
+}
+exports.default = default_1;
+//# sourceMappingURL=add-compat-stylesheets.js.map

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

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

package/src/schematics/utility/workspace.d.ts

@@ -14,4 +14,4 @@ export declare function getProject(workspace: workspaces.WorkspaceDefinition, pr
 /**
  * Allows updates to the Angular project config (angular.json).
  */
-export declare function updateWorkspace(updater: (workspace: workspaces.WorkspaceDefinition) => void): Rule;
+export declare function updateWorkspace(updater: (workspace: workspaces.WorkspaceDefinition) => void | Promise<void>): Rule;

package/src/schematics/utility/workspace.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/utility/workspace.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,2DAA6E;AAE7E,iCAA0C;AAE1C;;;GAGG;AACH,SAAS,UAAU,CAAC,IAAU;IAC5B,OAAO;QACL,0BAA0B;QAC1B,KAAK,CAAC,QAAQ,CAAC,IAAY;YACzB,OAAO,IAAA,uBAAgB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;QACD,0BAA0B;QAC1B,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,IAAY;YACxC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,IAAY;YAC5B,gCAAgC;YAChC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACrE,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,IAAY;YACvB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,YAAY,CAAC,IAAU;IAI3C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,iBAAU,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAChE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AAC7B,CAAC;AAPD,oCAOC;AAEM,KAAK,UAAU,UAAU,CAC9B,SAAyC,EACzC,WAAmB;IAEnB,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,gCAAmB,CAC3B,QAAQ,WAAW,yEAAyE,CAC7F,CAAC;KACH;IAED,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;AAClC,CAAC;AAZD,gCAYC;AAED;;GAEG;AACH,SAAgB,eAAe,CAC7B,OAA4D;IAE5D,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;QAErD,iEAAiE;QACjE,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;QAEzB,gDAAgD;QAChD,MAAM,iBAAU,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC;AAZD,0CAYC"}
+{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/utility/workspace.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,2DAA6E;AAE7E,iCAA0C;AAE1C;;;GAGG;AACH,SAAS,UAAU,CAAC,IAAU;IAC5B,OAAO;QACL,0BAA0B;QAC1B,KAAK,CAAC,QAAQ,CAAC,IAAY;YACzB,OAAO,IAAA,uBAAgB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;QACD,0BAA0B;QAC1B,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,IAAY;YACxC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,IAAY;YAC5B,gCAAgC;YAChC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACrE,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,IAAY;YACvB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,YAAY,CAAC,IAAU;IAI3C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,iBAAU,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAChE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AAC7B,CAAC;AAPD,oCAOC;AAEM,KAAK,UAAU,UAAU,CAC9B,SAAyC,EACzC,WAAmB;IAEnB,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,gCAAmB,CAC3B,QAAQ,WAAW,yEAAyE,CAC7F,CAAC;KACH;IAED,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;AAClC,CAAC;AAZD,gCAYC;AAED;;GAEG;AACH,SAAgB,eAAe,CAC7B,OAA4E;IAE5E,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;QAErD,iEAAiE;QACjE,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;QAEzB,gDAAgD;QAChD,MAAM,iBAAU,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC;AAZD,0CAYC"}