@equinor/fusion-framework-cli 10.7.0 → 10.7.1

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # Change Log
2
2
 
3
+ ## 10.7.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#2954](https://github.com/equinor/fusion-framework/pull/2954) [`aac72ce`](https://github.com/equinor/fusion-framework/commit/aac72ce780588c72eb517d3e8c4860f002cc570d) Thanks [@odinr](https://github.com/odinr)! - fixed issues with overriding proxy options
8
+
9
+ - [#2955](https://github.com/equinor/fusion-framework/pull/2955) [`6f104e2`](https://github.com/equinor/fusion-framework/commit/6f104e2ed191e77c6127376e035bbf7af80f166b) Thanks [@asbjornhaland](https://github.com/asbjornhaland)! - - Add env to 'onReactAppLoaded' event
10
+ - Prevent context provider change if app key is not current app for 'onReactAppLoaded'
11
+
3
12
  ## 10.7.0
4
13
 
5
14
  ### Minor Changes
@@ -93,8 +93,12 @@ export const useContextResolver = () => {
93
93
  /** observe changes to app modules and clear / set the context provider on change */
94
94
  useObservableSubscription(instance$, onContextProviderChange, clearContextProvider);
95
95
  useEffect(() => framework.modules.event.addEventListener('onReactAppLoaded', (e) => {
96
- console.debug('useContextResolver::onReactAppLoaded', 'using legacy register hack method');
97
- return onContextProviderChange(e.detail.modules);
96
+ var _a;
97
+ // Only change provider if event is for current app
98
+ if (e.detail.env.manifest.appKey === ((_a = framework.modules.app.current) === null || _a === void 0 ? void 0 : _a.appKey)) {
99
+ console.debug('useContextResolver::onReactAppLoaded', 'using legacy register hack method');
100
+ return onContextProviderChange(e.detail.modules);
101
+ }
98
102
  }), [framework, onContextProviderChange]);
99
103
  const processError = useCallback((err) => {
100
104
  if (err.name === 'QueryClientError') {
@@ -1 +1 @@
1
- {"version":3,"file":"useContextResolver.js","sourceRoot":"","sources":["../../../../src/bin/dev-portal/ContextSelector/useContextResolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useContextResolver.js","sourceRoot":"","sources":["../../../../src/bin/dev-portal/ContextSelector/useContextResolver.ts"],"names":[],"mappings":"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"}