@equinor/fusion-framework-cli 0.1.15 → 0.2.1

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.1](https://github.com/equinor/fusion-framework/compare/@equinor/fusion-framework-cli@0.2.0...@equinor/fusion-framework-cli@0.2.1) (2022-11-16)
+
+**Note:** Version bump only for package @equinor/fusion-framework-cli
+
+## [0.2.0](https://github.com/equinor/fusion-framework/compare/@equinor/fusion-framework-cli@0.1.15...@equinor/fusion-framework-cli@0.2.0) (2022-11-14)
+
+### Features
+
+-   add router and app loader ([f21661d](https://github.com/equinor/fusion-framework/commit/f21661d1255633848d1662dabb74e8e33ab629d5))
+-   **cli:** add proxy routing for app and config ([b923830](https://github.com/equinor/fusion-framework/commit/b9238309a2f15a470d63411d2da0b58a1eb63e90))
+
 ## 0.1.15 (2022-11-14)
 
 **Note:** Version bump only for package @equinor/fusion-framework-cli

package/bin/app-config.js

@@ -0,0 +1,82 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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';
+const supportedTypes = ['js', 'json'];
+export const resolvePackageRoot = () => {
+    const pkgFile = findUpSync('package.json');
+    if (!pkgFile) {
+        throw Error('failed to resolve package');
+    }
+    return pkgFile;
+};
+export const resolvePackage = () => {
+    const pkgFile = resolvePackageRoot();
+    const pkgRaw = fs.readFileSync(pkgFile, 'utf8');
+    return { root: path.dirname(pkgFile), pkg: JSON.parse(pkgRaw) };
+};
+export const getConfigType = (root) => {
+    const base = path.join(root, 'app.config');
+    return supportedTypes
+        .map((type) => ({ type, file: [base, type].join('.') }))
+        .find((x) => fs.existsSync(x.file) && fs.statSync(x.file).isFile());
+};
+const loadConfigFromJavascript = (file) => __awaiter(void 0, void 0, void 0, function* () {
+    return (yield import(file)).default();
+});
+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) {
+            case 'js':
+                return loadConfigFromJavascript(resolved.file);
+            case 'json':
+                return loadConfigFromJson(resolved.file);
+            default:
+                return Promise.resolve({});
+        }
+    })(), { environment, endpoints } = _a, manifest = __rest(_a, ["environment", "endpoints"]);
+    return Object.assign(Object.assign({}, manifest), { environment, endpoints, configSource: resolved });
+});
+const validateConfig = (config) => {
+    if (!config.main) {
+        throw Error('missing `main` entry in package.json');
+    }
+};
+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 manifest = Object.assign({
+        appKey: pkg.name.replace(/^@|\w.*\//gm, ''),
+    }, localConfig.manifest, {
+        version: pkg.version,
+        name: pkg.name,
+        main: pkg.main,
+        __DEV__: dev,
+    });
+    validateConfig(manifest);
+    return Object.assign(Object.assign({}, localConfig), { manifest, dev });
+});

package/bin/create-config.js

@@ -1,21 +1,24 @@
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
-import { findUpSync } from 'find-up';
-import { defineConfig } from 'vite';
+import { resolve } from 'path';
+import { defineConfig, createLogger } from 'vite';
 import react from '@vitejs/plugin-react';
-const resolvePackage = () => {
-    const pkgFile = findUpSync('package.json');
-    if (!pkgFile) {
-        throw Error('failed to resolve package');
-    }
-    const pkgRaw = readFileSync(pkgFile, 'utf8');
-    return { root: dirname(pkgFile), pkg: JSON.parse(pkgRaw) };
+import { resolvePackage } from './app-config.js';
+const createCustomLogger = () => {
+    const logger = createLogger();
+    const originalWarning = logger.warn;
+    logger.warn = (msg, options) => {
+        /** import of app file from framework */
+        if (msg.includes('import(manifest.entry)') &&
+            msg.includes('dynamic-import-vars#limitations'))
+            return;
+        originalWarning(msg, options);
+    };
+    return logger;
 };
 export const createConfig = () => {
-    const { root } = resolvePackage();
+    const { root, pkg } = resolvePackage();
     return defineConfig({
         plugins: [react()],
-        root: resolve(root, 'src'),
+        root: root,
         server: {
             middlewareMode: true,
         },
@@ -24,11 +27,12 @@ export const createConfig = () => {
         build: {
             outDir: resolve(root, 'dist'),
             lib: {
-                entry: resolve(root, 'src/index.tsx'),
+                entry: resolve(root, pkg.main),
                 fileName: 'app-bundle',
                 formats: ['es'],
             },
         },
+        customLogger: createCustomLogger(),
     });
 };
 export default createConfig;