@c8y/devkit 1021.80.1 → 1022.3.2
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 +1 -1
- package/dist/src/builders/dev-server/schema.json +4 -20
- package/dist/src/schematics/ng-add/configs/angular-json.d.ts +1 -1
- package/dist/src/schematics/ng-add/configs/angular-json.js +20 -14
- package/dist/src/schematics/ng-add/configs/angular-json.js.map +1 -1
- package/dist/src/schematics/ng-add/index.js +19 -6
- package/dist/src/schematics/ng-add/index.js.map +1 -1
- package/dist/src/webpack/EnvironmentOptions.d.ts +10 -1
- package/dist/src/webpack/EnvironmentOptions.js.map +1 -1
- package/dist/src/webpack/config/base.js +8 -6
- package/dist/src/webpack/config/base.js.map +1 -1
- package/dist/src/webpack/config/development.js +20 -0
- package/dist/src/webpack/config/development.js.map +1 -1
- package/dist/src/webpack/config/extra.d.ts +1 -1
- package/dist/src/webpack/config/extra.js +1 -1
- package/dist/src/webpack/config/extra.js.map +1 -1
- package/dist/src/webpack/config/import-maps.d.ts +8 -0
- package/dist/src/webpack/config/import-maps.js +41 -0
- package/dist/src/webpack/config/import-maps.js.map +1 -0
- package/dist/src/webpack/config/plugin.js +3 -0
- package/dist/src/webpack/config/plugin.js.map +1 -1
- package/dist/src/webpack/config/translation.js +1 -1
- package/dist/src/webpack/config/translation.js.map +1 -1
- package/dist/src/webpack/plugin/plugin.d.ts +15 -0
- package/dist/src/webpack/utils/proxy.js +5 -0
- package/dist/src/webpack/utils/proxy.js.map +1 -1
- package/package.json +23 -24
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { DevServerBuilderOptions, BrowserBuilderOptions } from '@angular-devkit/build-angular';
|
|
2
2
|
import { EnvironmentOptions } from '../webpack/EnvironmentOptions';
|
|
3
3
|
/**
|
|
4
4
|
* Interface representing the configuration options for the builder.
|
|
@@ -4,12 +4,6 @@
|
|
|
4
4
|
"description": "Dev Server target options for Build Facade.",
|
|
5
5
|
"type": "object",
|
|
6
6
|
"properties": {
|
|
7
|
-
"browserTarget": {
|
|
8
|
-
"type": "string",
|
|
9
|
-
"description": "A browser builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
|
|
10
|
-
"pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
|
|
11
|
-
"x-deprecated": "Use 'buildTarget' instead."
|
|
12
|
-
},
|
|
13
7
|
"buildTarget": {
|
|
14
8
|
"type": "string",
|
|
15
9
|
"description": "A build builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
|
|
@@ -90,8 +84,7 @@
|
|
|
90
84
|
},
|
|
91
85
|
"hmr": {
|
|
92
86
|
"type": "boolean",
|
|
93
|
-
"description": "Enable hot module replacement."
|
|
94
|
-
"default": false
|
|
87
|
+
"description": "Enable hot module replacement."
|
|
95
88
|
},
|
|
96
89
|
"watch": {
|
|
97
90
|
"type": "boolean",
|
|
@@ -117,7 +110,7 @@
|
|
|
117
110
|
},
|
|
118
111
|
"forceEsbuild": {
|
|
119
112
|
"type": "boolean",
|
|
120
|
-
"description": "Force the development server to use the 'browser-esbuild' builder when building.
|
|
113
|
+
"description": "Force the development server to use the 'browser-esbuild' builder when building.",
|
|
121
114
|
"default": false
|
|
122
115
|
},
|
|
123
116
|
"prebundle": {
|
|
@@ -157,16 +150,7 @@
|
|
|
157
150
|
}
|
|
158
151
|
},
|
|
159
152
|
"additionalProperties": false,
|
|
160
|
-
"
|
|
161
|
-
|
|
162
|
-
"required": [
|
|
163
|
-
"buildTarget"
|
|
164
|
-
]
|
|
165
|
-
},
|
|
166
|
-
{
|
|
167
|
-
"required": [
|
|
168
|
-
"browserTarget"
|
|
169
|
-
]
|
|
170
|
-
}
|
|
153
|
+
"required": [
|
|
154
|
+
"buildTarget"
|
|
171
155
|
]
|
|
172
156
|
}
|
|
@@ -6,7 +6,7 @@ interface AngularJson {
|
|
|
6
6
|
projects: Record<string, workspaces.ProjectDefinition>;
|
|
7
7
|
}
|
|
8
8
|
/** Adds custom builders and adjust project settings. */
|
|
9
|
-
export declare function updateAngularJson(host: Tree, options: CumulocityNgAddOptions): Tree;
|
|
9
|
+
export declare function updateAngularJson(host: Tree, options: CumulocityNgAddOptions, isStandaloneAppTemplate: boolean): Tree;
|
|
10
10
|
/**
|
|
11
11
|
* Retrieves the project name from the Angular configuration. If the project name is not provided,
|
|
12
12
|
* it defaults to the first project listed in the Angular configuration.
|
|
@@ -7,7 +7,7 @@ exports.getAngularJson = getAngularJson;
|
|
|
7
7
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
8
8
|
exports.ANGULAR_JSON = 'angular.json';
|
|
9
9
|
/** Adds custom builders and adjust project settings. */
|
|
10
|
-
function updateAngularJson(host, options) {
|
|
10
|
+
function updateAngularJson(host, options, isStandaloneAppTemplate) {
|
|
11
11
|
if (!host.exists(exports.ANGULAR_JSON)) {
|
|
12
12
|
throw new schematics_1.SchematicsException(`The file ${exports.ANGULAR_JSON} doesn't exists...`);
|
|
13
13
|
}
|
|
@@ -54,7 +54,11 @@ function updateAngularJson(host, options) {
|
|
|
54
54
|
if (!Array.isArray(commandOptions.styles)) {
|
|
55
55
|
commandOptions.styles = [];
|
|
56
56
|
}
|
|
57
|
-
|
|
57
|
+
// use different stylesheet for login app
|
|
58
|
+
const styleSheetToAdd = options.application.contextPath === 'login'
|
|
59
|
+
? '@c8y/style/login.less'
|
|
60
|
+
: '@c8y/style/main.less';
|
|
61
|
+
commandOptions.styles.unshift(styleSheetToAdd);
|
|
58
62
|
}
|
|
59
63
|
// Added to remove warning: CommonJS or AMD dependencies can cause optimization bailouts.
|
|
60
64
|
// https://angular.io/guide/build#configuring-commonjs-dependencies
|
|
@@ -64,18 +68,20 @@ function updateAngularJson(host, options) {
|
|
|
64
68
|
'zone.js/dist/zone',
|
|
65
69
|
'chroma-js'
|
|
66
70
|
];
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
project
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
71
|
+
if (!isStandaloneAppTemplate) {
|
|
72
|
+
// Disable standalone schematics
|
|
73
|
+
const disableStandaloneOptionInSchematics = (schematic) => {
|
|
74
|
+
if (!project?.schematics[schematic]) {
|
|
75
|
+
project.schematics[schematic] = { standalone: false };
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
project.schematics[schematic].standalone = false;
|
|
79
|
+
}
|
|
80
|
+
};
|
|
81
|
+
disableStandaloneOptionInSchematics('@schematics/angular:component');
|
|
82
|
+
disableStandaloneOptionInSchematics('@schematics/angular:directive');
|
|
83
|
+
disableStandaloneOptionInSchematics('@schematics/angular:pipe');
|
|
84
|
+
}
|
|
79
85
|
/**
|
|
80
86
|
* TODO: try to fix it, right now we can't add path to index.html, as webpack starts to break.
|
|
81
87
|
* It complains about multiple sources trying to write to index.html
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-json.js","sourceRoot":"","sources":["../../../../../src/schematics/ng-add/configs/angular-json.ts"],"names":[],"mappings":";;;AAUA,
|
|
1
|
+
{"version":3,"file":"angular-json.js","sourceRoot":"","sources":["../../../../../src/schematics/ng-add/configs/angular-json.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ const index_html_1 = require("./configs/index-html");
|
|
|
11
11
|
const tsconfig_app_json_1 = require("./configs/tsconfig-app-json");
|
|
12
12
|
const utils_1 = require("./utils");
|
|
13
13
|
const tsconfig_json_1 = require("./configs/tsconfig-json");
|
|
14
|
+
const fs_1 = require("fs");
|
|
14
15
|
function ngAdd(options) {
|
|
15
16
|
return async (_host, context) => {
|
|
16
17
|
if (!options.application) {
|
|
@@ -19,29 +20,35 @@ function ngAdd(options) {
|
|
|
19
20
|
const appPath = (0, core_1.normalize)(`${(0, path_1.dirname)(require.resolve(`${options.application}/package.json`))}`);
|
|
20
21
|
context.logger.info(`Adding Cumulocity IoT files (${options.application}) to the application (${options.project})...`);
|
|
21
22
|
const templateSource = getTemplateSource(appPath);
|
|
22
|
-
const alignFileRule = (_tree, _context) => alignFiles(_tree, _context, options);
|
|
23
|
+
const alignFileRule = (_tree, _context) => alignFiles(_tree, _context, options, appPath);
|
|
23
24
|
return (0, schematics_1.chain)([
|
|
24
25
|
(0, schematics_1.branchAndMerge)((0, schematics_1.mergeWith)(templateSource, schematics_1.MergeStrategy.Overwrite), schematics_1.MergeStrategy.Overwrite),
|
|
25
26
|
alignFileRule
|
|
26
27
|
]);
|
|
27
28
|
};
|
|
28
29
|
}
|
|
29
|
-
function alignFiles(tree, context, options) {
|
|
30
|
+
function alignFiles(tree, context, options, templatePath) {
|
|
30
31
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
31
32
|
const appPackageJson = require(`${options.application}/package.json`);
|
|
32
|
-
const
|
|
33
|
+
const appConfigFilePath = 'app/app.config';
|
|
34
|
+
const filesToDeleteIfNotPresentInTemplate = [
|
|
35
|
+
'app/app.component',
|
|
36
|
+
'app/app.routes',
|
|
37
|
+
appConfigFilePath
|
|
38
|
+
];
|
|
33
39
|
/** Get project source root */
|
|
34
40
|
const projectSourceRoot = (0, angular_json_1.getAngularJson)(tree)?.projects[(0, angular_json_1.getProjectName)(tree, options?.project)]?.sourceRoot;
|
|
35
41
|
context.logger.debug(`Project source root: ${projectSourceRoot}`);
|
|
42
|
+
const isStandaloneAppTemplate = (0, fs_1.existsSync)((0, core_1.getSystemPath)((0, core_1.join)(templatePath, `src/${appConfigFilePath}.ts`)));
|
|
36
43
|
// TODO remove when MTM-59468 is done
|
|
37
|
-
if (tree.exists(`${projectSourceRoot}
|
|
44
|
+
if (!isStandaloneAppTemplate && tree.exists(`${projectSourceRoot}/${appConfigFilePath}`)) {
|
|
38
45
|
context.logger.info('💡 Note: @c8y/websdk does not support standalone applications. The standalone flag will be disabled.');
|
|
39
46
|
}
|
|
40
47
|
/**
|
|
41
48
|
* Update angular.json
|
|
42
49
|
*/
|
|
43
50
|
context.logger.info('Updating angular.json...');
|
|
44
|
-
(0, angular_json_1.updateAngularJson)(tree, options);
|
|
51
|
+
(0, angular_json_1.updateAngularJson)(tree, options, isStandaloneAppTemplate);
|
|
45
52
|
/**
|
|
46
53
|
* Update tsconfig.app.json
|
|
47
54
|
*/
|
|
@@ -61,7 +68,13 @@ function alignFiles(tree, context, options) {
|
|
|
61
68
|
* Remove files
|
|
62
69
|
*/
|
|
63
70
|
context.logger.info('Removing files...');
|
|
64
|
-
|
|
71
|
+
filesToDeleteIfNotPresentInTemplate.forEach(filePath => {
|
|
72
|
+
const pathToFileInTemplate = (0, core_1.getSystemPath)((0, core_1.join)(templatePath, `src/${filePath}.ts`));
|
|
73
|
+
if (!(0, fs_1.existsSync)(pathToFileInTemplate)) {
|
|
74
|
+
context.logger.info(`Removing ${filePath}...`);
|
|
75
|
+
(0, utils_1.deleteFile)(tree, `${projectSourceRoot}/${filePath}`);
|
|
76
|
+
}
|
|
77
|
+
});
|
|
65
78
|
/**
|
|
66
79
|
* Update dependencies
|
|
67
80
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/schematics/ng-add/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,9 @@ type toOmitRunTimeOptions = (typeof notRunTimeOptions)[number];
|
|
|
7
7
|
/**
|
|
8
8
|
* Options that define, how the application should act on runtime.
|
|
9
9
|
*/
|
|
10
|
-
export type RunTimeOptions = Omit<ApplicationOptions, toOmitRunTimeOptions
|
|
10
|
+
export type RunTimeOptions = Omit<ApplicationOptions, toOmitRunTimeOptions> & {
|
|
11
|
+
availability?: 'MARKET' | 'PRIVATE' | 'SHARED';
|
|
12
|
+
};
|
|
11
13
|
/**
|
|
12
14
|
* Options that define, how the app should act on build time (while build with webpack).
|
|
13
15
|
*/
|
|
@@ -66,6 +68,13 @@ export declare class WebpackOptions {
|
|
|
66
68
|
* about the patterns to add here.
|
|
67
69
|
*/
|
|
68
70
|
copy?: Pattern[];
|
|
71
|
+
/**
|
|
72
|
+
* By default the `monaco-editor-webpack-plugin` will be used in the build.
|
|
73
|
+
* This will add the monaco editor to the build even if you do not use it.
|
|
74
|
+
* If you want to skip the plugin, set this option to true.
|
|
75
|
+
* This will remove the plugin from the build and reduce the size of the build.
|
|
76
|
+
*/
|
|
77
|
+
skipMonacoPlugin?: boolean;
|
|
69
78
|
/**
|
|
70
79
|
* Enables module federation.
|
|
71
80
|
* auto: Determines shared dependency automatically (default)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentOptions.js","sourceRoot":"","sources":["../../../src/webpack/EnvironmentOptions.ts"],"names":[],"mappings":";;;AAKa,QAAA,iBAAiB,GAAG,CAAC,eAAe,CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"EnvironmentOptions.js","sourceRoot":"","sources":["../../../src/webpack/EnvironmentOptions.ts"],"names":[],"mappings":";;;AAKa,QAAA,iBAAiB,GAAG,CAAC,eAAe,CAA2C,CAAC;AA6C7F,MAAa,cAAc;CA2E1B;AA3ED,wCA2EC;AAED;;GAEG;AACU,QAAA,eAAe,GAAG;IAC7B,IAAI;IACJ,OAAO;IACP,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;CACL,CAAC"}
|
|
@@ -84,12 +84,14 @@ async function webpackConfigurationTransformer(baseWebpackConfig, browserBuilder
|
|
|
84
84
|
}
|
|
85
85
|
];
|
|
86
86
|
const monacoEditorConfig = {
|
|
87
|
-
plugins:
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
87
|
+
plugins: browserBuilderOptions.buildTime?.skipMonacoPlugin
|
|
88
|
+
? []
|
|
89
|
+
: [
|
|
90
|
+
new MonacoWebpackPlugin({
|
|
91
|
+
filename: 'monaco-editor/[name].worker.[contenthash].js',
|
|
92
|
+
languages: ['json', 'javascript', 'typescript', 'css', 'html', 'yaml', 'markdown']
|
|
93
|
+
})
|
|
94
|
+
]
|
|
93
95
|
};
|
|
94
96
|
if (envOptions.runTime?.upgrade) {
|
|
95
97
|
ignoreWarnings.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/webpack/config/base.ts"],"names":[],"mappings":";;AA2CA,gGAMC;AASD,wHAeC;AAzED,yDAAmF;AACnF,mCAA8B;AAC9B,+BAA+B;AAE/B,iDAAsD;AAKtD,8DAAoE;AACpE,8CAK0B;AAC1B,mCAAqD;AACrD,+CAAyD;AACzD,mCAA2C;AAC3C,qCAAuD;AACvD,qCAAuD;AACvD,6CAAuD;AACvD,qCAAuD;AACvD,+CAAiE;AACjE,qCAA0D;AAC1D,oEAAoE;AAEpE;;;;;;;GAOG;AAEH;;;;;;GAMG;AACH,SAAgB,0CAA0C,CACxD,OAAiC,EACjC,OAAuB;IAEvB,OAAO,CAAC,iBAAuC,EAAE,EAAE,CACjD,+BAA+B,CAAC,iBAAiB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AACzE,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,sDAAsD,CACpE,OAAmC,EACnC,OAAuB;IAEvB,OAAO,CAAC,iBAAuC,EAAE,EAAE,CACjD,OAAO;SACJ,gBAAgB,CAAC,IAAA,kCAAsB,EAAC,OAAO,CAAC,WAAqB,CAAC,CAAC;SACvE,IAAI,CAAC,cAAc,CAAC,EAAE,CACrB,+BAA+B,CAC7B,iBAAiB,EACjB,cAAqD,EACrD,OAAO,EACP,OAAO,CACR,CACF,CAAC;AACR,CAAC;AAED;;;;;;;;;;;GAWG;AACH,KAAK,UAAU,+BAA+B,CAC5C,iBAAuC,EACvC,qBAA+C,EAC/C,cAA8B,EAC9B,uBAAoD;IAEpD,MAAM,eAAe,GAAG,MAAM,IAAA,4BAAkB,EAAC,cAAc,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,MAAM,IAAA,+BAAqB,EAAC,cAAc,CAAC,CAAC;IAC/D,qBAAqB,GAAG,IAAA,8CAAoC,EAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;IAEhG,uEAAuE;IACvE,4DAA4D;IAC5D,MAAM,gBAAgB,GAAG,IAAA,qBAAY,EAAC;QACpC,iBAAiB;QACjB,IAAA,aAAI,EAAC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAiD;KAC5F,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,IAAA,oBAAsB,EAAC,UAAU,CAAC,CAAC;IAC7D,MAAM,kBAAkB,GAAG,IAAA,eAAoB,GAAE,CAAC;IAClD,MAAM,YAAY,GAAG,IAAA,2BAAiB,GAAE,CAAC;IACzC,MAAM,WAAW,GAAG,IAAA,cAAgB,GAAE,CAAC;IACvC,MAAM,YAAY,GAAG,IAAA,eAAiB,EAAC,qBAAqB,EAAE,gBAAgB,EAAE,eAAe,CAAC,CAAC;IACjG,MAAM,YAAY,GAAG,IAAA,eAAiB,GAAE,CAAC;IACzC,MAAM,YAAY,GAAG,IAAA,eAAiB,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACrE,MAAM,gBAAgB,GAAG,IAAA,0CAAwB,EAAC,gBAAgB,CAAC,CAAC;IACpE,MAAM,cAAc,GAA0B;QAC5C;YACE,OAAO,EAAE,0DAA0D;SACpE;KACF,CAAC;IACF,MAAM,kBAAkB,GAAG;QACzB,OAAO,EAAE;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/webpack/config/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,26 @@ function addMiddlewareForRedirectToIndexHTML(contextPath, middlewares) {
|
|
|
47
47
|
res.redirect(301, `/apps/${contextPath}/index.html`);
|
|
48
48
|
}
|
|
49
49
|
});
|
|
50
|
+
// Redirects from other apps to the login app will go via the public path: `/apps/public/login/index.html`
|
|
51
|
+
// In order to use the locally running login app, we need to redirect these to `/apps/login/index.html`
|
|
52
|
+
if (contextPath === 'login') {
|
|
53
|
+
middlewares.unshift({
|
|
54
|
+
name: 'redirect-to-locally-running-login-app',
|
|
55
|
+
path: `^/apps/public/login$`,
|
|
56
|
+
middleware: (req, res) => {
|
|
57
|
+
res.redirect(302, `/apps/login/index.html`);
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
middlewares.unshift({
|
|
61
|
+
name: 'redirect-to-locally-running-login-app2',
|
|
62
|
+
path: `^/apps/public/login/index.html`,
|
|
63
|
+
middleware: (req, res) => {
|
|
64
|
+
// in order to keep the query params, we need to use the originalUrl and just remove the /public/
|
|
65
|
+
const propperPath = req.originalUrl.replace(/\/apps\/public\//, '/apps/');
|
|
66
|
+
res.redirect(302, propperPath);
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
}
|
|
50
70
|
return middlewares;
|
|
51
71
|
}
|
|
52
72
|
//# sourceMappingURL=development.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"development.js","sourceRoot":"","sources":["../../../../src/webpack/config/development.ts"],"names":[],"mappings":";;AAMA,4DA2BC;AAjCD,0CAAgD;AAMhD,SAAgB,wBAAwB,CACtC,GAAuB,EACvB,oBAA0C,EAC1C,cAA0C;IAE1C,IAAI,oBAAoB,CAAC,SAAS,EAAE,CAAC;QACnC,oBAAoB,CAAC,SAAS,CAAC,kBAAkB,CAAC,GAAG,WAAW,CAAC,EAAE,CACjE,mCAAmC,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAE5E;;WAEG;QACH,IAAI,CAAC,CAAC,oBAAoB,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC;YACjE,oBAAoB,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,GAAG,SAAS,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAC/F,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;YAChC,oBAAoB,CAAC,SAAS,CAAC,KAAK,GAAG,IAAA,sBAAc,EAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,oBAAoB,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;YAC5C,oBAAoB,CAClB,oBAAoB,CAAC,SAAS,CAAC,MAA6B,EAC5D,oBAAoB,CAAC,SAAS,CAAC,IAAI,CACpC,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED;;;;;GAKG;AACH,SAAS,oBAAoB,CAAC,qBAA0C,EAAE,IAAsB;IAC9F,IAAI,CAAC,CAAC,qBAAqB,CAAC,YAAY,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QACnD,qBAAqB,CAAC,YAAY,GAAG,qBAAqB,CAAC,YAAY;aACpE,QAAQ,EAAE;aACV,OAAO,CAAC,aAAa,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,mCAAmC,CAAC,WAAmB,EAAE,WAAyB;IACzF,WAAW,CAAC,OAAO,CAAC;QAClB,IAAI,EAAE,wBAAwB;QAC9B,IAAI,EAAE,UAAU,WAAW,GAAG;QAC9B,UAAU,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;YAC1C,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,WAAW,aAAa,CAAC,CAAC;QACvD,CAAC;KACF,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"development.js","sourceRoot":"","sources":["../../../../src/webpack/config/development.ts"],"names":[],"mappings":";;AAMA,4DA2BC;AAjCD,0CAAgD;AAMhD,SAAgB,wBAAwB,CACtC,GAAuB,EACvB,oBAA0C,EAC1C,cAA0C;IAE1C,IAAI,oBAAoB,CAAC,SAAS,EAAE,CAAC;QACnC,oBAAoB,CAAC,SAAS,CAAC,kBAAkB,CAAC,GAAG,WAAW,CAAC,EAAE,CACjE,mCAAmC,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAE5E;;WAEG;QACH,IAAI,CAAC,CAAC,oBAAoB,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC;YACjE,oBAAoB,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,GAAG,SAAS,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAC/F,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;YAChC,oBAAoB,CAAC,SAAS,CAAC,KAAK,GAAG,IAAA,sBAAc,EAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,oBAAoB,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;YAC5C,oBAAoB,CAClB,oBAAoB,CAAC,SAAS,CAAC,MAA6B,EAC5D,oBAAoB,CAAC,SAAS,CAAC,IAAI,CACpC,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED;;;;;GAKG;AACH,SAAS,oBAAoB,CAAC,qBAA0C,EAAE,IAAsB;IAC9F,IAAI,CAAC,CAAC,qBAAqB,CAAC,YAAY,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QACnD,qBAAqB,CAAC,YAAY,GAAG,qBAAqB,CAAC,YAAY;aACpE,QAAQ,EAAE;aACV,OAAO,CAAC,aAAa,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,mCAAmC,CAAC,WAAmB,EAAE,WAAyB;IACzF,WAAW,CAAC,OAAO,CAAC;QAClB,IAAI,EAAE,wBAAwB;QAC9B,IAAI,EAAE,UAAU,WAAW,GAAG;QAC9B,UAAU,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;YAC1C,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,WAAW,aAAa,CAAC,CAAC;QACvD,CAAC;KACF,CAAC,CAAC;IAEH,0GAA0G;IAC1G,uGAAuG;IACvG,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;QAC5B,WAAW,CAAC,OAAO,CAAC;YAClB,IAAI,EAAE,uCAAuC;YAC7C,IAAI,EAAE,sBAAsB;YAC5B,UAAU,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;gBAC1C,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,wBAAwB,CAAC,CAAC;YAC9C,CAAC;SACF,CAAC,CAAC;QACH,WAAW,CAAC,OAAO,CAAC;YAClB,IAAI,EAAE,wCAAwC;YAC9C,IAAI,EAAE,gCAAgC;YACtC,UAAU,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;gBAC1C,iGAAiG;gBACjG,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;gBAC1E,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YACjC,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { EnvironmentOptions } from '../EnvironmentOptions';
|
|
2
2
|
import { WebpackConfiguration } from 'webpack-dev-server';
|
|
3
|
-
export declare function buildExtraConfig(env: EnvironmentOptions, currentConfig: WebpackConfiguration):
|
|
3
|
+
export declare function buildExtraConfig(env: EnvironmentOptions, currentConfig: WebpackConfiguration): WebpackConfiguration;
|
|
@@ -13,7 +13,7 @@ function buildExtraConfig(env, currentConfig) {
|
|
|
13
13
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
14
14
|
extraWebPackConfig = extraWebPackConfig(currentConfig, env);
|
|
15
15
|
}
|
|
16
|
-
return extraWebPackConfig || {};
|
|
16
|
+
return (extraWebPackConfig || {});
|
|
17
17
|
}
|
|
18
18
|
catch (ex) {
|
|
19
19
|
console.error('Error while resolving the extra webpack configuration:', ex);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extra.js","sourceRoot":"","sources":["../../../../src/webpack/config/extra.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"extra.js","sourceRoot":"","sources":["../../../../src/webpack/config/extra.ts"],"names":[],"mappings":";;AAIA,4CAoBC;AAxBD,+BAA+B;AAI/B,SAAgB,gBAAgB,CAC9B,GAAuB,EACvB,aAAmC;IAEnC,IAAI,CAAC;QACH,IAAI,kBAAkB,GAAG,GAAG,CAAC,SAAS,EAAE,kBAAkB,CAAC;QAC3D,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE,CAAC;YAC3C,8DAA8D;YAC9D,kBAAkB,GAAG,OAAO,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,OAAO,kBAAkB,KAAK,UAAU,EAAE,CAAC;YAC7C,8DAA8D;YAC9D,kBAAkB,GAAG,kBAAkB,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,CAAC,kBAAkB,IAAI,EAAE,CAAyB,CAAC;IAC5D,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACZ,OAAO,CAAC,KAAK,CAAC,wDAAwD,EAAE,EAAE,CAAC,CAAC;QAC5E,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import CopyPlugin from 'copy-webpack-plugin';
|
|
2
|
+
import { C8yBrowserBuilderOptions } from '../../builders/BuilderOptions';
|
|
3
|
+
/**
|
|
4
|
+
* Apply import maps to the options and return copy patterns for the files.
|
|
5
|
+
* @param options The configuration options for the C8yBrowserBuilder.
|
|
6
|
+
* @returns The to copy files.
|
|
7
|
+
*/
|
|
8
|
+
export declare function applyImportMaps(options: C8yBrowserBuilderOptions): CopyPlugin.Pattern[];
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.applyImportMaps = applyImportMaps;
|
|
4
|
+
const core_1 = require("@angular-devkit/core");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
/**
|
|
7
|
+
* Apply import maps to the options and return copy patterns for the files.
|
|
8
|
+
* @param options The configuration options for the C8yBrowserBuilder.
|
|
9
|
+
* @returns The to copy files.
|
|
10
|
+
*/
|
|
11
|
+
function applyImportMaps(options) {
|
|
12
|
+
if (!options.runTime.importMap) {
|
|
13
|
+
return [];
|
|
14
|
+
}
|
|
15
|
+
const copyPattern = [];
|
|
16
|
+
options.runTime.importMap = Object.entries(options.runTime.importMap).reduce((acc, [key, value]) => {
|
|
17
|
+
if (value.startsWith('http')) {
|
|
18
|
+
acc[key] = value;
|
|
19
|
+
return acc;
|
|
20
|
+
}
|
|
21
|
+
const isJSFile = value.endsWith('.js') || value.endsWith('.jsm');
|
|
22
|
+
if (!isJSFile) {
|
|
23
|
+
const pathToMainImport = require.resolve(value);
|
|
24
|
+
const fileName = (0, path_1.basename)(pathToMainImport);
|
|
25
|
+
copyPattern.push({
|
|
26
|
+
from: (0, core_1.getSystemPath)((0, core_1.normalize)(pathToMainImport)),
|
|
27
|
+
to: (0, core_1.join)((0, core_1.normalize)('imports'), value)
|
|
28
|
+
});
|
|
29
|
+
acc[key] = (0, core_1.join)((0, core_1.normalize)(`imports/${value}`), fileName);
|
|
30
|
+
return acc;
|
|
31
|
+
}
|
|
32
|
+
copyPattern.push({
|
|
33
|
+
from: (0, core_1.getSystemPath)((0, core_1.normalize)(value)),
|
|
34
|
+
to: (0, core_1.join)((0, core_1.normalize)('imports'), value)
|
|
35
|
+
});
|
|
36
|
+
acc[key] = (0, core_1.join)((0, core_1.normalize)(`imports/${value}`), value);
|
|
37
|
+
return acc;
|
|
38
|
+
}, {});
|
|
39
|
+
return copyPattern;
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=import-maps.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"import-maps.js","sourceRoot":"","sources":["../../../../src/webpack/config/import-maps.ts"],"names":[],"mappings":";;AAUA,0CAoCC;AA9CD,+CAAsE;AAEtE,+BAAgC;AAGhC;;;;GAIG;AACH,SAAgB,eAAe,CAAC,OAAiC;IAC/D,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QAC/B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,WAAW,GAAyB,EAAE,CAAC;IAC7C,OAAO,CAAC,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAC1E,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACpB,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACjB,OAAO,GAAG,CAAC;QACb,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,gBAAgB,CAAC,CAAC;YAC5C,WAAW,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,IAAA,oBAAa,EAAC,IAAA,gBAAS,EAAC,gBAAgB,CAAC,CAAC;gBAChD,EAAE,EAAE,IAAA,WAAI,EAAC,IAAA,gBAAS,EAAC,SAAS,CAAC,EAAE,KAAK,CAAC;aACtC,CAAC,CAAC;YACH,GAAG,CAAC,GAAG,CAAC,GAAG,IAAA,WAAI,EAAC,IAAA,gBAAS,EAAC,WAAW,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;YACzD,OAAO,GAAG,CAAC;QACb,CAAC;QAED,WAAW,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,IAAA,oBAAa,EAAC,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC;YACrC,EAAE,EAAE,IAAA,WAAI,EAAC,IAAA,gBAAS,EAAC,SAAS,CAAC,EAAE,KAAK,CAAC;SACtC,CAAC,CAAC;QACH,GAAG,CAAC,GAAG,CAAC,GAAG,IAAA,WAAI,EAAC,IAAA,gBAAS,EAAC,WAAW,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;QAEtD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAA4B,CAC7B,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
|
@@ -9,10 +9,12 @@ const plugin_1 = require("../plugin/plugin");
|
|
|
9
9
|
const translation_aggregation_plugin_1 = require("../plugin/translation-aggregation-plugin");
|
|
10
10
|
const federation_1 = require("./federation");
|
|
11
11
|
const translation_1 = require("./translation");
|
|
12
|
+
const import_maps_1 = require("./import-maps");
|
|
12
13
|
function config(options, configuration, projectRootPath) {
|
|
13
14
|
if (options.index && typeof options.index !== 'string') {
|
|
14
15
|
throw new Error('Only string path to HTML file is supported.');
|
|
15
16
|
}
|
|
17
|
+
const copyPattern = (0, import_maps_1.applyImportMaps)(options);
|
|
16
18
|
const cumulocityPlugin = new plugin_1.CumulocityPlugin({
|
|
17
19
|
runTimeOptions: options.runTime,
|
|
18
20
|
buildTimeOptions: options.buildTime,
|
|
@@ -39,6 +41,7 @@ function config(options, configuration, projectRootPath) {
|
|
|
39
41
|
}
|
|
40
42
|
const fileCopy = {
|
|
41
43
|
patterns: [
|
|
44
|
+
...copyPattern,
|
|
42
45
|
...(options.buildTime?.copy || []),
|
|
43
46
|
{
|
|
44
47
|
from: `${(0, core_1.getSystemPath)((0, core_1.join)(projectRootPath, 'readme')).replace(/\\/g, '/')}{.md,}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/webpack/config/plugin.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/webpack/config/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,7 @@ function getLocalesContextReplacePlugin(env) {
|
|
|
48
48
|
// need to perform the same mapping as in ngx-components
|
|
49
49
|
// packages\ngx-components\core\i18n\translate.service.ts (loadLocales)
|
|
50
50
|
usedLocales = usedLocales.map(locale => getAngularLocalesLanguageString(locale));
|
|
51
|
-
return new webpack_1.ContextReplacementPlugin(/@angular\/common\/locales$/, new RegExp(`\\/(${usedLocales.join('|')})\\.
|
|
51
|
+
return new webpack_1.ContextReplacementPlugin(/@angular\/common\/locales$/, new RegExp(`\\/(${usedLocales.join('|')})\\.js$`));
|
|
52
52
|
}
|
|
53
53
|
/**
|
|
54
54
|
* The @angular/common/locales folder in node_modules contains files with names created based on RFC 3066bis.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translation.js","sourceRoot":"","sources":["../../../../src/webpack/config/translation.ts"],"names":[],"mappings":";;AAIA,wBA2BC;AAQD,wEAcC;AAuBD,0EAMC;AAlFD,+BAA+B;AAC/B,8DAA4E;AAC5E,qCAAkE;AAElE,SAAgB,MAAM,CAAC,GAAuB;IAC5C,OAAO;QACL,aAAa,EAAE;YACb,KAAK,EAAE;gBACL,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,sBAAsB,CAAC;aACrD;SACF;QACD,MAAM,EAAE;YACN,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,OAAO;oBACb,GAAG,EAAE,CAAC,QAAQ,CAAC;iBAChB;gBACD;oBACE,IAAI,EAAE,sBAAsB;oBAC5B,GAAG,EAAE;wBACH;4BACE,MAAM,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,2BAA2B,CAAC;4BACvD,OAAO,EAAE;gCACP,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS;6BAC/B;yBACF;qBACF;iBACF;aACF;SACF;KACF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAgB,8BAA8B,CAAC,GAAuB;IACpE,IAAI,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC3D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,WAAW,GAAG,oCAAe,CAAC;IAChC,CAAC;IAED,wDAAwD;IACxD,uEAAuE;IACvE,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC,CAAC;IAEjF,OAAO,IAAI,kCAAwB,CACjC,4BAA4B,EAC5B,IAAI,MAAM,CAAC,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"translation.js","sourceRoot":"","sources":["../../../../src/webpack/config/translation.ts"],"names":[],"mappings":";;AAIA,wBA2BC;AAQD,wEAcC;AAuBD,0EAMC;AAlFD,+BAA+B;AAC/B,8DAA4E;AAC5E,qCAAkE;AAElE,SAAgB,MAAM,CAAC,GAAuB;IAC5C,OAAO;QACL,aAAa,EAAE;YACb,KAAK,EAAE;gBACL,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,sBAAsB,CAAC;aACrD;SACF;QACD,MAAM,EAAE;YACN,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,OAAO;oBACb,GAAG,EAAE,CAAC,QAAQ,CAAC;iBAChB;gBACD;oBACE,IAAI,EAAE,sBAAsB;oBAC5B,GAAG,EAAE;wBACH;4BACE,MAAM,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,2BAA2B,CAAC;4BACvD,OAAO,EAAE;gCACP,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS;6BAC/B;yBACF;qBACF;iBACF;aACF;SACF;KACF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAgB,8BAA8B,CAAC,GAAuB;IACpE,IAAI,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC3D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,WAAW,GAAG,oCAAe,CAAC;IAChC,CAAC;IAED,wDAAwD;IACxD,uEAAuE;IACvE,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC,CAAC;IAEjF,OAAO,IAAI,kCAAwB,CACjC,4BAA4B,EAC5B,IAAI,MAAM,CAAC,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAClD,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,yBAAyB,GAAG;IAChC,EAAE,EAAE,OAAO;IACX,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;CACL,CAAC;AAMX,SAAgB,+BAA+B,CAAC,QAAQ,GAAG,IAAI;IAC7D,MAAM,GAAG,GAAG,QAAkD,CAAC;IAC/D,IAAI,yBAAyB,CAAC,GAAG,CAAC,EAAE,CAAC;QACnC,OAAO,yBAAyB,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -120,6 +120,11 @@ export declare class CumulocityPlugin {
|
|
|
120
120
|
versioningMatrix?: import("packages/client/lib").VersioningMatrix | undefined;
|
|
121
121
|
label?: string | undefined;
|
|
122
122
|
alarmsRefreshType?: ("interval" | "realtime") | undefined;
|
|
123
|
+
importMap?: {
|
|
124
|
+
[key: string]: string;
|
|
125
|
+
} | undefined;
|
|
126
|
+
loginRedirectPath?: string | undefined;
|
|
127
|
+
availability?: "MARKET" | "PRIVATE" | "SHARED";
|
|
123
128
|
modules: never[];
|
|
124
129
|
core_path: string;
|
|
125
130
|
data_path: string;
|
|
@@ -196,6 +201,11 @@ export declare class CumulocityPlugin {
|
|
|
196
201
|
versioningMatrix?: import("packages/client/lib").VersioningMatrix | undefined;
|
|
197
202
|
label?: string | undefined;
|
|
198
203
|
alarmsRefreshType?: ("interval" | "realtime") | undefined;
|
|
204
|
+
importMap?: {
|
|
205
|
+
[key: string]: string;
|
|
206
|
+
} | undefined;
|
|
207
|
+
loginRedirectPath?: string | undefined;
|
|
208
|
+
availability?: "MARKET" | "PRIVATE" | "SHARED";
|
|
199
209
|
};
|
|
200
210
|
languagesKeys(): string[];
|
|
201
211
|
languages(appLanguages?: {
|
|
@@ -276,6 +286,11 @@ export declare class CumulocityPlugin {
|
|
|
276
286
|
versioningMatrix?: import("packages/client/lib").VersioningMatrix | undefined;
|
|
277
287
|
label?: string | undefined;
|
|
278
288
|
alarmsRefreshType?: ("interval" | "realtime") | undefined;
|
|
289
|
+
importMap?: {
|
|
290
|
+
[key: string]: string;
|
|
291
|
+
} | undefined;
|
|
292
|
+
loginRedirectPath?: string | undefined;
|
|
293
|
+
availability?: "MARKET" | "PRIVATE" | "SHARED";
|
|
279
294
|
};
|
|
280
295
|
copyDefinitionToImports(copy: any, context: any): Promise<string[]>;
|
|
281
296
|
copyProcessCwd(cwd: string, context: string): string;
|
|
@@ -31,6 +31,11 @@ function getProxyConfig(url) {
|
|
|
31
31
|
const cookies = proxyResponse.headers['set-cookie'].map(cookie => cookie.replace(/;\s{0,}secure/gi, ''));
|
|
32
32
|
proxyResponse.headers['set-cookie'] = cookies;
|
|
33
33
|
}
|
|
34
|
+
const location = proxyResponse.headers.location;
|
|
35
|
+
const { statusCode } = proxyResponse;
|
|
36
|
+
if (location && statusCode === 301) {
|
|
37
|
+
proxyResponse.headers.location = location.replace(/https?:\/\/[^/]+/, '');
|
|
38
|
+
}
|
|
34
39
|
}
|
|
35
40
|
}
|
|
36
41
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/webpack/utils/proxy.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/webpack/utils/proxy.ts"],"names":[],"mappings":";;AAEA,wCA0CC;AA1CD,SAAgB,cAAc,CAAC,GAAW;IACxC,OAAO;QACL;YACE,MAAM,EAAE,GAAG;YACX,EAAE,EAAE,IAAI;YACR,MAAM,EAAE,KAAK;YACb,YAAY,EAAE,IAAI;YAClB,OAAO,EAAE,MAAM;YACf,YAAY,EAAE,MAAM;YACpB,IAAI,EAAE,CAAC,IAAI,CAAC;YACZ;;;;;;eAMG;YACH,mBAAmB,EAAE,WAAW;YAChC;;eAEG;YACH,OAAO,EAAE,UAAU,IAAY;gBAC7B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACpC,CAAC;YACD,UAAU,EAAE,aAAa,CAAC,EAAE;gBAC1B,YAAY,CAAC;gBAEb,IAAI,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;oBACxC,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAC/D,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CACtC,CAAC;oBACF,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC;gBAChD,CAAC;gBAED,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAChD,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;gBACrC,IAAI,QAAQ,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;oBACnC,aAAa,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;gBAC5E,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@c8y/devkit",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "1022.3.2",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"author": "Cumulocity",
|
|
6
6
|
"description": "Cumulocity Webpack Build Facade",
|
|
7
7
|
"main": "./dist/index.js",
|
|
8
8
|
"typings": "./dist/options.d.ts",
|
|
9
9
|
"engines": {
|
|
10
|
-
"node": ">=14 <=
|
|
10
|
+
"node": ">=14 <=22"
|
|
11
11
|
},
|
|
12
12
|
"exports": {
|
|
13
13
|
".": "./dist/index.js",
|
|
@@ -37,52 +37,53 @@
|
|
|
37
37
|
"tools"
|
|
38
38
|
],
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@
|
|
41
|
-
"@babel/
|
|
42
|
-
"@babel/
|
|
40
|
+
"@angular-devkit/build-angular": "^19.2.14",
|
|
41
|
+
"@babel/cli": "7.26.4",
|
|
42
|
+
"@babel/core": "^7.26.8",
|
|
43
|
+
"@babel/eslint-parser": "^7.26.8",
|
|
43
44
|
"@babel/helper-plugin-utils": "^7.14.0",
|
|
44
45
|
"@babel/parser": "^7.27.0",
|
|
45
46
|
"@babel/plugin-proposal-object-rest-spread": "^7.14.0",
|
|
46
47
|
"@babel/plugin-proposal-optional-chaining": "^7.18.9",
|
|
47
48
|
"@babel/plugin-syntax-dynamic-import": "7.8.3",
|
|
48
49
|
"@babel/plugin-transform-async-to-generator": "^7.18.6",
|
|
49
|
-
"@babel/preset-env": "^7.
|
|
50
|
-
"@c8y/client": "
|
|
51
|
-
"@c8y/options": "
|
|
52
|
-
"@c8y/toolkit": "
|
|
53
|
-
"@inquirer/prompts": "
|
|
54
|
-
"@schematics/angular": "^
|
|
50
|
+
"@babel/preset-env": "^7.26.8",
|
|
51
|
+
"@c8y/client": "1022.3.2",
|
|
52
|
+
"@c8y/options": "1022.3.2",
|
|
53
|
+
"@c8y/toolkit": "1022.3.2",
|
|
54
|
+
"@inquirer/prompts": "7.3.1",
|
|
55
|
+
"@schematics/angular": "^19.2.14",
|
|
55
56
|
"JSONPath": "0.11.2",
|
|
56
57
|
"angular-gettext-tools": "https://github.com/rubenv/angular-gettext-tools.git#5a20d5fe2ad768bfd0cac18259b4986346061eda",
|
|
57
58
|
"autoprefixer": "10.4.20",
|
|
58
|
-
"babel-eslint": "10.0
|
|
59
|
-
"babel-loader": "9.1
|
|
59
|
+
"babel-eslint": "10.1.0",
|
|
60
|
+
"babel-loader": "9.2.1",
|
|
60
61
|
"babel-plugin-angularjs-annotate": "0.10.0",
|
|
61
62
|
"chalk": "^4.1.2",
|
|
62
63
|
"commander": "11.1.0",
|
|
63
64
|
"copy-webpack-plugin": "12.0.2",
|
|
64
65
|
"cosmiconfig": "9.0.0",
|
|
65
|
-
"cosmiconfig-typescript-loader": "~6.
|
|
66
|
+
"cosmiconfig-typescript-loader": "~6.1.0",
|
|
66
67
|
"css-loader": "6.10.0",
|
|
67
68
|
"dotenv": "16.4.7",
|
|
68
69
|
"fast-glob": "3.3.2",
|
|
69
70
|
"file-loader": "^6.2.0",
|
|
70
|
-
"fs-extra": "11.
|
|
71
|
-
"html-loader": "5.
|
|
72
|
-
"html-webpack-plugin": "5.6.
|
|
71
|
+
"fs-extra": "11.3.0",
|
|
72
|
+
"html-loader": "5.1.0",
|
|
73
|
+
"html-webpack-plugin": "5.6.3",
|
|
73
74
|
"imports-loader": "^0.8.0",
|
|
74
|
-
"mini-css-extract-plugin": "2.9.
|
|
75
|
+
"mini-css-extract-plugin": "2.9.2",
|
|
75
76
|
"monaco-editor-webpack-plugin": "7.1.0",
|
|
76
77
|
"pofile": "1.0.11",
|
|
77
|
-
"postcss-loader": "
|
|
78
|
-
"style-loader": "
|
|
78
|
+
"postcss-loader": "8.1.1",
|
|
79
|
+
"style-loader": "4.0.0",
|
|
79
80
|
"terser-webpack-plugin": "^5.3.14",
|
|
80
81
|
"tslib": "^2.6.3",
|
|
81
82
|
"typescript": "5.5.4",
|
|
82
83
|
"typescript-json-schema": "^0.65.1",
|
|
83
84
|
"webpack-dev-middleware": "7.4.2",
|
|
84
85
|
"webpack-hot-middleware": "2.26.1",
|
|
85
|
-
"webpack-merge": "^
|
|
86
|
+
"webpack-merge": "^6.0.1",
|
|
86
87
|
"webpack-sources": "^3.2.3",
|
|
87
88
|
"zip-dir": "2.0.0"
|
|
88
89
|
},
|
|
@@ -92,13 +93,11 @@
|
|
|
92
93
|
"devDependencies": {
|
|
93
94
|
"@types/lodash": "4.17.16",
|
|
94
95
|
"@types/node": "18",
|
|
95
|
-
"@types/unzip-stream": "0.3.4",
|
|
96
96
|
"@types/webpack": "^5.28.5",
|
|
97
97
|
"@types/webpack-dev-server": "^4.3.1"
|
|
98
98
|
},
|
|
99
99
|
"peerDependencies": {
|
|
100
|
-
"@angular-devkit/
|
|
101
|
-
"@angular-devkit/schematics": "^18.2.15",
|
|
100
|
+
"@angular-devkit/schematics": "^19.2.14",
|
|
102
101
|
"webpack": "^5.94.0"
|
|
103
102
|
},
|
|
104
103
|
"peerDependenciesMeta": {
|