fix(cli): adding ApiConfigSchema zod type to zli (#2511)

* Revert "fix/packages/modules (#2510)" This reverts commit 663bed8. * Revert "refactor(cli): Remove "type" module from package.json" This reverts commit 43b4cac. * fix(cli): adding ApiConfigSchema zod type
equinor · Oct 14, 2024 · 7f02123 · 7f02123
1 parent 9fc0f90
commit 7f02123
Show file tree

Hide file tree

Showing 42 changed files with 40 additions and 113 deletions.
diff --git a/.changeset/popular-snakes-deliver.md b/.changeset/popular-snakes-deliver.md
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-app",
     "version": "9.1.9",
     "description": "",
-    "type": "module",
     "main": "dist/esm/index.js",
     "types": "./dist/types/index.d.ts",
     "exports": {

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -36,7 +36,7 @@
         }
     },
     "scripts": {
-        "build": "pnpm build:lib && pnpm build:dev-proxy && pnpm build:bin",
+        "build": "pnpm build:lib && pnpm build:dev-proxy  && pnpm build:bin",
         "build:clean": "rm -rf dist && rm -f tsconfig.tsbuildinfo && pnpm build",
         "build:lib": "tsc -b tsconfig.lib.json",
         "build:bin": "rollup -c",

diff --git a/packages/cli/rollup.config.mjs b/packages/cli/rollup.config.mjs
@@ -1,23 +1,21 @@
 import typescript from '@rollup/plugin-typescript';
 
 export default [
-    {
-        input: './src/bin/main.ts',
-        output: {
-            file: './dist/bin/main.mjs',
-            format: 'es',
-        },
-        plugins: [
-            typescript({
-                outputToFilesystem: false,
-                compilerOptions: {
-                    composite: false,
-                    declaration: false,
-                    outDir: './dist/bin',
-                    declarationDir: './dist/bin',
-                    sourceMap: false,
-                },
-            }),
-        ],
+  {
+    input: './src/bin/main.ts',
+    output: {
+      file: './dist/bin/main.mjs',
+      format: 'es'
     },
-];
+    plugins: [typescript({
+      outputToFilesystem: false,
+      compilerOptions: {
+        composite: false,
+        declaration: false,
+        outDir: './dist/bin',
+        declarationDir: './dist/bin',
+        sourceMap: false,
+      }
+    })]
+  },
+];
diff --git a/packages/cli/src/bin/utils/load-app-config.ts b/packages/cli/src/bin/utils/load-app-config.ts
@@ -4,7 +4,7 @@ import { formatPath, chalk } from './format.js';
 import { createAppConfig } from '../../lib/app-config.js';
 import { type ConfigExecuterEnv } from '../../lib/utils/config.js';
 import { type ResolvedAppPackage } from '../../lib/app-package.js';
-import { ApiAppConfig } from '@equinor/fusion-framework-module-app/schemas.js';
+import { ApiAppConfig } from '../../schemas.js';
 
 export const loadAppConfig = async (
     env: ConfigExecuterEnv,

diff --git a/packages/cli/src/bin/utils/publishAppConfig.ts b/packages/cli/src/bin/utils/publishAppConfig.ts
@@ -1,4 +1,4 @@
-import { ApiAppConfig } from '@equinor/fusion-framework-module-app/schemas.js';
+import { ApiAppConfig } from '../../schemas.js';
 
 /**
  * Publishes app config to the apps-service endpoint

diff --git a/packages/cli/src/lib/app-config.ts b/packages/cli/src/lib/app-config.ts
@@ -9,7 +9,7 @@ import {
 
 import { AssertionError } from './utils/assert.js';
 
-import { ApiAppConfig, ApiAppConfigSchema } from '@equinor/fusion-framework-module-app/schemas.js';
+import { ApiAppConfig, ApiAppConfigSchema } from '../schemas.js';
 
 type FindAppConfigOptions = FindConfigOptions & {
     file?: string;

diff --git a/packages/cli/src/lib/plugins/app-proxy/app-proxy-plugin.ts b/packages/cli/src/lib/plugins/app-proxy/app-proxy-plugin.ts
@@ -4,7 +4,7 @@ import { AppManifest } from '@equinor/fusion-framework-app';
 
 import { ClientRequest, IncomingMessage, ServerResponse } from 'node:http';
 
-import { ApiAppConfig } from '@equinor/fusion-framework-module-app/schemas.js';
+import { ApiAppConfig } from '../../../schemas.js';
 
 /**
  * Preserve token for executing proxy assets

diff --git a/packages/cli/src/schemas.ts b/packages/cli/src/schemas.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod';
+
+/**
+ * Api config object
+ */
+export const ApiAppConfigSchema = z.object({
+    environment: z.record(z.any()).optional().default({}),
+    endpoints: z
+        .record(
+            z.object({
+                url: z.string(),
+                scopes: z.array(z.string()).optional().default([]),
+            }),
+        )
+        .optional(),
+});
+
+export type ApiAppConfig = z.infer<typeof ApiAppConfigSchema>;
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
@@ -4,7 +4,6 @@
     "outDir": "dist",
     "rootDir": "src",
     "target": "ES6",
-    "declaration": true,
     "declarationDir": "./dist/types",
     "baseUrl": ".",
     "jsx": "react-jsx",

diff --git a/packages/framework/package.json b/packages/framework/package.json
@@ -3,7 +3,6 @@
     "version": "7.2.8",
     "description": "",
     "main": "dist/esm/index.js",
-    "type": "module",
     "types": "dist/types/index.d.ts",
     "exports": {
         ".": {

diff --git a/packages/modules/ag-grid/package.json b/packages/modules/ag-grid/package.json
@@ -3,7 +3,6 @@
     "version": "32.2.0",
     "description": "Fusion module for using AG Grid",
     "main": "dist/esm/index.js",
-    "type": "module",
     "exports": {
         ".": {
             "import": "./dist/esm/index.js",

diff --git a/packages/modules/app/package.json b/packages/modules/app/package.json
@@ -3,7 +3,6 @@
     "version": "5.3.11",
     "description": "",
     "main": "dist/esm/index.js",
-    "type": "module",
     "exports": {
         ".": {
             "import": "./dist/esm/index.js",

diff --git a/packages/modules/bookmark/package.json b/packages/modules/bookmark/package.json
@@ -3,7 +3,6 @@
     "version": "1.2.12",
     "description": "",
     "main": "./dist/esm/index.js",
-    "type": "module",
     "exports": {
         ".": {
             "import": "./dist/esm/index.js",

diff --git a/packages/modules/context/package.json b/packages/modules/context/package.json
@@ -3,7 +3,6 @@
     "version": "5.0.12",
     "description": "",
     "main": "./dist/esm/index.js",
-    "type": "module",
     "exports": {
         ".": {
             "import": "./dist/esm/index.js",

diff --git a/packages/modules/event/package.json b/packages/modules/event/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-module-event",
     "version": "4.2.4",
     "description": "Fusion module for events",
-    "type": "module",
     "main": "./dist/esm/index.js",
     "module": "./dist/esm/index.js",
     "exports": {

diff --git a/packages/modules/feature-flag/package.json b/packages/modules/feature-flag/package.json
@@ -3,7 +3,6 @@
     "version": "1.1.9",
     "description": "",
     "main": "dist/esm/index.js",
-    "type": "module",
     "exports": {
         ".": {
             "import": "./dist/esm/index.js",

diff --git a/packages/modules/http/package.json b/packages/modules/http/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-module-http",
     "version": "6.2.0",
     "description": "",
-    "type": "module",
     "main": "dist/esm/index.js",
     "types": "index.d.ts",
     "exports": {

diff --git a/packages/modules/module/package.json b/packages/modules/module/package.json
@@ -3,7 +3,6 @@
     "version": "4.3.5",
     "description": "",
     "main": "dist/esm/index.js",
-    "type": "module",
     "exports": {
         ".": {
             "import": "./dist/esm/index.js",

diff --git a/packages/modules/msal/package.json b/packages/modules/msal/package.json
@@ -3,7 +3,6 @@
     "version": "3.1.5",
     "description": "",
     "main": "dist/esm/index.js",
-    "type": "module",
     "exports": {
         ".": {
             "import": "./dist/esm/index.js",

diff --git a/packages/modules/navigation/package.json b/packages/modules/navigation/package.json
@@ -4,7 +4,6 @@
     "description": "",
     "sideEffects": false,
     "main": "dist/esm/index.js",
-    "type": "module",
     "types": "index.d.ts",
     "typesVersions": {
         ">=4.2": {

diff --git a/packages/modules/service-discovery/package.json b/packages/modules/service-discovery/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-module-service-discovery",
     "version": "8.0.1",
     "description": "",
-    "type": "module",
     "main": "dist/esm/index.js",
     "exports": {
         ".": {

diff --git a/packages/modules/services/package.json b/packages/modules/services/package.json
@@ -3,7 +3,6 @@
     "version": "4.1.5",
     "description": "",
     "sideEffects": false,
-    "type": "module",
     "main": "dist/esm/index.js",
     "types": "index.d.ts",
     "typesVersions": {

diff --git a/packages/modules/signalr/package.json b/packages/modules/signalr/package.json
@@ -4,7 +4,6 @@
     "description": "",
     "sideEffects": false,
     "main": "dist/esm/index.js",
-    "type": "module",
     "types": "dist/types/index.d.ts",
     "typesVersions": {
         ">=4.2": {

diff --git a/packages/modules/telemetry/package.json b/packages/modules/telemetry/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-module-telemetry",
     "version": "4.1.5",
     "description": "Fusion module for using Microsoft Telemetry",
-    "type": "module",
     "main": "dist/esm/index.js",
     "exports": {
         ".": {

diff --git a/packages/modules/widget/package.json b/packages/modules/widget/package.json
@@ -3,7 +3,6 @@
     "version": "8.0.0",
     "description": "",
     "main": "dist/esm/index.js",
-    "type": "module",
     "exports": {
         ".": {
             "import": "./dist/esm/index.js",

diff --git a/packages/react/app/package.json b/packages/react/app/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-react-app",
     "version": "5.2.9",
     "description": "",
-    "type": "module",
     "main": "./dist/esm/index.js",
     "types": "./dist/types/index.d.ts",
     "exports": {

diff --git a/packages/react/components/bookmark/package.json b/packages/react/components/bookmark/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-react-components-bookmark",
     "version": "0.5.1",
     "description": "",
-    "type": "module",
     "main": "dist/esm/index.js",
     "exports": {
         ".": {

diff --git a/packages/react/components/people-resolver/package.json b/packages/react/components/people-resolver/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-react-components-people-provider",
     "version": "1.4.8",
     "description": "",
-    "type": "module",
     "main": "dist/esm/index.js",
     "exports": {
         ".": {

diff --git a/packages/react/framework/package.json b/packages/react/framework/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-react",
     "version": "7.2.3",
     "description": "",
-    "type": "module",
     "main": "dist/esm/index.js",
     "exports": {
         ".": {

diff --git a/packages/react/legacy-interopt/package.json b/packages/react/legacy-interopt/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-legacy-interopt",
     "version": "16.0.0",
     "description": "Library for interopt legacy fusion applications",
-    "type": "module",
     "main": "dist/esm/index.js",
     "exports": {
         ".": {

diff --git a/packages/react/modules/bookmark/package.json b/packages/react/modules/bookmark/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-react-module-bookmark",
     "version": "2.1.17",
     "description": "",
-    "type": "module",
     "main": "dist/esm/index.js",
     "exports": {
         ".": {

diff --git a/packages/react/modules/context/package.json b/packages/react/modules/context/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-react-module-context",
     "version": "6.2.13",
     "description": "",
-    "type": "module",
     "main": "dist/esm/index.js",
     "exports": {
         ".": {

diff --git a/packages/react/modules/event/package.json b/packages/react/modules/event/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-react-module-event",
     "version": "3.2.7",
     "description": "",
-    "type": "module",
     "main": "dist/esm/index.js",
     "exports": {
         ".": {

diff --git a/packages/react/modules/http/package.json b/packages/react/modules/http/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-react-module-http",
     "version": "8.0.0",
     "description": "",
-    "type": "module",
     "main": "dist/esm/index.js",
     "exports": {
         ".": {

diff --git a/packages/react/modules/module/package.json b/packages/react/modules/module/package.json
@@ -1,7 +1,6 @@
 {
     "name": "@equinor/fusion-framework-react-module",
     "version": "3.1.6",
-    "type": "module",
     "main": "dist/esm/index.js",
     "exports": {
         ".": {

diff --git a/packages/react/modules/signalr/package.json b/packages/react/modules/signalr/package.json
@@ -3,7 +3,6 @@
     "version": "3.0.16",
     "description": "",
     "sideEffects": false,
-    "type": "module",
     "main": "dist/esm/index.js",
     "types": "index.d.ts",
     "typesVersions": {

diff --git a/packages/react/widget/package.json b/packages/react/widget/package.json
@@ -2,7 +2,6 @@
     "name": "@equinor/fusion-framework-react-widget",
     "version": "1.1.17",
     "description": "",
-    "type": "module",
     "main": "dist/esm/index.js",
     "types": "dist/types/index.d.ts",
     "exports": {