@c8y/devkit 1019.0.3 → 1019.0.7
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.
|
@@ -15,37 +15,8 @@ const helpers_1 = require("./helpers");
|
|
|
15
15
|
*/
|
|
16
16
|
async function getAppAsZip(path) {
|
|
17
17
|
const size = (0, fs_1.statSync)(path).size;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
let pendingFiles = 0;
|
|
21
|
-
let readJsonInnerResolveMethod;
|
|
22
|
-
const parseFileData = (data) => {
|
|
23
|
-
try {
|
|
24
|
-
const fileData = JSON.parse(data.toString());
|
|
25
|
-
appData = Object.assign(appData, (0, helpers_1.dataToAppData)(fileData));
|
|
26
|
-
}
|
|
27
|
-
catch (e) {
|
|
28
|
-
// do nothing
|
|
29
|
-
}
|
|
30
|
-
pendingFiles--;
|
|
31
|
-
resolveIfReady();
|
|
32
|
-
};
|
|
33
|
-
const onClose = () => {
|
|
34
|
-
closed = true;
|
|
35
|
-
resolveIfReady();
|
|
36
|
-
};
|
|
37
|
-
const resolveIfReady = () => {
|
|
38
|
-
if (pendingFiles === 0 && closed) {
|
|
39
|
-
const appDataCopy = (0, lodash_1.cloneDeep)(appData);
|
|
40
|
-
const name = (0, helpers_1.getName)(appDataCopy, (0, path_1.basename)(path));
|
|
41
|
-
const key = (0, helpers_1.getKey)(appDataCopy, name);
|
|
42
|
-
const contextPath = (0, helpers_1.getContextPath)(appDataCopy, name);
|
|
43
|
-
(0, lodash_1.assign)(appDataCopy, { name, key, contextPath });
|
|
44
|
-
readJsonInnerResolveMethod(appDataCopy);
|
|
45
|
-
}
|
|
46
|
-
};
|
|
47
|
-
const json = await new Promise(resolve => {
|
|
48
|
-
readJsonInnerResolveMethod = resolve;
|
|
18
|
+
const json = await new Promise((resolve, reject) => {
|
|
19
|
+
const partialCumulocityJSONData = new Array();
|
|
49
20
|
(0, fs_1.createReadStream)(path)
|
|
50
21
|
.pipe((0, unzip_stream_1.Parse)())
|
|
51
22
|
.on('entry', entry => {
|
|
@@ -54,14 +25,35 @@ async function getAppAsZip(path) {
|
|
|
54
25
|
const macTrash = !!fileName.match(/__MACOSX/);
|
|
55
26
|
const readFile = isCumulocity && !macTrash;
|
|
56
27
|
if (readFile) {
|
|
57
|
-
|
|
58
|
-
entry.on('data', parseFileData);
|
|
28
|
+
entry.on('data', (data) => partialCumulocityJSONData.push(data));
|
|
59
29
|
}
|
|
60
30
|
else {
|
|
61
31
|
entry.autodrain();
|
|
62
32
|
}
|
|
63
33
|
})
|
|
64
|
-
.on('close',
|
|
34
|
+
.on('close', () => {
|
|
35
|
+
if (partialCumulocityJSONData.length === 0) {
|
|
36
|
+
return reject('No manifest file found in zip file');
|
|
37
|
+
}
|
|
38
|
+
try {
|
|
39
|
+
let partialCumulocityJSONString = '';
|
|
40
|
+
partialCumulocityJSONData.forEach(data => {
|
|
41
|
+
partialCumulocityJSONString += data.toString();
|
|
42
|
+
});
|
|
43
|
+
const fileData = JSON.parse(partialCumulocityJSONString);
|
|
44
|
+
const appDataFromFile = (0, helpers_1.dataToAppData)(fileData);
|
|
45
|
+
const appDataCopy = (0, lodash_1.cloneDeep)(appDataFromFile);
|
|
46
|
+
const name = (0, helpers_1.getName)(appDataCopy, (0, path_1.basename)(path));
|
|
47
|
+
const key = (0, helpers_1.getKey)(appDataCopy, name);
|
|
48
|
+
const contextPath = (0, helpers_1.getContextPath)(appDataCopy, name);
|
|
49
|
+
(0, lodash_1.assign)(appDataCopy, { name, key, contextPath });
|
|
50
|
+
resolve(appDataCopy);
|
|
51
|
+
}
|
|
52
|
+
catch (e) {
|
|
53
|
+
reject(e);
|
|
54
|
+
}
|
|
55
|
+
})
|
|
56
|
+
.on('error', e => reject(e));
|
|
65
57
|
});
|
|
66
58
|
return {
|
|
67
59
|
fileName: (0, path_1.basename)(path),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-as-zip-file.js","sourceRoot":"","sources":["../../../../src/builders/deploy/app-as-zip-file.ts"],"names":[],"mappings":";;;AAAA,mCAA2C;AAC3C,+BAAgC;AAChC,2CAA6D;AAC7D,2BAAgD;AAChD,+CAAmD;AACnD,uCAA2E;AAG3E;;;;;GAKG;AACI,KAAK,UAAU,WAAW,CAAC,IAAY;IAC5C,MAAM,IAAI,GAAG,IAAA,aAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC;IACjC,IAAI,
|
|
1
|
+
{"version":3,"file":"app-as-zip-file.js","sourceRoot":"","sources":["../../../../src/builders/deploy/app-as-zip-file.ts"],"names":[],"mappings":";;;AAAA,mCAA2C;AAC3C,+BAAgC;AAChC,2CAA6D;AAC7D,2BAAgD;AAChD,+CAAmD;AACnD,uCAA2E;AAG3E;;;;;GAKG;AACI,KAAK,UAAU,WAAW,CAAC,IAAY;IAC5C,MAAM,IAAI,GAAG,IAAA,aAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtE,MAAM,yBAAyB,GAAG,IAAI,KAAK,EAAU,CAAC;QACtD,IAAA,qBAAgB,EAAC,IAAI,CAAC;aACnB,IAAI,CAAC,IAAA,oBAAU,GAAE,CAAC;aAClB,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YACnB,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;YAC5B,MAAM,YAAY,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,0BAA0B,CAAC,CAAC,CAAC;YACrF,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAG,YAAY,IAAI,CAAC,QAAQ,CAAC;YAC3C,IAAI,QAAQ,EAAE;gBACZ,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;aAC1E;iBAAM;gBACL,KAAK,CAAC,SAAS,EAAE,CAAC;aACnB;QACH,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAChB,IAAI,yBAAyB,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1C,OAAO,MAAM,CAAC,oCAAoC,CAAC,CAAC;aACrD;YACD,IAAI;gBACF,IAAI,2BAA2B,GAAG,EAAE,CAAC;gBACrC,yBAAyB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBACvC,2BAA2B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACjD,CAAC,CAAC,CAAC;gBACH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;gBACzD,MAAM,eAAe,GAAG,IAAA,uBAAa,EAAC,QAAQ,CAAC,CAAC;gBAChD,MAAM,WAAW,GAAG,IAAA,kBAAS,EAAC,eAAe,CAAC,CAAC;gBAE/C,MAAM,IAAI,GAAG,IAAA,iBAAO,EAAC,WAAW,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CAAC;gBAClD,MAAM,GAAG,GAAG,IAAA,gBAAM,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBACtC,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBACtD,IAAA,eAAM,EAAC,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;gBAEhD,OAAO,CAAC,WAAW,CAAC,CAAC;aACtB;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC;QACxB,IAAI;QACJ,MAAM,EAAE,IAAA,qBAAgB,EAAC,IAAI,CAAC;QAC9B,IAAI;KACL,CAAC;AACJ,CAAC;AAjDD,kCAiDC"}
|
|
@@ -12,10 +12,12 @@ const tsconfig_app_json_1 = require("./configs/tsconfig-app-json");
|
|
|
12
12
|
const utils_1 = require("./utils");
|
|
13
13
|
function ngAdd(options) {
|
|
14
14
|
return async (host, context) => {
|
|
15
|
-
|
|
15
|
+
// need to prefix path with `file:` to make it work on windows
|
|
16
|
+
// otherwise the `c:/` of windows path is interpreted as protocol
|
|
17
|
+
const appPath = `file:${(0, path_1.dirname)(require.resolve(`${options.application}/package.json`))}`;
|
|
16
18
|
context.logger.info('Adding Cumulocity IoT modules to the application...');
|
|
17
19
|
const templateSource = (0, schematics_1.apply)((0, schematics_1.url)(appPath), [
|
|
18
|
-
ignoreFiles(['package.json', '.npmignore', 'node_modules'])
|
|
20
|
+
ignoreFiles(['package.json', '.npmignore', 'node_modules', 'NOTICES'])
|
|
19
21
|
]);
|
|
20
22
|
const alignFileRule = (_tree, _context) => alignFiles(_tree, _context, options);
|
|
21
23
|
return (0, schematics_1.chain)([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAWoC;AACpC,4DAA0E;AAC1E,2EAIkD;AAClD,+BAA+B;AAC/B,yDAA2F;AAC3F,uDAAwD;AACxD,qDAAiD;AACjD,mEAAgE;AAChE,mCAAqC;AAGrC,SAAgB,KAAK,CAAC,OAA+B;IACnD,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@c8y/devkit",
|
|
3
|
-
"version": "1019.0.
|
|
3
|
+
"version": "1019.0.7",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"author": "Cumulocity",
|
|
6
6
|
"description": "Cumulocity Webpack Build Facade",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"@babel/plugin-syntax-dynamic-import": "7.8.3",
|
|
45
45
|
"@babel/plugin-transform-async-to-generator": "^7.18.6",
|
|
46
46
|
"@babel/preset-env": "^7.16.7",
|
|
47
|
-
"@c8y/client": "1019.0.
|
|
47
|
+
"@c8y/client": "1019.0.7",
|
|
48
48
|
"@schematics/angular": "^15.2.6",
|
|
49
49
|
"angular-gettext-tools": "2.5.3",
|
|
50
50
|
"babel-eslint": "10.0.1",
|