@skyux/packages 9.0.0-beta.0 → 9.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skyux/packages",
3
- "version": "9.0.0-beta.0",
3
+ "version": "9.0.0",
4
4
  "author": "Blackbaud, Inc.",
5
5
  "description": "Handles the `ng update` command for SKY UX component libraries.",
6
6
  "keywords": [
@@ -37,54 +37,54 @@
37
37
  "migrations": "./src/schematics/migrations/migration-collection.json",
38
38
  "packageGroup": {
39
39
  "@blackbaud/angular-tree-component": "^1.0.0-alpha.0",
40
- "@skyux-sdk/eslint-config": "9.0.0-beta.0",
41
- "@skyux-sdk/prettier-schematics": "9.0.0-beta.0",
42
- "@skyux-sdk/testing": "9.0.0-beta.0",
43
- "@skyux/a11y": "9.0.0-beta.0",
44
- "@skyux/action-bars": "9.0.0-beta.0",
45
- "@skyux/ag-grid": "9.0.0-beta.0",
46
- "@skyux/angular-tree-component": "9.0.0-beta.0",
47
- "@skyux/animations": "9.0.0-beta.0",
48
- "@skyux/assets": "9.0.0-beta.0",
49
- "@skyux/autonumeric": "9.0.0-beta.0",
50
- "@skyux/avatar": "9.0.0-beta.0",
51
- "@skyux/colorpicker": "9.0.0-beta.0",
52
- "@skyux/config": "9.0.0-beta.0",
53
- "@skyux/core": "9.0.0-beta.0",
54
- "@skyux/data-manager": "9.0.0-beta.0",
55
- "@skyux/datetime": "9.0.0-beta.0",
56
- "@skyux/errors": "9.0.0-beta.0",
57
- "@skyux/flyout": "9.0.0-beta.0",
58
- "@skyux/forms": "9.0.0-beta.0",
59
- "@skyux/grids": "9.0.0-beta.0",
60
- "@skyux/http": "9.0.0-beta.0",
61
- "@skyux/i18n": "9.0.0-beta.0",
40
+ "@skyux-sdk/eslint-config": "9.0.0",
41
+ "@skyux-sdk/prettier-schematics": "9.0.0",
42
+ "@skyux-sdk/testing": "9.0.0",
43
+ "@skyux/a11y": "9.0.0",
44
+ "@skyux/action-bars": "9.0.0",
45
+ "@skyux/ag-grid": "9.0.0",
46
+ "@skyux/angular-tree-component": "9.0.0",
47
+ "@skyux/animations": "9.0.0",
48
+ "@skyux/assets": "9.0.0",
49
+ "@skyux/autonumeric": "9.0.0",
50
+ "@skyux/avatar": "9.0.0",
51
+ "@skyux/colorpicker": "9.0.0",
52
+ "@skyux/config": "9.0.0",
53
+ "@skyux/core": "9.0.0",
54
+ "@skyux/data-manager": "9.0.0",
55
+ "@skyux/datetime": "9.0.0",
56
+ "@skyux/errors": "9.0.0",
57
+ "@skyux/flyout": "9.0.0",
58
+ "@skyux/forms": "9.0.0",
59
+ "@skyux/grids": "9.0.0",
60
+ "@skyux/http": "9.0.0",
61
+ "@skyux/i18n": "9.0.0",
62
62
  "@skyux/icons": "^6.0.0",
63
- "@skyux/indicators": "9.0.0-beta.0",
64
- "@skyux/inline-form": "9.0.0-beta.0",
65
- "@skyux/layout": "9.0.0-beta.0",
66
- "@skyux/list-builder": "9.0.0-beta.0",
67
- "@skyux/list-builder-common": "9.0.0-beta.0",
68
- "@skyux/list-builder-view-checklist": "9.0.0-beta.0",
69
- "@skyux/list-builder-view-grids": "9.0.0-beta.0",
70
- "@skyux/lists": "9.0.0-beta.0",
71
- "@skyux/lookup": "9.0.0-beta.0",
72
- "@skyux/modals": "9.0.0-beta.0",
73
- "@skyux/navbar": "9.0.0-beta.0",
74
- "@skyux/omnibar-interop": "9.0.0-beta.0",
75
- "@skyux/pages": "9.0.0-beta.0",
76
- "@skyux/phone-field": "9.0.0-beta.0",
77
- "@skyux/popovers": "9.0.0-beta.0",
78
- "@skyux/progress-indicator": "9.0.0-beta.0",
79
- "@skyux/router": "9.0.0-beta.0",
80
- "@skyux/select-field": "9.0.0-beta.0",
81
- "@skyux/split-view": "9.0.0-beta.0",
82
- "@skyux/tabs": "9.0.0-beta.0",
83
- "@skyux/text-editor": "9.0.0-beta.0",
84
- "@skyux/theme": "9.0.0-beta.0",
85
- "@skyux/tiles": "9.0.0-beta.0",
86
- "@skyux/toast": "9.0.0-beta.0",
87
- "@skyux/validation": "9.0.0-beta.0",
63
+ "@skyux/indicators": "9.0.0",
64
+ "@skyux/inline-form": "9.0.0",
65
+ "@skyux/layout": "9.0.0",
66
+ "@skyux/list-builder": "9.0.0",
67
+ "@skyux/list-builder-common": "9.0.0",
68
+ "@skyux/list-builder-view-checklist": "9.0.0",
69
+ "@skyux/list-builder-view-grids": "9.0.0",
70
+ "@skyux/lists": "9.0.0",
71
+ "@skyux/lookup": "9.0.0",
72
+ "@skyux/modals": "9.0.0",
73
+ "@skyux/navbar": "9.0.0",
74
+ "@skyux/omnibar-interop": "9.0.0",
75
+ "@skyux/pages": "9.0.0",
76
+ "@skyux/phone-field": "9.0.0",
77
+ "@skyux/popovers": "9.0.0",
78
+ "@skyux/progress-indicator": "9.0.0",
79
+ "@skyux/router": "9.0.0",
80
+ "@skyux/select-field": "9.0.0",
81
+ "@skyux/split-view": "9.0.0",
82
+ "@skyux/tabs": "9.0.0",
83
+ "@skyux/text-editor": "9.0.0",
84
+ "@skyux/theme": "9.0.0",
85
+ "@skyux/tiles": "9.0.0",
86
+ "@skyux/toast": "9.0.0",
87
+ "@skyux/validation": "9.0.0",
88
88
  "ag-grid-angular": "^29.3.5",
89
89
  "ag-grid-community": "^29.3.5",
90
90
  "ag-grid-enterprise": "^29.3.5",
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "schematics": {
3
3
  "noop": {
4
- "version": "9.0.0-beta.0",
4
+ "version": "9.0.0",
5
5
  "factory": "./noop/noop.schematic",
6
6
  "description": "Update all SKY UX component packages"
7
7
  },
@@ -5,8 +5,12 @@ const tasks_1 = require("@angular-devkit/schematics/tasks");
5
5
  const typescript_1 = tslib_1.__importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
6
6
  const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
7
7
  const dependencies_1 = require("@schematics/angular/utility/dependencies");
8
- const imports_1 = require("../../../utility/typescript/imports");
9
8
  const workspace_1 = require("../../../utility/workspace");
9
+ function getImportNames(importDeclaration) {
10
+ return (importDeclaration.importClause?.namedBindings).elements
11
+ .map((element) => element.name.getText())
12
+ .sort();
13
+ }
10
14
  function movePageComponent() {
11
15
  return async (tree, context) => {
12
16
  const { workspace } = await (0, workspace_1.getWorkspace)(tree);
@@ -19,50 +23,46 @@ function movePageComponent() {
19
23
  // Parse the TypeScript file.
20
24
  const source = typescript_1.default.createSourceFile(path, tree.readText(path), typescript_1.default.ScriptTarget.Latest, true);
21
25
  // Find all imports of SkyPageLayoutType and SkyPageModule from @skyux/layout.
22
- const pageImports = (0, imports_1.getImports)(source, new Map([['@skyux/layout', ['SkyPageLayoutType', 'SkyPageModule']]]));
26
+ const importsToMove = ['SkyPageLayoutType', 'SkyPageModule'];
27
+ const pageImports = (0, ast_utils_1.findNodes)(source, (node) => {
28
+ return (typescript_1.default.isImportDeclaration(node) &&
29
+ typescript_1.default.isStringLiteral(node.moduleSpecifier) &&
30
+ node.moduleSpecifier.text.startsWith('@skyux/layout') &&
31
+ !!node.importClause?.namedBindings &&
32
+ typescript_1.default.isNamedImports(node.importClause.namedBindings) &&
33
+ node.importClause.namedBindings.elements.some((element) => importsToMove.includes(element.name.getText())));
34
+ });
23
35
  // Found one.
24
36
  if (pageImports.length > 0) {
25
37
  // We'll need to add the dependency to @skyux/pages.
26
38
  addDependency = true;
27
- pageImports.forEach((pageImport) => {
28
- // Angular uses a change recorder and the magic string library.
29
- const insertRecorder = tree.beginUpdate(path);
30
- // Add the new import.
31
- const change = (0, ast_utils_1.insertImport)(source, path, pageImport.getText(), '@skyux/pages');
32
- insertRecorder.insertRight(change.pos, change.toAdd);
33
- // Commit the update.
34
- tree.commitUpdate(insertRecorder);
35
- const removeRecorder = tree.beginUpdate(path);
39
+ // Angular uses a change recorder and the magic string library.
40
+ const updateRecorder = tree.beginUpdate(path);
41
+ const importsToAdd = pageImports
42
+ .map((pageImport) => getImportNames(pageImport).filter((importName) => importsToMove.includes(importName)))
43
+ .flat();
44
+ pageImports.forEach((importToUpdate) => {
45
+ const otherImports = getImportNames(importToUpdate).filter((importName) => !importsToMove.includes(importName));
36
46
  // Is anything else imported from @skyux/layout?
37
- if (pageImport.parent.elements.length > 1) {
38
- // Yes. Remove only one named import.
39
- const index = pageImport.parent.elements.findIndex((element) => element.name.getText() === pageImport.getText());
40
- // Find the start and end of the import.
41
- let importStart;
42
- let importEnd;
43
- if (index > 0) {
44
- // Not the first import.
45
- // Remove text from the end of the previous import to the end of the import.
46
- importStart = pageImport.parent.elements.at(index - 1).getEnd();
47
- importEnd = pageImport.parent.elements.at(index).getEnd();
48
- }
49
- else {
50
- // First import.
51
- // Remove text from the start of the import to the start of the next import.
52
- importStart = pageImport.parent.elements.at(index).getStart();
53
- importEnd = pageImport.parent.elements.at(index + 1).getStart();
54
- }
55
- // Remove the import.
56
- removeRecorder.remove(importStart, importEnd - importStart);
47
+ if (otherImports.length > 0 &&
48
+ importToUpdate.importClause?.namedBindings) {
49
+ // Yes. Update the import.
50
+ updateRecorder.remove(importToUpdate.importClause.namedBindings.getStart(), importToUpdate.importClause.namedBindings.getWidth());
51
+ updateRecorder.insertLeft(importToUpdate.importClause.namedBindings.getStart(), `{ ${otherImports.join(', ')} }`);
57
52
  }
58
53
  else {
59
54
  // No. Remove the whole import declaration.
60
- const importDeclaration = pageImport.parent.parent.parent;
61
- removeRecorder.remove(importDeclaration.getFullStart(), importDeclaration.getFullWidth());
55
+ updateRecorder.remove(importToUpdate.getFullStart(), importToUpdate.getFullWidth());
62
56
  }
63
- // Commit the update.
64
- tree.commitUpdate(removeRecorder);
65
57
  });
58
+ // Commit the update and parse the file again.
59
+ tree.commitUpdate(updateRecorder);
60
+ // Add the new import.
61
+ const updatedSource = typescript_1.default.createSourceFile(path, tree.readText(path), typescript_1.default.ScriptTarget.Latest, true);
62
+ const recorder = tree.beginUpdate(path);
63
+ const change = (0, ast_utils_1.insertImport)(updatedSource, path, importsToAdd.join(', '), '@skyux/pages');
64
+ recorder.insertLeft(change.pos, change.toAdd);
65
+ tree.commitUpdate(recorder);
66
66
  }
67
67
  }
68
68
  else if (path.endsWith('.component.html')) {
@@ -1 +1 @@
1
- {"version":3,"file":"move-page-component.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-9/move-page-component/move-page-component.schematic.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"move-page-component.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-9/move-page-component/move-page-component.schematic.ts"],"names":[],"mappings":"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"}
@@ -1,20 +1,45 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ const tslib_1 = require("tslib");
3
4
  const schematics_1 = require("@angular-devkit/schematics");
5
+ const ts = tslib_1.__importStar(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
6
+ const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
4
7
  const dependencies_1 = require("@schematics/angular/utility/dependencies");
8
+ const workspace_1 = require("@schematics/angular/utility/workspace");
5
9
  const ensure_peers_installed_1 = require("../../../rules/ensure-peers-installed");
6
- const tree_1 = require("../../../utility/tree");
7
- const workspace_1 = require("../../../utility/workspace");
10
+ const OLD_PACKAGE = '@circlon/angular-tree-component';
11
+ const NEW_PACKAGE = '@blackbaud/angular-tree-component';
8
12
  function renameTypeScriptImportPaths() {
9
13
  return async (tree) => {
10
- const { workspace } = await (0, workspace_1.getWorkspace)(tree);
14
+ const workspace = await (0, workspace_1.getWorkspace)(tree);
11
15
  for (const [, projectDefinition] of workspace.projects.entries()) {
12
16
  tree.getDir(projectDefinition.root).visit((filePath) => {
13
17
  if (filePath.match(/\.ts$/)) {
14
- const content = (0, tree_1.readRequiredFile)(tree, filePath);
15
- const updatedContent = content.replace(/import {\s*(?:\w|,|\s)+\s*} from ['"](@circlon)\/angular-tree-component(?:\w|\/)*['"];/g, (match, importPath) => match.replace(importPath, '@blackbaud'));
16
- if (updatedContent !== content) {
17
- tree.overwrite(filePath, updatedContent);
18
+ const source = ts.createSourceFile(filePath, tree.readText(filePath), ts.ScriptTarget.Latest, true);
19
+ const oldImports = (0, ast_utils_1.findNodes)(source, (node) => ts.isImportDeclaration(node) &&
20
+ ts.isStringLiteral(node.moduleSpecifier) &&
21
+ node.moduleSpecifier.text.startsWith(OLD_PACKAGE));
22
+ if (oldImports.length > 0) {
23
+ const recorder = tree.beginUpdate(filePath);
24
+ oldImports.forEach((node) => {
25
+ const moduleSpecifier = node.moduleSpecifier;
26
+ recorder.remove(moduleSpecifier.getStart() + 1, OLD_PACKAGE.length);
27
+ recorder.insertLeft(moduleSpecifier.getStart() + 1, NEW_PACKAGE);
28
+ });
29
+ tree.commitUpdate(recorder);
30
+ }
31
+ }
32
+ else if (filePath.match(/\.s?css$/)) {
33
+ const content = tree.readText(filePath);
34
+ let pos = content.indexOf(OLD_PACKAGE);
35
+ if (pos > -1) {
36
+ const recorder = tree.beginUpdate(filePath);
37
+ do {
38
+ recorder.remove(pos, OLD_PACKAGE.length);
39
+ recorder.insertLeft(pos, NEW_PACKAGE);
40
+ pos = content.indexOf(OLD_PACKAGE, pos + 1);
41
+ } while (pos > -1);
42
+ tree.commitUpdate(recorder);
18
43
  }
19
44
  }
20
45
  });
@@ -1 +1 @@
1
- {"version":3,"file":"update-angular-tree-component.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-9/update-angular-tree-component/update-angular-tree-component.schematic.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,2EAA8E;AAE9E,kFAA6E;AAC7E,gDAAyD;AACzD,0DAA0D;AAE1D,SAAS,2BAA2B;IAClC,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAE/C,KAAK,MAAM,CAAC,EAAE,iBAAiB,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE;YAChE,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACrD,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;oBAC3B,MAAM,OAAO,GAAG,IAAA,uBAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;oBAEjD,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CACpC,yFAAyF,EACzF,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,CAC/D,CAAC;oBAEF,IAAI,cAAc,KAAK,OAAO,EAAE;wBAC9B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;qBAC1C;iBACF;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AAED;IACE,OAAO,IAAA,kBAAK,EAAC;QACX,2BAA2B,EAAE;QAC7B,IAAA,6CAAoB,EAClB,+BAA+B,EAC/B;YACE;gBACE,IAAI,EAAE,mCAAmC;gBACzC,OAAO,EAAE,eAAe;gBACxB,IAAI,EAAE,iCAAkB,CAAC,OAAO;aACjC;SACF,EACD;YACE;gBACE,IAAI,EAAE,iCAAiC;aACxC;SACF,CACF;KACF,CAAC,CAAC;AACL,CAAC;AAnBD,4BAmBC"}
1
+ {"version":3,"file":"update-angular-tree-component.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-9/update-angular-tree-component/update-angular-tree-component.schematic.ts"],"names":[],"mappings":"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"}