@progress/kendo-angular-schematics 16.4.0-develop.4 → 16.4.0-develop.6
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 +2 -0
- package/e2e/utils.js +53 -13
- package/e2e/utils.js.map +1 -1
- package/package.json +2 -2
- package/src/utils/kendo-utils.js +2 -3
- package/src/utils/kendo-utils.js.map +1 -1
package/e2e/utils.d.ts
CHANGED
|
@@ -16,6 +16,8 @@ export declare function copyFile(sourceFilePath: string, targetFilePath: string)
|
|
|
16
16
|
export declare function deleteFileIfExists(fileName: string, filePath: string): Promise<void>;
|
|
17
17
|
export declare function replaceStringInFile(filePath: string, oldString: string, newString: string): void;
|
|
18
18
|
export declare function replaceAllStringInFile(filePath: string, oldString: string, newString: string): void;
|
|
19
|
+
export declare function checkStringInFile(filePath: string, searchString: string): boolean;
|
|
20
|
+
export declare function printSpecificKeys(filePath: string, specificKey: string): void;
|
|
19
21
|
export declare function exec(cmd: string, wd: string): Promise<{
|
|
20
22
|
stdout: string;
|
|
21
23
|
stderr: string;
|
package/e2e/utils.js
CHANGED
|
@@ -4,13 +4,14 @@
|
|
|
4
4
|
*-------------------------------------------------------------------------------------------*/
|
|
5
5
|
"use strict";
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
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;
|
|
7
|
+
exports.patchModules = exports.getNGVersion = exports.waitToLoadApp = exports.loadUrl = exports.kill = exports.execAsync = exports.exec = exports.printSpecificKeys = exports.checkStringInFile = 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
13
|
const kendo_e2e_1 = require("@progress/kendo-e2e");
|
|
14
|
+
const fs_1 = require("fs");
|
|
14
15
|
const execSync = (0, util_1.promisify)(child_process_1.exec);
|
|
15
16
|
exports.tempDir = (0, path_1.resolve)('../tmp');
|
|
16
17
|
exports.schematicsPath = (0, path_1.resolve)("./dist/libs/schematics/");
|
|
@@ -29,23 +30,37 @@ async function packSchematics() {
|
|
|
29
30
|
exports.packSchematics = packSchematics;
|
|
30
31
|
function cleanFolder(dir) {
|
|
31
32
|
const resolvedDir = (0, path_1.resolve)(dir);
|
|
32
|
-
if (
|
|
33
|
+
if ((0, fs_1.existsSync)(resolvedDir)) {
|
|
33
34
|
console.log(`Cleanup: ${resolvedDir}`);
|
|
34
|
-
|
|
35
|
+
(0, fs_1.rmSync)(resolvedDir, { recursive: true, force: true });
|
|
35
36
|
}
|
|
36
37
|
console.log(`Create: ${resolvedDir}`);
|
|
37
|
-
|
|
38
|
+
(0, fs_1.mkdirSync)(resolvedDir, { recursive: true });
|
|
38
39
|
}
|
|
39
40
|
exports.cleanFolder = cleanFolder;
|
|
40
41
|
function copyFolder(sourceFolder, targetFolder) {
|
|
41
42
|
const src = (0, path_1.resolve)(sourceFolder);
|
|
42
43
|
const target = (0, path_1.resolve)(targetFolder);
|
|
43
|
-
|
|
44
|
-
|
|
44
|
+
if (!(0, fs_1.existsSync)(src)) {
|
|
45
|
+
throw new Error(`Source folder does not exist: ${src}`);
|
|
46
|
+
}
|
|
47
|
+
// Ensuring the target folder is accessible before copying
|
|
48
|
+
if (!(0, fs_1.existsSync)(target)) {
|
|
49
|
+
const tempFile = (0, fs_1.openSync)(target, 'w');
|
|
50
|
+
(0, fs_1.closeSync)(tempFile);
|
|
51
|
+
}
|
|
52
|
+
try {
|
|
53
|
+
(0, fs_1.cpSync)(src, target, { recursive: true, dereference: true });
|
|
54
|
+
console.log(`Copy ${src} to ${target}`);
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
console.error(`Error copying ${src} to ${target}:`, error);
|
|
58
|
+
throw error;
|
|
59
|
+
}
|
|
45
60
|
}
|
|
46
61
|
exports.copyFolder = copyFolder;
|
|
47
62
|
function copyFile(sourceFilePath, targetFilePath) {
|
|
48
|
-
|
|
63
|
+
(0, fs_1.cpSync)(sourceFilePath, targetFilePath, { force: true });
|
|
49
64
|
console.log(`File '${sourceFilePath}' copied to '${targetFilePath}' successfully.`);
|
|
50
65
|
}
|
|
51
66
|
exports.copyFile = copyFile;
|
|
@@ -62,19 +77,44 @@ async function deleteFileIfExists(fileName, filePath) {
|
|
|
62
77
|
exports.deleteFileIfExists = deleteFileIfExists;
|
|
63
78
|
function replaceStringInFile(filePath, oldString, newString) {
|
|
64
79
|
const absolutePath = (0, path_1.resolve)(filePath);
|
|
65
|
-
const content =
|
|
66
|
-
|
|
80
|
+
const content = (0, fs_1.readFileSync)(absolutePath, 'utf8');
|
|
81
|
+
(0, fs_1.writeFileSync)(absolutePath, content.replace(oldString, newString), 'utf8');
|
|
67
82
|
console.log(`Replace: ${oldString}\nWith: ${newString}\nIn: ${absolutePath}`);
|
|
68
83
|
}
|
|
69
84
|
exports.replaceStringInFile = replaceStringInFile;
|
|
70
85
|
function replaceAllStringInFile(filePath, oldString, newString) {
|
|
71
86
|
const absolutePath = (0, path_1.resolve)(filePath);
|
|
72
|
-
const content =
|
|
87
|
+
const content = (0, fs_1.readFileSync)(absolutePath, 'utf8');
|
|
73
88
|
const regex = new RegExp(oldString, 'g');
|
|
74
|
-
|
|
89
|
+
(0, fs_1.writeFileSync)(absolutePath, content.replace(regex, newString), 'utf8');
|
|
75
90
|
console.log(`Replace: ${oldString}\nWith: ${newString}\nIn: ${filePath}`);
|
|
76
91
|
}
|
|
77
92
|
exports.replaceAllStringInFile = replaceAllStringInFile;
|
|
93
|
+
function checkStringInFile(filePath, searchString) {
|
|
94
|
+
const absolutePath = (0, path_1.resolve)(filePath);
|
|
95
|
+
const content = (0, fs_1.readFileSync)(absolutePath, 'utf8');
|
|
96
|
+
const found = content.includes(searchString);
|
|
97
|
+
console.log(`Search for: ${searchString}\nIn: ${absolutePath}\nFound: ${found}`);
|
|
98
|
+
return found;
|
|
99
|
+
}
|
|
100
|
+
exports.checkStringInFile = checkStringInFile;
|
|
101
|
+
function printSpecificKeys(filePath, specificKey) {
|
|
102
|
+
const absolutePath = (0, path_1.resolve)(filePath);
|
|
103
|
+
const content = fs.readFileSync(absolutePath, 'utf8');
|
|
104
|
+
const json = JSON.parse(content);
|
|
105
|
+
function printKeys(obj) {
|
|
106
|
+
for (const key in obj) {
|
|
107
|
+
if (key === specificKey) {
|
|
108
|
+
console.log(`The key : value pair is: ${key}: ${obj[key]}`);
|
|
109
|
+
}
|
|
110
|
+
if (typeof obj[key] === 'object' && obj[key] !== null) {
|
|
111
|
+
printKeys(obj[key]);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
printKeys(json);
|
|
116
|
+
}
|
|
117
|
+
exports.printSpecificKeys = printSpecificKeys;
|
|
78
118
|
async function exec(cmd, wd) {
|
|
79
119
|
const cwd = (0, path_1.resolve)(wd);
|
|
80
120
|
console.log(`Execute: ${cmd}\nCwd: ${cwd}`);
|
|
@@ -117,7 +157,7 @@ async function waitToLoadApp(browser, appName) {
|
|
|
117
157
|
}
|
|
118
158
|
exports.waitToLoadApp = waitToLoadApp;
|
|
119
159
|
function getNGVersion(appPath) {
|
|
120
|
-
const content =
|
|
160
|
+
const content = (0, fs_1.readFileSync)((0, path_1.resolve)(`${appPath}/package.json`), 'utf-8');
|
|
121
161
|
const json = JSON.parse(content);
|
|
122
162
|
const coreVersion = json.dependencies['@angular/core'];
|
|
123
163
|
return parseInt(coreVersion.split('.')[0].substring(1));
|
|
@@ -127,7 +167,7 @@ function patchModules(appPath, kendoPackage) {
|
|
|
127
167
|
const absoluteAppPath = (0, path_1.resolve)(appPath);
|
|
128
168
|
const rootModules = (0, path_1.resolve)(`${absoluteAppPath}/node_modules/@progress/kendo-angular-schematics`);
|
|
129
169
|
const packageModules = (0, path_1.resolve)(`${absoluteAppPath}/node_modules/@progress/${kendoPackage}/node_modules/@progress/kendo-angular-schematics`);
|
|
130
|
-
if (
|
|
170
|
+
if ((0, fs_1.existsSync)((0, path_1.resolve)(packageModules))) {
|
|
131
171
|
console.log(`Replace schematics at ${packageModules} node_modules.`);
|
|
132
172
|
cleanFolder(packageModules);
|
|
133
173
|
copyFolder(rootModules, packageModules);
|
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;AACjC,mDAAkD;AAClD,MAAM,QAAQ,GAAG,IAAA,gBAAS,EAAC,oBAAW,CAAC,CAAC;AAE3B,QAAA,OAAO,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;AAC5B,QAAA,cAAc,GAAG,IAAA,cAAO,EAAC,yBAAyB,CAAC,CAAC;AACpD,QAAA,qBAAqB,GAAG,yDAAyD,CAAC;AAClF,QAAA,qBAAqB,GAAG,IAAA,cAAO,EAAC,GAAG,eAAO,IAAI,6BAAqB,EAAE,CAAC,CAAC;AAE7E,KAAK,UAAU,cAAc;IAChC,MAAM,kBAAkB,CAAC,6BAAqB,EAAE,sBAAc,CAAC,CAAA;IAC/D,MAAM,kBAAkB,CAAC,6BAAqB,EAAE,eAAO,CAAC,CAAA;IAExD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,sBAAc,CAAC,CAAC;IACtD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,6BAAqB,CAAC,EAAE;QAChD,OAAO,CAAC,IAAI,CAAC,WAAW,MAAM,EAAE,CAAC,CAAA;QACjC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KACjD;IAED,QAAQ,CAAC,IAAA,cAAO,EAAC,GAAG,sBAAc,IAAI,6BAAqB,EAAE,CAAC,EAAE,6BAAqB,CAAC,CAAC;AAC3F,CAAC;AAXD,wCAWC;AAED,SAAgB,WAAW,CAAC,GAAW;IACnC,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;IACjC,IAAI,
|
|
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": "16.4.0-develop.
|
|
3
|
+
"version": "16.4.0-develop.6",
|
|
4
4
|
"description": "Kendo UI Schematics for Angular",
|
|
5
5
|
"license": "SEE LICENSE in LICENSE.md",
|
|
6
6
|
"author": "Progress",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"rxjs": "^6.5.3 || ^7.0.0"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@progress/kendo-angular-schematics": "16.4.0-develop.
|
|
32
|
+
"@progress/kendo-angular-schematics": "16.4.0-develop.6",
|
|
33
33
|
"semver": "^7.5.3",
|
|
34
34
|
"@types/semver": "^7.5.0"
|
|
35
35
|
},
|
package/src/utils/kendo-utils.js
CHANGED
|
@@ -49,15 +49,14 @@ function checkOrAddKendoTheme(options, project) {
|
|
|
49
49
|
if (buildOptions) {
|
|
50
50
|
const styles = buildOptions?.styles || [];
|
|
51
51
|
// Check if there is a kendo theme in styles, and if there is none - add one.
|
|
52
|
-
if (!styles.reduce((acc, next) => acc || next.includes("@progress/kendo-theme-"), false)) {
|
|
52
|
+
if (!styles.reduce((acc, next) => acc || (typeof next === 'string' && next.includes("@progress/kendo-theme-")), false)) {
|
|
53
53
|
styles.push("node_modules/@progress/kendo-theme-default/dist/default-ocean-blue.scss");
|
|
54
54
|
buildOptions.styles = styles;
|
|
55
|
-
// This may be better at editing and preserving formatting, but the API is not so straight forward to set styles: import { updateWorkspace } from "@schematics/angular/utility/workspace";
|
|
56
55
|
tree.overwrite(configPath, JSON.stringify(json, null, 2));
|
|
57
56
|
(0, dependencies_1.addPackageJsonDependency)(tree, {
|
|
58
57
|
type: dependencies_1.NodeDependencyType.Dev,
|
|
59
58
|
name: '@progress/kendo-theme-default',
|
|
60
|
-
version: "^
|
|
59
|
+
version: "^8.0.0",
|
|
61
60
|
overwrite: true
|
|
62
61
|
});
|
|
63
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kendo-utils.js","sourceRoot":"","sources":["../../../../../libs/schematics/src/utils/kendo-utils.ts"],"names":[],"mappings":";;;;AACA,4DAA4F;AAC5F,2EAAwG;AACxG,uDAAiC;AAUjC,SAAgB,wBAAwB,CAAC,OAAiC,EAAE,IAAU,EAAE,OAA0B;IAC9G,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,GAAG,eAAe,CAAC;IACvD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAC9B,IAAI;YACA,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAC9E,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,YAAY,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;YACvF,IAAI,cAAc,CAAC,KAAK,IAAI,EAAE,IAAI,OAAO,CAAC,UAAU,EAAE;gBAClD,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;aACtE;iBAAM,IAAI,cAAc,CAAC,KAAK,IAAI,EAAE,EAAE;gBACnC,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE;oBAClC,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC;iBAC9B;aACJ;iBAAM;gBACH,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE;oBAClC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;iBAC7B;aACJ;SACJ;QAAC,MAAM;YACJ,yCAAyC;SAC5C;KACJ;AACL,CAAC;AArBD,4DAqBC;AAED;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,OAAgB,EAAE,OAA0B;IAC7E,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC7C,IAAI;YACA,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,GAAG,eAAe,CAAC;YAClD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBACzB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;gBAClE,MAAM,YAAY,GAAG,IAAI,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC;gBAClF,IAAI,YAAY,EAAE;oBACd,MAAM,MAAM,GAAa,YAAY,EAAE,MAAM,IAAI,EAAE,CAAC;oBACpD,6EAA6E;oBAC7E,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"kendo-utils.js","sourceRoot":"","sources":["../../../../../libs/schematics/src/utils/kendo-utils.ts"],"names":[],"mappings":"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"}
|