@equinor/echo-cli 0.20.0-beta-0 → 0.20.0-beta-1
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/lib/config/webpack/configBuilders/devServer.d.ts +1 -1
- package/lib/config/webpack/configBuilders/devServer.js +11 -7
- package/lib/config/webpack/configBuilders/devServer.js.map +1 -1
- package/lib/config/webpack/server.js +1 -1
- package/lib/config/webpack/server.js.map +1 -1
- package/package.json +2 -2
|
@@ -5,4 +5,4 @@ import { EchoModuleConfig } from '../../common/echoModuleConfig.js';
|
|
|
5
5
|
* @param - Additional options (https://webpack.js.org/configuration/dev-server/)
|
|
6
6
|
* @returns {WebpackDevServerOptions} A settings object.
|
|
7
7
|
*/
|
|
8
|
-
export declare function defineDevServer(current: string, root: string,
|
|
8
|
+
export declare function defineDevServer(current: string, root: string, echoModuleConfig: EchoModuleConfig): WebpackDevServer.Configuration;
|
|
@@ -5,12 +5,11 @@ import * as path from 'path';
|
|
|
5
5
|
* @param - Additional options (https://webpack.js.org/configuration/dev-server/)
|
|
6
6
|
* @returns {WebpackDevServerOptions} A settings object.
|
|
7
7
|
*/
|
|
8
|
-
export function defineDevServer(current, root,
|
|
8
|
+
export function defineDevServer(current, root, echoModuleConfig) {
|
|
9
9
|
const publicPath = path.join(current, 'build');
|
|
10
10
|
const { port, host, open, logging } = echoModuleConfig.server;
|
|
11
11
|
const { stats } = echoModuleConfig.devMiddleware;
|
|
12
12
|
return {
|
|
13
|
-
https: true,
|
|
14
13
|
host,
|
|
15
14
|
port,
|
|
16
15
|
static: [
|
|
@@ -44,15 +43,20 @@ export function defineDevServer(current, root, modulePath, echoModuleConfig) {
|
|
|
44
43
|
return middlewares;
|
|
45
44
|
},
|
|
46
45
|
client: {
|
|
47
|
-
// overlay: {
|
|
48
|
-
// errors: true,
|
|
49
|
-
// warnings: false
|
|
50
|
-
// },
|
|
51
46
|
logging
|
|
52
47
|
},
|
|
53
48
|
historyApiFallback: true,
|
|
54
49
|
open,
|
|
55
|
-
compress: true
|
|
50
|
+
compress: true,
|
|
51
|
+
server: {
|
|
52
|
+
type: 'https', // Enable HTTPS
|
|
53
|
+
options: {
|
|
54
|
+
// You can specify custom certificate options here if needed
|
|
55
|
+
// key: fs.readFileSync('path/to/server.key'),
|
|
56
|
+
// cert: fs.readFileSync('path/to/server.crt'),
|
|
57
|
+
// ca: fs.readFileSync('path/to/ca.pem'),
|
|
58
|
+
}
|
|
59
|
+
}
|
|
56
60
|
};
|
|
57
61
|
}
|
|
58
62
|
//# sourceMappingURL=devServer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devServer.js","sourceRoot":"","sources":["../../../../src/config/webpack/configBuilders/devServer.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAC3B,OAAe,EACf,IAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"devServer.js","sourceRoot":"","sources":["../../../../src/config/webpack/configBuilders/devServer.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAC3B,OAAe,EACf,IAAY,EACZ,gBAAkC;IAElC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/C,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,MAAM,CAAC;IAC9D,MAAM,EAAE,KAAK,EAAE,GAAG,gBAAgB,CAAC,aAAa,CAAC;IAEjD,OAAO;QACH,IAAI;QACJ,IAAI;QACJ,MAAM,EAAE;YACJ;gBACI,SAAS,EAAE,IAAI;gBACf,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,GAAG;aAClB;YACD;gBACI,SAAS,EAAE,UAAU;gBACrB,KAAK,EAAE,IAAI;aACd;SACJ;QACD,GAAG,EAAE,IAAI;QACT,UAAU,EAAE,IAAI;QAChB,aAAa,EAAE;YACX,WAAW,EAAE,IAAI;YACjB,UAAU;YACV,KAAK,EAAE,IAAI;YACX,KAAK;SACR;QACD,gBAAgB,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE;YACzC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACzD,CAAC;YAED,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAE3E,WAAW,CAAC,IAAI,CAAC;gBACb,IAAI,EAAE,GAAG;gBACT,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,aAAa,CAAC;aAC/D,CAAC,CAAC;YAEH,OAAO,WAAW,CAAC;QACvB,CAAC;QACD,MAAM,EAAE;YACJ,OAAO;SACV;QACD,kBAAkB,EAAE,IAAI;QACxB,IAAI;QACJ,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE;YACJ,IAAI,EAAE,OAAO,EAAE,eAAe;YAC9B,OAAO,EAAE;YACL,4DAA4D;YAC5D,8CAA8C;YAC9C,+CAA+C;YAC/C,yCAAyC;aAC5C;SACJ;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -2,7 +2,7 @@ import WebpackDevServer from 'webpack-dev-server';
|
|
|
2
2
|
import { merge } from 'webpack-merge';
|
|
3
3
|
import { defineDevServer } from './configBuilders/devServer.js';
|
|
4
4
|
export function devServer(compiler, options) {
|
|
5
|
-
const defaultDevServerOptions = defineDevServer(options.currentDir, options.wwwRoot, options.echoModuleConfig
|
|
5
|
+
const defaultDevServerOptions = defineDevServer(options.currentDir, options.wwwRoot, options.echoModuleConfig);
|
|
6
6
|
let devServerOptionsToUse = defaultDevServerOptions;
|
|
7
7
|
if (compiler.options.devServer) {
|
|
8
8
|
console.log('EchoCli: Merging devServer values with custom config');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/config/webpack/server.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,UAAU,SAAS,CAAC,QAAkB,EAAE,OAA2B;IACrE,MAAM,uBAAuB,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/config/webpack/server.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,UAAU,SAAS,CAAC,QAAkB,EAAE,OAA2B;IACrE,MAAM,uBAAuB,GAAG,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE/G,IAAI,qBAAqB,GAAG,uBAAuB,CAAC;IACpD,IAAI,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;QACpE,0FAA0F;QAC1F,qBAAqB,GAAG,KAAK,CAAC,uBAAuB,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;IAErE,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,EAAE,EAAE;QACzB,IAAI,GAAG,EAAE,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,sCAAsC,GAAG,GAAG,CAAC,CAAC;QAChE,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,GAAG,CACP,0CAA0C,qBAAqB,CAAC,IAAI,IAAI,qBAAqB,CAAC,IAAI,EAAE,CACvG,CAAC;QACN,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@equinor/echo-cli",
|
|
3
|
-
"version": "0.20.0-beta-
|
|
3
|
+
"version": "0.20.0-beta-1",
|
|
4
4
|
"description": "Command line interface for Echo Apps",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"source": "src/test.js",
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
"webpack": "5.99.8",
|
|
77
77
|
"webpack-bundle-analyzer": "4.10.2",
|
|
78
78
|
"webpack-dev-middleware": "7.4.2",
|
|
79
|
-
"webpack-dev-server": "
|
|
79
|
+
"webpack-dev-server": "^5.2.1",
|
|
80
80
|
"webpack-hot-middleware": "2.26.1",
|
|
81
81
|
"webpack-merge": "6.0.1",
|
|
82
82
|
"webpackbar": "7.0.0"
|