npm - @equinor/fusion-framework-cli - Versions diffs - 10.0.0-next-536392d2277f82421eaeb407d8839c716cb83be0 → 10.0.0-next-e2f0f5f45ddcf734f0d1c8a7ea2fb5e761f7b8f0 - Mend

@equinor/fusion-framework-cli 10.0.0-next-536392d2277f82421eaeb407d8839c716cb83be0 → 10.0.0-next-e2f0f5f45ddcf734f0d1c8a7ea2fb5e761f7b8f0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (179) hide show

package/dist/bin/public/index.html CHANGED Viewed

@@ -28,7 +28,7 @@
     }
   </style>
-<script type="module" crossorigin src="/assets/index-CwGBhRCD.js"></script>
+<script type="module" crossorigin src="/assets/index-Cb85_fOB.js"></script>
 <body>
   <div id="root"></div>

package/dist/lib/app-config.js CHANGED Viewed

@@ -8,19 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { loadConfig, initiateConfig, resolveConfig, } from './utils/config.js';
-import { AssertionError, assertObject } from './utils/assert.js';
-import deepmerge from 'deepmerge/index.js';
+import { AssertionError } from './utils/assert.js';
+import { ApiAppConfigSchema } from '@equinor/fusion-framework-module-app/schemas.js';
 export const appConfigFilename = 'app.config';
-export function assertAppConfig(value) {
-    // TODO
-    assertObject(value);
-}
 export const defineAppConfig = (fn) => fn;
-export const mergeAppConfigs = (base, overrides) => {
-    const manifest = deepmerge(base, overrides);
-    assertAppConfig(manifest);
-    return manifest;
-};
 export const loadAppConfig = (filename) => loadConfig(filename !== null && filename !== void 0 ? filename : appConfigFilename);
 export const resolveAppConfig = (options) => __awaiter(void 0, void 0, void 0, function* () {
     if (options === null || options === void 0 ? void 0 : options.file) {
@@ -32,17 +23,12 @@ export const resolveAppConfig = (options) => __awaiter(void 0, void 0, void 0, f
     }
     return resolveConfig(appConfigFilename, { find: options });
 });
-export const createAppConfigFromPackage = (_pkg) => {
-    const appConfig = {};
-    assertAppConfig(appConfig);
-    return appConfig;
-};
 export const createAppConfig = (env, base, options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const resolved = yield resolveAppConfig(options);
     if (resolved) {
-        const config = (_a = (yield initiateConfig(resolved.config, env, { base }))) !== null && _a !== void 0 ? _a : {};
-        assertAppConfig(config);
+        const configValue = (_a = (yield initiateConfig(resolved.config, env, { base }))) !== null && _a !== void 0 ? _a : {};
+        const config = ApiAppConfigSchema.parse(configValue);
         return { config, path: resolved.path };
     }
     else if (options === null || options === void 0 ? void 0 : options.file) {

package/dist/lib/app-config.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"app-config.js","sourceRoot":"","sources":["../../src/lib/app-config.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACH,UAAU,EAGV,cAAc,EAEd,aAAa,GAChB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,cAAc,EAAE,~~YAAY,EAAE,~~MAAM,mBAAmB,CAAC;~~AAEjE~~,OAAO,~~SAAS~~,MAAM,~~oBAAoB~~,CAAC;~~AAc3C~~,MAAM,CAAC,MAAM,iBAAiB,GAAG,YAAY,CAAC;~~AAE9C~~,MAAM,~~UAAU,eAAe,~~CAAC,~~KAAgB;IAC5C,OAAO;IACP,YAAY,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC;AAED,~~MAAM,~~CAAC,MAAM,~~eAAe,GAAG,CAAC,EAAe,EAAE,EAAE,CAAC,EAAE,CAAC;AAEvD,MAAM,CAAC,MAAM,~~eAAe,GAAG,CAC3B,IAAwB,EACxB,SAA6B,EACpB,EAAE;IACX,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,EAAE,SAAS,CAAyB,CAAC;IACpE,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC1B,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,~~aAAa,GAAG,CAAC,QAAiB,EAAE,EAAE,CAC/C,UAAU,~~CAAY~~,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,iBAAiB,CAAC,CAAC;~~AAEzD~~,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,OAEC,EAC0C,EAAE;IAC7C,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACjD,OAAO;YACH,MAAM;YACN,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC;IACN,CAAC;IACD,OAAO,aAAa,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAC/D,CAAC,CAAA,CAAC;AAEF,MAAM,CAAC,MAAM,~~0BAA0B,GAAG,CAAC,IAAwB,EAAa,EAAE;IAC9E,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,~~eAAe,~~CAAC,SAAS,CAAC,CAAC;IAC3B,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,~~GAAG,CAC3B,GAAsB,EACtB,~~IAAe~~,~~EACf~~,OAA8B,~~EACe~~,EAAE;;~~IAC/C~~,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,~~MAAM~~,GAAG,MAAA,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC;~~QAC5E~~,~~eAAe~~,CAAC,~~MAAM~~,CAAC,CAAC;~~QACxB~~,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC;SAAM,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,cAAc,CAAC;YACrB,OAAO,EAAE,gCAAgC,OAAO,CAAC,IAAI,EAAE;YACvD,QAAQ,EAAE,QAAQ;SACrB,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAC5B,CAAC,CAAA,CAAC"}
1	+ {"version":3,"file":"app-config.js","sourceRoot":"","sources":["../../src/lib/app-config.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACH,UAAU,EAGV,cAAc,EAEd,aAAa,GAChB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAgB,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AAYnG,MAAM,CAAC,MAAM,iBAAiB,GAAG,YAAY,CAAC;AAC9C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAe,EAAE,EAAE,CAAC,EAAE,CAAC;AAEvD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAiB,EAAE,EAAE,CAC/C,UAAU,CAAe,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,iBAAiB,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,OAEC,EAC0C,EAAE;IAC7C,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACjD,OAAO;YACH,MAAM;YACN,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC;IACN,CAAC;IACD,OAAO,aAAa,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAC/D,CAAC,CAAA,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC3B,GAAsB,EACtB,IAAkB,EAClB,OAA8B,EACkB,EAAE;;IAClD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,WAAW,GAAG,MAAA,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC;QACjF,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACrD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC;SAAM,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,cAAc,CAAC;YACrB,OAAO,EAAE,gCAAgC,OAAO,CAAC,IAAI,EAAE;YACvD,QAAQ,EAAE,QAAQ;SACrB,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAC5B,CAAC,CAAA,CAAC"}

package/dist/lib/index.js CHANGED Viewed

@@ -1,4 +1,4 @@
 export { mergeManifests, defineAppManifest } from './app-manifest.js';
-export { mergeAppConfigs, defineAppConfig, } from './app-config.js';
+export { defineAppConfig } from './app-config.js';
 export { defineAppPackage, resolveAppKey, resolveEntryPoint, } from './app-package.js';
 //# sourceMappingURL=index.js.map

package/dist/lib/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAsB,MAAM,mBAAmB,CAAC;AAE1F,OAAO,~~EACH~~,eAAe,~~EACf~~,~~eAAe,GAGlB,~~MAAM,iBAAiB,CAAC;~~AAEzB~~,OAAO,EACH,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAGpB,MAAM,kBAAkB,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAsB,MAAM,mBAAmB,CAAC;AAE1F,OAAO,EAAE,eAAe,EAA0C,MAAM,iBAAiB,CAAC;AAE1F,OAAO,EACH,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAGpB,MAAM,kBAAkB,CAAC"}

package/dist/lib/plugins/app-proxy/app-proxy-plugin.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"app-proxy-plugin.js","sourceRoot":"","sources":["../../../../src/lib/plugins/app-proxy/app-proxy-plugin.ts"],"names":[],"mappings":";;;;;;;;;~~AAKA~~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"}
1	+ {"version":3,"file":"app-proxy-plugin.js","sourceRoot":"","sources":["../../../../src/lib/plugins/app-proxy/app-proxy-plugin.ts"],"names":[],"mappings":"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"}

package/dist/types/app-config.d.ts ADDED Viewed

@@ -0,0 +1,26 @@
+import { type ResolvedConfig, type FindConfigOptions, ConfigExecuterEnv } from './utils/config.js';
+import { ApiAppConfig } from '@equinor/fusion-framework-module-app/schemas.js';
+type FindAppConfigOptions = FindConfigOptions & {
+    file?: string;
+};
+export type AppConfigFn = (env: ConfigExecuterEnv, args: {
+    base: ApiAppConfig;
+}) => ApiAppConfig | Promise<ApiAppConfig | void> | void;
+export type AppConfigExport = ApiAppConfig | AppConfigFn;
+export declare const appConfigFilename = "app.config";
+export declare const defineAppConfig: (fn: AppConfigFn) => AppConfigFn;
+export declare const loadAppConfig: (filename?: string) => Promise<import("./utils/config.js").ConfigExecuter<{
+    environment: Record<string, any>;
+    endpoints?: Record<string, {
+        url: string;
+        scopes: string[];
+    }> | undefined;
+}, import("./utils/config.js").ConfigExecuterArgs>>;
+export declare const resolveAppConfig: (options?: FindConfigOptions & {
+    file?: string;
+}) => Promise<ResolvedConfig<AppConfigFn> | void>;
+export declare const createAppConfig: (env: ConfigExecuterEnv, base: ApiAppConfig, options?: FindAppConfigOptions) => Promise<{
+    config: ApiAppConfig;
+    path?: string;
+}>;
+export {};

package/dist/types/{lib/index.d.ts → index.d.ts} RENAMED Viewed

@@ -1,3 +1,3 @@
 export { mergeManifests, defineAppManifest, type AppManifestFn } from './app-manifest.js';
-export { mergeAppConfigs, defineAppConfig, type AppConfigFn, type AppConfigExport, } from './app-config.js';
+export { defineAppConfig, type AppConfigFn, type AppConfigExport } from './app-config.js';
 export { defineAppPackage, resolveAppKey, resolveEntryPoint, type AppPackageJson, type ResolvedAppPackage, } from './app-package.js';

package/dist/types/{lib/plugins → plugins}/app-proxy/app-proxy-plugin.d.ts RENAMED Viewed

@@ -1,6 +1,7 @@
 import { Plugin } from 'vite';
-import { AppConfig, AppManifest } from '@equinor/fusion-framework-app';
+import { AppManifest } from '@equinor/fusion-framework-app';
 import { ClientRequest, IncomingMessage, ServerResponse } from 'node:http';
+import { ApiAppConfig } from '@equinor/fusion-framework-module-app/schemas.js';
 /**
  * Options for configuring the App Proxy Plugin.
  *
@@ -24,7 +25,7 @@ export type AppProxyPluginOptions = {
         /** application version */
         version: string;
         /** callback function for generating configuration for the application */
-        generateConfig: () => Promise<AppConfig>;
+        generateConfig: () => Promise<ApiAppConfig>;
         /** callback function for generating manifest for the application */
         generateManifest: () => Promise<AppManifest>;
     };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-cli",
-  "version": "10.0.0-next-536392d2277f82421eaeb407d8839c716cb83be0",
+  "version": "10.0.0-next-e2f0f5f45ddcf734f0d1c8a7ea2fb5e761f7b8f0",
   "keywords": [
     "Fusion",
     "Fusion Framework",
@@ -54,7 +54,8 @@
     "vite": "^5.4.3",
     "vite-plugin-environment": "^1.1.3",
     "vite-plugin-restart": "^0.4.0",
-    "vite-tsconfig-paths": "^4.2.0"
+    "vite-tsconfig-paths": "^4.2.0",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@equinor/eds-core-react": "^0.41.2",
@@ -68,6 +69,7 @@
     "@equinor/fusion-wc-chip": "^1.2.1",
     "@equinor/fusion-wc-person": "^3.0.1",
     "@material-ui/styles": "^4.11.5",
+    "@rollup/plugin-typescript": "^12.1.0",
     "@types/adm-zip": "^0.5.0",
     "@types/loader-utils": "^2.0.6",
     "@types/node": "^20.11.14",
@@ -79,31 +81,33 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.15.0",
+    "rimraf": "^6.0.0",
     "rollup": "^4.22.4",
     "rxjs": "^7.8.1",
     "styled-components": "^6.0.7",
     "typescript": "^5.5.4",
-    "@equinor/fusion-framework-app": "^9.1.10-next-536392d2277f82421eaeb407d8839c716cb83be0",
     "@equinor/fusion-framework": "^7.2.8",
+    "@equinor/fusion-framework-app": "^9.1.10-next-e2f0f5f45ddcf734f0d1c8a7ea2fb5e761f7b8f0",
+    "@equinor/fusion-framework-module-app": "^6.0.0-next-e2f0f5f45ddcf734f0d1c8a7ea2fb5e761f7b8f0",
     "@equinor/fusion-framework-module-context": "^5.0.12",
     "@equinor/fusion-framework-module-bookmark": "^1.2.12",
-    "@equinor/fusion-framework-module-app": "^6.0.0-next-536392d2277f82421eaeb407d8839c716cb83be0",
-    "@equinor/fusion-framework-module-msal": "^3.1.5",
     "@equinor/fusion-framework-module-feature-flag": "^1.1.9",
     "@equinor/fusion-framework-module-navigation": "^4.0.7",
+    "@equinor/fusion-framework-module-msal": "^3.1.5",
     "@equinor/fusion-framework-module-services": "^4.1.5",
-    "@equinor/fusion-framework-react": "^7.3.0-next-536392d2277f82421eaeb407d8839c716cb83be0",
-    "@equinor/fusion-framework-react-components-bookmark": "^0.5.2-next-536392d2277f82421eaeb407d8839c716cb83be0",
-    "@equinor/fusion-framework-react-module-bookmark": "^2.1.18-next-536392d2277f82421eaeb407d8839c716cb83be0",
+    "@equinor/fusion-framework-react-components-bookmark": "^0.5.2-next-e2f0f5f45ddcf734f0d1c8a7ea2fb5e761f7b8f0",
+    "@equinor/fusion-framework-react": "^7.3.0-next-e2f0f5f45ddcf734f0d1c8a7ea2fb5e761f7b8f0",
+    "@equinor/fusion-framework-react-module-bookmark": "^2.1.18-next-e2f0f5f45ddcf734f0d1c8a7ea2fb5e761f7b8f0",
+    "@equinor/fusion-framework-react-components-people-provider": "^1.4.9-next-e2f0f5f45ddcf734f0d1c8a7ea2fb5e761f7b8f0",
     "@equinor/fusion-observable": "^8.4.1",
-    "@equinor/fusion-framework-react-components-people-provider": "^1.4.9-next-536392d2277f82421eaeb407d8839c716cb83be0",
     "@equinor/fusion-query": "^5.1.3"
   },
   "scripts": {
-    "prebuild": "pnpm build:source",
-    "build": "pnpm build:source && pnpm build:dev-server",
+    "build": "pnpm build:lib && pnpm build:dev-proxy  && pnpm build:bin",
     "build:clean": "rm -rf dist && rm -f tsconfig.tsbuildinfo && pnpm build",
-    "build:source": "tsc -b",
-    "build:dev-server": "vite build"
+    "build:lib": "tsc -b tsconfig.lib.json",
+    "build:bin": "rollup -c",
+    "build:dev-proxy": "vite build",
+    "clean": "rimraf dist, tsconfig.tsbuildinfo, tsconfig.lib.tsbuildinfo"
   }
 }

package/dist/bin/build-application.js DELETED Viewed

@@ -1,65 +0,0 @@
-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());
-    });
-};
-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 = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
-    const { configSourceFiles, library, outDir } = options;
-    const env = {
-        command: 'build',
-        mode: (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'production',
-    };
-    const spinner = Spinner.Global({ prefixText: chalk.dim('build') });
-    spinner.start('resolve application package');
-    const pkg = yield 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 } = yield loadAppManifest(env, pkg, {
-        file: configSourceFiles === null || configSourceFiles === void 0 ? void 0 : configSourceFiles.manifest,
-    });
-    spinner.succeed();
-    const { viteConfig } = yield loadViteConfig(env, {
-        file: configSourceFiles === null || configSourceFiles === void 0 ? void 0 : configSourceFiles.vite,
-    });
-    const includeAssetsPattern = ((_b = manifest.build) === null || _b === void 0 ? void 0 : _b.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 = yield import('@vitejs/plugin-react');
-        viteConfig.plugins.push(reactPlugin.default());
-    }
-    viteConfig.build.outDir = outDir.trim();
-    spinner.attachConsole = true;
-    console.log('Building application...');
-    const viteBuild = yield build(viteConfig);
-    spinner.attachConsole = false;
-    return {
-        viteConfig,
-        viteBuild,
-        pkg,
-    };
-});
-//# sourceMappingURL=build-application.js.map

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

@@ -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 DELETED Viewed

@@ -1,56 +0,0 @@
-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());
-    });
-};
-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 = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    const { outDir, archive } = options;
-    const spinner = Spinner.Global({ prefixText: chalk.dim('pack') });
-    spinner.start('build application');
-    const { pkg } = yield buildApplication({ outDir });
-    spinner.succeed();
-    spinner.start('generate manifest');
-    const buildManifest = yield createBuildManifest({ outputFile: `${outDir}/app-manifest.json` });
-    spinner.succeed('generated manifest:', '\n' + JSON.stringify(buildManifest, undefined, 2));
-    const bundle = new AdmZip();
-    bundle.addLocalFile(pkg.path);
-    spinner.info(`added ./package.json`);
-    bundle.addLocalFolder(outDir);
-    spinner.info(`added ./${outDir}`);
-    const appDir = dirname(pkg.path);
-    const licenseFile = resolve(appDir, 'LICENSE.md');
-    if (fileExistsSync(licenseFile)) {
-        bundle.addLocalFile(licenseFile);
-        spinner.info(`added ${licenseFile}`);
-    }
-    else {
-        spinner.warn(`missing ${licenseFile}`);
-    }
-    const readmeFile = resolve(appDir, 'README.md');
-    if (fileExistsSync(readmeFile)) {
-        bundle.addLocalFile(readmeFile);
-        spinner.info(`added ${readmeFile}`);
-    }
-    else {
-        spinner.warn(`missing ${readmeFile}`);
-    }
-    spinner.start('compressing content');
-    if (!fileExistsSync(dirname(archive))) {
-        yield 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 DELETED Viewed

@@ -1 +0,0 @@

- {"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 DELETED Viewed

@@ -1,123 +0,0 @@
-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());
-    });
-};
-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 { 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 = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d;
-    const { configSourceFiles, library, port, devPortalPath } = options;
-    const spinner = Spinner.Global({ prefixText: chalk.dim('dev-server') });
-    const pkg = yield loadPackage();
-    const env = {
-        command: 'serve',
-        mode: (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'development',
-        root: pkg.root,
-    };
-    const generateManifest = () => __awaiter(void 0, void 0, void 0, function* () {
-        const { manifest } = yield 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 = () => __awaiter(void 0, void 0, void 0, function* () {
-        const { config } = yield loadAppConfig(env, pkg, {
-            file: configSourceFiles.app,
-        });
-        return config;
-    });
-    const { appKey } = yield generateManifest();
-    /**
-     * Load application manifest
-     * Application might have overridden the `appKey`
-     */
-    spinner.info(`resolved application key ${chalk.magenta(appKey)}`);
-    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,
-                    generateManifest,
-                },
-            }),
-            // 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());
-    }
-    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));
-    spinner.start('🚀 start server');
-    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 DELETED Viewed

@@ -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 DELETED Viewed

@@ -1,115 +0,0 @@
-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());
-    });
-};
-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 { getEndpointUrl, loadAppConfig, loadPackage, isAppRegistered, requireToken, publishAppConfig, } from './utils/index.js';
-import { resolveAppKey } from '../lib/app-package.js';
-import { exit } from 'node:process';
-import assert from 'node:assert';
-export const createExportConfig = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const { command = 'build', outputFile, configFile, publish, env, service } = options;
-    const spinner = Spinner.Global({ prefixText: chalk.dim('config') });
-    const pkg = yield loadPackage();
-    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(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);
-    }
-    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}`);
-            }
-            const exist = yield isAppRegistered(state.endpoint);
-            assert(exist, `${appKey} is not registered`);
-            spinner.succeed(`${appKey} is registered`);
-        }
-        catch (e) {
-            const err = e;
-            spinner.fail('🙅‍♂️', chalk.bgRed(err.message));
-            throw err;
-        }
-        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;
-//# sourceMappingURL=create-export-config.js.map

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

@@ -1 +0,0 @@

- {"version":3,"file":"create-export-config.js","sourceRoot":"","sources":["../../src/bin/create-export-config.ts"],"names":[],"mappings":"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"}