@equinor/fusion-framework-cli 5.0.8 → 5.1.0

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.1.0](https://github.com/equinor/fusion-framework/compare/@equinor/fusion-framework-cli@5.0.8...@equinor/fusion-framework-cli@5.1.0) (2023-03-20)
+
+### Features
+
+-   **cli:** allow configuring portal host in cli ([9641b21](https://github.com/equinor/fusion-framework/commit/9641b215a1bff957687e9eda661679f000588a47))
+
 ## [5.0.8](https://github.com/equinor/fusion-framework/compare/@equinor/fusion-framework-cli@5.0.7...@equinor/fusion-framework-cli@5.0.8) (2023-03-20)
 
 **Note:** Version bump only for package @equinor/fusion-framework-cli

package/bin/app-config.js

@@ -7,17 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import path from 'path';
 import fs from 'fs';
 import { findUpSync } from 'find-up';
@@ -46,19 +35,19 @@ const loadConfigFromJavascript = (file) => __awaiter(void 0, void 0, void 0, fun
 const loadConfigFromJson = (file) => __awaiter(void 0, void 0, void 0, function* () {
     return JSON.parse(fs.readFileSync(file, 'utf-8'));
 });
-export const loadConfig = (root) => __awaiter(void 0, void 0, void 0, function* () {
-    const resolved = getConfigType(root);
-    const _a = yield (() => {
-        switch (resolved === null || resolved === void 0 ? void 0 : resolved.type) {
+export const loadConfig = (path) => __awaiter(void 0, void 0, void 0, function* () {
+    const configSource = getConfigType(path);
+    const customConfig = yield (() => {
+        switch (configSource === null || configSource === void 0 ? void 0 : configSource.type) {
             case 'js':
-                return loadConfigFromJavascript(resolved.file);
+                return loadConfigFromJavascript(configSource.file);
             case 'json':
-                return loadConfigFromJson(resolved.file);
+                return loadConfigFromJson(configSource.file);
             default:
                 return Promise.resolve({});
         }
-    })(), { environment, endpoints } = _a, manifest = __rest(_a, ["environment", "endpoints"]);
-    return Object.assign(Object.assign({}, manifest), { environment, endpoints, configSource: resolved });
+    })();
+    return Object.assign(Object.assign({}, customConfig), { configSource });
 });
 const validateConfig = (config) => {
     if (!config.main) {
@@ -67,16 +56,15 @@ const validateConfig = (config) => {
 };
 export const resolveAppConfig = () => __awaiter(void 0, void 0, void 0, function* () {
     const { root, pkg } = resolvePackage();
-    const _b = yield loadConfig(root), { configSource } = _b, localConfig = __rest(_b, ["configSource"]);
-    const dev = { root, configSource };
+    const appConfig = yield loadConfig(root);
     const manifest = Object.assign({
         key: pkg.name.replace(/^@|\w.*\//gm, ''),
-    }, localConfig.manifest, {
+    }, appConfig.manifest, {
         version: pkg.version,
         name: pkg.name,
         main: pkg.main,
-        __DEV__: dev,
+        __DEV__: { root, configSource: appConfig.configSource, portal: appConfig.portalHost },
     });
     validateConfig(manifest);
-    return Object.assign(Object.assign({}, localConfig), { manifest, dev });
+    return Object.assign(Object.assign({}, appConfig), { manifest, pkg, root });
 });

package/bin/main.js

@@ -24,10 +24,17 @@ const app = program
 app.command('dev')
     .description('Create a development server')
     .option('-p, --port <number>', 'dev-server port', '3000')
-    .action((port) => __awaiter(void 0, void 0, void 0, function* () {
+    .option('--portal <string>', 'fusion portal host')
+    .action(({ port, portal }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const spinner = ora('Loading configuration').start();
-    const viteConfig = mergeConfig(yield createConfig(), { server: port });
+    const viteConfig = mergeConfig(yield createConfig(), { server: { port } });
     const appConfig = yield resolveAppConfig();
+    if (portal) {
+        appConfig.portalHost = portal
+            ? portal
+            : (_a = process.env.FUSION_PORTAL_HOST) !== null && _a !== void 0 ? _a : 'https://fusion-s-portal-ci.azurewebsites.net';
+    }
     spinner.succeed('Configuration loaded');
     startDevServer({ viteConfig, appConfig });
 }));

package/bin/serve.js

@@ -29,13 +29,14 @@ export const server = (config) => __awaiter(void 0, void 0, void 0, function* ()
     host.port = String((_c = (_b = config.viteConfig.server) === null || _b === void 0 ? void 0 : _b.port) !== null && _c !== void 0 ? _c : 3000);
     const spinner = ora('Configuring dev-server').start();
     const vite = yield createServer(config.viteConfig);
+    const { portalHost } = config.appConfig;
     spinner.succeed('Configured dev-server');
     /** expose middlewares from vite (dev-server) */
     app.use(vite.middlewares);
     /** serve static files (portal prebuild) */
     app.use(express.static(resolveRelativePath('dev-portal'), { index: false }));
     app.use(createProxyMiddleware('/_discovery/environments/current', {
-        target: 'https://pro-s-portal-ci.azurewebsites.net',
+        target: portalHost,
         changeOrigin: true,
         selfHandleResponse: true,
         onProxyRes: responseInterceptor((responseBuffer, _proxyRes, req) => __awaiter(void 0, void 0, void 0, function* () {
@@ -52,7 +53,7 @@ export const server = (config) => __awaiter(void 0, void 0, void 0, function* ()
     app.get('/api/apps/:appKey/config', 
     // '/api/widget/:appKey/config',
     createProxyMiddleware('/api/apps/*/config', {
-        target: 'https://pro-s-portal-ci.azurewebsites.net',
+        target: portalHost,
         changeOrigin: true,
         selfHandleResponse: true,
         onProxyRes: responseInterceptor((responseBuffer, proxyRes, req, res) => __awaiter(void 0, void 0, void 0, function* () {
@@ -72,7 +73,7 @@ export const server = (config) => __awaiter(void 0, void 0, void 0, function* ()
         })),
     }));
     app.get('/api/apps/:appKey', createProxyMiddleware('/api/apps/*', {
-        target: 'https://pro-s-portal-ci.azurewebsites.net',
+        target: portalHost,
         changeOrigin: true,
         selfHandleResponse: true,
         onProxyRes: responseInterceptor((responseBuffer, proxyRes, req, res) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@equinor/fusion-framework-cli",
-    "version": "5.0.8",
+    "version": "5.1.0",
     "keywords": [
         "Fusion",
         "Fusion Framework",
@@ -56,5 +56,5 @@
         "typescript": "^4.9.3",
         "vite-plugin-environment": "^1.1.3"
     },
-    "gitHead": "a59959b7f25df08c9f93b05f1ea46980ff9e1303"
+    "gitHead": "4bb6a70e2acb5c22a9a953da23c98565b8ef28d2"
 }