@c8y/devkit 1022.9.6 → 1022.13.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/webpack/config/base.js +1 -1
- package/dist/src/webpack/config/base.js.map +1 -1
- package/dist/src/webpack/config/development.d.ts +2 -3
- package/dist/src/webpack/config/development.js +20 -4
- package/dist/src/webpack/config/development.js.map +1 -1
- package/dist/src/webpack/config/plugin.js +2 -1
- package/dist/src/webpack/config/plugin.js.map +1 -1
- package/dist/src/webpack/plugin/plugin.d.ts +1 -0
- package/dist/src/webpack/plugin/plugin.js +12 -4
- package/dist/src/webpack/plugin/plugin.js.map +1 -1
- package/dist/src/webpack/plugin/translation-aggregation-plugin.js +2 -4
- package/dist/src/webpack/plugin/translation-aggregation-plugin.js.map +1 -1
- package/package.json +4 -5
|
@@ -136,7 +136,7 @@ async function webpackConfigurationTransformer(baseWebpackConfig, browserBuilder
|
|
|
136
136
|
extraWebPackConfig
|
|
137
137
|
]);
|
|
138
138
|
let prodOrDevConfig = devServerBuilderOptions
|
|
139
|
-
? (0, development_1.webpackDevelopmentConfig)(
|
|
139
|
+
? (0, development_1.webpackDevelopmentConfig)(browserBuilderOptions, mergedConfig, devServerBuilderOptions)
|
|
140
140
|
: mergedConfig;
|
|
141
141
|
// You could start a dev-server with production mode `-c=production`
|
|
142
142
|
if (mergedConfig.mode === 'production') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/webpack/config/base.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/webpack/config/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { C8yDevServerBuilderOptions } from '../../builders/BuilderOptions';
|
|
1
|
+
import { C8yBrowserBuilderOptions, C8yDevServerBuilderOptions } from '../../builders/BuilderOptions';
|
|
3
2
|
import { WebpackConfiguration } from 'webpack-dev-server';
|
|
4
|
-
export declare function webpackDevelopmentConfig(env:
|
|
3
|
+
export declare function webpackDevelopmentConfig(env: C8yBrowserBuilderOptions, webpackConfiguration: WebpackConfiguration, builderOptions: C8yDevServerBuilderOptions): WebpackConfiguration;
|
|
@@ -4,12 +4,14 @@ exports.webpackDevelopmentConfig = webpackDevelopmentConfig;
|
|
|
4
4
|
const proxy_1 = require("../utils/proxy");
|
|
5
5
|
function webpackDevelopmentConfig(env, webpackConfiguration, builderOptions) {
|
|
6
6
|
if (webpackConfiguration.devServer) {
|
|
7
|
-
webpackConfiguration.devServer['setupMiddlewares'] = middlewares => addMiddlewareForRedirectToIndexHTML(env.runTime
|
|
7
|
+
webpackConfiguration.devServer['setupMiddlewares'] = middlewares => addMiddlewareForRedirectToIndexHTML(env.runTime, middlewares);
|
|
8
|
+
const { baseHref } = env;
|
|
9
|
+
const publicPath = baseHref ? baseHref : `/apps/${env.runTime.contextPath}`;
|
|
8
10
|
/**
|
|
9
11
|
* TODO: check if we can set publicPath in a other way
|
|
10
12
|
*/
|
|
11
13
|
if (!!webpackConfiguration?.devServer?.devMiddleware?.publicPath) {
|
|
12
|
-
webpackConfiguration.devServer.devMiddleware.publicPath =
|
|
14
|
+
webpackConfiguration.devServer.devMiddleware.publicPath = publicPath;
|
|
13
15
|
}
|
|
14
16
|
if (!builderOptions.proxyConfig) {
|
|
15
17
|
webpackConfiguration.devServer.proxy = (0, proxy_1.getProxyConfig)(builderOptions.url);
|
|
@@ -35,11 +37,12 @@ function alignNgWebsocketPort(wsClientConfiguration, port) {
|
|
|
35
37
|
}
|
|
36
38
|
/**
|
|
37
39
|
* Redirect request -> from :9090/apps/contextPath (without slash!) -> to :9090/apps/contextPath/index.html
|
|
38
|
-
* @param
|
|
40
|
+
* @param runTimeOptions The RunTimeOptions of the application.
|
|
39
41
|
* @param middlewares The middlewares of the dev server.
|
|
40
42
|
* @returns Updated middlewares.
|
|
41
43
|
*/
|
|
42
|
-
function addMiddlewareForRedirectToIndexHTML(
|
|
44
|
+
function addMiddlewareForRedirectToIndexHTML(runTimeOptions, middlewares) {
|
|
45
|
+
const { contextPath, isPackage } = runTimeOptions;
|
|
43
46
|
middlewares.unshift({
|
|
44
47
|
name: 'redirect-to-index-html',
|
|
45
48
|
path: `^/apps/${contextPath}$`,
|
|
@@ -47,6 +50,19 @@ function addMiddlewareForRedirectToIndexHTML(contextPath, middlewares) {
|
|
|
47
50
|
res.redirect(301, `/apps/${contextPath}/index.html`);
|
|
48
51
|
}
|
|
49
52
|
});
|
|
53
|
+
if (isPackage) {
|
|
54
|
+
// this is supposed to avoid that the same plugin is loaded twice during local development
|
|
55
|
+
// to avoid this, we return a 404 for the requests that would load the plugin from the tenant
|
|
56
|
+
middlewares.unshift({
|
|
57
|
+
name: 'Do not serve the same plugin during local development with version/tag in contextPath',
|
|
58
|
+
path: `^/apps/${contextPath}(@[^/]+)/`,
|
|
59
|
+
middleware: (req, res) => {
|
|
60
|
+
res
|
|
61
|
+
.status(404)
|
|
62
|
+
.send(`During local development, the plugin should be loaded via /apps/${contextPath}/.`);
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
}
|
|
50
66
|
// Redirects from other apps to the login app will go via the public path: `/apps/public/login/index.html`
|
|
51
67
|
// In order to use the locally running login app, we need to redirect these to `/apps/login/index.html`
|
|
52
68
|
if (contextPath === 'login') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"development.js","sourceRoot":"","sources":["../../../../src/webpack/config/development.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"development.js","sourceRoot":"","sources":["../../../../src/webpack/config/development.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,8 @@ function config(options, configuration, projectRootPath) {
|
|
|
18
18
|
const cumulocityPlugin = new plugin_1.CumulocityPlugin({
|
|
19
19
|
runTimeOptions: options.runTime,
|
|
20
20
|
buildTimeOptions: options.buildTime,
|
|
21
|
-
customIndexTemplateViaTarget: options.index
|
|
21
|
+
customIndexTemplateViaTarget: options.index,
|
|
22
|
+
baseHref: options.baseHref
|
|
22
23
|
});
|
|
23
24
|
let fromPath = 'node_modules/@c8y/style/img';
|
|
24
25
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/webpack/config/plugin.ts"],"names":[],"mappings":";;AAYA,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/webpack/config/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export interface CumulocityPluginOptions {
|
|
|
7
7
|
runTimeOptions: RunTimeOptions;
|
|
8
8
|
buildTimeOptions?: BuildTimeOptions;
|
|
9
9
|
customIndexTemplateViaTarget: string;
|
|
10
|
+
baseHref?: string;
|
|
10
11
|
}
|
|
11
12
|
export type CumulocityPluginCompiler = Compiler & {
|
|
12
13
|
c8yPluginInstance?: CumulocityPlugin;
|
|
@@ -5,9 +5,7 @@ const fg = require("fast-glob");
|
|
|
5
5
|
const HtmlWebpackPlugin = require("html-webpack-plugin");
|
|
6
6
|
const lodash_1 = require("lodash");
|
|
7
7
|
const path = require("path");
|
|
8
|
-
|
|
9
|
-
// @ts-ignore
|
|
10
|
-
const webpack_sources_1 = require("webpack-sources");
|
|
8
|
+
const webpack_1 = require("webpack");
|
|
11
9
|
const index_content_1 = require("./index-content");
|
|
12
10
|
const locales_1 = require("./locales");
|
|
13
11
|
const translation_data_store_1 = require("./translation-data-store");
|
|
@@ -75,6 +73,16 @@ class CumulocityPlugin {
|
|
|
75
73
|
meta: {}
|
|
76
74
|
});
|
|
77
75
|
}
|
|
76
|
+
// set base href
|
|
77
|
+
const { baseHref } = this.options;
|
|
78
|
+
if (baseHref) {
|
|
79
|
+
htmlPluginData.headTags.unshift({
|
|
80
|
+
voidTag: true,
|
|
81
|
+
tagName: 'base',
|
|
82
|
+
attributes: { href: baseHref },
|
|
83
|
+
meta: {}
|
|
84
|
+
});
|
|
85
|
+
}
|
|
78
86
|
const preload = Array.from(chunks).reduce((links, { name, files }) => {
|
|
79
87
|
if (name && (name.match(/app$/) || name.match(/branding$/))) {
|
|
80
88
|
return links.concat(Array.from(files).map((href) => ({
|
|
@@ -181,7 +189,7 @@ class CumulocityPlugin {
|
|
|
181
189
|
const { assets } = compilation;
|
|
182
190
|
const FILE = 'cumulocity.json';
|
|
183
191
|
if (this.options.runTimeOptions && !assets[FILE]) {
|
|
184
|
-
assets[FILE] = new
|
|
192
|
+
assets[FILE] = new webpack_1.sources.RawSource(JSON.stringify((0, lodash_1.omit)(this.getRunTimeOptionsAndAdditionalInfos(), 'brandingEntry', 'entryModule'), null, 2));
|
|
185
193
|
}
|
|
186
194
|
}
|
|
187
195
|
getRunTimeOptionsAndAdditionalInfos() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/webpack/plugin/plugin.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,yDAAyD;AACzD,mCAAkD;AAClD,6BAA6B;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/webpack/plugin/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,7 @@ exports.TranslationAggregationPlugin = void 0;
|
|
|
5
5
|
// @ts-ignore
|
|
6
6
|
const angular_gettext_tools_1 = require("angular-gettext-tools");
|
|
7
7
|
const pofile = require("pofile");
|
|
8
|
-
|
|
9
|
-
// @ts-ignore
|
|
10
|
-
const webpack_sources_1 = require("webpack-sources");
|
|
8
|
+
const webpack_1 = require("webpack");
|
|
11
9
|
const translation_data_store_1 = require("./translation-data-store");
|
|
12
10
|
const translationDataStoreInstance = translation_data_store_1.TranslationDataStore.instance;
|
|
13
11
|
const PLUGIN_NAME = 'TranslationAggregationPlugin';
|
|
@@ -49,7 +47,7 @@ class TranslationAggregationPlugin {
|
|
|
49
47
|
// Iterate over the compiled translations for each language.
|
|
50
48
|
this.compile().forEach(({ language, json }) => {
|
|
51
49
|
// Add a new asset for the current language with the JSON content.
|
|
52
|
-
assets[`${language}.json`] = new
|
|
50
|
+
assets[`${language}.json`] = new webpack_1.sources.RawSource(json);
|
|
53
51
|
});
|
|
54
52
|
}
|
|
55
53
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translation-aggregation-plugin.js","sourceRoot":"","sources":["../../../../src/webpack/plugin/translation-aggregation-plugin.ts"],"names":[],"mappings":";;;AAAA,6DAA6D;AAC7D,aAAa;AACb,iEAAgF;AAChF,iCAAiC;
|
|
1
|
+
{"version":3,"file":"translation-aggregation-plugin.js","sourceRoot":"","sources":["../../../../src/webpack/plugin/translation-aggregation-plugin.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@c8y/devkit",
|
|
3
|
-
"version": "1022.
|
|
3
|
+
"version": "1022.13.0",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"author": "Cumulocity",
|
|
6
6
|
"description": "Cumulocity Webpack Build Facade",
|
|
@@ -48,9 +48,9 @@
|
|
|
48
48
|
"@babel/plugin-syntax-dynamic-import": "7.8.3",
|
|
49
49
|
"@babel/plugin-transform-async-to-generator": "^7.18.6",
|
|
50
50
|
"@babel/preset-env": "^7.26.8",
|
|
51
|
-
"@c8y/client": "1022.
|
|
52
|
-
"@c8y/options": "1022.
|
|
53
|
-
"@c8y/toolkit": "1022.
|
|
51
|
+
"@c8y/client": "1022.13.0",
|
|
52
|
+
"@c8y/options": "1022.13.0",
|
|
53
|
+
"@c8y/toolkit": "1022.13.0",
|
|
54
54
|
"@inquirer/prompts": "7.7.1",
|
|
55
55
|
"@schematics/angular": "^19.2.15",
|
|
56
56
|
"JSONPath": "0.11.2",
|
|
@@ -84,7 +84,6 @@
|
|
|
84
84
|
"webpack-dev-middleware": "7.4.2",
|
|
85
85
|
"webpack-hot-middleware": "2.26.1",
|
|
86
86
|
"webpack-merge": "^6.0.1",
|
|
87
|
-
"webpack-sources": "^3.2.3",
|
|
88
87
|
"zip-dir": "2.0.0"
|
|
89
88
|
},
|
|
90
89
|
"browserslist": [
|