@c8y/devkit 1019.2.9 → 1019.4.8
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/schematics/ng-add/index.js +0 -1
- package/dist/src/schematics/ng-add/index.js.map +1 -1
- package/dist/src/webpack/ApplicationOptions.d.ts +23 -1
- package/dist/src/webpack/EnvironmentOptions.d.ts +10 -4
- package/dist/src/webpack/EnvironmentOptions.js.map +1 -1
- package/dist/src/webpack/config/base.js +0 -3
- package/dist/src/webpack/config/base.js.map +1 -1
- package/dist/src/webpack/plugin/plugin.d.ts +3 -0
- package/dist/src/webpack/utils/federationUtils.js +39 -26
- package/dist/src/webpack/utils/federationUtils.js.map +1 -1
- package/dist/src/webpack/utils/helpers.js +14 -1
- package/dist/src/webpack/utils/helpers.js.map +1 -1
- package/package.json +9 -9
- package/dist/src/webpack/config/favicon.d.ts +0 -2
- package/dist/src/webpack/config/favicon.js +0 -20
- package/dist/src/webpack/config/favicon.js.map +0 -1
|
@@ -58,7 +58,6 @@ function alignFiles(tree, context, options) {
|
|
|
58
58
|
*/
|
|
59
59
|
context.logger.info('Removing files...');
|
|
60
60
|
(0, utils_1.deleteFile)(tree, `${projectSourceRoot}/app/app.component`);
|
|
61
|
-
(0, utils_1.deleteFile)(tree, `${projectSourceRoot}/favicon.ico`);
|
|
62
61
|
/**
|
|
63
62
|
* Update dependencies
|
|
64
63
|
*/
|
|
@@ -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,8DAA8D;QAC9D,iEAAiE;QACjE,MAAM,OAAO,GAAG,QAAQ,IAAA,cAAO,EAAC,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,CAAC,EAAE,CAAC;QAE1F,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;QAE3E,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,OAAO,CAAC,EAAE;YACzC,WAAW,CAAC,CAAC,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;SACvE,CAAC,CAAC;QACH,MAAM,aAAa,GAAS,CAAC,KAAW,EAAE,QAA0B,EAAE,EAAE,CACtE,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEvC,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,2BAAc,EAAC,IAAA,sBAAS,EAAC,cAAc,EAAE,0BAAa,CAAC,SAAS,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC;YAC3F,aAAa;SACd,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAnBD,sBAmBC;AAED,SAAS,UAAU,CAAC,IAAU,EAAE,OAAyB,EAAE,OAA+B;IACxF,8DAA8D;IAC9D,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,CAAC;IAEtE,8BAA8B;IAC9B,MAAM,iBAAiB,GAAG,IAAA,6BAAc,EAAC,IAAI,CAAC,EAAE,QAAQ,CACtD,IAAA,6BAAc,EAAC,IAAI,EAAE,OAAO,EAAE,OAAiB,CAAC,CACjD,EAAE,UAAoB,CAAC;IACxB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,iBAAiB,EAAE,CAAC,CAAC;IAElE;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAEzC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAChD,IAAA,gCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IAClD,IAAA,qCAAiB,EAAC,IAAI,CAAC,CAAC;IAExB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAC9C,IAAA,sBAAS,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAEnC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACzC,IAAA,kBAAU,EAAC,IAAI,EAAE,GAAG,iBAAiB,oBAAoB,CAAC,CAAC;
|
|
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,8DAA8D;QAC9D,iEAAiE;QACjE,MAAM,OAAO,GAAG,QAAQ,IAAA,cAAO,EAAC,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,CAAC,EAAE,CAAC;QAE1F,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;QAE3E,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,OAAO,CAAC,EAAE;YACzC,WAAW,CAAC,CAAC,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;SACvE,CAAC,CAAC;QACH,MAAM,aAAa,GAAS,CAAC,KAAW,EAAE,QAA0B,EAAE,EAAE,CACtE,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEvC,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,2BAAc,EAAC,IAAA,sBAAS,EAAC,cAAc,EAAE,0BAAa,CAAC,SAAS,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC;YAC3F,aAAa;SACd,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAnBD,sBAmBC;AAED,SAAS,UAAU,CAAC,IAAU,EAAE,OAAyB,EAAE,OAA+B;IACxF,8DAA8D;IAC9D,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,CAAC;IAEtE,8BAA8B;IAC9B,MAAM,iBAAiB,GAAG,IAAA,6BAAc,EAAC,IAAI,CAAC,EAAE,QAAQ,CACtD,IAAA,6BAAc,EAAC,IAAI,EAAE,OAAO,EAAE,OAAiB,CAAC,CACjD,EAAE,UAAoB,CAAC;IACxB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,iBAAiB,EAAE,CAAC,CAAC;IAElE;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAEzC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAChD,IAAA,gCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IAClD,IAAA,qCAAiB,EAAC,IAAI,CAAC,CAAC;IAExB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAC9C,IAAA,sBAAS,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAEnC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACzC,IAAA,kBAAU,EAAC,IAAI,EAAE,GAAG,iBAAiB,oBAAoB,CAAC,CAAC;IAE3D;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IAClD,MAAM,YAAY,GAAqB,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAC1F,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACpB,IAAI;QACJ,OAAO,EAAE,OAAiB;QAC1B,IAAI,EAAE,iCAAkB,CAAC,OAAO;QAChC,SAAS,EAAE,IAAI;KAChB,CAAC,CACH,CAAC;IAEF,MAAM,eAAe,GAAqB,MAAM,CAAC,OAAO,CACtD,cAAc,CAAC,eAAe,IAAI,EAAE,CACrC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1B,IAAI;QACJ,OAAO,EAAE,OAAiB;QAC1B,IAAI,EAAE,iCAAkB,CAAC,GAAG;QAC5B,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC,CAAC;IAEJ,CAAC,GAAG,YAAY,EAAE,GAAG,eAAe,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACzD,IAAA,uCAAwB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;IAC9C,OAAO,IAAI,CAAC;AACd,CAAC;AAED,yCAAyC;AACzC,SAAS,WAAW,CAAC,QAAkB;IACrC,OAAO,IAAA,mBAAM,EAAC,CAAC,IAAY,EAAE,EAAE;QAC7B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACpD,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IApplication } from '@c8y/client';
|
|
1
|
+
import { IApplication, VersioningMatrix } from '@c8y/client';
|
|
2
2
|
import type { PluginsExports } from './EnvironmentOptions';
|
|
3
3
|
import type { Pattern } from 'copy-webpack-plugin';
|
|
4
4
|
export interface ApplicationOptions {
|
|
@@ -245,6 +245,28 @@ export interface ApplicationOptions {
|
|
|
245
245
|
* The name of the root element. By default c8y-bootstrap.
|
|
246
246
|
*/
|
|
247
247
|
rootTagName?: string;
|
|
248
|
+
/**
|
|
249
|
+
* A matrix of versions indicating which versions of the application (key) are dependent on which version of a cumulocity component (API version and Web SDK version of the shell application currently supported, indicated by the value).
|
|
250
|
+
* The versions of the dependent components can be indicated by a semver range.
|
|
251
|
+
* @example
|
|
252
|
+
* ```json
|
|
253
|
+
* {
|
|
254
|
+
* "1.0.0": {
|
|
255
|
+
* "sdk": ">=1016.0.0 <1017.0.0",
|
|
256
|
+
* "api": ">=1016.0.0 <1017.0.0"
|
|
257
|
+
* },
|
|
258
|
+
* "2.0.0": {
|
|
259
|
+
* "sdk": "~1017.0.0",
|
|
260
|
+
* "api": "~1017.0.0"
|
|
261
|
+
* },
|
|
262
|
+
* "3.0.0": {
|
|
263
|
+
* "sdk": ">=1018.0.0",
|
|
264
|
+
* "api": ">=1018.0.0"
|
|
265
|
+
* },
|
|
266
|
+
* }
|
|
267
|
+
* ```
|
|
268
|
+
*/
|
|
269
|
+
versioningMatrix?: VersioningMatrix;
|
|
248
270
|
}
|
|
249
271
|
export interface MapDefaultConfig {
|
|
250
272
|
/**
|
|
@@ -57,10 +57,16 @@ export declare class WebpackOptions {
|
|
|
57
57
|
url?: string;
|
|
58
58
|
/** Path to the branding entry file. (Set it to false to disable any styling. You can handle the styling then on your own e.g. in an angular.json file using ng-cli) */
|
|
59
59
|
brandingEntry?: string | boolean;
|
|
60
|
-
/**
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
60
|
+
/**
|
|
61
|
+
* Enables or disables source maps for scripts.
|
|
62
|
+
* @deprecated Configure this in the dev server options of the angular.json @see https://angular.io/guide/workspace-config#source-map-configuration
|
|
63
|
+
*/
|
|
64
|
+
sourceMap?: boolean;
|
|
65
|
+
/**
|
|
66
|
+
* Enable or disable source maps for Less.
|
|
67
|
+
* @deprecated Configure this in the dev server options of the angular.json @see https://angular.io/guide/workspace-config#source-map-configuration
|
|
68
|
+
*/
|
|
69
|
+
sourceMapLess?: boolean;
|
|
64
70
|
/** Extra webpack options
|
|
65
71
|
* Could be:
|
|
66
72
|
* - a string path to the file with additional webpack options (as function or as object)
|
|
@@ -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;AAmB5C,MAAa,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;AAmB5C,MAAa,cAAc;CA8G1B;AA9GD,wCA8GC"}
|
|
@@ -12,7 +12,6 @@ const plugin_1 = require("./plugin");
|
|
|
12
12
|
const production_1 = require("./production");
|
|
13
13
|
const styles_1 = require("./styles");
|
|
14
14
|
const translation_1 = require("./translation");
|
|
15
|
-
const favicon_1 = require("./favicon");
|
|
16
15
|
const lodash_1 = require("lodash");
|
|
17
16
|
const extra_1 = require("./extra");
|
|
18
17
|
/**
|
|
@@ -76,7 +75,6 @@ async function webpackConfigurationTransformer(baseWebpackConfig, browserBuilder
|
|
|
76
75
|
const legacyConfig = (0, legacy_1.config)();
|
|
77
76
|
const stylesConfig = (0, styles_1.config)(envOptions, c8yWebpackConfig);
|
|
78
77
|
const federationConfig = (0, federationUtils_1.buildConfigForFederation)(c8yWebpackConfig);
|
|
79
|
-
const faviconConfig = (0, favicon_1.config)();
|
|
80
78
|
const ignoreWarnings = [
|
|
81
79
|
{
|
|
82
80
|
message: /.*? part of the TypeScript compilation but it's unused\./
|
|
@@ -97,7 +95,6 @@ async function webpackConfigurationTransformer(baseWebpackConfig, browserBuilder
|
|
|
97
95
|
legacyConfig,
|
|
98
96
|
stylesConfig,
|
|
99
97
|
federationConfig,
|
|
100
|
-
faviconConfig,
|
|
101
98
|
{
|
|
102
99
|
watchOptions: {
|
|
103
100
|
aggregateTimeout: 600,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/webpack/config/base.ts"],"names":[],"mappings":";;;AAAA,yDAAmF;AAEnF,iDAAsD;AACtD,8DAAoE;AACpE,8CAK0B;AAC1B,mCAAqD;AACrD,+CAAyD;AACzD,qCAAuD;AACvD,qCAAuD;AACvD,6CAAuD;AACvD,qCAAuD;AACvD,+CAAiE;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/webpack/config/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -110,6 +110,7 @@ export declare class CumulocityPlugin {
|
|
|
110
110
|
mapConfig?: import("../ApplicationOptions").MapDefaultConfig | undefined;
|
|
111
111
|
mapNominatimUrl?: string | undefined;
|
|
112
112
|
rootTagName?: string | undefined;
|
|
113
|
+
versioningMatrix?: import("packages/client/lib").VersioningMatrix | undefined;
|
|
113
114
|
modules: never[];
|
|
114
115
|
core_path: string;
|
|
115
116
|
data_path: string;
|
|
@@ -176,6 +177,7 @@ export declare class CumulocityPlugin {
|
|
|
176
177
|
mapConfig?: import("../ApplicationOptions").MapDefaultConfig | undefined;
|
|
177
178
|
mapNominatimUrl?: string | undefined;
|
|
178
179
|
rootTagName?: string | undefined;
|
|
180
|
+
versioningMatrix?: import("packages/client/lib").VersioningMatrix | undefined;
|
|
179
181
|
};
|
|
180
182
|
languagesKeys(): string[];
|
|
181
183
|
languages(appLanguages?: {
|
|
@@ -246,6 +248,7 @@ export declare class CumulocityPlugin {
|
|
|
246
248
|
mapConfig?: import("../ApplicationOptions").MapDefaultConfig | undefined;
|
|
247
249
|
mapNominatimUrl?: string | undefined;
|
|
248
250
|
rootTagName?: string | undefined;
|
|
251
|
+
versioningMatrix?: import("packages/client/lib").VersioningMatrix | undefined;
|
|
249
252
|
};
|
|
250
253
|
copyDefinitionToImports(copy: any, context: any): Promise<string[]>;
|
|
251
254
|
copyProcessCwd(cwd: string, context: string): string;
|
|
@@ -42,7 +42,7 @@ const dontResolveVersion = {
|
|
|
42
42
|
rxjs: true
|
|
43
43
|
};
|
|
44
44
|
// Todo, check if still valid.
|
|
45
|
-
const snapshotRegexp = new RegExp(
|
|
45
|
+
const snapshotRegexp = new RegExp(/-.*$/);
|
|
46
46
|
function getSharedDependencies(buildOptions) {
|
|
47
47
|
const rootPackageJsonPath = getRootPackageJsonPath(buildOptions);
|
|
48
48
|
const sharedDependenciesFromPackageJson = resolveDependencies(path.resolve(rootPackageJsonPath, 'package.json'));
|
|
@@ -110,20 +110,7 @@ function getRootPackageJsonPath(env) {
|
|
|
110
110
|
}
|
|
111
111
|
function resolveDependencies(filePath) {
|
|
112
112
|
const packageJson = fs.readJsonSync(filePath);
|
|
113
|
-
|
|
114
|
-
// In our mono-repo the dependencies are in a folder one level up.
|
|
115
|
-
try {
|
|
116
|
-
const parentPath = path.join(filePath, '..', '..', 'package.json');
|
|
117
|
-
if (fileExist(parentPath)) {
|
|
118
|
-
const packageParentJson = fs.readJsonSync(parentPath);
|
|
119
|
-
if (packageParentJson.name === '@c8y/apps') {
|
|
120
|
-
dependencies = packageParentJson.dependencies;
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
catch (ex) {
|
|
125
|
-
dependencies = packageJson.dependencies;
|
|
126
|
-
}
|
|
113
|
+
const dependencies = packageJson.dependencies;
|
|
127
114
|
// ngx-components sadly has atm it's own dependencies (should be shared dependencies)
|
|
128
115
|
// the following function resolves them to also share them in a module federation setup.
|
|
129
116
|
const ngxComponentsDependencies = resolveDependenciesFromNgxComponents() || {};
|
|
@@ -143,11 +130,7 @@ function resolveDependenciesFromNgxComponents() {
|
|
|
143
130
|
function getDependenciesWithSubmodules(dependenciesWithResolvedPaths) {
|
|
144
131
|
return dependenciesWithResolvedPaths.map(resolvedDependency => {
|
|
145
132
|
const { path: depPath } = resolvedDependency;
|
|
146
|
-
|
|
147
|
-
if (resolvedDependency.name.match('ngx-components')) {
|
|
148
|
-
// getC8ySubmoduleName transforms ngx-components submodules names into @c8y/ngx-components/... form.
|
|
149
|
-
submodules = submodules.map(submodule => getC8ySubmoduleName(submodule, 'ngx-components'));
|
|
150
|
-
}
|
|
133
|
+
const submodules = getRawSubmodules(depPath);
|
|
151
134
|
if (submodules.length > 0) {
|
|
152
135
|
return { dependency: resolvedDependency, submodules };
|
|
153
136
|
}
|
|
@@ -187,17 +170,47 @@ function getRequiredVersionPrefix(dependency, version, originalVersion) {
|
|
|
187
170
|
}
|
|
188
171
|
return '~';
|
|
189
172
|
}
|
|
190
|
-
function getC8ySubmoduleName(submodule, submoduleName) {
|
|
191
|
-
const tokens = submodule.split('/');
|
|
192
|
-
const index = tokens.indexOf(submoduleName);
|
|
193
|
-
const ngxComponentsSubmodule = tokens.slice(index + 1, tokens.length).join('/');
|
|
194
|
-
return `@c8y/ngx-components/${ngxComponentsSubmodule}`;
|
|
195
|
-
}
|
|
196
173
|
function getRawSubmodules(depResolvedPath) {
|
|
174
|
+
// ngx-components might be inside of the monorepo... here we need to do special handling
|
|
175
|
+
// as the exports are not on the root, they are in the dist folder:
|
|
176
|
+
if (depResolvedPath.match(/packages[\/\\]ngx-components/)) {
|
|
177
|
+
depResolvedPath = path.join(depResolvedPath, 'dist');
|
|
178
|
+
}
|
|
179
|
+
let packageJson;
|
|
180
|
+
try {
|
|
181
|
+
packageJson = fs.readJSONSync(path.resolve(depResolvedPath, 'package.json'));
|
|
182
|
+
}
|
|
183
|
+
catch (ex) {
|
|
184
|
+
console.debug(`${depResolvedPath} package.json not found`);
|
|
185
|
+
}
|
|
186
|
+
if (packageJson?.exports) {
|
|
187
|
+
let submodules = getSubmodulesViaPackageJsonExports(packageJson.exports, packageJson.name);
|
|
188
|
+
// filter out the .po files, as they are otherwise causing issues with module federation
|
|
189
|
+
if (packageJson.name === '@c8y/ngx-components') {
|
|
190
|
+
submodules = submodules.filter(submodule => !submodule.endsWith('.po'));
|
|
191
|
+
}
|
|
192
|
+
return submodules;
|
|
193
|
+
}
|
|
197
194
|
return findSecondaries(depResolvedPath, excludedSubDependencies)
|
|
198
195
|
.filter(submodule => isDistFolderDependency(submodule))
|
|
199
196
|
.map(submodule => getSubmoduleNestedUpToFourLevelsDeep(submodule));
|
|
200
197
|
}
|
|
198
|
+
function getSubmodulesViaPackageJsonExports(exports, name) {
|
|
199
|
+
// see: https://github.com/angular-architects/module-federation-plugin/blob/53a9aa740475b87f689a5781847d418e66b44226/libs/mf/src/utils/share-utils.ts#L189C3-L195C5
|
|
200
|
+
const keys = Object.keys(exports).filter(key => key != '.' &&
|
|
201
|
+
key != './package.json' &&
|
|
202
|
+
!key.endsWith('*') &&
|
|
203
|
+
(exports[key]['default'] || typeof exports[key] === 'string'));
|
|
204
|
+
const result = [];
|
|
205
|
+
for (const key of keys) {
|
|
206
|
+
const secondaryName = path.join(name, key).split(path.sep).join(path.posix.sep);
|
|
207
|
+
if (excludedSubDependencies.includes(secondaryName)) {
|
|
208
|
+
continue;
|
|
209
|
+
}
|
|
210
|
+
result.push(secondaryName);
|
|
211
|
+
}
|
|
212
|
+
return result;
|
|
213
|
+
}
|
|
201
214
|
function isDistFolderDependency(submodule) {
|
|
202
215
|
return !submodule.match('/dist');
|
|
203
216
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"federationUtils.js","sourceRoot":"","sources":["../../../../src/webpack/utils/federationUtils.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,+BAA+B;AAC/B,mCAA2C;AAC3C,sFAAsF;AACtF,0DAA0D;AAC1D,qIAAqI;AACrI,qDAAqD;AACrD,+BAA+B;AAoB/B,SAAgB,wBAAwB,CAAC,aAA4B;IACnE,MAAM,EAAE,KAAK,EAAE,GAAQ,aAAa,CAAC;IACrC;;;;OAIG;IACH,IAAI,KAAK,EAAE,SAAS,EAAE;QACpB,OAAO,KAAK,CAAC,SAAS,CAAC;KACxB;IACD,OAAO;QACL,MAAM,EAAE;YACN,GAAG,aAAa,CAAC,MAAM;YACvB,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,iBAAiB;SAC9B;QACD,YAAY,EAAE;YACZ,GAAG,aAAa,CAAC,YAAY;YAC7B,YAAY,EAAE,KAAK;SACpB;KACF,CAAC;AACJ,CAAC;AArBD,4DAqBC;AAYD,MAAM,uBAAuB,GAAa,EAAE,CAAC;AAE7C,MAAM,uBAAuB,GAA+B;IAC1D,mBAAmB,EAAE,IAAI;IACzB,SAAS,EAAE,IAAI;IACf,KAAK,EAAE,IAAI;CACZ,CAAC;AAEF,MAAM,kBAAkB,GAA+B;IACrD,IAAI,EAAE,IAAI;CACX,CAAC;AAEF,8BAA8B;AAC9B,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"federationUtils.js","sourceRoot":"","sources":["../../../../src/webpack/utils/federationUtils.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,+BAA+B;AAC/B,mCAA2C;AAC3C,sFAAsF;AACtF,0DAA0D;AAC1D,qIAAqI;AACrI,qDAAqD;AACrD,+BAA+B;AAoB/B,SAAgB,wBAAwB,CAAC,aAA4B;IACnE,MAAM,EAAE,KAAK,EAAE,GAAQ,aAAa,CAAC;IACrC;;;;OAIG;IACH,IAAI,KAAK,EAAE,SAAS,EAAE;QACpB,OAAO,KAAK,CAAC,SAAS,CAAC;KACxB;IACD,OAAO;QACL,MAAM,EAAE;YACN,GAAG,aAAa,CAAC,MAAM;YACvB,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,iBAAiB;SAC9B;QACD,YAAY,EAAE;YACZ,GAAG,aAAa,CAAC,YAAY;YAC7B,YAAY,EAAE,KAAK;SACpB;KACF,CAAC;AACJ,CAAC;AArBD,4DAqBC;AAYD,MAAM,uBAAuB,GAAa,EAAE,CAAC;AAE7C,MAAM,uBAAuB,GAA+B;IAC1D,mBAAmB,EAAE,IAAI;IACzB,SAAS,EAAE,IAAI;IACf,KAAK,EAAE,IAAI;CACZ,CAAC;AAEF,MAAM,kBAAkB,GAA+B;IACrD,IAAI,EAAE,IAAI;CACX,CAAC;AAEF,8BAA8B;AAC9B,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;AAE1C,SAAgB,qBAAqB,CAAC,YAAsC;IAC1E,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,YAAY,CAAC,CAAC;IACjE,MAAM,iCAAiC,GAAG,mBAAmB,CAC3D,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAClD,CAAC;IACF,MAAM,YAAY,GAAiB,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC;SAC9E,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,qCAAqC,CAAC,GAAG,CAAC,CAAC;SACtD,MAAM,CAAC,OAAO,CAAiB,CAAC;IAEnC,MAAM,0BAA0B,GAC9B,6BAA6B,CAAC,YAAY,CAAC,CAAC;IAE9C,MAAM,kCAAkC,GACtC,mCAAmC,CACjC,0BAA0B,EAC1B,YAAY,CAAC,SAAS,EAAE,UAAU,KAAK,QAAQ,CAChD,CAAC;IAEJ,OAAO,kCAAkC,CAAC;AAC5C,CAAC;AAnBD,sDAmBC;AAED,SAAgB,8BAA8B,CAAC,KAAe;IAC5D,MAAM,YAAY,GAAG,KAAK;SACvB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,qCAAqC,CAAC,IAAI,CAAC,CAAC;SACxD,MAAM,CAAC,OAAO,CAAiB,CAAC;IACnC,MAAM,0BAA0B,GAC9B,6BAA6B,CAAC,YAAY,CAAC,CAAC;IAE9C,MAAM,kCAAkC,GACtC,mCAAmC,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;IAEzE,OAAO,kCAAkC,CAAC;AAC5C,CAAC;AAXD,wEAWC;AAED,SAAgB,qCAAqC,CACnD,MAAc,EACd,iCAAwD;IAExD,IAAI,OAAO,CAAC;IACZ,IAAI,uBAAuB,CAAC,MAAM,CAAC,EAAE;QACnC,OAAO,SAAS,CAAC;KAClB;IACD,IAAI;QACF,OAAO,GAAG,eAAe,CAAC,UAAU,CAAC,MAAM,EAAE,iCAAiC,CAAC,CAAC;KACjF;IAAC,OAAO,EAAE,EAAE;QACX,OAAO,CAAC,IAAI,CACV,GAAG,KAAK,CAAC,MAAM,CACb,SAAS,CACV,gBAAgB,MAAM,oDAAoD,CAC5E,CAAC;QACF,OAAO,SAAS,CAAC;KAClB;IACD,uGAAuG;IACvG,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QAC9D,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;KAC/C;IACD,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,OAAO;QACP,cAAc,EAAE,iCAAiC;YAC/C,CAAC,CAAC,iCAAiC,CAAC,MAAM,CAAC;YAC3C,CAAC,CAAC,OAAO;QACX,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,MAAM,eAAe,CAAC,CAAC;KAC9D,CAAC;AACJ,CAAC;AA9BD,sFA8BC;AAED,SAAgB,UAAU,CACxB,MAAc,EACd,iCAAwD;IAExD,IAAI,iCAAiC,IAAI,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACnE,OAAO,iCAAiC,CAAC,MAAM,CAAC,CAAC;KAClD;IACD,8DAA8D;IAC9D,OAAO,OAAO,CAAC,GAAG,MAAM,eAAe,CAAC,CAAC,OAAO,CAAC;AACnD,CAAC;AATD,gCASC;AAED,SAAS,sBAAsB,CAAC,GAA6B;IAC3D,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;IAC9E,IAAI,iBAAiB,GAAG,GAAG,CAAC;IAC5B,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC,EAAE;QACtE,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,iBAAiB,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3C,MAAM,IAAI,KAAK,CAAC,mDAAmD,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;SAChF;KACF;IACD,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAgB;IAC3C,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;IAE9C,qFAAqF;IACrF,wFAAwF;IACxF,MAAM,yBAAyB,GAAG,oCAAoC,EAAE,IAAI,EAAE,CAAC;IAE/E,OAAO,EAAE,GAAG,yBAAyB,EAAE,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,CAAC;AACnE,CAAC;AAED,SAAS,SAAS,CAAC,QAAgB;IACjC,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,oCAAoC;IAC3C,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;IAChF,IAAI,SAAS,CAAC,mBAAmB,CAAC,EAAE;QAClC,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;QACzD,OAAO,WAAW,CAAC,YAAY,CAAC;KACjC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,6BAA6B,CACpC,6BAA2C;IAE3C,OAAO,6BAA6B,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAE;QAC5D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC;QAC7C,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAa,CAAC;QACzD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,UAAU,EAAE,CAAC;SACvD;QACD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mCAAmC,CAC1C,0BAAqD,EACrD,aAAsB;IAEtB,OAAO,IAAA,eAAM,EACX,0BAA0B,EAC1B,CAAC,kBAAsC,EAAE,UAAU,EAAE,EAAE;QACrD,MAAM,EACJ,UAAU,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,EAC7C,UAAU,EACX,GAAG,UAAU,CAAC;QAEf,uGAAuG;QACvG,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAEjD,MAAM,mBAAmB,GAAG;YAC1B,eAAe,EAAE,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,GAAG,YAAY;YACvF,SAAS,EAAE,IAAI;YACf,aAAa;YACb,OAAO,EAAE,YAAY;YACrB,qCAAqC;SACtC,CAAC;QAEF,kBAAkB,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC;QAE/C,IAAI,UAAU,EAAE;YACd,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBAC7B,kBAAkB,CAAC,SAAS,CAAC,GAAG,mBAAmB,CAAC;YACtD,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,kBAAkB,CAAC;IAC5B,CAAC,EACD,EAAE,CACH,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAe;IACzC,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,wBAAwB,CAAC,UAAkB,EAAE,OAAe,EAAE,eAAuB;IAC5F,IAAI,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACtE,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;KAC3B;IACD,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QACjC,OAAO,GAAG,CAAC;KACZ;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,gBAAgB,CAAC,eAAuB;IAC/C,wFAAwF;IACxF,mEAAmE;IACnE,IAAI,eAAe,CAAC,KAAK,CAAC,8BAA8B,CAAC,EAAE;QACzD,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;KACtD;IACD,IAAI,WAAW,CAAC;IAChB,IAAI;QACF,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;KAC9E;IAAC,OAAO,EAAE,EAAE;QACX,OAAO,CAAC,KAAK,CAAC,GAAG,eAAe,yBAAyB,CAAC,CAAC;KAC5D;IAED,IAAI,WAAW,EAAE,OAAO,EAAE;QACxB,IAAI,UAAU,GAAG,kCAAkC,CAAC,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QAC3F,wFAAwF;QACxF,IAAI,WAAW,CAAC,IAAI,KAAK,qBAAqB,EAAE;YAC9C,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;SACzE;QACD,OAAO,UAAU,CAAC;KACnB;IAED,OAAO,eAAe,CAAC,eAAe,EAAE,uBAAuB,CAAC;SAC7D,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;SACtD,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,oCAAoC,CAAC,SAAS,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,kCAAkC,CAAC,OAA+B,EAAE,IAAY;IACvF,mKAAmK;IACnK,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CACtC,GAAG,CAAC,EAAE,CACJ,GAAG,IAAI,GAAG;QACV,GAAG,IAAI,gBAAgB;QACvB,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC;QAClB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAChE,CAAC;IACF,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChF,IAAI,uBAAuB,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YACnD,SAAS;SACV;QAED,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KAC5B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,sBAAsB,CAAC,SAAiB;IAC/C,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,oCAAoC,CAAC,SAAiB;IAC7D,kEAAkE;IAElE,iDAAiD;IACjD,MAAM,oBAAoB,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClD,OAAO,IAAA,kBAAS,EAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtD,CAAC;AAED;;;GAGG;AAEH,SAAS,eAAe,CAAC,OAAe,EAAE,QAAkB;IAC1D,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IACzC,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAe,EAAE,QAAkB,EAAE,GAAa;IAC1E,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAEtC,MAAM,IAAI,GAAG,KAAK;SACf,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;SAC/B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,cAAc,CAAC,CAAC;IAEtE,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;IAClF,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE;QAC3B,MAAM,gBAAgB,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;QACjF,IAAI,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;YACvC,SAAS;SACV;QACD,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC3B,gBAAgB,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;KACpC;AACH,CAAC"}
|
|
@@ -40,6 +40,18 @@ exports.getProjectRootPath = getProjectRootPath;
|
|
|
40
40
|
* @returns A merged C8yBrowserBuilderOptions.
|
|
41
41
|
*/
|
|
42
42
|
function migrateDeprecatedBrowserBuildOptions(options, env) {
|
|
43
|
+
let sourceMap = options.sourceMap;
|
|
44
|
+
if (!(0, lodash_1.isUndefined)(env.buildTime?.sourceMap)) {
|
|
45
|
+
sourceMap = env.buildTime?.sourceMap;
|
|
46
|
+
}
|
|
47
|
+
if (!(0, lodash_1.isUndefined)(env.buildTime?.sourceMapLess)) {
|
|
48
|
+
sourceMap = {
|
|
49
|
+
scripts: env.buildTime?.sourceMap || true,
|
|
50
|
+
styles: env.buildTime?.sourceMapLess,
|
|
51
|
+
hidden: false,
|
|
52
|
+
vendor: true
|
|
53
|
+
};
|
|
54
|
+
}
|
|
43
55
|
return {
|
|
44
56
|
...options,
|
|
45
57
|
tsConfig: env.buildTime?.tsConfigPath || options.tsConfig,
|
|
@@ -47,7 +59,8 @@ function migrateDeprecatedBrowserBuildOptions(options, env) {
|
|
|
47
59
|
main: env.buildTime?.entryModule || options.main,
|
|
48
60
|
index: env.buildTime?.indexTemplate || options.index,
|
|
49
61
|
buildTime: env.buildTime,
|
|
50
|
-
runTime: env.runTime
|
|
62
|
+
runTime: env.runTime,
|
|
63
|
+
sourceMap
|
|
51
64
|
};
|
|
52
65
|
}
|
|
53
66
|
exports.migrateDeprecatedBrowserBuildOptions = migrateDeprecatedBrowserBuildOptions;
|
|
@@ -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.4.8",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"author": "Cumulocity",
|
|
6
6
|
"description": "Cumulocity Webpack Build Facade",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"tools"
|
|
35
35
|
],
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@babel/cli": "7.
|
|
37
|
+
"@babel/cli": "7.23.4",
|
|
38
38
|
"@babel/core": "^7.12.0",
|
|
39
39
|
"@babel/eslint-parser": "^7.21.3",
|
|
40
40
|
"@babel/helper-plugin-utils": "^7.14.0",
|
|
@@ -43,8 +43,8 @@
|
|
|
43
43
|
"@babel/plugin-proposal-optional-chaining": "^7.18.9",
|
|
44
44
|
"@babel/plugin-syntax-dynamic-import": "7.8.3",
|
|
45
45
|
"@babel/plugin-transform-async-to-generator": "^7.18.6",
|
|
46
|
-
"@babel/preset-env": "^7.
|
|
47
|
-
"@c8y/client": "1019.
|
|
46
|
+
"@babel/preset-env": "^7.23.8",
|
|
47
|
+
"@c8y/client": "1019.4.8",
|
|
48
48
|
"@schematics/angular": "^15.2.6",
|
|
49
49
|
"angular-gettext-tools": "2.5.3",
|
|
50
50
|
"babel-eslint": "10.0.1",
|
|
@@ -58,13 +58,13 @@
|
|
|
58
58
|
"css-minimizer-webpack-plugin": "^4.0.0",
|
|
59
59
|
"dotenv": "16.3.1",
|
|
60
60
|
"file-loader": "^6.2.0",
|
|
61
|
-
"fs-extra": "11.
|
|
62
|
-
"html-loader": "
|
|
61
|
+
"fs-extra": "11.2.0",
|
|
62
|
+
"html-loader": "5.0.0",
|
|
63
63
|
"html-webpack-plugin": "5.5.0",
|
|
64
64
|
"imports-loader": "^0.8.0",
|
|
65
65
|
"mini-css-extract-plugin": "2.7.2",
|
|
66
66
|
"postcss-loader": "6.1.1",
|
|
67
|
-
"style-loader": "3.3.
|
|
67
|
+
"style-loader": "3.3.4",
|
|
68
68
|
"terser-webpack-plugin": "^5.3.3",
|
|
69
69
|
"tslib": "^2.3.1",
|
|
70
70
|
"tslint": "^5.9.1",
|
|
@@ -85,8 +85,8 @@
|
|
|
85
85
|
"last 2 major versions"
|
|
86
86
|
],
|
|
87
87
|
"devDependencies": {
|
|
88
|
-
"@types/lodash": "4.14.
|
|
89
|
-
"@types/unzip-stream": "0.3.
|
|
88
|
+
"@types/lodash": "4.14.202",
|
|
89
|
+
"@types/unzip-stream": "0.3.4",
|
|
90
90
|
"@types/node": "14.11.11",
|
|
91
91
|
"@types/semver": "^7.3.13",
|
|
92
92
|
"@types/webpack": "^5.28.0",
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.config = void 0;
|
|
4
|
-
function config() {
|
|
5
|
-
return {
|
|
6
|
-
module: {
|
|
7
|
-
rules: [
|
|
8
|
-
{
|
|
9
|
-
test: /(\/|\\)favicon\.(ico|png|svg)$/,
|
|
10
|
-
type: 'asset/resource',
|
|
11
|
-
generator: {
|
|
12
|
-
filename: 'favicon.ico'
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
]
|
|
16
|
-
}
|
|
17
|
-
};
|
|
18
|
-
}
|
|
19
|
-
exports.config = config;
|
|
20
|
-
//# sourceMappingURL=favicon.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"favicon.js","sourceRoot":"","sources":["../../../../src/webpack/config/favicon.ts"],"names":[],"mappings":";;;AAEA,SAAgB,MAAM;IACpB,OAAO;QACL,MAAM,EAAE;YACN,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,gCAAgC;oBACtC,IAAI,EAAE,gBAAgB;oBACtB,SAAS,EAAE;wBACT,QAAQ,EAAE,aAAa;qBACxB;iBACF;aACF;SACF;KACF,CAAC;AACJ,CAAC;AAdD,wBAcC"}
|