@forge/react 10.10.3-experimental-147ff14 → 10.10.3-next.0

package/CHANGELOG.md

@@ -1,17 +1,5 @@
 # @forge/react
 
-## 10.10.3-experimental-147ff14
-
-### Major Changes
-
-- f9073fe: Improve useConfig hook so it reflects value properly on macro config updates
-
-## 10.10.3
-
-### Patch Changes
-
-- ea9fa2a: Fix update method in useSpaceProperty to ensure it works as expect when value does not exist
-
 ## 10.10.3-next.0
 
 ### Patch Changes

package/out/hooks/__test__/useConfig.test.js

@@ -2,23 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
-const listeners = new Map();
-const simpleBridgeEvents = {
-    on: (event, callback) => {
-        if (!listeners.has(event)) {
-            listeners.set(event, []);
-        }
-        listeners.get(event)?.push(callback);
-    },
-    emit: (event, data) => {
-        if (listeners.has(event)) {
-            listeners.get(event)?.forEach((callback) => callback(data));
-        }
-    },
-    clearListeners: (event) => {
-        listeners.delete(event);
-    }
-};
 // defining mock function above import so it is initialised before jest.mock runs
 const mockGetContext = jest.fn(async () => null);
 const react_1 = tslib_1.__importStar(require("react"));
@@ -28,8 +11,7 @@ const testUtils_1 = require("../../__test__/testUtils");
 jest.mock('@forge/bridge', () => ({
     view: {
         getContext: mockGetContext
-    },
-    events: simpleBridgeEvents
+    }
 }));
 const MOCK_CONFIG = {
     value: 1
@@ -50,16 +32,10 @@ const renderTest = async () => {
         (0, react_1.useEffect)(() => configListener(config), [config]);
         return (0, jsx_runtime_1.jsx)(react_1.default.Fragment, {});
     };
-    const { update } = await reconcilerTestRenderer_1.default.create((0, jsx_runtime_1.jsx)(Test, {}));
-    return {
-        update: async () => {
-            await update((0, jsx_runtime_1.jsx)(Test, {}));
-        }
-    };
+    await reconcilerTestRenderer_1.default.create((0, jsx_runtime_1.jsx)(Test, {}));
 };
 describe('useConfig', () => {
     beforeAll(() => (0, testUtils_1.setupBridge)());
-    beforeEach(() => simpleBridgeEvents.clearListeners('FORGE_CORE_MACRO_CONFIG_CHANGED'));
     afterEach(() => jest.clearAllMocks());
     it('correctly outputs a given config', async () => {
         mockGetContext.mockResolvedValue(MOCK_CONTEXT_WITH_CONFIG);
@@ -73,12 +49,4 @@ describe('useConfig', () => {
         // no change to undef value after productContext call, do not re-render
         expect(configListener).not.toHaveBeenNthCalledWith(2, expect.anything);
     });
-    it('when config is updated, outputs new config', async () => {
-        mockGetContext.mockResolvedValue(MOCK_CONTEXT_WITH_CONFIG);
-        await renderTest();
-        expect(mockGetContext).toHaveBeenCalledTimes(1);
-        const newConfig = { value: 2 };
-        simpleBridgeEvents.emit('FORGE_CORE_MACRO_CONFIG_CHANGED', newConfig);
-        expect(mockGetContext).toHaveBeenCalledTimes(2);
-    });
 });

package/out/hooks/useConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useConfig.d.ts","sourceRoot":"","sources":["../../src/hooks/useConfig.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,SAAS,WAiBrB,CAAC"}
+{"version":3,"file":"useConfig.d.ts","sourceRoot":"","sources":["../../src/hooks/useConfig.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,WAGrB,CAAC"}

package/out/hooks/useConfig.js

@@ -1,31 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useConfig = void 0;
-const react_1 = require("react");
-const bridge_1 = require("@forge/bridge");
-const updateConfig = (setConfig) => {
-    bridge_1.view
-        .getContext()
-        .then((context) => {
-        setConfig(context?.extension.config);
-    })
-        .catch((err) => {
-        throw err;
-    });
-};
+const useProductContext_1 = require("./useProductContext");
 const useConfig = () => {
-    const [config, setConfig] = (0, react_1.useState)(undefined);
-    (0, react_1.useEffect)(() => {
-        updateConfig(setConfig);
-    }, []);
-    (0, react_1.useEffect)(() => {
-        const sub = bridge_1.events.on('FORGE_CORE_MACRO_CONFIG_CHANGED', () => {
-            updateConfig(setConfig);
-        });
-        return () => {
-            void sub.then((subscription) => subscription.unsubscribe());
-        };
-    }, []);
-    return config;
+    const context = (0, useProductContext_1.useProductContext)();
+    return context?.extension.config;
 };
 exports.useConfig = useConfig;

package/out/reconciler.js

@@ -218,7 +218,7 @@ exports.hostConfig = {
 const reconciler = (0, react_reconciler_1.default)(exports.hostConfig);
 exports.ForgeReconciler = {
     render: (element) => {
-        const rootElement = (0, exports.createElement)({ type: 'Root', props: {}, forgeReactMajorVersion: 11 });
+        const rootElement = (0, exports.createElement)({ type: 'Root', props: {}, forgeReactMajorVersion: 10 });
         const container = reconciler.createContainer(rootElement, 0, null, false, null, 'root', (err) => {
             // eslint-disable-next-line no-console
             console.log(err);
@@ -233,7 +233,7 @@ exports.ForgeReconciler = {
         }
     },
     addConfig: (element) => {
-        const macroConfigElement = (0, exports.createElement)({ type: 'MacroConfig', props: {}, forgeReactMajorVersion: 11 });
+        const macroConfigElement = (0, exports.createElement)({ type: 'MacroConfig', props: {}, forgeReactMajorVersion: 10 });
         const container = reconciler.createContainer(macroConfigElement, 0, null, false, null, 'macroConfig', (err) => {
             // eslint-disable-next-line no-console
             console.log(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/react",
-  "version": "10.10.3-experimental-147ff14",
+  "version": "10.10.3-next.0",
   "description": "Forge React reconciler",
   "author": "Atlassian",
   "license": "UNLICENSED",