@c8y/devkit 1019.13.5 → 1019.18.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/dist/src/builders/BuilderOptions.d.ts +9 -0
- package/dist/src/builders/browser/index.js +33 -2
- package/dist/src/builders/browser/index.js.map +1 -1
- package/dist/src/builders/browser/schema.json +6 -0
- package/dist/src/builders/deploy/deploy-builder.js +16 -3
- package/dist/src/builders/deploy/deploy-builder.js.map +1 -1
- package/dist/src/builders/deploy/schema.json +5 -0
- package/dist/src/builders/dev-server/index.js +19 -20
- package/dist/src/builders/dev-server/index.js.map +1 -1
- package/dist/src/options.d.ts +1 -0
- package/dist/src/options.js +2 -1
- package/dist/src/options.js.map +1 -1
- package/dist/src/webpack/EnvironmentOptions.d.ts +4 -0
- package/dist/src/webpack/EnvironmentOptions.js.map +1 -1
- package/dist/src/webpack/utils/helpers.js +4 -1
- package/dist/src/webpack/utils/helpers.js.map +1 -1
- package/package.json +2 -2
|
@@ -18,6 +18,11 @@ export interface C8yDevServerBuilderOptions extends EnvironmentOptions, DevServe
|
|
|
18
18
|
shell: string;
|
|
19
19
|
}
|
|
20
20
|
export interface C8yBrowserBuilderOptions extends EnvironmentOptions, BrowserBuilderOptions {
|
|
21
|
+
/**
|
|
22
|
+
* Zip option which is false by default. If provided when building, the contents of the built app will be
|
|
23
|
+
* zipped. The zip file will be located in the dist/<<appName>> folder.
|
|
24
|
+
*/
|
|
25
|
+
zip: boolean;
|
|
21
26
|
}
|
|
22
27
|
export interface C8yDeployBuilderOptions extends EnvironmentOptions, BrowserBuilderOptions {
|
|
23
28
|
/**
|
|
@@ -51,6 +56,10 @@ export interface C8yDeployBuilderOptions extends EnvironmentOptions, BrowserBuil
|
|
|
51
56
|
* Tags are received via -t flag when running deploy with ng cli.
|
|
52
57
|
*/
|
|
53
58
|
tags?: string;
|
|
59
|
+
/**
|
|
60
|
+
* Enforce deployment even if the tags exist already. The command will try to remove existing versions with the tag provided with -t.
|
|
61
|
+
*/
|
|
62
|
+
deleteExistingTags?: string;
|
|
54
63
|
/**
|
|
55
64
|
* Property responsible for picking right configuration (development, production) for build.
|
|
56
65
|
* Browser target is not provided in command as a flag. Instead, configuration is, with via flag -c.
|
|
@@ -4,14 +4,45 @@ const architect_1 = require("@angular-devkit/architect");
|
|
|
4
4
|
const lodash_1 = require("lodash");
|
|
5
5
|
const base_1 = require("../../webpack/config/base");
|
|
6
6
|
const build_angular_1 = require("@angular-devkit/build-angular");
|
|
7
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
8
|
+
// @ts-ignore
|
|
9
|
+
const zipdir = require("zip-dir");
|
|
10
|
+
const path = require("path");
|
|
11
|
+
const rxjs_1 = require("rxjs");
|
|
12
|
+
const operators_1 = require("rxjs/operators");
|
|
7
13
|
// Sadly the `Builder` interface is not exported by @angular-devkit/architect
|
|
8
14
|
const builder = (0, architect_1.createBuilder)(buildBuilder);
|
|
9
15
|
exports.default = builder;
|
|
10
|
-
function buildBuilder(options, context) {
|
|
16
|
+
async function buildBuilder(options, context) {
|
|
11
17
|
const cleanedOptions = (0, lodash_1.omitBy)(options, lodash_1.isUndefined);
|
|
12
18
|
const webpackConfig = (0, base_1.webpackConfigurationTransformerWithContext)(cleanedOptions, context);
|
|
13
|
-
return (0, build_angular_1.executeBrowserBuilder)(cleanedOptions, context, {
|
|
19
|
+
return (0, rxjs_1.from)((0, build_angular_1.executeBrowserBuilder)(cleanedOptions, context, {
|
|
14
20
|
webpackConfiguration: webpackConfig
|
|
21
|
+
}))
|
|
22
|
+
.pipe((0, operators_1.switchMap)(async (result) => {
|
|
23
|
+
if (cleanedOptions.zip) {
|
|
24
|
+
await zipOutput(options, context);
|
|
25
|
+
}
|
|
26
|
+
return Promise.resolve(result);
|
|
27
|
+
}))
|
|
28
|
+
.toPromise();
|
|
29
|
+
}
|
|
30
|
+
async function zipOutput(options, context) {
|
|
31
|
+
const outputPath = options.outputPath;
|
|
32
|
+
const lastDirectoryName = path.basename(outputPath);
|
|
33
|
+
const zipFileName = `${lastDirectoryName}.zip`;
|
|
34
|
+
const parentDirectory = path.dirname(outputPath);
|
|
35
|
+
const zipFilePath = path.join(parentDirectory, zipFileName);
|
|
36
|
+
await new Promise((resolve, reject) => {
|
|
37
|
+
zipdir(outputPath, { saveTo: zipFilePath }, (err) => {
|
|
38
|
+
if (err) {
|
|
39
|
+
reject(err);
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
resolve();
|
|
43
|
+
}
|
|
44
|
+
});
|
|
15
45
|
});
|
|
46
|
+
context.logger.info(`${zipFileName} created successfully.`);
|
|
16
47
|
}
|
|
17
48
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/builders/browser/index.ts"],"names":[],"mappings":";;AAAA,yDAA0E;AAC1E,mCAA6C;AAC7C,oDAAuF;AACvF,iEAAsE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/builders/browser/index.ts"],"names":[],"mappings":";;AAAA,yDAA0E;AAC1E,mCAA6C;AAC7C,oDAAuF;AACvF,iEAAsE;AAEtE,6DAA6D;AAC7D,aAAa;AACb,kCAAkC;AAClC,6BAA6B;AAC7B,+BAA4B;AAC5B,8CAA2C;AAE3C,6EAA6E;AAC7E,MAAM,OAAO,GAAY,IAAA,yBAAa,EAAC,YAAY,CAAC,CAAC;AACrD,kBAAe,OAAO,CAAC;AAEvB,KAAK,UAAU,YAAY,CAAC,OAAiC,EAAE,OAAuB;IACpF,MAAM,cAAc,GAAG,IAAA,eAAM,EAAC,OAAO,EAAE,oBAAW,CAA6B,CAAC;IAChF,MAAM,aAAa,GAAG,IAAA,iDAA0C,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE1F,OAAO,IAAA,WAAI,EACT,IAAA,qCAAqB,EAAC,cAAc,EAAE,OAAO,EAAE;QAC7C,oBAAoB,EAAE,aAAa;KACpC,CAAC,CACH;SACE,IAAI,CACH,IAAA,qBAAS,EAAC,KAAK,EAAC,MAAM,EAAC,EAAE;QACvB,IAAI,cAAc,CAAC,GAAG,EAAE;YACtB,MAAM,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACnC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC,CAAC,CACH;SACA,SAAS,EAAE,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,OAAiC,EAAE,OAAuB;IACjF,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACtC,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,GAAG,iBAAiB,MAAM,CAAC;IAC/C,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAE5D,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,CAAC,GAAQ,EAAE,EAAE;YACvD,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,EAAE,CAAC;aACX;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,wBAAwB,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -457,6 +457,12 @@
|
|
|
457
457
|
"description": "The default url to proxy to.",
|
|
458
458
|
"default": "https://unknown.cumulocity.com",
|
|
459
459
|
"alias": "u"
|
|
460
|
+
},
|
|
461
|
+
"zip": {
|
|
462
|
+
"type": "boolean",
|
|
463
|
+
"description": "Determines if the output should be compressed into a .zip file. By default, this option is set to 'false'",
|
|
464
|
+
"default": "false",
|
|
465
|
+
"alias": "z"
|
|
460
466
|
}
|
|
461
467
|
},
|
|
462
468
|
"additionalProperties": false,
|
|
@@ -98,13 +98,17 @@ async function createClient({ user, password, url: baseUrl, tenant }) {
|
|
|
98
98
|
async function deploy({ json, buffer, fileName, size }) {
|
|
99
99
|
const application = await getApplicationOrCreateIfNotExists(json);
|
|
100
100
|
const uploadedFile = await uploadApplication(application, buffer, fileName, size);
|
|
101
|
-
|
|
101
|
+
const isFirstVersion = !application.applicationVersions || application.applicationVersions.length === 0;
|
|
102
|
+
const hasLatestTag = builderOptions.tags && builderOptions.tags.indexOf('latest') >= 0;
|
|
103
|
+
// packages will be only activated if tag is set to latest
|
|
104
|
+
// or if this is the first version of the package
|
|
105
|
+
if (application.isPackage && (isFirstVersion || hasLatestTag)) {
|
|
102
106
|
await client.application.update({
|
|
103
107
|
id: application.id,
|
|
104
108
|
activeVersionId: uploadedFile.binaryId
|
|
105
109
|
});
|
|
106
110
|
}
|
|
107
|
-
|
|
111
|
+
if (!application.isPackage) {
|
|
108
112
|
await activateBinary(uploadedFile, application);
|
|
109
113
|
}
|
|
110
114
|
if (json.type === 'HOSTED' && json.availability === client_1.ApplicationAvailability.MARKET) {
|
|
@@ -141,11 +145,20 @@ async function uploadApplication(application, buffer, filePath, size) {
|
|
|
141
145
|
}
|
|
142
146
|
try {
|
|
143
147
|
const msg = options_1.options['TXT.APP_UPLOADING'](buffer.length || size);
|
|
144
|
-
const tags = builderOptions
|
|
148
|
+
const { tags, deleteExistingTags } = builderOptions;
|
|
145
149
|
if (tags && !application.isPackage) {
|
|
146
150
|
console.info(chalk.yellow(options_1.options['TXT.NOT_PACKAGE_WARNING']));
|
|
147
151
|
}
|
|
148
152
|
console.info(chalk.green(msg));
|
|
153
|
+
if (tags && deleteExistingTags) {
|
|
154
|
+
console.info(chalk.yellow(options_1.options['TXT.DELETE_EXISTING_TAG_WARNING']));
|
|
155
|
+
const appVersions = application.applicationVersions?.filter(version => version.tags && version.tags.some(tag => tags.indexOf(tag) > -1));
|
|
156
|
+
if (appVersions && appVersions?.length > 0) {
|
|
157
|
+
for (const appVersion of appVersions) {
|
|
158
|
+
await client.application.deleteVersionPackage(application, appVersion);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}
|
|
149
162
|
const uploadOverrides = getPackageUploadOverrides(application);
|
|
150
163
|
const { data } = await client.application
|
|
151
164
|
.binary(application)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-builder.js","sourceRoot":"","sources":["../../../../src/builders/deploy/deploy-builder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"deploy-builder.js","sourceRoot":"","sources":["../../../../src/builders/deploy/deploy-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,11 @@
|
|
|
34
34
|
"description": "Tags for package applications. To provide multiple tags, separate them with \",\"",
|
|
35
35
|
"alias": "t"
|
|
36
36
|
},
|
|
37
|
+
"deleteExistingTags": {
|
|
38
|
+
"type": "boolean",
|
|
39
|
+
"description": "Enforce deployment even if the tags exist already. The command will try to remove existing versions with the tag provided with -t.",
|
|
40
|
+
"alias": "d"
|
|
41
|
+
},
|
|
37
42
|
"browserTarget": {
|
|
38
43
|
"type": "string",
|
|
39
44
|
"description": "The target string for the build"
|
|
@@ -12,56 +12,55 @@ const builder = (0, architect_1.createBuilder)(devServerBuilder);
|
|
|
12
12
|
exports.default = builder;
|
|
13
13
|
function devServerBuilder(options, context) {
|
|
14
14
|
const webpackConfig = (0, base_1.webpackConfigurationTransformerWithContextForDevServer)(options, context);
|
|
15
|
-
|
|
15
|
+
let migratedOptions;
|
|
16
|
+
const result = (0, rxjs_1.from)((0, helpers_1.getOptionsFromContext)(context)).pipe((0, operators_1.map)((env) => (0, helpers_1.migrateDeprecatedDevServerOptions)(options, env)), (0, operators_1.tap)((options) => (migratedOptions = options)), (0, operators_1.switchMap)((options) => (0, build_angular_1.executeDevServerBuilder)(options, context, {
|
|
16
17
|
webpackConfiguration: webpackConfig,
|
|
17
|
-
logging: (stats,
|
|
18
|
+
logging: (stats, _) => {
|
|
18
19
|
if (stats.hasWarnings()) {
|
|
19
20
|
context.logger.warn(stats.toString(), stats.toJson());
|
|
20
21
|
}
|
|
21
22
|
if (stats.hasErrors()) {
|
|
22
23
|
context.logger.error(stats.toString(), stats.toJson());
|
|
23
24
|
}
|
|
24
|
-
if (!stats.hasErrors()) {
|
|
25
|
-
context.logger.info(getSuccessLog(options, configuration));
|
|
26
|
-
}
|
|
27
25
|
}
|
|
28
26
|
})));
|
|
29
|
-
return result
|
|
27
|
+
return result.pipe((0, operators_1.tap)((value) => {
|
|
28
|
+
if (value.webpackStats && !value.webpackStats.errorsCount) {
|
|
29
|
+
context.logger.info(getSuccessLog(migratedOptions, value.baseUrl));
|
|
30
|
+
}
|
|
31
|
+
}));
|
|
30
32
|
}
|
|
31
33
|
/**
|
|
32
34
|
* Returns a success message with the relevant URLs.
|
|
33
35
|
* @param options The current build options.
|
|
34
|
-
* @param
|
|
35
|
-
* @param env The currently build env options.
|
|
36
|
+
* @param devServerUrl Current dev server url path.
|
|
36
37
|
* @returns A success message with relevant urls.
|
|
37
38
|
*/
|
|
38
|
-
function getSuccessLog(options,
|
|
39
|
-
|
|
40
|
-
const serverUrl = `http://localhost:${configuration.devServer?.port || options.port}`;
|
|
41
|
-
const loggingStr = `
|
|
39
|
+
function getSuccessLog(options, devServerUrl) {
|
|
40
|
+
return `
|
|
42
41
|
✅ ****** c8y build ${chalk.green('successfully')} ******\n
|
|
43
|
-
💻 Dev server running: ${chalk.bold(chalk.underline(
|
|
42
|
+
💻 Dev server running: ${chalk.bold(chalk.underline(devServerUrl))}
|
|
44
43
|
👉 Proxy pointing to: ${chalk.bold(options.url)}
|
|
45
44
|
${options.shell
|
|
46
|
-
? `🐚 Shell pointing to: ${chalk.underline(getModuleFederationShellLog(
|
|
45
|
+
? `🐚 Shell pointing to: ${chalk.underline(getModuleFederationShellLog(devServerUrl, options))}`
|
|
47
46
|
: ''}
|
|
48
47
|
\n✅ ***** -------------------------- *****
|
|
49
48
|
`;
|
|
50
|
-
return loggingStr;
|
|
51
49
|
}
|
|
52
50
|
/**
|
|
53
51
|
* Logs a message with all exported module federation modules as URL parameter.
|
|
54
|
-
* @param
|
|
55
|
-
* @param
|
|
56
|
-
* @param env The env options to get the exports from.
|
|
52
|
+
* @param devServerUrl The current server url.
|
|
53
|
+
* @param options The current build options.
|
|
57
54
|
* @returns A URL which points to the remotes via URL parameter.
|
|
58
55
|
*/
|
|
59
|
-
function getModuleFederationShellLog(
|
|
56
|
+
function getModuleFederationShellLog(devServerUrl, options) {
|
|
57
|
+
const urlObj = new URL(devServerUrl);
|
|
58
|
+
const baseUrl = `${urlObj.protocol}//${urlObj.hostname}${urlObj.port ? ':' + urlObj.port : ''}`;
|
|
60
59
|
const shellRemotes = {
|
|
61
60
|
[options.runTime.contextPath]: (options.runTime?.exports || []).map(remoteExport => remoteExport.module)
|
|
62
61
|
};
|
|
63
62
|
const encodedRemotes = encodeURIComponent(JSON.stringify(shellRemotes));
|
|
64
|
-
const moduleFederationShellAppProxyUrl = `${
|
|
63
|
+
const moduleFederationShellAppProxyUrl = `${baseUrl}/apps/${options.shell}/index.html?remotes=${encodedRemotes}`;
|
|
65
64
|
return moduleFederationShellAppProxyUrl;
|
|
66
65
|
}
|
|
67
66
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/builders/dev-server/index.ts"],"names":[],"mappings":";;AAAA,yDAA0E;AAC1E,iEAAwE;AACxE,+BAA+B;AAC/B,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/builders/dev-server/index.ts"],"names":[],"mappings":"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"}
|
package/dist/src/options.d.ts
CHANGED
package/dist/src/options.js
CHANGED
|
@@ -93,6 +93,7 @@ exports.options = {
|
|
|
93
93
|
'TXT.VERBOSE': 'Adds more details to output logging',
|
|
94
94
|
'TXT.NONEXISTING_VERSION': 'The selected version doest not exist.',
|
|
95
95
|
'TXT.SHELL': 'Proxied module federation shell application.',
|
|
96
|
-
'TXT.REQUIRED_OPTION': (prop) => `Property "${prop}" is required
|
|
96
|
+
'TXT.REQUIRED_OPTION': (prop) => `Property "${prop}" is required.`,
|
|
97
|
+
'TXT.DELETE_EXISTING_TAG_WARNING': 'Deleting the existing tag.'
|
|
97
98
|
};
|
|
98
99
|
//# sourceMappingURL=options.js.map
|
package/dist/src/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/options.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/options.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,10 @@ export type RunTimeOptions = Omit<ApplicationOptions, toOmitRunTimeOptions>;
|
|
|
12
12
|
* Options that define, how the app should act on build time (while build with webpack).
|
|
13
13
|
*/
|
|
14
14
|
export type BuildTimeOptions = Partial<WebpackOptions> & Pick<ApplicationOptions, toOmitRunTimeOptions>;
|
|
15
|
+
/**
|
|
16
|
+
* The configuration options for the application defined in the cumulocity.config.ts file.
|
|
17
|
+
*/
|
|
18
|
+
export type ConfigurationOptions = EnvironmentOptions | (() => Promise<EnvironmentOptions>) | (() => EnvironmentOptions);
|
|
15
19
|
/**
|
|
16
20
|
* All runtime and build time options combined.
|
|
17
21
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentOptions.js","sourceRoot":"","sources":["../../../src/webpack/EnvironmentOptions.ts"],"names":[],"mappings":";;;AAKa,QAAA,iBAAiB,GAAG;IAC/B,eAAe;IACf,cAAc;IACd,aAAa;IACb,eAAe;IACf,YAAY;IACZ,MAAM;CACmC,CAAC;
|
|
1
|
+
{"version":3,"file":"EnvironmentOptions.js","sourceRoot":"","sources":["../../../src/webpack/EnvironmentOptions.ts"],"names":[],"mappings":";;;AAKa,QAAA,iBAAiB,GAAG;IAC/B,eAAe;IACf,cAAc;IACd,aAAa;IACb,eAAe;IACf,YAAY;IACZ,MAAM;CACmC,CAAC;AA2B5C,MAAa,cAAc;CA8G1B;AA9GD,wCA8GC"}
|
|
@@ -110,10 +110,13 @@ async function getPackageOptions(path) {
|
|
|
110
110
|
};
|
|
111
111
|
return newOptions;
|
|
112
112
|
}
|
|
113
|
-
|
|
113
|
+
let optionsFromTsConfigFile = result?.config;
|
|
114
114
|
if (!optionsFromTsConfigFile) {
|
|
115
115
|
throw new Error(`The configuration file seems to be empty ${result?.filepath}`);
|
|
116
116
|
}
|
|
117
|
+
if ((0, lodash_1.isFunction)(optionsFromTsConfigFile)) {
|
|
118
|
+
optionsFromTsConfigFile = await Promise.resolve(optionsFromTsConfigFile());
|
|
119
|
+
}
|
|
117
120
|
if (!optionsFromTsConfigFile?.buildTime) {
|
|
118
121
|
optionsFromTsConfigFile.buildTime = {};
|
|
119
122
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../src/webpack/utils/helpers.ts"],"names":[],"mappings":";;;;AACA,+CAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../src/webpack/utils/helpers.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.
|
|
3
|
+
"version": "1019.18.0",
|
|
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.23.8",
|
|
47
|
-
"@c8y/client": "1019.
|
|
47
|
+
"@c8y/client": "1019.18.0",
|
|
48
48
|
"@schematics/angular": "^15.2.6",
|
|
49
49
|
"angular-gettext-tools": "2.5.3",
|
|
50
50
|
"babel-eslint": "10.0.1",
|