@equinor/echo-cli 0.20.0-beta-2 → 0.20.0-beta-4

package/lib/config/webpack/configBuilders/devServer.d.ts

@@ -5,4 +5,4 @@ import { EchoModuleConfig } from '../../common/echoModuleConfig.js';
  * @param - Additional options (https://webpack.js.org/configuration/dev-server/)
  * @returns {WebpackDevServerOptions} A settings object.
  */
-export declare function defineDevServer(current: string, root: string, echoModuleConfig: EchoModuleConfig): WebpackDevServer.Configuration;
+export declare function defineDevServer(current: string, root: string, modulePath: string, echoModuleConfig: EchoModuleConfig): WebpackDevServer.Configuration;

package/lib/config/webpack/configBuilders/devServer.js

@@ -5,7 +5,7 @@ import * as path from 'path';
  * @param - Additional options (https://webpack.js.org/configuration/dev-server/)
  * @returns {WebpackDevServerOptions} A settings object.
  */
-export function defineDevServer(current, root, echoModuleConfig) {
+export function defineDevServer(current, root, modulePath, echoModuleConfig) {
     const publicPath = path.join(current, 'build');
     const { port, host, open, logging } = echoModuleConfig.server;
     const { stats } = echoModuleConfig.devMiddleware;
@@ -31,6 +31,9 @@ export function defineDevServer(current, root, echoModuleConfig) {
             index: true,
             stats
         },
+        server: {
+            type: 'https'
+        },
         setupMiddlewares: (middlewares, devServer) => {
             if (!devServer.app) {
                 throw new Error('webpack-dev-server is not defined');
@@ -43,20 +46,15 @@ export function defineDevServer(current, root, echoModuleConfig) {
             return middlewares;
         },
         client: {
+            // overlay: {
+            //     errors: true,
+            //     warnings: false
+            // },
             logging
         },
         historyApiFallback: true,
         open,
-        compress: true,
-        server: {
-            type: 'https', // Enable HTTPS
-            options: {
-            // You can specify custom certificate options here if needed
-            // key: fs.readFileSync('path/to/server.key'),
-            // cert: fs.readFileSync('path/to/server.crt'),
-            // ca: fs.readFileSync('path/to/ca.pem'),
-            }
-        }
+        compress: true
     };
 }
 //# sourceMappingURL=devServer.js.map

package/lib/config/webpack/configBuilders/devServer.js.map

@@ -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,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"}
+{"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,UAAkB,EAClB,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,MAAM,EAAE;YACJ,IAAI,EAAE,OAAO;SAChB;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,aAAa;YACb,oBAAoB;YACpB,sBAAsB;YACtB,KAAK;YACL,OAAO;SACV;QACD,kBAAkB,EAAE,IAAI;QACxB,IAAI;QACJ,QAAQ,EAAE,IAAI;KACjB,CAAC;AACN,CAAC"}

package/lib/config/webpack/configBuilders/output.js

@@ -3,7 +3,7 @@ export function defineOutput(options) {
     const { manifest, chunk } = options.echoModuleConfig;
     const shortName = manifest.shortName;
     return {
-        clean: true,
+        clean: options.isProduction,
         path: path.join(options.currentDir, 'build'),
         filename: chunk ? `${shortName}-main.js` : getFileName(options.main), //`${shortName}.echo.bundle.js`,
         library: shortName,

package/lib/config/webpack/configBuilders/output.js.map

@@ -1 +1 @@
-{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../src/config/webpack/configBuilders/output.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AA0BxB,MAAM,UAAU,YAAY,CAAC,OAA2B;IACpD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAErD,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACrC,OAAO;QACH,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC;QAC5C,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,gCAAgC;QACtG,OAAO,EAAE,SAAS;QAClB,aAAa,EAAE,KAAK;QACpB,wDAAwD;QACxD,oFAAoF;KACvF,CAAC;AACN,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,QAAgB;IACxC,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrC,OAAO,QAAQ,CAAC;AACpB,CAAC"}
+{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../src/config/webpack/configBuilders/output.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AA0BxB,MAAM,UAAU,YAAY,CAAC,OAA2B;IACpD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAErD,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACrC,OAAO;QACH,KAAK,EAAE,OAAO,CAAC,YAAY;QAC3B,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC;QAC5C,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,gCAAgC;QACtG,OAAO,EAAE,SAAS;QAClB,aAAa,EAAE,KAAK;QACpB,wDAAwD;QACxD,oFAAoF;KACvF,CAAC;AACN,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,QAAgB;IACxC,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrC,OAAO,QAAQ,CAAC;AACpB,CAAC"}

package/lib/config/webpack/server.js

@@ -2,7 +2,7 @@ import WebpackDevServer from 'webpack-dev-server';
 import { merge } from 'webpack-merge';
 import { defineDevServer } from './configBuilders/devServer.js';
 export function devServer(compiler, options) {
-    const defaultDevServerOptions = defineDevServer(options.currentDir, options.wwwRoot, options.echoModuleConfig);
+    const defaultDevServerOptions = defineDevServer(options.currentDir, options.wwwRoot, options.echoModuleConfig.manifest.path, options.echoModuleConfig);
     let devServerOptionsToUse = defaultDevServerOptions;
     if (compiler.options.devServer) {
         console.log('EchoCli: Merging devServer values with custom config');

package/lib/config/webpack/server.js.map

@@ -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,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"}
+{"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,CAC3C,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,EACtC,OAAO,CAAC,gBAAgB,CAC3B,CAAC;IAEF,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/lib/cpc/.gitattributes

@@ -0,0 +1,3 @@
+* text=auto
+*.sh text eol=lf
+.env text eol=lf

package/lib/cpc/echoModule.config.json

@@ -0,0 +1,22 @@
+{
+    "bundler": "webpack",
+    "manifest": {
+        "name": "cpc",
+        "key": "cpc",
+        "shortName": "cpc",
+        "path": "/cpc",
+        "description": "",
+        "private": false,
+        "fileUri": "module-url-placeholder"
+    },
+    "server": {
+        "contentBase": "/build",
+        "port": 3000,
+        "open": true,
+        "host": "localhost",
+        "logging": "none"
+    },
+    "devMiddleware": {
+        "stats": "errors-warnings"
+    }
+}

package/lib/cpc/echoModuleId.json

@@ -0,0 +1,3 @@
+{
+    "moduleId": "<<------Insert moduleId here ------>>"
+}

package/lib/cpc/env.sh

@@ -0,0 +1,54 @@
+# Script copied from echopedia to make environment variables work in an app service. Using build folder instead of public folder.
+# The content of the .gitattributes file is needed so this script will work for both linux and windows.
+
+#!/bin/bash
+
+#https://www.freecodecamp.org/news/how-to-implement-runtime-environment-variables-with-create-react-app-docker-and-nginx-7f9d42a91d70/
+#
+
+# Recreate config file
+rm -rf ./env-config.js
+touch ./env-config.js
+
+echo "creating env-config.js"
+
+# Add assignment 
+echo "window._env_ = {" >> ./env-config.js
+
+# Read each line in .env file
+# Each line represents key=value pairs
+while read -r line || [[ -n "$line" ]];
+do
+  #only process lines containting =
+  if [[ $line == *"="* ]]; then
+
+    # Split env variables by character `=`
+    if printf '%s\n' "$line" | grep -q -e '='; then
+      varname=$(printf '%s\n' "$line" | sed -e 's/=.*//')
+      varvalue=$(printf '%s\n' "$line" | sed -e 's/^[^=]*=//')
+    fi
+
+    # Read value of current variable if exists as Environment variable
+    value=$(printf '%s\n' "${!varname}")
+    # Otherwise use value from .env file
+    [[ -z $value ]] && value=${varvalue}
+
+    # Append configuration property to JS file
+    echo "  $varname: \"$value\"," >> ./env-config.js
+
+    #print variables
+    valueObfuscated=$(printf '%s' "$value" | cut -c 1-3)
+    #echo "  $varname: \"$value\"," #print the environment variables
+    echo "  $varname=\"$valueObfuscated***\"," #print the environment variables obfuscated
+  fi
+done < .env
+
+echo "}" >> ./env-config.js
+
+#if directory exists, copy to public folder. Needed for dev enironment (npm start)
+if [ -d "build" ]; then
+  rm -rf ./build/env-config.js
+  cp ./env-config.js ./build/env-config.js
+fi
+
+echo "done creating env-config.js"