@skyux/packages 5.0.0-beta.117 → 5.0.0-beta.118
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/CHANGELOG.md +4 -0
- package/package.json +1 -1
- package/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.js +17 -1
- package/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.js.map +1 -1
- package/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.spec.js +11 -8
- package/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.spec.js.map +1 -1
- package/schematics/utility/workspace.d.ts +5 -1
- package/schematics/utility/workspace.js +14 -1
- package/schematics/utility/workspace.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
# 5.0.0-beta.118 (2021-09-23)
|
|
2
|
+
|
|
3
|
+
- `@skyux/flyout@5.0.0-beta.4` [Release notes](https://github.com/blackbaud/skyux-flyout/blob/5.0.0-beta.4/CHANGELOG.md)
|
|
4
|
+
|
|
1
5
|
# 5.0.0-beta.117 (2021-09-22)
|
|
2
6
|
|
|
3
7
|
- `@skyux/flyout@5.0.0-beta.3` [Release notes](https://github.com/blackbaud/skyux-flyout/blob/5.0.0-beta.3/CHANGELOG.md)
|
package/package.json
CHANGED
|
@@ -28,6 +28,19 @@ try {
|
|
|
28
28
|
}
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
|
+
function addEntryPointToCodeCoverageIgnore(projectName) {
|
|
32
|
+
return workspace_1.updateWorkspace((workspace) => {
|
|
33
|
+
const project = workspace.projects.get(projectName);
|
|
34
|
+
const testTarget = project.targets.get('test');
|
|
35
|
+
const options = testTarget.options;
|
|
36
|
+
options.codeCoverageExclude = (options.codeCoverageExclude ||
|
|
37
|
+
[]);
|
|
38
|
+
const ignorePattern = `projects/${projectName}/src/test.ts`;
|
|
39
|
+
if (!options.codeCoverageExclude.includes(ignorePattern)) {
|
|
40
|
+
options.codeCoverageExclude.push(ignorePattern);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
31
44
|
function updatePackages() {
|
|
32
45
|
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
33
46
|
const { workspace } = yield workspace_1.getWorkspace(tree);
|
|
@@ -36,7 +49,10 @@ function updatePackages() {
|
|
|
36
49
|
if (project.extensions.projectType !== 'library') {
|
|
37
50
|
return;
|
|
38
51
|
}
|
|
39
|
-
return schematics_1.chain([
|
|
52
|
+
return schematics_1.chain([
|
|
53
|
+
updateSpecsEntryPoint(projectName),
|
|
54
|
+
addEntryPointToCodeCoverageIgnore(projectName),
|
|
55
|
+
]);
|
|
40
56
|
});
|
|
41
57
|
}
|
|
42
58
|
exports.default = updatePackages;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-coverage-for-testing-module.schematic.js","sourceRoot":"","sources":["../../../../src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAyD;AAEzD,6CAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"setup-coverage-for-testing-module.schematic.js","sourceRoot":"","sources":["../../../../src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAyD;AAEzD,6CAAsD;AACtD,uDAIiC;AAEjC,SAAS,qBAAqB,CAAC,WAAmB;IAChD,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,QAAQ,GAAG,YAAY,WAAW,cAAc,CAAC;QACvD,IAAI,QAAQ,GAAG,uBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE;YAC9C,QAAQ,IAAI;;;;;;CAMjB,CAAC;YACI,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;SACpC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iCAAiC,CAAC,WAAmB;IAC5D,OAAO,2BAAe,CAAC,CAAC,SAAS,EAAE,EAAE;QACnC,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC;QACrD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;QAChD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAQ,CAAC;QAEpC,OAAO,CAAC,mBAAmB,GAAG,CAAC,OAAO,CAAC,mBAAmB;YACxD,EAAE,CAAa,CAAC;QAElB,MAAM,aAAa,GAAG,YAAY,WAAW,cAAc,CAAC;QAC5D,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YACxD,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACjD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAwB,cAAc;IACpC,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,wBAAY,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,sBAAU,CAC/C,SAAS,EACT,SAAS,CAAC,UAAU,CAAC,cAAwB,CAC9C,CAAC;QAEF,0BAA0B;QAC1B,IAAI,OAAO,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YAChD,OAAO;SACR;QAED,OAAO,kBAAK,CAAC;YACX,qBAAqB,CAAC,WAAW,CAAC;YAClC,iCAAiC,CAAC,WAAW,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;AACJ,CAAC;AAnBD,iCAmBC"}
|
|
@@ -38,8 +38,8 @@ try {
|
|
|
38
38
|
}, tree)
|
|
39
39
|
.toPromise();
|
|
40
40
|
}
|
|
41
|
-
function validateFiles() {
|
|
42
|
-
const entryPointContents =
|
|
41
|
+
function validateFiles(updatedTree) {
|
|
42
|
+
const entryPointContents = updatedTree.readContent(`projects/${defaultProjectName}/src/test.ts`);
|
|
43
43
|
expect(entryPointContents)
|
|
44
44
|
.toEqual(`// This file is required by karma.conf.js and loads recursively all the .spec and framework files
|
|
45
45
|
|
|
@@ -72,17 +72,20 @@ context.keys().map(context);
|
|
|
72
72
|
|
|
73
73
|
${testingModuleContext}
|
|
74
74
|
`);
|
|
75
|
+
const angularJson = JSON.parse(updatedTree.readContent('angular.json'));
|
|
76
|
+
expect(angularJson.projects[defaultProjectName].architect.test.options
|
|
77
|
+
.codeCoverageExclude).toEqual([`projects/${defaultProjectName}/src/test.ts`]);
|
|
75
78
|
}
|
|
76
79
|
it('should setup testing module for code coverage', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
77
|
-
yield runSchematic();
|
|
78
|
-
validateFiles();
|
|
80
|
+
const updatedTree = yield runSchematic();
|
|
81
|
+
validateFiles(updatedTree);
|
|
79
82
|
}));
|
|
80
83
|
it('should abort if testing module already setup', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
81
|
-
yield runSchematic();
|
|
82
|
-
validateFiles();
|
|
84
|
+
let updatedTree = yield runSchematic();
|
|
85
|
+
validateFiles(updatedTree);
|
|
83
86
|
// Run the schematic again.
|
|
84
|
-
yield runSchematic();
|
|
85
|
-
validateFiles();
|
|
87
|
+
updatedTree = yield runSchematic();
|
|
88
|
+
validateFiles(updatedTree);
|
|
86
89
|
}));
|
|
87
90
|
it('should abort if project type is application', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
88
91
|
tree = yield scaffold_1.createTestApp(runner, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-coverage-for-testing-module.schematic.spec.js","sourceRoot":"","sources":["../../../../src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAG4C;AAE5C,gDAAwB;AAExB,qDAA0E;AAE1E,QAAQ,CAAC,6CAA6C,EAAE,GAAG,EAAE;IAC3D,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,8BAA8B,CAAC,CAAC;IAC5E,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACpC,MAAM,aAAa,GAAG,mCAAmC,CAAC;IAE1D,MAAM,oBAAoB,GAAG;;;;iBAId,CAAC;IAEhB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAErE,IAAI,IAAkB,CAAC;IAEvB,UAAU,CAAC,GAAS,EAAE;QACpB,IAAI,GAAG,MAAM,4BAAiB,CAAC,MAAM,EAAE;YACrC,IAAI,EAAE,kBAAkB;SACzB,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,SAAS,YAAY,CAAC,IAAa;QACjC,OAAO,MAAM;aACV,iBAAiB,CAChB,aAAa,EACb;YACE,kBAAkB,EAAE,IAAI,IAAI,kBAAkB;SAC/C,EACD,IAAI,CACL;aACA,SAAS,EAAE,CAAC;IACjB,CAAC;IAED,SAAS,aAAa;
|
|
1
|
+
{"version":3,"file":"setup-coverage-for-testing-module.schematic.spec.js","sourceRoot":"","sources":["../../../../src/schematics/migrations/setup-coverage-for-testing-module/setup-coverage-for-testing-module.schematic.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAG4C;AAE5C,gDAAwB;AAExB,qDAA0E;AAE1E,QAAQ,CAAC,6CAA6C,EAAE,GAAG,EAAE;IAC3D,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,8BAA8B,CAAC,CAAC;IAC5E,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACpC,MAAM,aAAa,GAAG,mCAAmC,CAAC;IAE1D,MAAM,oBAAoB,GAAG;;;;iBAId,CAAC;IAEhB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAErE,IAAI,IAAkB,CAAC;IAEvB,UAAU,CAAC,GAAS,EAAE;QACpB,IAAI,GAAG,MAAM,4BAAiB,CAAC,MAAM,EAAE;YACrC,IAAI,EAAE,kBAAkB;SACzB,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,SAAS,YAAY,CAAC,IAAa;QACjC,OAAO,MAAM;aACV,iBAAiB,CAChB,aAAa,EACb;YACE,kBAAkB,EAAE,IAAI,IAAI,kBAAkB;SAC/C,EACD,IAAI,CACL;aACA,SAAS,EAAE,CAAC;IACjB,CAAC;IAED,SAAS,aAAa,CAAC,WAAyB;QAC9C,MAAM,kBAAkB,GAAG,WAAW,CAAC,WAAW,CAChD,YAAY,kBAAkB,cAAc,CAC7C,CAAC;QACF,MAAM,CAAC,kBAAkB,CAAC;aACvB,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6Bb,oBAAoB;CACrB,CAAC,CAAC;QAEC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC;QACxE,MAAM,CACJ,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO;aAC5D,mBAAmB,CACvB,CAAC,OAAO,CAAC,CAAC,YAAY,kBAAkB,cAAc,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,EAAE,CAAC,+CAA+C,EAAE,GAAS,EAAE;QAC7D,MAAM,WAAW,GAAG,MAAM,YAAY,EAAE,CAAC;QACzC,aAAa,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAS,EAAE;QAC5D,IAAI,WAAW,GAAG,MAAM,YAAY,EAAE,CAAC;QACvC,aAAa,CAAC,WAAW,CAAC,CAAC;QAC3B,2BAA2B;QAC3B,WAAW,GAAG,MAAM,YAAY,EAAE,CAAC;QACnC,aAAa,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAS,EAAE;QAC3D,IAAI,GAAG,MAAM,wBAAa,CAAC,MAAM,EAAE;YACjC,kBAAkB,EAAE,QAAQ;SAC7B,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEjD,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QACzD,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;IACvD,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { workspaces } from '@angular-devkit/core';
|
|
2
|
-
import { Tree } from '@angular-devkit/schematics';
|
|
2
|
+
import { Rule, Tree } from '@angular-devkit/schematics';
|
|
3
3
|
/**
|
|
4
4
|
* Returns the workspace host and project config (angular.json).
|
|
5
5
|
*/
|
|
@@ -11,3 +11,7 @@ export declare function getProject(workspace: workspaces.WorkspaceDefinition, pr
|
|
|
11
11
|
project: workspaces.ProjectDefinition;
|
|
12
12
|
projectName: string;
|
|
13
13
|
}>;
|
|
14
|
+
/**
|
|
15
|
+
* Allows updates to the Angular project config (angular.json).
|
|
16
|
+
*/
|
|
17
|
+
export declare function updateWorkspace(updater: (workspace: workspaces.WorkspaceDefinition) => void): Rule;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.getProject = exports.getWorkspace = void 0;
|
|
12
|
+
exports.updateWorkspace = exports.getProject = exports.getWorkspace = void 0;
|
|
13
13
|
const core_1 = require("@angular-devkit/core");
|
|
14
14
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
15
15
|
const tree_1 = require("./tree");
|
|
@@ -65,4 +65,17 @@ function getProject(workspace, projectName) {
|
|
|
65
65
|
});
|
|
66
66
|
}
|
|
67
67
|
exports.getProject = getProject;
|
|
68
|
+
/**
|
|
69
|
+
* Allows updates to the Angular project config (angular.json).
|
|
70
|
+
*/
|
|
71
|
+
function updateWorkspace(updater) {
|
|
72
|
+
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
73
|
+
const { host, workspace } = yield getWorkspace(tree);
|
|
74
|
+
// Send the workspace to the callback to allow it to be modified.
|
|
75
|
+
yield updater(workspace);
|
|
76
|
+
// Update the workspace config with any changes.
|
|
77
|
+
yield core_1.workspaces.writeWorkspace(workspace, host);
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
exports.updateWorkspace = updateWorkspace;
|
|
68
81
|
//# sourceMappingURL=workspace.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../src/schematics/utility/workspace.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../src/schematics/utility/workspace.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAkD;AAClD,2DAA6E;AAE7E,iCAA0C;AAE1C;;;GAGG;AACH,SAAS,UAAU,CAAC,IAAU;IAC5B,OAAO;QACL,0BAA0B;QACpB,QAAQ,CAAC,IAAY;;gBACzB,OAAO,uBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACtC,CAAC;SAAA;QACD,0BAA0B;QACpB,SAAS,CAAC,IAAY,EAAE,IAAY;;gBACxC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACpC,CAAC;SAAA;QACK,WAAW,CAAC,IAAY;;gBAC5B,gCAAgC;gBAChC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YACrE,CAAC;SAAA;QACK,MAAM,CAAC,IAAY;;gBACvB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC;SAAA;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAsB,YAAY,CAAC,IAAU;;QAI3C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9B,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,iBAAU,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAChE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC;CAAA;AAPD,oCAOC;AAED,SAAsB,UAAU,CAC9B,SAAyC,EACzC,WAAmB;;QAEnB,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,gCAAmB,CAC3B,QAAQ,WAAW,yEAAyE,CAC7F,CAAC;SACH;QAED,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAClC,CAAC;CAAA;AAZD,gCAYC;AAED;;GAEG;AACH,SAAgB,eAAe,CAC7B,OAA4D;IAE5D,OAAO,CAAO,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,CAAA,CAAC;AACJ,CAAC;AAZD,0CAYC"}
|