@progress/kendo-angular-schematics 14.2.1-develop.1 → 14.3.0-develop.10
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/e2e/utils.d.ts +11 -0
- package/e2e/utils.js +65 -2
- package/e2e/utils.js.map +1 -1
- package/package.json +2 -2
package/e2e/utils.d.ts
CHANGED
|
@@ -5,7 +5,15 @@
|
|
|
5
5
|
/// <reference types="node" />
|
|
6
6
|
import { ChildProcess } from "child_process";
|
|
7
7
|
import { Browser } from "@progress/kendo-e2e";
|
|
8
|
+
export declare const tempDir: string;
|
|
9
|
+
export declare const schematicsPath: string;
|
|
10
|
+
export declare const schematicsPackageName = "progress-kendo-angular-schematics-0.0.0-PLACEHOLDER.tgz";
|
|
11
|
+
export declare const schematicsPackagePath: string;
|
|
12
|
+
export declare function packSchematics(): Promise<void>;
|
|
8
13
|
export declare function cleanFolder(dir: string): void;
|
|
14
|
+
export declare function copyFolder(sourceFolder: string, targetFolder: string): void;
|
|
15
|
+
export declare function copyFile(sourceFilePath: string, targetFilePath: string): void;
|
|
16
|
+
export declare function deleteFileIfExists(fileName: string, filePath: string): Promise<void>;
|
|
9
17
|
export declare function replaceStringInFile(filePath: string, oldString: string, newString: string): void;
|
|
10
18
|
export declare function replaceAllStringInFile(filePath: string, oldString: string, newString: string): void;
|
|
11
19
|
export declare function exec(cmd: string, wd: string): Promise<{
|
|
@@ -15,3 +23,6 @@ export declare function exec(cmd: string, wd: string): Promise<{
|
|
|
15
23
|
export declare function execAsync(cmd: string, wd: string): ChildProcess;
|
|
16
24
|
export declare function kill(process: ChildProcess): void;
|
|
17
25
|
export declare function loadUrl(browser: Browser, url: string): Promise<void>;
|
|
26
|
+
export declare function waitToLoadApp(browser: Browser, appName: string): Promise<boolean>;
|
|
27
|
+
export declare function getNGVersion(appPath: string): number;
|
|
28
|
+
export declare function patchModules(appPath: string, kendoPackage: string): void;
|
package/e2e/utils.js
CHANGED
|
@@ -4,13 +4,28 @@
|
|
|
4
4
|
*-------------------------------------------------------------------------------------------*/
|
|
5
5
|
"use strict";
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.loadUrl = exports.kill = exports.execAsync = exports.exec = exports.replaceAllStringInFile = exports.replaceStringInFile = exports.cleanFolder = void 0;
|
|
7
|
+
exports.patchModules = exports.getNGVersion = exports.waitToLoadApp = exports.loadUrl = exports.kill = exports.execAsync = exports.exec = exports.replaceAllStringInFile = exports.replaceStringInFile = exports.deleteFileIfExists = exports.copyFile = exports.copyFolder = exports.cleanFolder = exports.packSchematics = exports.schematicsPackagePath = exports.schematicsPackageName = exports.schematicsPath = exports.tempDir = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
9
|
const fs = tslib_1.__importStar(require("fs"));
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const child_process_1 = require("child_process");
|
|
12
12
|
const util_1 = require("util");
|
|
13
|
+
const kendo_e2e_1 = require("@progress/kendo-e2e");
|
|
13
14
|
const execSync = (0, util_1.promisify)(child_process_1.exec);
|
|
15
|
+
exports.tempDir = (0, path_1.resolve)('../tmp');
|
|
16
|
+
exports.schematicsPath = (0, path_1.resolve)("./dist/libs/schematics/");
|
|
17
|
+
exports.schematicsPackageName = 'progress-kendo-angular-schematics-0.0.0-PLACEHOLDER.tgz';
|
|
18
|
+
exports.schematicsPackagePath = (0, path_1.resolve)(`${exports.tempDir}/${exports.schematicsPackageName}`);
|
|
19
|
+
async function packSchematics() {
|
|
20
|
+
await deleteFileIfExists(exports.schematicsPackageName, exports.schematicsPath);
|
|
21
|
+
await deleteFileIfExists(exports.schematicsPackageName, exports.tempDir);
|
|
22
|
+
const output = await exec('npm pack', exports.schematicsPath);
|
|
23
|
+
if (!output.stdout.includes(exports.schematicsPackageName)) {
|
|
24
|
+
throw new Error('Failed to pack schematics.');
|
|
25
|
+
}
|
|
26
|
+
copyFile((0, path_1.resolve)(`${exports.schematicsPath}/${exports.schematicsPackageName}`), exports.schematicsPackagePath);
|
|
27
|
+
}
|
|
28
|
+
exports.packSchematics = packSchematics;
|
|
14
29
|
function cleanFolder(dir) {
|
|
15
30
|
const resolvedDir = (0, path_1.resolve)(dir);
|
|
16
31
|
if (fs.existsSync(resolvedDir)) {
|
|
@@ -21,11 +36,34 @@ function cleanFolder(dir) {
|
|
|
21
36
|
fs.mkdirSync(resolvedDir, { recursive: true });
|
|
22
37
|
}
|
|
23
38
|
exports.cleanFolder = cleanFolder;
|
|
39
|
+
function copyFolder(sourceFolder, targetFolder) {
|
|
40
|
+
const src = (0, path_1.resolve)(sourceFolder);
|
|
41
|
+
const target = (0, path_1.resolve)(targetFolder);
|
|
42
|
+
fs.cpSync(src, target, { recursive: true, dereference: true });
|
|
43
|
+
console.log(`Copy ${src} to ${target}`);
|
|
44
|
+
}
|
|
45
|
+
exports.copyFolder = copyFolder;
|
|
46
|
+
function copyFile(sourceFilePath, targetFilePath) {
|
|
47
|
+
fs.cpSync(sourceFilePath, targetFilePath, { force: true });
|
|
48
|
+
console.log(`File '${sourceFilePath}' copied to '${targetFilePath}' successfully.`);
|
|
49
|
+
}
|
|
50
|
+
exports.copyFile = copyFile;
|
|
51
|
+
async function deleteFileIfExists(fileName, filePath) {
|
|
52
|
+
try {
|
|
53
|
+
const fullPathToFile = (0, path_1.resolve)(filePath + '/' + fileName);
|
|
54
|
+
await fs.promises.unlink(fullPathToFile);
|
|
55
|
+
console.log(`File: '${fullPathToFile}' has been deleted.`);
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
console.warn(`Error deleting file: ${error.message}`);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
exports.deleteFileIfExists = deleteFileIfExists;
|
|
24
62
|
function replaceStringInFile(filePath, oldString, newString) {
|
|
25
63
|
const absolutePath = (0, path_1.resolve)(filePath);
|
|
26
64
|
const content = fs.readFileSync(absolutePath, 'utf8');
|
|
27
65
|
fs.writeFileSync(absolutePath, content.replace(oldString, newString), 'utf8');
|
|
28
|
-
console.log(`Replace: ${oldString}\nWith: ${newString}\nIn: ${
|
|
66
|
+
console.log(`Replace: ${oldString}\nWith: ${newString}\nIn: ${absolutePath}`);
|
|
29
67
|
}
|
|
30
68
|
exports.replaceStringInFile = replaceStringInFile;
|
|
31
69
|
function replaceAllStringInFile(filePath, oldString, newString) {
|
|
@@ -70,4 +108,29 @@ async function loadUrl(browser, url) {
|
|
|
70
108
|
}, 90000, `Failed to load ${url}`, 1000);
|
|
71
109
|
}
|
|
72
110
|
exports.loadUrl = loadUrl;
|
|
111
|
+
async function waitToLoadApp(browser, appName) {
|
|
112
|
+
const preNG17 = `//*[text()='${appName} app is running!']`;
|
|
113
|
+
const postNG17 = `//*[text()='Hello, ${appName}']`;
|
|
114
|
+
const label = kendo_e2e_1.By.xpath(`${preNG17} | ${postNG17}`);
|
|
115
|
+
return await browser.isVisible(label, 60000);
|
|
116
|
+
}
|
|
117
|
+
exports.waitToLoadApp = waitToLoadApp;
|
|
118
|
+
function getNGVersion(appPath) {
|
|
119
|
+
const content = fs.readFileSync((0, path_1.resolve)(`${appPath}/package.json`), 'utf-8');
|
|
120
|
+
const json = JSON.parse(content);
|
|
121
|
+
const coreVersion = json.dependencies['@angular/core'];
|
|
122
|
+
return parseInt(coreVersion.split('.')[0].substring(1));
|
|
123
|
+
}
|
|
124
|
+
exports.getNGVersion = getNGVersion;
|
|
125
|
+
function patchModules(appPath, kendoPackage) {
|
|
126
|
+
const absoluteAppPath = (0, path_1.resolve)(appPath);
|
|
127
|
+
const rootModules = (0, path_1.resolve)(`${absoluteAppPath}/node_modules/@progress/kendo-angular-schematics`);
|
|
128
|
+
const packageModules = (0, path_1.resolve)(`${absoluteAppPath}/node_modules/@progress/${kendoPackage}/node_modules/@progress/kendo-angular-schematics`);
|
|
129
|
+
if (fs.existsSync((0, path_1.resolve)(packageModules))) {
|
|
130
|
+
console.log(`Replace schematics at ${packageModules} node_modules.`);
|
|
131
|
+
cleanFolder(packageModules);
|
|
132
|
+
copyFolder(rootModules, packageModules);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
exports.patchModules = patchModules;
|
|
73
136
|
//# sourceMappingURL=utils.js.map
|
package/e2e/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../libs/schematics/e2e/utils.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,+BAA+B;AAC/B,iDAAkE;AAClE,+BAAiC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../libs/schematics/e2e/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@progress/kendo-angular-schematics",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.3.0-develop.10",
|
|
4
4
|
"description": "Kendo UI Schematics for Angular",
|
|
5
5
|
"license": "SEE LICENSE in LICENSE.md",
|
|
6
6
|
"author": "Progress",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"rxjs": "^6.5.3 || ^7.0.0"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@progress/kendo-angular-schematics": "14.
|
|
33
|
+
"@progress/kendo-angular-schematics": "14.3.0-develop.10",
|
|
34
34
|
"semver": "^7.5.3",
|
|
35
35
|
"@types/semver": "^7.5.0"
|
|
36
36
|
},
|