Chore/dedupe packages (#905)

* chore: update typescript * chore: fix linting * build: create changeset
equinor · May 28, 2023 · a7858a1 · a7858a1
1 parent 64968c4
commit a7858a1
Show file tree

Hide file tree

Showing 36 changed files with 84 additions and 52 deletions.
diff --git a/.changeset/stale-pigs-leave.md b/.changeset/stale-pigs-leave.md
@@ -0,0 +1,36 @@
+---
+"@equinor/fusion-framework-app": patch
+"@equinor/fusion-framework-cli": patch
+"@equinor/fusion-framework": patch
+"@equinor/fusion-framework-module-ag-grid": patch
+"@equinor/fusion-framework-module-app": patch
+"@equinor/fusion-framework-module-context": patch
+"@equinor/fusion-framework-module-http": patch
+"@equinor/fusion-framework-module": patch
+"@equinor/fusion-framework-module-msal": patch
+"@equinor/fusion-framework-module-navigation": patch
+"@equinor/fusion-framework-module-service-discovery": patch
+"@equinor/fusion-framework-module-telemetry": patch
+"@equinor/fusion-framework-module-widget": patch
+"@equinor/fusion-framework-react-app": patch
+"@equinor/fusion-framework-react-components-bookmark": patch
+"@equinor/fusion-framework-react": patch
+"@equinor/fusion-framework-legacy-interopt": patch
+"@equinor/fusion-framework-react-module-bookmark": patch
+"@equinor/fusion-framework-react-module-context": patch
+"@equinor/fusion-framework-react-module-event": patch
+"@equinor/fusion-framework-react-module-http": patch
+"@equinor/fusion-framework-react-module": patch
+"@equinor/fusion-framework-cookbook-app-react-bookmark-advanced": patch
+"@equinor/fusion-framework-cookbook-app-react-bookmark": patch
+"@equinor/fusion-framework-cookbook-app-react": patch
+---
+
+__🚧 Chore: dedupe packages__
+
+- align all versions of typescript
+- update types to build
+  - a couple of typecasts did not [satisfies](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-0.html#satisfies-support-in-jsdoc) and was recasted as `unknwon`, marked with `TODO`, should be fixed in future  
+- added missing [exhausted-deps](https://legacy.reactjs.org/docs/hooks-rules.html), this might cause rerender, since `ReactRouterDom.createBrowserHistory` might create history dynamicly.
+  - this should be tested in portal when updating the `@equinor/fusion-framework-legacy-interopt`
+  - https://github.com/equinor/fusion-framework/blob/7c0a475174f61ba02570614c237d5cfb3b009cb1/packages/react/legacy-interopt/src/create-legacy-render.tsx#L59
diff --git a/cookbooks/app-react-bookmark-advanced/src/App.tsx b/cookbooks/app-react-bookmark-advanced/src/App.tsx
@@ -1,9 +1,5 @@
 import Router from './Router';
 
-export const App = () => {
-    return (
-        <Router />
-    );
-};
+export const App = () => <Router />;
 
 export default App;
diff --git a/cookbooks/app-react/src/App.tsx b/cookbooks/app-react/src/App.tsx
@@ -1,5 +1,3 @@
-export const App = () => (
-    <h1>🚀 Hello Fusion😎</h1>
-);
+export const App = () => <h1>🚀 Hello Fusion😎</h1>;
 
 export default App;
diff --git a/package.json b/package.json
@@ -9,8 +9,8 @@
   },
   "scripts": {
     "bootstrap": "lerna bootstrap",
-    "clean": "yarn run clean:npm && yarn run clean:build",
-    "clean:npm": "rm -rf node_modules && npx lerna exec 'rm -rf node_modules'",
+    "clean": "yarn run clean:build && yarn run clean:npm",
+    "clean:npm": "npx lerna exec 'rm -rf node_modules' && rm -rf node_modules",
     "clean:build": "npx lerna exec 'rm -rf dist'",
     "build": "lerna run build",
     "build:affected": "nx run-many --target=build --all",
@@ -73,7 +73,7 @@
     "@typescript-eslint/eslint-plugin": "^5.49.0",
     "eslint": "^8.33.0",
     "eslint-plugin-rxjs": "^5.0.2",
-    "lerna": "^6.4.1",
+    "lerna": "^6.6.2",
     "nx": "16.2.2",
     "prettier": "^2.8.3",
     "tslib": "^2.5.0",

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -40,6 +40,6 @@
         "@equinor/fusion-framework-module-msal": "^3.0.2"
     },
     "devDependencies": {
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/packages/app/src/configure-modules.ts b/packages/app/src/configure-modules.ts
@@ -45,7 +45,8 @@ export const configureModules =
         }
         const modules = (await configurator.initialize(
             args.fusion.modules
-        )) as AppModulesInstance<TModules>;
+            // TODO
+        )) as unknown as AppModulesInstance<TModules>;
 
         // @eikeland
         // TODO - remove check after fusion-cli is updated (app module is not enabled in fusion-cli)

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -69,6 +69,6 @@
         "react-dom": "^18.2.0",
         "react-router-dom": "^6.9.0",
         "styled-components": "^5.3.9",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/packages/framework/package.json b/packages/framework/package.json
@@ -42,6 +42,6 @@
         "rxjs": "^7.5.7"
     },
     "devDependencies": {
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/packages/modules/ag-grid/package.json b/packages/modules/ag-grid/package.json
@@ -30,7 +30,7 @@
     },
     "devDependencies": {
         "@equinor/fusion-framework-module": "^4.1.0",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@equinor/fusion-framework-module": ">=1.2.2"

diff --git a/packages/modules/app/package.json b/packages/modules/app/package.json
@@ -43,6 +43,6 @@
         "@equinor/fusion-framework-module-event": "^4.0.1",
         "@equinor/fusion-framework-module-http": "^5.0.2",
         "@equinor/fusion-framework-module-service-discovery": "^7.0.3",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/packages/modules/app/src/types.ts b/packages/modules/app/src/types.ts
@@ -21,6 +21,7 @@ export type ModuleDeps = [HttpModule, ServiceDiscoveryModule, EventModule];
 
 export type AppType = 'standalone' | 'report' | 'launcher';
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type CurrentApp<TModules extends Array<AnyModule> = [], TEnv = any> =
     | App<TEnv, TModules>
     | null

diff --git a/packages/modules/context/src/configurator.ts b/packages/modules/context/src/configurator.ts
@@ -58,13 +58,11 @@ export interface ContextModuleConfig {
         item: ContextItem | null
     ) => ReturnType<IContextProvider['validateContext']>;
 
-    resolveInitialContext?: (
-        args: {
-            ref?: AnyModuleInstance | any;
-            modules: ModuleInstance;
-        }
-        // ...args: Parameters<ContextModule['postInitialize']>
-    ) => ObservableInput<ContextItem | void>;
+    resolveInitialContext?: (args: {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        ref?: AnyModuleInstance | any;
+        modules: ModuleInstance;
+    }) => ObservableInput<ContextItem | void>;
 }
 
 export interface IContextModuleConfigurator {

diff --git a/packages/modules/http/package.json b/packages/modules/http/package.json
@@ -47,6 +47,6 @@
         "rxjs": "^7.5.7"
     },
     "devDependencies": {
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/packages/modules/module/package.json b/packages/modules/module/package.json
@@ -27,6 +27,6 @@
         "semver": "^7.5.0"
     },
     "devDependencies": {
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/packages/modules/msal/package.json b/packages/modules/msal/package.json
@@ -35,6 +35,6 @@
         "@equinor/fusion-framework-module": "^4.1.0"
     },
     "devDependencies": {
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/packages/modules/navigation/package.json b/packages/modules/navigation/package.json
@@ -36,7 +36,7 @@
     "devDependencies": {
         "@equinor/fusion-framework-module": "^4.1.0",
         "rxjs": "^7.5.7",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@equinor/fusion-framework-module": ">=1.2.2",

diff --git a/packages/modules/service-discovery/package.json b/packages/modules/service-discovery/package.json
@@ -29,6 +29,6 @@
         "rxjs": "^7.5.7"
     },
     "devDependencies": {
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/packages/modules/telemetry/package.json b/packages/modules/telemetry/package.json
@@ -34,6 +34,6 @@
         "@microsoft/applicationinsights-web": "^2.7.2"
     },
     "devDependencies": {
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/packages/modules/widget/package.json b/packages/modules/widget/package.json
@@ -38,6 +38,6 @@
         "@equinor/fusion-framework-module": "^4.1.0",
         "@equinor/fusion-framework-module-event": "^4.0.1",
         "@equinor/fusion-framework-module-service-discovery": "^7.0.3",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/packages/react/app/package.json b/packages/react/app/package.json
@@ -54,7 +54,7 @@
         "@types/react-dom": "^17.0.7",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@types/react": "^17.0.0 || ^18.0.0",

diff --git a/packages/react/components/bookmark/package.json b/packages/react/components/bookmark/package.json
@@ -37,7 +37,7 @@
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
         "styled-components": "^5.3.9",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@emotion/css": "^11.10.6",

diff --git a/packages/react/components/bookmark/src/components/row/MoreMenu.tsx b/packages/react/components/bookmark/src/components/row/MoreMenu.tsx
@@ -23,8 +23,10 @@ export const MoreMenu = ({ pRef, onClose, open, options }: MenuProps) => {
                     }}
                     key={name}
                 >
-                    {Icon && Icon}
-                    {name}
+                    <>
+                        {Icon && Icon}
+                        {name}
+                    </>
                 </Menu.Item>
             ))}
         </Menu>

diff --git a/packages/react/framework/package.json b/packages/react/framework/package.json
@@ -58,7 +58,7 @@
         "@types/react-dom": "^17.0.7",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@equinor/fusion-framework-react-module-signalr": "*",

diff --git a/packages/react/legacy-interopt/package.json b/packages/react/legacy-interopt/package.json
@@ -45,7 +45,7 @@
         "react": "^17.0.2",
         "react-router-dom": "^5",
         "rxjs": "^7.5.7",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@equinor/fusion": "*",

diff --git a/packages/react/legacy-interopt/src/components/create-legacy-context-component.tsx b/packages/react/legacy-interopt/src/components/create-legacy-context-component.tsx
@@ -1,5 +1,4 @@
 import { lazy } from 'react';
-import type { ReactNode } from 'react';
 
 import { FusionContext } from '@equinor/fusion';
 
@@ -12,7 +11,7 @@ export const createLegacyContextComponent = (props: Parameters<typeof createFusi
         props.framework ??= window.Fusion as PortalFramework;
         const fusionContext = await createFusionContext(props);
         return {
-            default: ({ children }: { children?: ReactNode }) => (
+            default: ({ children }: { children?: JSX.Element }) => (
                 <FusionContext.Provider value={fusionContext}>{children}</FusionContext.Provider>
             ),
         };

diff --git a/packages/react/legacy-interopt/src/create-legacy-render.tsx b/packages/react/legacy-interopt/src/create-legacy-render.tsx
@@ -56,7 +56,7 @@ const AppWrapper = (
                     break;
             }
         });
-    }, [appKey, framework]);
+    }, [appKey, basename, framework, history]);
     return (
         <HistoryContext.Provider value={{ history }}>
             <Router key={appKey} history={history}>

diff --git a/packages/react/modules/bookmark/package.json b/packages/react/modules/bookmark/package.json
@@ -43,7 +43,7 @@
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
         "rxjs": "^7.5.7",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@types/react": "^17.0.0 || ^18.0.0",

diff --git a/packages/react/modules/context/package.json b/packages/react/modules/context/package.json
@@ -32,7 +32,7 @@
         "@types/react-dom": "^17.0.7",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@types/react": "^17.0.0 || ^18.0.0",

diff --git a/packages/react/modules/event/package.json b/packages/react/modules/event/package.json
@@ -31,7 +31,7 @@
         "@types/react-dom": "^17.0.7",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@types/react": "^17.0.0 || ^18.0.0",

diff --git a/packages/react/modules/http/package.json b/packages/react/modules/http/package.json
@@ -29,7 +29,7 @@
         "@types/react-dom": "^17.0.7",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@equinor/fusion-framework-module-http": ">=1.0.0",

diff --git a/packages/react/modules/module/package.json b/packages/react/modules/module/package.json
@@ -33,7 +33,7 @@
         "@types/react-dom": "^17.0.7",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@types/react": "^17.0.0 || ^18.0.0",

diff --git a/packages/utils/observable/package.json b/packages/utils/observable/package.json
@@ -58,7 +58,7 @@
         "@types/react": "^17.0.2",
         "@types/uuid": "^8.3.4",
         "react": "^17.0.2",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@types/react": "^17.0.0 || ^18.0.0",

diff --git a/packages/utils/query/package.json b/packages/utils/query/package.json
@@ -66,7 +66,7 @@
         "@types/react": "^17.0.2",
         "@types/uuid": "^8.3.4",
         "react": "^17.0.2",
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     },
     "peerDependencies": {
         "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0",

diff --git a/packages/widget/package.json b/packages/widget/package.json
@@ -40,6 +40,6 @@
         "@equinor/fusion-framework-module-widget": "^1.0.3"
     },
     "devDependencies": {
-        "typescript": "^4.9.3"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/packages/widget/src/configure-widget-modules.ts b/packages/widget/src/configure-widget-modules.ts
@@ -45,7 +45,8 @@ export const configureWidgetModules =
         }
         const modules = (await configurator.initialize(
             args.fusion.modules
-        )) as WidgetModulesInstance<TModules>;
+            // TODO
+        )) as unknown as WidgetModulesInstance<TModules>;
 
         // TODO - fire event when widget is loaded
         // if (args.env.manifest?.key) {

diff --git a/yarn.lock b/yarn.lock
@@ -7562,7 +7562,7 @@ lerna-update-wizard@^1.1.2:
     normalize-path "^3.0.0"
     semver-compare "^1.0.0"
 
-lerna@^6.4.1:
+lerna@^6.6.2:
   version "6.6.2"
   resolved "https://registry.yarnpkg.com/lerna/-/lerna-6.6.2.tgz#ad921f913aca4e7307123a598768b6f15ca5804f"
   integrity sha512-W4qrGhcdutkRdHEaDf9eqp7u4JvI+1TwFy5woX6OI8WPe4PYBdxuILAsvhp614fUG41rKSGDKlOh+AWzdSidTg==
@@ -11166,12 +11166,12 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-"typescript@^3 || ^4", typescript@^4.9.3, typescript@^4.9.4:
+"typescript@^3 || ^4", typescript@^4.9.4:
   version "4.9.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
-"typescript@^4.6.4 || ^5.0.0":
+"typescript@^4.6.4 || ^5.0.0", typescript@^5.0.4:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b"
   integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==