@c8y/devkit 1021.22.108 → 1021.22.109
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.
|
@@ -4,7 +4,7 @@ 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
8
|
/**
|
|
9
9
|
* TODO: check if we can set publicPath in a other way
|
|
10
10
|
*/
|
|
@@ -35,11 +35,12 @@ function alignNgWebsocketPort(wsClientConfiguration, port) {
|
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
37
|
* Redirect request -> from :9090/apps/contextPath (without slash!) -> to :9090/apps/contextPath/index.html
|
|
38
|
-
* @param
|
|
38
|
+
* @param runTimeOptions The RunTimeOptions of the application.
|
|
39
39
|
* @param middlewares The middlewares of the dev server.
|
|
40
40
|
* @returns Updated middlewares.
|
|
41
41
|
*/
|
|
42
|
-
function addMiddlewareForRedirectToIndexHTML(
|
|
42
|
+
function addMiddlewareForRedirectToIndexHTML(runTimeOptions, middlewares) {
|
|
43
|
+
const { contextPath, isPackage } = runTimeOptions;
|
|
43
44
|
middlewares.unshift({
|
|
44
45
|
name: 'redirect-to-index-html',
|
|
45
46
|
path: `^/apps/${contextPath}$`,
|
|
@@ -47,6 +48,19 @@ function addMiddlewareForRedirectToIndexHTML(contextPath, middlewares) {
|
|
|
47
48
|
res.redirect(301, `/apps/${contextPath}/index.html`);
|
|
48
49
|
}
|
|
49
50
|
});
|
|
51
|
+
if (isPackage) {
|
|
52
|
+
// this is supposed to avoid that the same plugin is loaded twice during local development
|
|
53
|
+
// to avoid this, we return a 404 for the requests that would load the plugin from the tenant
|
|
54
|
+
middlewares.unshift({
|
|
55
|
+
name: 'Do not serve the same plugin during local development with version/tag in contextPath',
|
|
56
|
+
path: `^/apps/${contextPath}(@[^/]+)/`,
|
|
57
|
+
middleware: (req, res) => {
|
|
58
|
+
res
|
|
59
|
+
.status(404)
|
|
60
|
+
.send(`During local development, the plugin should be loaded via /apps/${contextPath}/.`);
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
}
|
|
50
64
|
return middlewares;
|
|
51
65
|
}
|
|
52
66
|
//# 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,
|
|
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,EAAE,WAAW,CAAC,CAAC;QAEhE;;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,CAC1C,cAA8B,EAC9B,WAAyB;IAEzB,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC;IAClD,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,IAAI,SAAS,EAAE,CAAC;QACd,0FAA0F;QAC1F,6FAA6F;QAC7F,WAAW,CAAC,OAAO,CAAC;YAClB,IAAI,EAAE,uFAAuF;YAC7F,IAAI,EAAE,UAAU,WAAW,WAAW;YACtC,UAAU,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;gBAC1C,GAAG;qBACA,MAAM,CAAC,GAAG,CAAC;qBACX,IAAI,CAAC,mEAAmE,WAAW,IAAI,CAAC,CAAC;YAC9F,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@c8y/devkit",
|
|
3
|
-
"version": "1021.22.
|
|
3
|
+
"version": "1021.22.109",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"author": "Cumulocity",
|
|
6
6
|
"description": "Cumulocity Webpack Build Facade",
|
|
@@ -47,8 +47,8 @@
|
|
|
47
47
|
"@babel/plugin-syntax-dynamic-import": "7.8.3",
|
|
48
48
|
"@babel/plugin-transform-async-to-generator": "^7.18.6",
|
|
49
49
|
"@babel/preset-env": "^7.24.4",
|
|
50
|
-
"@c8y/client": "1021.22.
|
|
51
|
-
"@c8y/options": "1021.22.
|
|
50
|
+
"@c8y/client": "1021.22.109",
|
|
51
|
+
"@c8y/options": "1021.22.109",
|
|
52
52
|
"@inquirer/prompts": "5.3.7",
|
|
53
53
|
"@schematics/angular": "^18.2.0",
|
|
54
54
|
"JSONPath": "0.11.2",
|