@equinor/fusion-framework-cli 0.1.5 → 0.1.6

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.6](https://github.com/equinor/fusion-framework/compare/@equinor/fusion-framework-cli@0.1.5...@equinor/fusion-framework-cli@0.1.6) (2022-11-03)
+
+**Note:** Version bump only for package @equinor/fusion-framework-cli
+
 ## [0.1.5](https://github.com/equinor/fusion-framework/compare/@equinor/fusion-framework-cli@0.1.4...@equinor/fusion-framework-cli@0.1.5) (2022-11-03)
 
 **Note:** Version bump only for package @equinor/fusion-framework-cli

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@equinor/fusion-framework-cli",
-    "version": "0.1.5",
+    "version": "0.1.6",
     "keywords": [
         "Fusion",
         "Fusion Framework",
@@ -43,5 +43,5 @@
         "typescript": "^4.8.4",
         "vite": "^3.2.0"
     },
-    "gitHead": "1e6d5c79e0658def6b1e4d208edb7c98a1ea5bfc"
+    "gitHead": "bb21836f3674173eb2809e6daa75d616c1dcf64e"
 }

package/src/dev-portal/AppLoader.tsx

@@ -1,41 +0,0 @@
-import { useCallback, useEffect, useRef } from 'react';
-
-import { useFramework } from '@equinor/fusion-framework-react/hooks';
-import { AppConfig, AppManifest, useAppEnv } from '@equinor/fusion-framework-react/app';
-import { StarProgress } from '@equinor/fusion-react-progress-indicator';
-
-export const AppLoader = (props: { appKey: string }) => {
-    const { appKey } = props;
-    const fusion = useFramework();
-    const ref = useRef<HTMLSpanElement>(null);
-    const renderRef = useRef<VoidFunction | undefined>(undefined);
-
-    const { config, manifest, isLoading } = useAppEnv(appKey);
-
-    const loadApp = useCallback(
-        async (manifest: AppManifest, config: AppConfig) => {
-            const url = new URL('/index.tsx', import.meta.url).href;
-            const { render } = await import(url);
-            if (ref.current) {
-                return render(ref.current, { fusion, env: { manifest, config } });
-            }
-        },
-        [ref, fusion]
-    );
-
-    useEffect(() => {
-        if (!isLoading && manifest && config) {
-            loadApp(manifest, config).then((x) => (renderRef.current = x));
-        }
-        return renderRef.current;
-    }, [loadApp, isLoading, manifest, config]);
-
-    return (
-        <div>
-            {isLoading && <StarProgress text="Loading Application" />}
-            <span ref={ref} style={{ display: isLoading ? 'none' : '' }}></span>;
-        </div>
-    );
-};
-
-export default AppLoader;

package/src/dev-portal/config.ts

@@ -1,40 +0,0 @@
-import { FusionConfigurator } from '@equinor/fusion-framework-react';
-import { ConsoleLogger } from '@equinor/fusion-framework-module-msal/client';
-
-export const configure = async (config: FusionConfigurator) => {
-    config.logger.level = 4;
-
-    config.configureServiceDiscovery({
-        client: {
-            baseUri: 'https://pro-s-portal-ci.azurewebsites.net',
-            defaultScopes: ['97978493-9777-4d48-b38a-67b0b9cd88d2/.default'],
-        },
-    });
-
-    config.configureMsal(
-        {
-            tenantId: '3aa4a235-b6e2-48d5-9195-7fcf05b459b0',
-            clientId: '9b707e3a-3e90-41ed-a47e-652a1e3b53d0',
-            redirectUri: '/authentication/login-callback',
-        },
-        { requiresAuth: true }
-    );
-
-    config.onConfigured(() => {
-        console.log('framework config done');
-    });
-
-    config.onInitialized(async (fusion) => {
-        fusion.auth.defaultClient.setLogger(new ConsoleLogger(0));
-
-        console.debug('📒 subscribing to all events');
-        fusion.event.subscribe((e) => console.debug(`🔔🌍 [${e.type}]`, e));
-
-        console.debug('📒 subscribing to [onReactAppLoaded]');
-        fusion.event.addEventListener('onReactAppLoaded', (e) =>
-            console.debug('🔔 [onReactAppLoaded]', e)
-        );
-    });
-};
-
-export default configure;

package/src/dev-portal/index.html

@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Vite + React + TS</title>
-  <script type="module" crossorigin defer>
-    const url = new URL('/@react-refresh', import.meta.url).href;
-    import(url).then(({default: {injectIntoGlobalHook}}) => {
-      injectIntoGlobalHook(window)
-      window.$RefreshReg$ = () => { }
-      window.$RefreshSig$ = () => (type) => type
-      window.__vite_plugin_react_preamble_installed__ = true
-    });
-  </script>
-
-<body>
-  <div id="root"></div>
-  
-  <script type="module" src="/main.tsx" crossorigin></script>
-</body>
-
-</html>

package/src/dev-portal/main.tsx

@@ -1,28 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom/client';
-
-import { Framework } from '@equinor/fusion-framework-react';
-
-import { ThemeProvider, theme } from '@equinor/fusion-react-styles';
-import { StarProgress } from '@equinor/fusion-react-progress-indicator';
-
-import { configure } from './config';
-
-import { AppLoader } from './AppLoader';
-
-ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
-    <React.StrictMode>
-        <ThemeProvider theme={theme}>
-            <Framework configure={configure} fallback={<StarProgress text="Loading framework" />}>
-                <div>
-                    <section>
-                        <header>
-                            <h1>Fusion Dev Portal</h1>
-                        </header>
-                    </section>
-                    <AppLoader appKey={'test-app'} />
-                </div>
-            </Framework>
-        </ThemeProvider>
-    </React.StrictMode>
-);

package/src/index.tsx

@@ -1,25 +0,0 @@
-import { StrictMode } from 'react';
-import * as ReactDOM from 'react-dom/client';
-
-// import 'vite/modulepreload-polyfill';
-
-const Test = (args) => {
-    return (
-        <div>
-            <p>Hello there this is all! good 🤙🏻</p>
-            <pre>{JSON.stringify(args, undefined, 4)}</pre>
-        </div>
-    );
-};
-
-export const render = (el: HTMLElement, args) => {
-    const root = ReactDOM.createRoot(el);
-    root.render(
-        <StrictMode>
-            <Test env={args.env} />
-        </StrictMode>
-    );
-    return () => root.unmount();
-};
-
-export default render;

package/src/scripts/create-config.ts

@@ -1,37 +0,0 @@
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
-import { findUpSync } from 'find-up';
-
-import { defineConfig, UserConfig } 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) };
-};
-
-export const createConfig = (): UserConfig => {
-    const { root } = resolvePackage();
-    return defineConfig({
-        plugins: [react()],
-        root: resolve(root, 'src'),
-        server: {
-            middlewareMode: true,
-        },
-        appType: 'custom',
-        build: {
-            outDir: resolve(root, 'dist'),
-            lib: {
-                entry: resolve(root, 'src/index.tsx'),
-                fileName: 'app-bundle',
-                formats: ['es'],
-            },
-        },
-    }) as unknown as UserConfig;
-};
-
-export default createConfig;

package/src/scripts/main.ts

@@ -1,37 +0,0 @@
-#!/usr/bin/env node
-
-import { Command } from 'commander';
-
-import ora from 'ora';
-
-import { build, mergeConfig } from 'vite';
-
-import startDevServer from './serve.js';
-import createConfig from './create-config.js';
-
-const program = new Command();
-
-program.name('fusion-framework-cli');
-program.description('CLI for Fusion Framework');
-program.version('0.0.1-alpha');
-
-const app = program
-    .command('app')
-    .description('Tooling for developing applications build on Fusion Framework');
-
-app.command('dev')
-    .description('Create a development server')
-
-    .option('-p, --port <number>', 'devserver port', '3000')
-    .action(async (port) => {
-        const spinner = ora('Loading configuration').start();
-        const config = mergeConfig(await createConfig(), { server: port });
-        spinner.succeed('Configuration loaded');
-        startDevServer(mergeConfig(config, { server: port }));
-    });
-
-app.command('build').action(() => {
-    build(createConfig());
-});
-
-program.parse();

package/src/scripts/serve.ts

@@ -1,38 +0,0 @@
-import { createServer } from 'vite';
-import type { UserConfig } from 'vite';
-
-import express from 'express';
-
-import dns from 'dns';
-dns.setDefaultResultOrder('verbatim');
-
-import path from 'path';
-import kleur from 'kleur';
-
-import ora from 'ora';
-
-const resolveRelativePath = (relative: string) =>
-    path.resolve(new URL(relative, import.meta.url).pathname);
-
-export const server = async (config: UserConfig) => {
-    const spinner = ora('Starting dev-server').start();
-    const app = express();
-
-    const port = config.server?.port ?? 3000;
-
-    const vite = await createServer(config);
-
-    app.use(vite.middlewares);
-    app.use(express.static(resolveRelativePath('dev-portal')));
-    app.use('*', async (_, res) => {
-        res.sendFile(resolveRelativePath('dev-portal/index.html'));
-    });
-
-    app.listen(port);
-
-    spinner.succeed(
-        `dev-server started on: ${kleur.underline().green(['http://localhost', port].join(':'))}`
-    );
-};
-
-export default server;

package/tsconfig.json

@@ -1,22 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "bin",
-    "rootDir": "src",
-    "declarationDir": "./dist/types",
-    "baseUrl": "src",
-    "jsx": "react-jsx"
-  },
-  "references": [
-    {
-      "path": "../framework-react"
-    }
-  ],
-  "include": [
-    "src/**/*",
-  ],
-  "exclude": [
-    "node_modules",
-    "lib"
-  ],
-}

package/tsconfig.scripts.json

@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "bin",
-    "rootDir": "src/scripts",
-    "target": "ES6",
-    "module": "es2020",
-    "lib": ["ES6", "ES2015", "DOM"],
-    "strict": true,
-    "types": ["node"],
-    "esModuleInterop": true,
-    "moduleResolution": "node"
-  },
-  "include": [
-    "src/scripts",
-  ],
-}

package/vite.config.ts

@@ -1,12 +0,0 @@
-import { defineConfig } from 'vite';
-import { fileURLToPath } from 'url';
-import react from '@vitejs/plugin-react';
-
-export default defineConfig({
-    plugins: [react()],
-    root: fileURLToPath(new URL('./src/dev-portal', import.meta.url)),
-    build: {
-        outDir: fileURLToPath(new URL('./bin/dev-portal', import.meta.url)),
-        emptyOutDir: true,
-    },
-});