@equinor/fusion-framework-cli 9.12.13 → 10.0.0-alpha-17c4eed176e5b4a0fcf867ed245471d3863af237

package/CHANGELOG.md

@@ -1,5 +1,161 @@
 # Change Log
 
+## 10.0.0-alpha-17c4eed176e5b4a0fcf867ed245471d3863af237
+
+### Major Changes
+
+-   [#2178](https://github.com/equinor/fusion-framework/pull/2178) [`9debd8c`](https://github.com/equinor/fusion-framework/commit/9debd8ccd73d30d6249d3b50a3b62aa3d658beb4) Thanks [@eikeland](https://github.com/eikeland)! - # App management
+
+    Adding new commands for app management, `publish`, `upload` and `tag`.
+
+    Introduces new parameters to the `config` command for publishing the app config to a build version.
+
+    ## breaking changes
+
+    -   This introduces braking changes to the `AppManifest` type. Apps-service is now returning instance of `ApplicationManifest` class.
+    -   The app-config endpoints is now an object containing url and scopes, where name is the object key:
+
+        ```ts
+          environment: {
+              scope: 'foobar',
+          },
+          endpoints: {
+              api: {
+                  url: 'https://foo.bars'
+                  scopes: ['foobar']
+              },
+          },
+        ```
+
+### Minor Changes
+
+-   [#2178](https://github.com/equinor/fusion-framework/pull/2178) [`8cb1d2a`](https://github.com/equinor/fusion-framework/commit/8cb1d2a40812986bfb0351dfb83ce6783d3f5a23) Thanks [@eikeland](https://github.com/eikeland)! - **@equinor/fusion-framework-cli:**
+
+    Create a plugin `externalPublicPlugin` to fix the issue with serving the `index.html` file from the specified external public directory. Vite mode `spa` will not serve the `index.html` file from the specified external public directory.
+
+    -   Enhanced the middleware to intercept requests and serve the `index.html` file from the specified external public directory.
+    -   Transformed the HTML using Vite's `transformIndexHtml` method.
+    -   Applied appropriate content headers and additional configured headers before sending the response.
+
+    ```typescript
+    const viteConfig = {
+      roo
+        plugins: [
+            // path wich contains the index.html file
+            externalPublicPlugin('./my-portal'),
+        ],
+    };
+
+    const viteConfig = defineConfig({
+        // vite configuration
+        root: './src', // this where vite will look for the index.html file
+        plugins: [
+            // path which contains the index.html file
+            externalPublicPlugin('./my-portal'),
+        ],
+    });
+    ```
+
+-   [#2459](https://github.com/equinor/fusion-framework/pull/2459) [`15152e4`](https://github.com/equinor/fusion-framework/commit/15152e413c054a5f57af93211a470c98c7696caa) Thanks [@odinr](https://github.com/odinr)! - **@equinor/fusion-framework-cli**
+
+    Updated the CLI to use the new service discovery API.
+
+    > [!NOTE]
+    > This is a quick fix until the new major version of the CLI is released.
+
+    -   Updated the `baseUri` to use a more specific URL path for service discovery.
+    -   Changed from `new URL(import.meta.url).origin` to `String(new URL('/_discovery/environments/current', import.meta.url))`.
+    -   Changed parsing of service discovery response to match new API format.
+
+-   [#2178](https://github.com/equinor/fusion-framework/pull/2178) [`8fbdf00`](https://github.com/equinor/fusion-framework/commit/8fbdf000b6d8ed725ab21a7df2207d46fd904454) Thanks [@eikeland](https://github.com/eikeland)! - **@equinor/fusion-framework-cli**
+
+    The `appProxyPlugin` is a Vite plugin designed to proxy requests to a Fusion app backend.
+    It sets up proxy rules for API and bundle requests and serves the app configuration and manifest based on the app key and version.
+
+    Key Features:
+
+    1. Proxy Configuration:
+
+        - Proxies API calls to the Fusion apps backend.
+        - Proxies bundle requests to the Fusion apps backend.
+        - Uses a base path `proxyPath` for proxying.
+        - Captures and reuses authorization tokens for asset requests.
+
+    2. **App Configuration and Manifest**:
+
+        - Serves the app configuration if the request matches the current app and version.
+        - Serves the app manifest if the request matches the current app.
+
+    3. **Middleware Setup**:
+        - Sets up middleware to handle requests for app configuration, manifest, and local bundles.
+
+    This plugin is used by the CLI for local development, but design as exportable for custom CLI to consume applications from other API`s
+
+    example configuration:
+
+    ```typescript
+    const viteConfig = defineConfig({
+        // vite configuration
+        plugins: [
+            appProxyPlugin({
+                proxy: {
+                    path: '/app-proxy',
+                    target: 'https://fusion-s-apps-ci.azurewebsites.net/',
+                    // optional callback when matched request is proxied
+                    onProxyReq: (proxyReq, req, res) => {
+                        proxyReq.on('response', (res) => {
+                            console.log(res.statusCode);
+                        });
+                    },
+                },
+                // optional, but required for serving local app configuration, manifest and resources
+                app: {
+                    key: 'my-app',
+                    version: '1.0.0',
+                    generateConfig: async () => ({}),
+                    generateManifest: async () => ({}),
+                },
+            }),
+        ],
+    });
+    ```
+
+    example usage:
+
+    ```typescript
+    // Example API calls
+    fetch('/app-proxy/apps/my-app/builds/1.0.0/config'); // local
+    fetch('/app-proxy/apps/my-app/builds/0.0.9/config'); // proxy
+    fetch('/app-proxy/apps/other-app/builds/1.0.0/config'); // proxy
+
+    // Example asset calls
+    fetch('/app-proxy/bundles/my-app/builds/1.0.0/index.js'); // local
+    fetch('/app-proxy/bundles/my-app/builds/0.0.9/index.js'); // proxy
+    ```
+
+### Patch Changes
+
+-   [#2462](https://github.com/equinor/fusion-framework/pull/2462) [`7f06955`](https://github.com/equinor/fusion-framework/commit/7f06955a641031bb11edddafe4bdd3d49c8d568b) Thanks [@odinr](https://github.com/odinr)! - **@equinor/fusion-framework-cli**
+
+    Introduced `proxyRequestLogger` to log proxy requests in the CLI.
+
+    -   Show the request URL and method in the console when a proxy request is made.
+    -   Show proxy response status code
+
+-   [#2458](https://github.com/equinor/fusion-framework/pull/2458) [`202cf10`](https://github.com/equinor/fusion-framework/commit/202cf10ae434d6432c8b57c2867b182223c19212) Thanks [@odinr](https://github.com/odinr)! - changed service discover url to match #c776845e753acf4a0bceda1c59d31e5939c44c31
+
+## 9.12.14
+
+### Patch Changes
+
+-   [#2431](https://github.com/equinor/fusion-framework/pull/2431) [`53ff9cc`](https://github.com/equinor/fusion-framework/commit/53ff9ccdbac95ae8d279aed49f173708bbe9adbe) Thanks [@dependabot](https://github.com/apps/dependabot)! - Upgrade vite from 5.3.5 to [5.4.3](<(https://github.com/vitejs/vite/blob/create-vite@5.4.0/packages/create-vite/CHANGELOG.md)>)
+
+-   Updated dependencies [[`f7c143d`](https://github.com/equinor/fusion-framework/commit/f7c143d44a88cc25c377d3ce8c3d1744114b891d)]:
+    -   @equinor/fusion-observable@8.4.1
+    -   @equinor/fusion-framework-module-feature-flag@1.1.8
+    -   @equinor/fusion-framework-app@9.1.7
+    -   @equinor/fusion-framework-react-components-people-provider@1.4.6
+
 ## 9.12.13
 
 ### Patch Changes

package/README.md

@@ -1,20 +1,42 @@
 ---
-title: usion Framework CLI
+title: Fusion Framework CLI
 ---
 
-Node CLI utility for working with Fusion Applications
+### fusion-framework-cli
 
-### [App](docs/app.md)
+The cli, named `fusion-framework-cli`, containt tooling for running and managing your application in the terminal or in your package scripts.
 
-see [Configuration](docs/app-configuration.md)
+The fusion-famework-cli should be installed as a devDependency.
 
-- tooling for [Vitest](https://vitest.dev/) - 🚀 coming soon 
-- tooling for proxy configuration  - 🚀 coming soon 
+```sh
+pnpm add -D @equinor/fusion-framework-cli
+```
 
-### Widget 
+You can always use the option `-h or --help or help` to get help for the CLI and its commands.
+
+Example:
+
+```sh
+fusion-framework-cli help
+```
+
+### App Commands
+
+See [App Commands](/cli/docs/commands.md)
+
+### Configuration
+
+See [Configuration](/cli/docs/configuration.md)
+
+### Tooling
+
+- tooling for [Vitest](https://vitest.dev/) - 🚀 coming soon
+- tooling for proxy configuration  - 🚀 coming soon
+
+### Widget
 
 Tooling for developing widgets  - 🚀 coming soon
 
-### Portal 
+### Portal
 
-Tooling for developing portals  - 🚀 coming
+Tooling for developing portals  - 🚀 coming

package/dist/bin/bundle-application.js

@@ -32,7 +32,8 @@ export const bundleApplication = (options) => __awaiter(void 0, void 0, void 0,
     spinner.info(`added ./package.json`);
     bundle.addLocalFolder(outDir);
     spinner.info(`added ./${outDir}`);
-    const licenseFile = resolve(pkg.path, 'LICENSE.md');
+    const appDir = dirname(pkg.path);
+    const licenseFile = resolve(appDir, 'LICENSE.md');
     if (fileExistsSync(licenseFile)) {
         bundle.addLocalFile(licenseFile);
         spinner.info(`added ${licenseFile}`);
@@ -40,7 +41,7 @@ export const bundleApplication = (options) => __awaiter(void 0, void 0, void 0,
     else {
         spinner.warn(`missing ${licenseFile}`);
     }
-    const readmeFile = resolve(pkg.path, 'README.md');
+    const readmeFile = resolve(appDir, 'README.md');
     if (fileExistsSync(readmeFile)) {
         bundle.addLocalFile(readmeFile);
         spinner.info(`added ${readmeFile}`);

package/dist/bin/bundle-application.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle-application.js","sourceRoot":"","sources":["../../src/bin/bundle-application.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bundle-application.js","sourceRoot":"","sources":["../../src/bin/bundle-application.ts"],"names":[],"mappings":"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"}

package/dist/bin/create-dev-serve.js

@@ -7,29 +7,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { join } from 'node:path';
-import { readFileSync } from 'node:fs';
+import { createServer, defineConfig, mergeConfig, } from 'vite';
 import { assert } from 'node:console';
-import { createServer } from 'vite';
-import ViteRestart from 'vite-plugin-restart';
+import { join, relative } from 'node:path';
 import portFinder from 'portfinder';
-import { createDevProxy } from './dev-proxy.js';
+import ViteRestart from 'vite-plugin-restart';
+import { appProxyPlugin } from './plugins/app-proxy.js';
+import { externalPublicPlugin } from './plugins/external-public.js';
+import { supportedExt } from '../lib/utils/config.js';
+import { manifestConfigFilename } from '../lib/app-manifest.js';
+import { appConfigFilename } from '../lib/app-config.js';
+import { resolveAppKey } from '../lib/app-package.js';
 import { loadAppConfig } from './utils/load-app-config.js';
 import { loadViteConfig } from './utils/load-vite-config.js';
-import { loadAppManifest } from './utils/load-manifest.js';
+import { loadPackage } from './utils/load-package.js';
 import { Spinner } from './utils/spinner.js';
 import { chalk, formatPath } from './utils/format.js';
-import { supportedExt } from '../lib/utils/config.js';
-import { createManifest, manifestConfigFilename } from '../lib/app-manifest.js';
-import { appConfigFilename, createAppConfig } from '../lib/app-config.js';
-import { loadPackage } from './utils/load-package.js';
-import { rateLimit } from 'express-rate-limit';
+import { loadAppManifest } from './utils/load-manifest.js';
+import { proxyRequestLogger } from './utils/proxy-request-logger.js';
 export const createDevServer = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const { configSourceFiles, library, portal, port, devPortalPath } = options;
+    var _a, _b, _c, _d;
+    const { configSourceFiles, library, port, devPortalPath } = options;
     const spinner = Spinner.Global({ prefixText: chalk.dim('dev-server') });
     const pkg = yield loadPackage();
-    spinner.info(`using portal 🔌${formatPath(portal)} as proxy target`);
+    const appKey = resolveAppKey(pkg.packageJson);
     const env = {
         command: 'serve',
         mode: (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'development',
@@ -39,114 +40,84 @@ export const createDevServer = (options) => __awaiter(void 0, void 0, void 0, fu
      * Load application manifest
      * Application might have overridden the `appKey`
      */
-    const manifest = yield loadAppManifest(env, pkg, { file: configSourceFiles.manifest });
-    const { key: appKey } = manifest.manifest;
     spinner.info(`resolved application key ${chalk.magenta(appKey)}`);
-    const { viteConfig, path: viteConfigPath } = yield loadViteConfig(env, {
+    const { viteConfig: baseViteConfig, path: viteConfigPath } = yield loadViteConfig(env, {
         file: configSourceFiles.vite,
     });
+    /**
+     * Defines the configuration for the development server.
+     */
+    const devServerConfig = defineConfig({
+        publicDir: devPortalPath,
+        appType: 'custom',
+        server: {
+            open: `/apps/${appKey}`,
+            port: port !== null && port !== void 0 ? port : (yield portFinder.getPortPromise({ port: 3000 })),
+        },
+        plugins: [
+            // Serve the dev portal as static files
+            externalPublicPlugin(devPortalPath),
+            // Proxy requests to the app server
+            appProxyPlugin({
+                proxy: {
+                    path: '/apps-proxy',
+                    target: 'https://fusion-s-apps-ci.azurewebsites.net/',
+                    onProxyReq: proxyRequestLogger,
+                },
+                app: {
+                    key: appKey,
+                    version: String(pkg.packageJson.version),
+                    generateConfig: () => __awaiter(void 0, void 0, void 0, function* () {
+                        const { config } = yield loadAppConfig(env, pkg, {
+                            file: configSourceFiles.app,
+                        });
+                        return config;
+                    }),
+                    generateManifest: () => __awaiter(void 0, void 0, void 0, function* () {
+                        const { manifest } = yield loadAppManifest(env, pkg, {
+                            file: configSourceFiles.manifest,
+                        });
+                        const assetPath = `bundles/apps/${appKey}/${pkg.packageJson.version}`;
+                        // TODO: @eikeland we need to fix this
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        // @ts-ignore
+                        return {
+                            appKey,
+                            build: Object.assign(Object.assign({}, manifest), { assetPath, configUrl: `${assetPath}/config` }),
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        };
+                    }),
+                },
+            }),
+            // Restart the server when config changes or the dev portal source is updated
+            ViteRestart({
+                restart: [
+                    'package.json',
+                    viteConfigPath,
+                    join(relative(process.cwd(), devPortalPath), '/**/*'),
+                ].filter((x) => !!x),
+                /** reload the CLI when config changes, note change to APP-KEY need restart */
+                reload: [
+                    ...supportedExt.map((ext) => [appConfigFilename, ext].join('')),
+                    ...supportedExt.map((ext) => [manifestConfigFilename, ext].join('')),
+                ],
+            }),
+        ],
+    });
+    // Merge the base Vite config with the dev server config
+    const viteConfig = mergeConfig(devServerConfig, baseViteConfig);
     /** Add library/framework plugins */
     if (library === 'react') {
         const reactPlugin = yield import('@vitejs/plugin-react');
         viteConfig.plugins.push(reactPlugin.default());
     }
-    viteConfig.plugins.push(ViteRestart({
-        restart: ['package.json', viteConfigPath].filter((x) => !!x),
-        /** reload the CLI when config changes, note change to APP-KEY need restart */
-        reload: [
-            ...supportedExt.map((ext) => [appConfigFilename, ext].join('')),
-            ...supportedExt.map((ext) => [manifestConfigFilename, ext].join('')),
-        ],
-    }));
+    assert((_b = viteConfig.build) === null || _b === void 0 ? void 0 : _b.lib, 'expected vite build to have library defined');
+    const { entry } = viteConfig.build.lib;
+    spinner.info('💾 application entrypoint', formatPath(String(entry), { relative: true }));
+    spinner.info('resolving cli internal assets from', formatPath(String(viteConfig.publicDir), { relative: true }));
     const vite = yield createServer(Object.assign(Object.assign({}, env), viteConfig));
-    assert(vite.config.build.lib, 'expected vite build to have library defined');
-    const { entry } = vite.config.build.lib;
-    spinner.info('💾 application entrypoint', formatPath(String(entry)));
-    spinner.info('resolving cli internal assets from ', formatPath(devPortalPath));
-    /** add proxy handlers */
-    const server = createDevProxy({
-        onConfigResponse: (slug, message, data) => __awaiter(void 0, void 0, void 0, function* () {
-            if (slug.appKey === appKey) {
-                if (message.statusCode === 404) {
-                    const { config: response, path } = yield loadAppConfig(env, pkg, {
-                        file: configSourceFiles.app,
-                    });
-                    return { response, path, statusCode: 200 };
-                }
-                else if (data) {
-                    const { config: response, path } = yield createAppConfig(env, data, {
-                        file: configSourceFiles.app,
-                    });
-                    path && spinner.info('created config from ', formatPath(path));
-                    return { response, path };
-                }
-            }
-        }),
-        onManifestResponse: (slug, message, data) => __awaiter(void 0, void 0, void 0, function* () {
-            if (slug.appKey === appKey) {
-                if (message.statusCode === 404) {
-                    const { manifest: response, path } = yield loadAppManifest(env, pkg, {
-                        file: configSourceFiles.manifest,
-                    });
-                    response.entry = `/${entry}`;
-                    return { response, path, statusCode: 200 };
-                }
-                else if (data) {
-                    const { manifest: response, path } = yield createManifest(env, data, {
-                        file: configSourceFiles.manifest,
-                    });
-                    response.entry = `/${entry}`;
-                    path && spinner.info('created manifest from ', formatPath(path));
-                    return { response, path };
-                }
-            }
-        }),
-        onManifestListResponse: (slug, message, data) => __awaiter(void 0, void 0, void 0, function* () {
-            var _a;
-            // TODO: Verify if we should always only return current app or all apps from API + current app.
-            if (!data) {
-                const { manifest, path } = yield loadAppManifest(env, pkg, {
-                    file: configSourceFiles.manifest,
-                });
-                manifest.entry = `/${entry}`;
-                return { response: [manifest], path };
-            }
-            let path;
-            const atIndex = (_a = data === null || data === void 0 ? void 0 : data.findIndex((manifest) => manifest.key === appKey)) !== null && _a !== void 0 ? _a : -1;
-            // If existing app, we need to change the entry-point.
-            if (atIndex > -1) {
-                data[atIndex].entry = `/${entry}`;
-            }
-            else {
-                const { manifest, path: manifestPath } = yield loadAppManifest(env, pkg, {
-                    file: configSourceFiles.manifest,
-                });
-                manifest.entry = `/${entry}`;
-                path = manifestPath;
-                data.push(manifest);
-            }
-            return { response: data, path };
-        }),
-    }, {
-        target: portal,
-        staticAssets: [{ path: devPortalPath }],
-    });
-    /** connect dev server to Vite */
-    server.use(vite.middlewares);
-    /** redirect all request that miss to index.html, SPA logic */
-    server.use('*', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
-        // TODO add check if file request
-        const htmlRaw = readFileSync(join(devPortalPath + '/index.html'), 'utf-8');
-        const html = yield vite.transformIndexHtml(req.url, htmlRaw);
-        res.send(html);
-    }), rateLimit({
-        max: 10,
-    }));
-    /** use provided port or resolve available  */
-    const serverPort = port !== null && port !== void 0 ? port : (yield portFinder.getPortPromise({ port: 3000 }));
     spinner.start('🚀 start server');
-    server.listen(serverPort);
-    spinner.succeed();
-    spinner.succeed('🔗', chalk.underline.green(new URL(`/apps/${appKey}`, `http://localhost:${serverPort}`).href));
+    yield vite.listen();
+    spinner.succeed('🔗', chalk.underline.green(new URL(`/apps/${appKey}`, (_d = (_c = vite.resolvedUrls) === null || _c === void 0 ? void 0 : _c.local[0]) !== null && _d !== void 0 ? _d : `https://localhost:/${vite.config.server.port}`).href));
 });
 //# sourceMappingURL=create-dev-serve.js.map

package/dist/bin/create-dev-serve.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-dev-serve.js","sourceRoot":"","sources":["../../src/bin/create-dev-serve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-dev-serve.js","sourceRoot":"","sources":["../../src/bin/create-dev-serve.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACH,YAAY,EACZ,YAAY,EACZ,WAAW,GAGd,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,OAAO,WAAW,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,EAAE,YAAY,EAA0B,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAO,OAUrC,EAAE,EAAE;;IACD,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEpE,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAExE,MAAM,GAAG,GAAG,MAAM,WAAW,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAE9C,MAAM,GAAG,GAAsB;QAC3B,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,aAAa;QAC3C,IAAI,EAAE,GAAG,CAAC,IAAI;KACjB,CAAC;IAEF;;;OAGG;IACH,OAAO,CAAC,IAAI,CAAC,4BAA4B,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAElE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE;QACnF,IAAI,EAAE,iBAAiB,CAAC,IAAI;KAC/B,CAAC,CAAC;IAEH;;OAEG;IACH,MAAM,eAAe,GAAG,YAAY,CAAC;QACjC,SAAS,EAAE,aAAa;QACxB,OAAO,EAAE,QAAQ;QACjB,MAAM,EAAE;YACJ,IAAI,EAAE,SAAS,MAAM,EAAE;YACvB,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,CAAC,MAAM,UAAU,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAClE;QACD,OAAO,EAAE;YACL,uCAAuC;YACvC,oBAAoB,CAAC,aAAa,CAAC;YACnC,mCAAmC;YACnC,cAAc,CAAC;gBACX,KAAK,EAAE;oBACH,IAAI,EAAE,aAAa;oBACnB,MAAM,EAAE,6CAA6C;oBACrD,UAAU,EAAE,kBAAkB;iBACjC;gBACD,GAAG,EAAE;oBACD,GAAG,EAAE,MAAM;oBACX,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC;oBACxC,cAAc,EAAE,GAAS,EAAE;wBACvB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE;4BAC7C,IAAI,EAAE,iBAAiB,CAAC,GAAG;yBAC9B,CAAC,CAAC;wBACH,OAAO,MAAM,CAAC;oBAClB,CAAC,CAAA;oBACD,gBAAgB,EAAE,GAAS,EAAE;wBACzB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE;4BACjD,IAAI,EAAE,iBAAiB,CAAC,QAAQ;yBACnC,CAAC,CAAC;wBACH,MAAM,SAAS,GAAG,gBAAgB,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;wBACtE,sCAAsC;wBACtC,6DAA6D;wBAC7D,aAAa;wBACb,OAAO;4BACH,MAAM;4BACN,KAAK,kCACE,QAAQ,KACX,SAAS,EACT,SAAS,EAAE,GAAG,SAAS,SAAS,GACnC;4BACD,8DAA8D;yBAC1D,CAAC;oBACb,CAAC,CAAA;iBACJ;aACJ,CAAC;YACF,6EAA6E;YAC7E,WAAW,CAAC;gBACR,OAAO,EAAE;oBACL,cAAc;oBACd,cAAc;oBACd,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,OAAO,CAAC;iBACxD,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjC,8EAA8E;gBAC9E,MAAM,EAAE;oBACJ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC/D,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACvE;aACJ,CAAC;SACL;KACJ,CAAC,CAAC;IAEH,wDAAwD;IACxD,MAAM,UAAU,GAAG,WAAW,CAAC,eAAe,EAAE,cAAc,CAAe,CAAC;IAE9E,oCAAoC;IACpC,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACtB,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACzD,UAAU,CAAC,OAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,CAAC,MAAA,UAAU,CAAC,KAAK,0CAAE,GAAG,EAAE,6CAA6C,CAAC,CAAC;IAE7E,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,KAAM,CAAC,GAAqB,CAAC;IAE1D,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAEzF,OAAO,CAAC,IAAI,CACR,oCAAoC,EACpC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAC/D,CAAC;IAEF,MAAM,IAAI,GAAG,MAAM,YAAY,iCAAM,GAAG,GAAK,UAAU,EAAG,CAAC;IAE3D,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACjC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,OAAO,CACX,IAAI,EACJ,KAAK,CAAC,SAAS,CAAC,KAAK,CACjB,IAAI,GAAG,CACH,SAAS,MAAM,EAAE,EACjB,MAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,KAAK,CAAC,CAAC,CAAC,mCAAI,sBAAsB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CACjF,CAAC,IAAI,CACT,CACJ,CAAC;AACN,CAAC,CAAA,CAAC"}

package/dist/bin/create-export-config.js

@@ -10,22 +10,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import nodeFs from 'node:fs';
 import { writeFile } from 'node:fs/promises';
 import { dirname } from 'node:path';
+import semverValid from 'semver/functions/valid.js';
 import { chalk, formatPath } from './utils/format.js';
 import { Spinner } from './utils/spinner.js';
-import { loadPackage } from './utils/load-package.js';
-import { loadAppConfig } from './utils/load-app-config.js';
+import { getEndpointUrl, loadAppConfig, loadPackage, isAppRegistered, requireToken, publishAppConfig, } from './utils/index.js';
+import { resolveAppKey } from '../lib/app-package.js';
+import { exit } from 'node:process';
 export const createExportConfig = (options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const { command = 'build', outputFile } = options !== null && options !== void 0 ? options : {};
+    const { command = 'build', outputFile, configFile, publish, env, service } = options;
     const spinner = Spinner.Global({ prefixText: chalk.dim('config') });
     const pkg = yield loadPackage();
-    const env = {
+    const appKey = resolveAppKey(pkg.packageJson);
+    const appEnv = {
         command,
         mode: (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'development',
         root: pkg.root,
     };
-    const { config } = yield loadAppConfig(env, pkg, {
-        file: options === null || options === void 0 ? void 0 : options.configFile,
+    const { config } = yield loadAppConfig(appEnv, pkg, {
+        file: configFile,
     });
     if (outputFile) {
         spinner.start(`outputting config to ${formatPath(outputFile)}`);
@@ -45,6 +48,65 @@ export const createExportConfig = (options) => __awaiter(void 0, void 0, void 0,
     else {
         console.log(config);
     }
+    if (publish) {
+        spinner.info('Preparing to publishing config');
+        /* Make sure version is valid */
+        const version = publish === 'current' ? pkg.packageJson.version : publish;
+        if (!version || (!semverValid(version) && !['latest', 'preview'].includes(version))) {
+            spinner.fail('🙅‍♂️', 'Can not publish config to invalid version', chalk.redBright(version), '');
+            exit(1);
+        }
+        /** make sure user has a valid token */
+        try {
+            spinner.info('Validating FUSION_TOKEN');
+            // make sure token exist
+            requireToken();
+            // call service discovery with token, will throw error if failed
+            yield getEndpointUrl('apps', env, '');
+            spinner.succeed('Found valid FUSION_TOKEN');
+        }
+        catch (e) {
+            const err = e;
+            spinner.fail(chalk.bgRed(err.message));
+            exit(1);
+        }
+        try {
+            spinner.info('Verifying that App is registered');
+            const state = { endpoint: '' };
+            try {
+                state.endpoint = yield getEndpointUrl(`apps/${appKey}`, env, service);
+            }
+            catch (e) {
+                const err = e;
+                throw new Error(`Could not get endpoint from service discovery while verifying app. service-discovery status: ${err.message}`);
+            }
+            yield isAppRegistered(state.endpoint, appKey);
+            spinner.succeed(`${appKey} is registered`);
+        }
+        catch (e) {
+            const err = e;
+            spinner.fail('🙅‍♂️', chalk.bgRed(err.message));
+            exit(1);
+        }
+        try {
+            spinner.info(`Publishing config to "${appKey}@${version}"`);
+            const state = { endpoint: '' };
+            try {
+                state.endpoint = yield getEndpointUrl(`apps/${appKey}/builds/${version}/config`, env, service);
+            }
+            catch (e) {
+                const err = e;
+                throw new Error(`Could not get endpoint from service discovery while publishig config. service-discovery status: ${err.message}`);
+            }
+            yield publishAppConfig(state.endpoint, appKey, config);
+            spinner.succeed('✅', 'Published config to version', chalk.yellowBright(version));
+        }
+        catch (e) {
+            const err = e;
+            spinner.fail('🙅‍♂️', chalk.bgRed(err.message));
+            exit(1);
+        }
+    }
     return config;
 });
 export default createExportConfig;

package/dist/bin/create-export-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-export-config.js","sourceRoot":"","sources":["../../src/bin/create-export-config.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAO,OAIxC,EAAE,EAAE;;IACD,MAAM,EAAE,OAAO,GAAG,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;IAExD,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEpE,MAAM,GAAG,GAAG,MAAM,WAAW,EAAE,CAAC;IAEhC,MAAM,GAAG,GAAsB;QAC3B,OAAO;QACP,IAAI,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,aAAa;QAC3C,IAAI,EAAE,GAAG,CAAC,IAAI;KACjB,CAAC;IAEF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE;QAC7C,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU;KAC5B,CAAC,CAAC;IAEH,IAAI,UAAU,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,wBAAwB,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;gBAC1C,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/C,CAAC;YACD,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9C,OAAO,CAAC,OAAO,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"create-export-config.js","sourceRoot":"","sources":["../../src/bin/create-export-config.ts"],"names":[],"mappings":"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"}