@equinor/fusion-framework-cli 10.7.4 → 11.0.0-next.0

package/dist/types/lib/utils/resolve-git-commit-sha.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Resolves the Git commit SHA for a given reference.
+ *
+ * @param ref - The Git reference to resolve. Defaults to 'HEAD' if not provided.
+ * @returns The resolved Git commit SHA as a string, or `undefined` if the command fails.
+ *
+ * @remarks
+ * This function uses the `git rev-parse` command to determine the commit SHA.
+ * Ensure that the function is executed in a valid Git repository context.
+ *
+ * @throws Will throw an error if the `git` command fails or is not available.
+ */
+export declare const resolveGitCommitSha: (ref?: string) => string | undefined;

package/dist/types/lib/utils/resolve-git-remote-url.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Resolves the URL of the Git remote named "origin" for the current repository.
+ *
+ * This function executes a shell command to retrieve the remote URL and converts
+ * SSH-style URLs (e.g., `git@github.com:user/repo.git`) to HTTPS-style URLs
+ * (e.g., `https://github.com/user/repo`). It also removes the `.git` suffix
+ * from the URL if present.
+ *
+ * @returns The resolved Git remote URL as a string, or `undefined` if the command
+ *          fails or the remote "origin" is not configured.
+ */
+export declare const resolveGitRemoteUrl: () => string | undefined;
+export default resolveGitRemoteUrl;

package/dist/types/lib/utils/resolve-github-annotations.d.ts

@@ -0,0 +1,65 @@
+/**
+ * Interface for the expected structure of the GitHub Actions event payload.
+ */
+export interface GithubEventPayload {
+    pull_request?: {
+        number?: number;
+        title?: string;
+        user?: {
+            login?: string;
+        };
+        head?: {
+            sha?: string;
+            ref?: string;
+        };
+        created_at?: string;
+        updated_at?: string;
+        html_url?: string;
+    };
+    after?: string;
+    head_commit?: {
+        id?: string;
+    };
+    ref?: string;
+    release?: {
+        tag_name?: string;
+        name?: string;
+        body?: string;
+        draft?: boolean;
+        prerelease?: boolean;
+        created_at?: string;
+        published_at?: string;
+        html_url?: string;
+    };
+    workflow?: string;
+    action?: string;
+}
+/**
+ * Resolves GitHub Actions-specific annotation variables from environment variables.
+ *
+ * This function extracts relevant workflow and repository information from GitHub Actions environment variables.
+ * It constructs a set of annotation variables that can be used for reporting or logging purposes in CI/CD pipelines.
+ *
+ * @returns {Record<string, string>} An object containing GitHub Actions annotation variables such as eventName, actor,
+ * payload, runId, repository, and runUrl. If a variable is not found, its value defaults to 'unknown'.
+ *
+ * Environment variables used by this function (see: https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables):
+ *   - GITHUB_EVENT_NAME: Name of the event that triggered the workflow
+ *   - GITHUB_ACTOR: Username of the person or app that initiated the workflow
+ *   - GITHUB_RUN_ID: Unique identifier for the workflow run
+ *   - GITHUB_REPOSITORY: Repository in the format owner/repo
+ *   - GITHUB_SERVER_URL: Base URL of the GitHub server (defaults to https://github.com)
+ *   - GITHUB_EVENT_PATH: Path to the event payload file (JSON)
+ *
+ * Notes for maintainers:
+ *   - The event payload can be large; consider truncating or parsing if only specific fields are needed.
+ *   - If reading the payload fails, the function returns a fallback string. Adjust error handling as needed for your use case.
+ *   - If you need additional GitHub Actions context, refer to the official documentation and add new variables here.
+ *   - The payload and other fields may contain sensitive information. Use caution when logging or exposing these values.
+ *
+ * Extending this function:
+ *   - To add more annotations, extract additional environment variables as needed and include them in the returned object.
+ *   - For custom workflows or self-hosted runners, verify that all required environment variables are available.
+ */
+export declare const resolveAnnotations: () => Record<string, string>;
+export default resolveAnnotations;

package/dist/types/lib/utils/resolve-package-repo.d.ts

@@ -0,0 +1,9 @@
+import type { PackageJson } from 'type-fest';
+/**
+ * Resolves the GitHub repository URL from a given `package.json` object.
+ *
+ * @param pkg - The `package.json` object to extract the repository information from.
+ * @returns The GitHub repository URL as a string.
+ * @throws Will throw an error if the `package.json` does not contain a repository field.
+ */
+export declare const resolveRepoFromPackage: (pkg: PackageJson) => string | undefined;

package/dist/types/lib/utils/resolve-package.d.ts

@@ -0,0 +1,15 @@
+import { type PackageJson, type NormalizeOptions as ResolvePackageOptions } from 'read-package-up';
+export type ResolvedPackage = {
+    packageJson: PackageJson;
+    path: string;
+    root: string;
+};
+/**
+ * Resolves the application package by searching for the nearest `package.json` file.
+ *
+ * @param options - Optional parameters to customize the search behavior.
+ * @returns A promise that resolves to the found package information.
+ * @throws Will throw an error if the `package.json` file is not found.
+ */
+export declare const resolvePackage: (options?: ResolvePackageOptions) => Promise<ResolvedPackage>;
+export default resolvePackage;

package/dist/types/lib/utils/resolve-source-entry-point.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Resolves the entry point file from a specified directory.
+ *
+ * This function searches for the first file that exists from a list of possible entry point filenames
+ * within a given directory. If no entry point is found, it throws an error with a helpful message.
+ *
+ * @param cwd - The current working directory. Defaults to `process.cwd()` if not provided.
+ * @param dir - The directory to search within. Defaults to `'src'` if not provided.
+ * @param opt - Optional parameters.
+ * @param opt.files - An array of filenames to look for. Defaults to ENTRY_POINT_FILES.
+ * @returns The resolved entry point file path if found.
+ * @throws {Error} If no entry point file is found in the directory.
+ */
+export declare const resolveEntryPoint: (cwd?: string, dir?: string, opt?: {
+    files?: string[];
+}) => string;
+export default resolveEntryPoint;

package/dist/types/lib/utils/types.d.ts

@@ -1,6 +1,6 @@
 export type RecursivePartial<T> = {
     [P in keyof T]?: T[P] extends Array<infer U> ? Array<Value<U>> : Value<T[P]>;
 };
-type AllowedPrimitives = boolean | string | number | Date;
+type AllowedPrimitives = Function | boolean | string | number | Date;
 type Value<T> = T extends AllowedPrimitives ? T : RecursivePartial<T>;
 export {};

package/dist/types/lib/utils/write-file.d.ts

@@ -0,0 +1,14 @@
+import { type PathLike, type WriteFileOptions } from 'node:fs';
+/**
+ * Writes data to a specified file, creating the necessary directories if they do not exist.
+ *
+ * This utility ensures that the directory structure for the file exists before writing.
+ * It is useful for safe file output in scripts and CLIs where the target directory may not exist.
+ *
+ * @param file - The path to the file where the data should be written.
+ * @param data - The content to write to the file. Can be a string or a Node.js `ArrayBufferView`.
+ * @param options - Optional settings for writing the file, such as encoding or file mode.
+ *
+ * @throws Will throw an error if the file cannot be written.
+ */
+export declare const writeFile: (file: PathLike, data: string | NodeJS.ArrayBufferView, options?: WriteFileOptions) => void;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "10.7.4";
+export declare const version = "11.0.0-next.0";

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@equinor/fusion-framework-cli",
-  "version": "10.7.4",
+  "version": "11.0.0-next.0",
+  "homepage": "https://github.com/equinor/fusion-framework",
   "keywords": [
     "Fusion",
     "Fusion Framework",
@@ -16,95 +17,73 @@
     "fusion-framework-cli": "./bin/cli.mjs"
   },
   "main": "./bin/main.js",
-  "types": "./dist/types/lib/index.d.ts",
+  "types": "./dist/types/lib.d.ts",
   "exports": {
     ".": {
       "types": "./dist/types/lib/index.d.ts",
-      "import": "./dist/lib/index.js"
+      "import": "./dist/esm/lib/index.js"
     },
-    "./plugin-app-assets": {
-      "types": "./dist/types/bin/plugins/app-assets/index.d.ts",
-      "import": "./dist/lib/plugins/app-assets/index.js"
+    "./app": {
+      "types": "./dist/types/lib/app/index.d.ts",
+      "import": "./dist/esm/lib/app/index.js"
     },
-    "./plugin-app-proxy": {
-      "types": "./dist/types/lib/plugins/app-proxy/index.d.ts",
-      "import": "./dist/lib/plugins/app-proxy/index.js"
+    "./portal": {
+      "types": "./dist/types/lib/portal/index.d.ts",
+      "import": "./dist/esm/lib/portal/index.js"
     },
-    "./plugin-external-public": {
-      "types": "./dist/types/lib/plugins/external-public/index.d.ts",
-      "import": "./dist/lib/plugins/external-public/index.js"
+    "./dev-server": {
+      "types": "./dist/types/lib/dev-server.d.ts",
+      "import": "./dist/esm/lib/dev-server.js"
+    },
+    "./bin": {
+      "types": "./dist/types/bin/index.d.ts",
+      "import": "./bin/build/bin.js"
     }
   },
   "dependencies": {
-    "@vitejs/plugin-react": "^4.0.4",
+    "@azure/msal-node": "^3.5.1",
+    "@azure/msal-node-extensions": "^1.5.11",
+    "@rollup/plugin-commonjs": "^28.0.3",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.1",
     "adm-zip": "^0.5.10",
+    "ajv": "^8.17.1",
     "chalk": "^5.3.0",
     "commander": "^13.0.0",
-    "deepmerge": "^4.3.1",
-    "find-up": "^7.0.0",
-    "is-mergeable-object": "^1.1.1",
-    "loader-utils": "^3.3.1",
-    "mime": "^4.0.4",
-    "node-fetch": "^3.3.2",
+    "is-ci": "^4.1.0",
+    "lodash.mergewith": "^4.6.2",
+    "open": "^10.1.1",
     "ora": "^8.0.1",
-    "portfinder": "^1.0.32",
-    "pretty-bytes": "^6.1.1",
+    "pretty-bytes": "^7.0.0",
     "read-package-up": "^11.0.0",
-    "semver": "^7.5.4",
-    "vite": "^6.0.7",
-    "vite-plugin-environment": "^1.1.3",
-    "vite-plugin-restart": "^0.4.0",
-    "vite-tsconfig-paths": "^4.2.0",
-    "zod": "^3.23.8"
+    "rollup": "^4.39.0",
+    "type-fest": "^4.40.0",
+    "vite": "^6.3.5",
+    "zod": "^3.25.20",
+    "@equinor/fusion-framework-dev-portal": "^1.0.0-next.0",
+    "@equinor/fusion-imports": "^1.1.0",
+    "@equinor/fusion-framework-dev-server": "^1.0.0-next.0"
   },
   "devDependencies": {
-    "@equinor/eds-core-react": "^0.45.0",
-    "@equinor/eds-icons": "^0.22.0",
-    "@equinor/eds-tokens": "^0.9.2",
-    "@equinor/eslint-config-fusion-react": "^2.0.1",
-    "@equinor/fusion-react-context-selector": "^1.0.4",
-    "@equinor/fusion-react-progress-indicator": "^0.3.0",
-    "@equinor/fusion-react-side-sheet": "1.3.7",
-    "@equinor/fusion-react-styles": "^0.6.4",
-    "@equinor/fusion-wc-chip": "^1.2.2",
-    "@equinor/fusion-wc-person": "^3.1.8",
-    "@material-ui/styles": "^4.11.5",
     "@types/adm-zip": "^0.5.0",
-    "@types/loader-utils": "^2.0.6",
+    "@types/lodash.mergewith": "^4.6.9",
     "@types/node": "^20.11.14",
-    "@types/react": "^18.2.50",
-    "@types/react-dom": "^18.2.7",
-    "@types/rollup": "^0.54.0",
-    "@types/semver": "^7.5.0",
-    "eslint-plugin-rxjs": "^5.0.3",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-router-dom": "^6.15.0",
-    "rollup": "^4.22.4",
     "rxjs": "^7.8.1",
-    "styled-components": "^6.0.7",
     "typescript": "^5.8.2",
+    "@equinor/fusion-framework-module": "^4.4.2",
     "@equinor/fusion-framework-module-app": "^6.1.13",
-    "@equinor/fusion-framework": "^7.3.12",
-    "@equinor/fusion-framework-module-context": "^6.0.3",
-    "@equinor/fusion-framework-module-bookmark": "^2.1.9",
-    "@equinor/fusion-framework-app": "^9.3.14",
-    "@equinor/fusion-framework-module-msal": "^4.0.6",
-    "@equinor/fusion-framework-module-feature-flag": "^1.1.18",
-    "@equinor/fusion-framework-module-navigation": "^5.0.2",
-    "@equinor/fusion-framework-module-services": "^6.0.2",
-    "@equinor/fusion-framework-react-components-bookmark": "^1.0.20",
-    "@equinor/fusion-framework-react-components-people-provider": "^1.5.17",
-    "@equinor/fusion-framework-react-module-bookmark": "^4.0.3",
-    "@equinor/fusion-framework-react": "^7.4.12",
-    "@equinor/fusion-observable": "^8.4.9",
-    "@equinor/fusion-query": "^5.2.8"
+    "@equinor/fusion-framework-module-http": "^6.3.3-next.0",
+    "@equinor/fusion-framework-module-service-discovery": "^8.0.15-next.0",
+    "@equinor/fusion-framework-module-msal-node": "^0.1.1-next.0"
+  },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
   },
   "scripts": {
-    "prebuild": "pnpm build:source",
-    "build": "pnpm build:source && pnpm build:dev-server",
-    "build:clean": "rm -rf dist && rm -f tsconfig.tsbuildinfo && pnpm build",
-    "build:source": "tsc -b",
-    "build:dev-server": "vite build"
+    "prebuild": "tsc -b",
+    "build": "rollup -c rollup.config.js",
+    "build:clean": "rm -rf dist && rm -rf bin/build && rm -f tsconfig.tsbuildinfo && pnpm build"
   }
 }

package/dist/bin/build-application.js

@@ -1,55 +0,0 @@
-import { dirname } from 'node:path';
-import { build } from 'vite';
-import { chalk } from './utils/format.js';
-import { Spinner } from './utils/spinner.js';
-import { loadViteConfig } from './utils/load-vite-config.js';
-import { loadAppManifest } from './utils/load-manifest.js';
-import { resolveAppPackage } from '../lib/app-package.js';
-import { AppAssetExportPlugin, createExtensionFilterPattern, } from '../lib/plugins/app-assets/index.js';
-export const buildApplication = async (options) => {
-    const { configSourceFiles, library, outDir } = options;
-    const env = {
-        command: 'build',
-        mode: process.env.NODE_ENV ?? 'production',
-    };
-    const spinner = Spinner.Global({ prefixText: chalk.dim('build') });
-    spinner.start('resolve application package');
-    const pkg = await resolveAppPackage();
-    spinner.succeed();
-    spinner.info('📦', chalk.yellowBright([pkg.packageJson.name, pkg.packageJson.version].join('@')));
-    const packageDirname = dirname(pkg.path);
-    spinner.info(`🏠 ${chalk.blueBright(packageDirname)}`);
-    spinner.start('resolve application manifest');
-    const { manifest } = await loadAppManifest(env, pkg, {
-        file: configSourceFiles?.manifest,
-    });
-    spinner.succeed();
-    const { viteConfig } = await loadViteConfig(env, {
-        file: configSourceFiles?.vite,
-    });
-    const includeAssetsPattern = manifest.build?.allowedExtensions
-        ? createExtensionFilterPattern(manifest.build.allowedExtensions)
-        : undefined;
-    spinner.info('📂', 'Using asset include filter:', chalk.red(includeAssetsPattern));
-    viteConfig.plugins = [
-        ...viteConfig.plugins,
-        AppAssetExportPlugin({
-            include: includeAssetsPattern,
-        }),
-    ];
-    if (library === 'react') {
-        const reactPlugin = await import('@vitejs/plugin-react');
-        viteConfig.plugins.push(reactPlugin.default());
-    }
-    viteConfig.build.outDir = outDir.trim();
-    spinner.attachConsole = true;
-    console.log('Building application...');
-    const viteBuild = await build(viteConfig);
-    spinner.attachConsole = false;
-    return {
-        viteConfig,
-        viteBuild,
-        pkg,
-    };
-};
-//# sourceMappingURL=build-application.js.map

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

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

package/dist/bin/bundle-application.js

@@ -1,41 +0,0 @@
-import AdmZip from 'adm-zip';
-import { dirname, resolve } from 'node:path';
-import { mkdir } from 'node:fs/promises';
-import { chalk, formatByteSize, formatPath } from './utils/format.js';
-import { Spinner } from './utils/spinner.js';
-import { buildApplication } from './build-application.js';
-import { createBuildManifest } from './create-export-manifest.js';
-import { fileExistsSync } from '../lib/utils/file-exists.js';
-export const bundleApplication = async (options) => {
-    const { outDir, archive } = options;
-    const spinner = Spinner.Global({ prefixText: chalk.dim('pack') });
-    spinner.start('build application');
-    const { pkg } = await buildApplication({ outDir });
-    spinner.succeed();
-    spinner.start('generate manifest');
-    const buildManifest = await createBuildManifest({ outputFile: `${outDir}/app-manifest.json` });
-    spinner.succeed('generated manifest:', '\n' + JSON.stringify(buildManifest, undefined, 2));
-    const bundle = new AdmZip();
-    bundle.addLocalFolder(outDir);
-    spinner.info(`added ./${outDir}`);
-    const appDir = dirname(pkg.path);
-    /* Files to add to zip package */
-    const addFiles = ['package.json', 'LICENSE.md', 'README.md', 'CHANGELOG.md'];
-    for (const file of addFiles) {
-        const filePath = resolve(appDir, file);
-        if (fileExistsSync(filePath)) {
-            bundle.addLocalFile(filePath);
-            spinner.info(`added ${file}`);
-        }
-        else {
-            spinner.warn(`missing ${file}`);
-        }
-    }
-    spinner.start('compressing content');
-    if (!fileExistsSync(dirname(archive))) {
-        await mkdir(dirname(archive), { recursive: true });
-    }
-    bundle.writeZip(archive);
-    spinner.succeed('Bundle complete', formatPath(archive, { relative: true }), formatByteSize(archive));
-};
-//# sourceMappingURL=bundle-application.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"bundle-application.js","sourceRoot":"","sources":["../../src/bin/bundle-application.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAC;AAE7B,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,OAA4C,EAAE,EAAE;IACtF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEpC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAElE,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACnC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,OAAO,EAAE,CAAC;IAElB,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,EAAE,UAAU,EAAE,GAAG,MAAM,oBAAoB,EAAE,CAAC,CAAC;IAC/F,OAAO,CAAC,OAAO,CAAC,qBAAqB,EAAE,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAE3F,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;IAE5B,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC9B,OAAO,CAAC,IAAI,CAAC,WAAW,MAAM,EAAE,CAAC,CAAC;IAElC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEjC,iCAAiC;IACjC,MAAM,QAAQ,GAAG,CAAC,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;IAC7E,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACvC,IAAI,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACrC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACtC,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACzB,OAAO,CAAC,OAAO,CACb,iBAAiB,EACjB,UAAU,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EACvC,cAAc,CAAC,OAAO,CAAC,CACxB,CAAC;AACJ,CAAC,CAAC"}

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

@@ -1,127 +0,0 @@
-import { createServer, defineConfig, mergeConfig, } from 'vite';
-import { assert } from 'node:console';
-import { join, relative } from 'node:path';
-import portFinder from 'portfinder';
-import deepmerge from 'deepmerge/index.js';
-import ViteRestart from 'vite-plugin-restart';
-import { appProxyPlugin } from '../lib/plugins/app-proxy/app-proxy-plugin.js';
-import { helpProxyPlugin } from '../lib/plugins/help-proxy/help-proxy-plugin.js';
-import { appSettingsPlugin } from '../lib/plugins/app-settings/index.js';
-import { externalPublicPlugin } from '../lib/plugins/external-public/external-public-plugin.js';
-import { supportedExt } from '../lib/utils/config.js';
-import { manifestConfigFilename } from '../lib/app-manifest.js';
-import { appConfigFilename } from '../lib/app-config.js';
-import { loadAppConfig } from './utils/load-app-config.js';
-import { loadViteConfig } from './utils/load-vite-config.js';
-import { loadPackage } from './utils/load-package.js';
-import { Spinner } from './utils/spinner.js';
-import { chalk, formatPath } from './utils/format.js';
-import { loadAppManifest } from './utils/load-manifest.js';
-import { proxyRequestLogger } from './utils/proxy-request-logger.js';
-export const createDevServer = async (options) => {
-    const { configSourceFiles, library, port, devPortalPath, noOpen } = options;
-    const spinner = Spinner.Global({ prefixText: chalk.dim('dev-server') });
-    const pkg = await loadPackage();
-    const env = {
-        command: 'serve',
-        mode: process.env.NODE_ENV ?? 'development',
-        root: pkg.root,
-    };
-    const generateManifest = async () => {
-        const { manifest } = await loadAppManifest(env, pkg, {
-            file: configSourceFiles.manifest,
-        });
-        const assetPath = `bundles/apps/${manifest.appKey}/${pkg.packageJson.version}`;
-        return deepmerge(manifest, {
-            build: {
-                assetPath,
-                configUrl: `${assetPath}/config`,
-            },
-        });
-    };
-    const generateConfig = async () => {
-        const { config } = await loadAppConfig(env, pkg, {
-            file: configSourceFiles.app,
-        });
-        return config;
-    };
-    const { appKey } = await generateManifest();
-    /**
-     * Load application manifest
-     * Application might have overridden the `appKey`
-     */
-    spinner.info(`resolved application key ${chalk.magenta(appKey)}`);
-    const { viteConfig: baseViteConfig, path: viteConfigPath } = await loadViteConfig(env, {
-        file: configSourceFiles.vite,
-    });
-    /**
-     * Defines the configuration for the development server.
-     */
-    const devServerConfig = defineConfig({
-        publicDir: devPortalPath,
-        appType: 'custom',
-        server: {
-            open: !noOpen ? `/apps/${appKey}` : false,
-            port: port ?? (await portFinder.getPortPromise({ port: 3000 })),
-        },
-        plugins: [
-            // Serve the dev portal as static files
-            externalPublicPlugin(devPortalPath),
-            appSettingsPlugin({
-                match: `/apps-proxy/persons/me/apps/${appKey}/settings`,
-            }),
-            // Proxy requests to the app server
-            appProxyPlugin({
-                proxy: {
-                    path: '/apps-proxy',
-                    target: 'https://apps.ci.api.fusion-dev.net/',
-                    onProxyReq: proxyRequestLogger,
-                },
-                app: {
-                    key: appKey,
-                    version: String(pkg.packageJson.version),
-                    generateConfig,
-                    generateManifest,
-                    manifestPath: `persons/me/apps/${appKey}`,
-                },
-            }),
-            // Proxy help assets request to help service.
-            helpProxyPlugin({
-                proxy: {
-                    path: '/help-proxy',
-                    target: 'https://help.ci.api.fusion-dev.net/',
-                    onProxyReq: proxyRequestLogger,
-                },
-            }),
-            // 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 = await import('@vitejs/plugin-react');
-        viteConfig.plugins.push(reactPlugin.default());
-    }
-    assert(viteConfig.build?.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 = await createServer({ ...env, ...viteConfig });
-    spinner.start('🚀 start server');
-    await vite.listen();
-    spinner.succeed('🔗', chalk.underline.green(new URL(`/apps/${appKey}`, vite.resolvedUrls?.local[0] ?? `https://localhost:/${vite.config.server.port}`).href));
-};
-//# sourceMappingURL=create-dev-serve.js.map

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

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

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

@@ -1,40 +0,0 @@
-import nodeFs from 'node:fs';
-import { writeFile } from 'node:fs/promises';
-import { dirname } from 'node:path';
-import { chalk, formatPath } from './utils/format.js';
-import { Spinner } from './utils/spinner.js';
-import { loadAppConfig, loadPackage } from './utils/index.js';
-export const createExportConfig = async (options) => {
-    const { command = 'build', outputFile, configFile } = options;
-    const spinner = Spinner.Global({ prefixText: chalk.dim('config') });
-    const pkg = await loadPackage();
-    const appEnv = {
-        command,
-        mode: process.env.NODE_ENV ?? 'development',
-        root: pkg.root,
-    };
-    const { config } = await loadAppConfig(appEnv, pkg, {
-        file: configFile,
-    });
-    if (outputFile) {
-        spinner.start(`outputting config to ${formatPath(outputFile)}`);
-        try {
-            const dir = dirname(outputFile).trim();
-            if (!nodeFs.existsSync(dirname(outputFile))) {
-                nodeFs.mkdirSync(dir, { recursive: true });
-            }
-            writeFile(outputFile, JSON.stringify(config));
-            spinner.succeed();
-        }
-        catch (err) {
-            spinner.fail();
-            throw err;
-        }
-    }
-    else {
-        console.log(config);
-    }
-    return config;
-};
-export default createExportConfig;
-//# sourceMappingURL=create-export-config.js.map

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

@@ -1 +0,0 @@
-{"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,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI9D,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAIxC,EAAE,EAAE;IACH,MAAM,EAAE,OAAO,GAAG,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAE9D,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,MAAM,GAAsB;QAChC,OAAO;QACP,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa;QAC3C,IAAI,EAAE,GAAG,CAAC,IAAI;KACf,CAAC;IAEF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE;QAClD,IAAI,EAAE,UAAU;KACjB,CAAC,CAAC;IAEH,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,wBAAwB,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC;YACH,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;gBAC5C,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,CAAC;YACD,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9C,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}