@equinor/fusion-framework-cli 10.0.0-beta-8c92234668d5f4b20de0650ff947f3afeb7c335c → 10.0.0-next-9f6eec8c5a4cb3dd430fc6bee227442a3dc28bb8

package/CHANGELOG.md

@@ -1,18 +1,411 @@
 # Change Log
 
-## 10.0.0-beta-8c92234668d5f4b20de0650ff947f3afeb7c335c
+## 10.0.0-next-9f6eec8c5a4cb3dd430fc6bee227442a3dc28bb8
 
 ### Major Changes
 
--   [#2178](https://github.com/equinor/fusion-framework/pull/2178) [`972dbe8`](https://github.com/equinor/fusion-framework/commit/972dbe82681f1c76042151bb6b78af9915c41389) Thanks [@eikeland](https://github.com/eikeland)! - # App management
+-   [#2494](https://github.com/equinor/fusion-framework/pull/2494) [`9f6eec8`](https://github.com/equinor/fusion-framework/commit/9f6eec8c5a4cb3dd430fc6bee227442a3dc28bb8) Thanks [@odinr](https://github.com/odinr)! - Adding new commands for app management, `build-publish`, `build-pack`, `build-upload`, `build-config`, `build-manifest` and `build-tag`.
+
+    Introduces new parameters to the `build-config` command for publishing the app config to a build version.
+
+    Commands:
+
+    -   `build-pack` - Bundle the app for distribution
+        -   `-o, --output <output>` - Output directory for the packed app
+        -   `-a, --archive` - Archive name for the packed app
+    -   `build-upload` - Upload the packed app to the Fusion App Store
+        -   `-b, --bundle <bundle>` - Path to the packed app bundle
+        -   `-e, --env <ci | fqa | tr | fprd>` - Environment to upload the app to
+        -   `-s, --service <service>` - Custom app service
+    -   `build-tag` - Tag the uploaded app with a version
+        -   `-t, --tag <tag>` - Tag to apply to the uploaded app
+        -   `-v, --version <version>` - Version to attach to the tag
+        -   `-e, --env <ci | fqa | tr | fprd>` - Environment to tag the app in
+        -   `-s, --service <service>` - Custom app service
+    -   `build-publish` - Publish the app config to a build version
+        -   `-t, --tag <tag>` - Tag to apply to the uploaded app
+        -   `-e, --env <ci | fqa | tr | fprd>` - Environment to tag the app in
+        -   `-s, --service <service>` - Custom app service
+    -   `build-config` - Publish the app config to a build version
+        -   `-o, --output <output>` - Output file for the app config
+        -   `-c, --config <config>` - Path to the app config file (for config generation)
+        -   `-p, --publish<semver | current | latest | preview>` - Publish the app config to the build version
+        -   `-e, --env <ci | fqa | tr | fprd>` - Environment to publish the app config to
+        -   `-s, --service <service>` - Custom app service
+    -   `build-manifest` - Creates the build manifest to publish with app
+        -   `-o, --output <output>` - Output file for manifest
+        -   `-c, --config <config>` - Manifest config file
+
+    simple usage:
 
-    Adding new commands for app management, `publish`, `upload` and `tag`.
+    ```sh
+    fusion-framework-cli app build-publish -e ci
+    ```
+
+    complex usage:
+
+    ```sh
+    fusion-framework-cli app build-pack -o ./dist -a my-app.zip
+    fusion-framework-cli app build-upload -b ./dist/my-app.zip -e ci
+    fusion-framework-cli app build-tag -t my-tag -v 1.0.0 -e ci
+    ```
+
+    After publishing a build of an app, the app config should be uploaded to the build version. This is done by running the `build-config` command.
+
+    ```sh
+    # Publish the app config to the build version
+    fusion-framework-cli app build-config -p -e ci
+
+    # Publish the app config to a specific build tag
+    fusion-framework-cli app build-config -p preview -e ci
+
+    # Publish the app config to a specific build version
+    fusion-framework-cli app build-config -p 1.0.0 -e ci
+    ```
+
+    **breaking changes:**
+
+    -   renaming all commands accociated with build.
+    -   The app-config endpoints is now an object containing url and scopes, where name is the object key:
+
+        ```ts
+          environment: {
+              myProp: 'foobar',
+          },
+          endpoints: {
+              api: {
+                  url: 'https://foo.bars'
+                  scopes: ['foobar./default']
+              },
+          },
+        ```
+
+    -   The `config` command has been removed, use `build-config` instead
+
+### Minor Changes
+
+-   [#2494](https://github.com/equinor/fusion-framework/pull/2494) [`9f6eec8`](https://github.com/equinor/fusion-framework/commit/9f6eec8c5a4cb3dd430fc6bee227442a3dc28bb8) Thanks [@odinr](https://github.com/odinr)! - 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
+
+-   [#2494](https://github.com/equinor/fusion-framework/pull/2494) [`9f6eec8`](https://github.com/equinor/fusion-framework/commit/9f6eec8c5a4cb3dd430fc6bee227442a3dc28bb8) Thanks [@odinr](https://github.com/odinr)! - 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 = 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'),
+        ],
+    });
+    ```
+
+-   [#2494](https://github.com/equinor/fusion-framework/pull/2494) [`9f6eec8`](https://github.com/equinor/fusion-framework/commit/9f6eec8c5a4cb3dd430fc6bee227442a3dc28bb8) Thanks [@odinr](https://github.com/odinr)! - Updated commands in CLI to reflect purpose of the command:
+
+    -   renamed `config` to `build-config` to generate build config of an application.
+    -   renamed `pack`to `build-pack` to bundle an application.
+    -   added `build-manifest` command to generate build manifest of an application.
+
+    > [!WARNING]
+    > Config callback for `manifest` and `config` now allows `void` return type.
+    > Return value from callback is now merged with default config instead of replacing it, this might be a breaking change for some applications.
+
+    > [!NOTE]
+    > This mean that `mergeAppConfig` and `mergeManifestConfig` functions are no longer needed and can be removed from the application.
+
+-   [#2494](https://github.com/equinor/fusion-framework/pull/2494) [`9f6eec8`](https://github.com/equinor/fusion-framework/commit/9f6eec8c5a4cb3dd430fc6bee227442a3dc28bb8) Thanks [@odinr](https://github.com/odinr)! - 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
+    ```
+
+-   [#2494](https://github.com/equinor/fusion-framework/pull/2494) [`9f6eec8`](https://github.com/equinor/fusion-framework/commit/9f6eec8c5a4cb3dd430fc6bee227442a3dc28bb8) Thanks [@odinr](https://github.com/odinr)! - when building an application the `AppAssetExportPlugin` is now added to the `ViteConfig` and configure to include `manifest.build.allowedExtensions`
+
+-   [#2494](https://github.com/equinor/fusion-framework/pull/2494) [`9f6eec8`](https://github.com/equinor/fusion-framework/commit/9f6eec8c5a4cb3dd430fc6bee227442a3dc28bb8) Thanks [@odinr](https://github.com/odinr)! - **App Assets Export Plugin**
+
+    Create a plugin that exports assets from the app's source code.
+    This plugin resolves the issue where assets are not extracted from the app's source code since the app is in `lib` mode.
+
+    ```typescript
+    export default {
+      plugins: [
+        AppAssetExportPlugin(
+          include: createExtensionFilterPattern(
+            manifest.build.allowedExtensions
+            ),
+        ),
+      ]
+    }
+    ```
+
+    see readme for more information.
+
+### Patch Changes
+
+-   [#2494](https://github.com/equinor/fusion-framework/pull/2494) [`9f6eec8`](https://github.com/equinor/fusion-framework/commit/9f6eec8c5a4cb3dd430fc6bee227442a3dc28bb8) Thanks [@odinr](https://github.com/odinr)! - Updating fusion-wc-person to fix issues when using selectedPerson = null in PersonSelect component.
+
+    Updated the following dependencies
+
+    -   `@equinor/fusion-wc-person` from `^3.0.1` to `^3.0.3` in `packages/cli/package.json` and `packages/react/components/people-resolver/package.json`.
+
+-   [#2494](https://github.com/equinor/fusion-framework/pull/2494) [`9f6eec8`](https://github.com/equinor/fusion-framework/commit/9f6eec8c5a4cb3dd430fc6bee227442a3dc28bb8) Thanks [@odinr](https://github.com/odinr)! - Generated base manifest from package will now include `StandardIncludeAssetExtensions` as `allowedExtensions`
+
+## 9.13.1
+
+### Patch Changes
+
+-   [#2493](https://github.com/equinor/fusion-framework/pull/2493) [`4839295`](https://github.com/equinor/fusion-framework/commit/4839295263f07704bc43930351ce34dfb27a4c81) Thanks [@eikeland](https://github.com/eikeland)! - Updating fusion-wc-person to fix issues when using selectedPerson = null in PersonSelect component.
+
+    Updated the following dependencies
+
+    -   `@equinor/fusion-wc-person` from `^3.0.1` to `^3.0.3` in `packages/cli/package.json` and `packages/react/components/people-resolver/package.json`.
+
+-   Updated dependencies [[`4839295`](https://github.com/equinor/fusion-framework/commit/4839295263f07704bc43930351ce34dfb27a4c81)]:
+    -   @equinor/fusion-framework-react-components-people-provider@1.4.8
+    -   @equinor/fusion-framework-app@9.1.9
+    -   @equinor/fusion-framework-module-feature-flag@1.1.9
+
+## 9.13.0
+
+### Minor Changes
 
-    Introduces new parameters to the `config` command for publishing the app config to a build version.
+-   [#2465](https://github.com/equinor/fusion-framework/pull/2465) [`eb11a19`](https://github.com/equinor/fusion-framework/commit/eb11a1952cfa5a1ec8ca40d8f53303ff7c675cbe) Thanks [@dependabot](https://github.com/apps/dependabot)! - updated @equinor/eds-core-react to 0.42.0
+
+-   [#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.
+
+### Patch Changes
+
+-   [#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
+
+-   Updated dependencies []:
+    -   @equinor/fusion-framework-app@9.1.8
+    -   @equinor/fusion-framework-module-feature-flag@1.1.9
+    -   @equinor/fusion-framework-react-components-people-provider@1.4.7
+
+## 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
+
+-   [#2403](https://github.com/equinor/fusion-framework/pull/2403) [`67ea61d`](https://github.com/equinor/fusion-framework/commit/67ea61dad8f50e8b8b977008b26374c2f982eb4d) Thanks [@dependabot](https://github.com/apps/dependabot)! - bump @equinor/eds-core-react from 0.40.1 to 0.41.2
+
+    [see EDS changelog](https://github.com/equinor/design-system/blob/develop/packages/eds-core-react/CHANGELOG.md)
+
+-   Updated dependencies []:
+    -   @equinor/fusion-framework-app@9.1.6
+    -   @equinor/fusion-framework-module-feature-flag@1.1.7
+    -   @equinor/fusion-framework-react-components-people-provider@1.4.5
+
+## 9.12.12
+
+### Patch Changes
+
+-   [#2349](https://github.com/equinor/fusion-framework/pull/2349) [`0dd8160`](https://github.com/equinor/fusion-framework/commit/0dd8160b7b840e04ec6a92ed2bf8d00494752a00) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps): bump @vitejs/plugin-react from 4.2.1 to 4.3.1
+
+-   [#2389](https://github.com/equinor/fusion-framework/pull/2389) [`a3543e3`](https://github.com/equinor/fusion-framework/commit/a3543e31353c9eac25140842643cb8e27e9b187e) Thanks [@eikeland](https://github.com/eikeland)! - Updating fusion(react|wc)-person to fix issues with clearing component
+
+-   [#2337](https://github.com/equinor/fusion-framework/pull/2337) [`79fa856`](https://github.com/equinor/fusion-framework/commit/79fa8566d27dcc4d38da3a6b3fef1b78223f7458) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps-dev): bump rollup from 4.12.0 to 4.18.1
+
+-   [#2358](https://github.com/equinor/fusion-framework/pull/2358) [`decb9e9`](https://github.com/equinor/fusion-framework/commit/decb9e9e3d1bb1b0577b729a1e7ae812afdd83cb) Thanks [@eikeland](https://github.com/eikeland)! - Updating vitest to 2.0.4. Setting vitest as devDependency in fusion-query. Updating vite to 5.3.4
+
+-   [#2352](https://github.com/equinor/fusion-framework/pull/2352) [`2025368`](https://github.com/equinor/fusion-framework/commit/202536855f736fb58f09442da5ca473325c1141c) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps): bump vite from 5.2.10 to 5.3.3
+
+-   [#2256](https://github.com/equinor/fusion-framework/pull/2256) [`db92a9d`](https://github.com/equinor/fusion-framework/commit/db92a9d2132f74e2a72287640e6fdfbe3afa2824) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps): bump commander from 12.0.0 to 12.1.0
+
+-   [#2253](https://github.com/equinor/fusion-framework/pull/2253) [`6f93346`](https://github.com/equinor/fusion-framework/commit/6f9334672c6dd77237d52508bef8893303f33ca7) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps-dev): bump @equinor/fusion-react-context-selector from 0.6.3 to 0.6.5
+
+-   [#2264](https://github.com/equinor/fusion-framework/pull/2264) [`797095a`](https://github.com/equinor/fusion-framework/commit/797095ab3b51a675159be5541381ca06637a1b71) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps): bump express-rate-limit from 7.2.0 to 7.3.1
+
+-   [#2350](https://github.com/equinor/fusion-framework/pull/2350) [`960ca34`](https://github.com/equinor/fusion-framework/commit/960ca34cae26f386e28c16bac00e7932f4f9199a) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps): bump @equinor/eds-core-react from 0.38.0 to 0.40.1
+
+-   [#2360](https://github.com/equinor/fusion-framework/pull/2360) [`1c7ac1b`](https://github.com/equinor/fusion-framework/commit/1c7ac1b42213f33a668e79d750e0b12b227a7052) Thanks [@eikeland](https://github.com/eikeland)! - Enhanced ContextSelector component in the CLI package:
+
+    -   Implemented responsive context clearing mechanism
+    -   Improved handling of context selection and clearing events
+    -   Optimized component rendering with useMemo and useCallback hooks
+
+-   [#2261](https://github.com/equinor/fusion-framework/pull/2261) [`aae93b9`](https://github.com/equinor/fusion-framework/commit/aae93b95120f1285545ea1b8344817c31e134ff5) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps): bump adm-zip from 0.5.10 to 0.5.14
+
+-   Updated dependencies [[`bbde502`](https://github.com/equinor/fusion-framework/commit/bbde502e638f459379f63968febbc97ebe282b76), [`a3543e3`](https://github.com/equinor/fusion-framework/commit/a3543e31353c9eac25140842643cb8e27e9b187e), [`decb9e9`](https://github.com/equinor/fusion-framework/commit/decb9e9e3d1bb1b0577b729a1e7ae812afdd83cb), [`e092f75`](https://github.com/equinor/fusion-framework/commit/e092f7599f1f2e0e0676a9f10565299272813594)]:
+    -   @equinor/fusion-observable@8.4.0
+    -   @equinor/fusion-framework-react-components-people-provider@1.4.4
+    -   @equinor/fusion-framework-module-feature-flag@1.1.6
+    -   @equinor/fusion-framework-app@9.1.5
+
+## 9.12.11
+
+### Patch Changes
+
+-   [#2251](https://github.com/equinor/fusion-framework/pull/2251) [`60afeaa`](https://github.com/equinor/fusion-framework/commit/60afeaab11ad2a76469807142098464bd5442e68) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps): bump @vitejs/plugin-react from 4.2.1 to 4.3.1
+
+-   [#2340](https://github.com/equinor/fusion-framework/pull/2340) [`9435ee4`](https://github.com/equinor/fusion-framework/commit/9435ee4ddebade18436c5c6bd57ee86b6baf0b24) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps): bump vite from 5.2.10 to 5.3.3
+
+-   Updated dependencies []:
+    -   @equinor/fusion-framework-app@9.1.4
+    -   @equinor/fusion-framework-module-feature-flag@1.1.5
+    -   @equinor/fusion-framework-react-components-people-provider@1.4.3
+
+## 9.12.10
+
+### Patch Changes
+
+-   [#2328](https://github.com/equinor/fusion-framework/pull/2328) [`33d394f`](https://github.com/equinor/fusion-framework/commit/33d394f9718340f579e3f427bc68b59df5030d15) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps): bump vite from 5.2.10 to 5.3.3
+
+-   [#2322](https://github.com/equinor/fusion-framework/pull/2322) [`b4dd215`](https://github.com/equinor/fusion-framework/commit/b4dd2150b5f3202e4bae9773afd55993043b4a5e) Thanks [@dependabot](https://github.com/apps/dependabot)! - The Vite changelog highlights several fixes, features, and refactors in versions 5.3.3, 5.3.2, and 5.3.0.
+    Key updates include lazy evaluation of `__vite__mapDeps` files, removal of pure CSS dynamic import, and improvements to build and asset handling.
+    Additionally, Vite now supports the `system` library format and adds options for not starting a WebSocket server and ignoring certain code sections.
+    The changelog also notes performance enhancements, dependency updates, and bug fixes, including resolving circular dependencies, improving error recovery, and updating non-major dependencies.
+
+    build(deps): bump vite from 5.2.10 to 5.3.3
+
+-   [#2333](https://github.com/equinor/fusion-framework/pull/2333) [`86d55b8`](https://github.com/equinor/fusion-framework/commit/86d55b8d27a572f3f62170b1e72aceda54f955e1) Thanks [@odinr](https://github.com/odinr)! - Updated `TypeScript` to 5.5.3
+
+-   [#2320](https://github.com/equinor/fusion-framework/pull/2320) [`1dd85f3`](https://github.com/equinor/fusion-framework/commit/1dd85f3a408a73df556d1812a5f280945cc100ee) Thanks [@odinr](https://github.com/odinr)! - Removed the `removeComments` option from the `tsconfig.base.json` file.
+
+    Removing the `removeComments` option allows TypeScript to preserve comments in the compiled JavaScript output. This can be beneficial for several reasons:
+
+    1. Improved debugging: Preserved comments can help developers understand the code better during debugging sessions.
+    2. Documentation: JSDoc comments and other important code documentation will be retained in the compiled output.
+    3. Source map accuracy: Keeping comments can lead to more accurate source maps, which is crucial for debugging and error tracking.
+
+    No action is required from consumers of the library. This change affects the build process and doesn't introduce any breaking changes or new features.
+
+    Before:
+
+    ```json
+    {
+        "compilerOptions": {
+            "module": "ES2022",
+            "target": "ES6",
+            "incremental": true,
+            "removeComments": true,
+            "preserveConstEnums": true,
+            "sourceMap": true,
+            "moduleResolution": "node"
+        }
+    }
+    ```
+
+    After:
+
+    ```json
+    {
+        "compilerOptions": {
+            "module": "ES2022",
+            "target": "ES6",
+            "incremental": true,
+            "preserveConstEnums": true,
+            "sourceMap": true,
+            "moduleResolution": "node"
+        }
+    }
+    ```
+
+    This change ensures that comments are preserved in the compiled output, potentially improving the development and debugging experience for users of the Fusion Framework.
+
+-   [#2330](https://github.com/equinor/fusion-framework/pull/2330) [`4c4471a`](https://github.com/equinor/fusion-framework/commit/4c4471a61d083c6b00d25ebf82952632ff50e200) Thanks [@dependabot](https://github.com/apps/dependabot)! - build(deps-dev): bump rollup from 4.12.0 to 4.18.1
+
+-   Updated dependencies [[`86d55b8`](https://github.com/equinor/fusion-framework/commit/86d55b8d27a572f3f62170b1e72aceda54f955e1), [`29ff796`](https://github.com/equinor/fusion-framework/commit/29ff796ebb3a643c604e4153b6798bde5992363c), [`a723e86`](https://github.com/equinor/fusion-framework/commit/a723e8605059ad126602d053c65114c3ce908964), [`1dd85f3`](https://github.com/equinor/fusion-framework/commit/1dd85f3a408a73df556d1812a5f280945cc100ee)]:
+    -   @equinor/fusion-framework-react-components-people-provider@1.4.2
+    -   @equinor/fusion-framework-module-feature-flag@1.1.5
+    -   @equinor/fusion-observable@8.3.3
+    -   @equinor/fusion-framework-app@9.1.3
+
+## 9.12.9
+
+### Patch Changes
 
-    ## breaking changes
+-   [#2270](https://github.com/equinor/fusion-framework/pull/2270) [`b739416`](https://github.com/equinor/fusion-framework/commit/b7394165a573e545152cfcedc2ddae186ec94112) Thanks [@asbjornhaland](https://github.com/asbjornhaland)! - - Update fusion-wc-person to resolve issue with positioning
 
-    This introduces braking changes to the `AppConfig` type and `AppManifest` type.
+-   Updated dependencies [[`97e41a5`](https://github.com/equinor/fusion-framework/commit/97e41a55d05644b6684c6cb165b65b115bd416eb), [`b739416`](https://github.com/equinor/fusion-framework/commit/b7394165a573e545152cfcedc2ddae186ec94112)]:
+    -   @equinor/fusion-observable@8.3.2
+    -   @equinor/fusion-framework-react-components-people-provider@1.4.1
+    -   @equinor/fusion-framework-module-feature-flag@1.1.4
+    -   @equinor/fusion-framework-app@9.1.2
 
 ## 9.12.8
 

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`, contains tooling for running, building and publishing your application.
 
-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/build-application.js

@@ -12,9 +12,11 @@ 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;
+    var _a, _b;
     const { configSourceFiles, library, outDir } = options;
     const env = {
         command: 'build',
@@ -27,18 +29,37 @@ export const buildApplication = (options) => __awaiter(void 0, void 0, void 0, f
     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

@@ -1 +1 @@
-{"version":3,"file":"build-application.js","sourceRoot":"","sources":["../../src/bin/build-application.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAO,OAQtC,EAAE,EAAE;;IACD,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,GAAG,GAAsB;QAC3B,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,YAAY;KAC7C,CAAC;IAEF,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEnE,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAC7C,MAAM,GAAG,GAAG,MAAM,iBAAiB,EAAE,CAAC;IACtC,OAAO,CAAC,OAAO,EAAE,CAAC;IAElB,OAAO,CAAC,IAAI,CACR,IAAI,EACJ,KAAK,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAChF,CAAC;IAEF,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzC,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IAEvD,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE;QAC7C,IAAI,EAAE,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI;KAChC,CAAC,CAAC;IAEH,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,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAExC,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,CAAC;IAE1C,OAAO;QACH,UAAU;QACV,SAAS;KACZ,CAAC;AACN,CAAC,CAAA,CAAC"}
+{"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

@@ -10,29 +10,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import AdmZip from 'adm-zip';
 import { dirname, resolve } from 'node:path';
 import { mkdir } from 'node:fs/promises';
-import { loadPackage } from './utils/load-package.js';
 import { chalk, formatByteSize, formatPath } from './utils/format.js';
 import { Spinner } from './utils/spinner.js';
 import { buildApplication } from './build-application.js';
-import createExportManifest from './create-export-manifest.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') });
-    const pkg = yield loadPackage();
     spinner.start('build application');
-    yield buildApplication({ outDir });
+    const { pkg } = yield buildApplication({ outDir });
     spinner.succeed();
     spinner.start('generate manifest');
-    const manifest = yield createExportManifest({ outputFile: `${outDir}/app-manifest.json` });
-    spinner.succeed();
-    console.log(chalk.dim(JSON.stringify(manifest, undefined, 2)));
+    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 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 +38,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}`);
@@ -53,7 +51,6 @@ export const bundleApplication = (options) => __awaiter(void 0, void 0, void 0,
         yield mkdir(dirname(archive), { recursive: true });
     }
     bundle.writeZip(archive);
-    spinner.info(formatPath(archive), formatByteSize(archive));
-    spinner.succeed();
+    spinner.succeed('Bundle complete', formatPath(archive, { relative: true }), formatByteSize(archive));
 });
 //# sourceMappingURL=bundle-application.js.map

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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"}