@atlaskit/editor-common 105.9.0 → 105.9.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-common
 
+## 105.9.1
+
+### Patch Changes
+
+- [#159910](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/159910)
+  [`795f5ed29ca14`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/795f5ed29ca14) -
+  Make getNodeRenderer synchronous so loading state never appear in Confluence
+- Updated dependencies
+
 ## 105.9.0
 
 ### Minor Changes

package/dist/cjs/extensions/extension-handlers.js

@@ -116,8 +116,6 @@ function getNodeRenderer(extensionProvider, extensionType, extensionKey) {
   return (0, _reactLoadable.default)({
     loader: function loader() {
       if ((0, _platformFeatureFlags.fg)('confluence_preload_extension_providers')) {
-        // Logic here is specific to Confluence because it doesn't use the original react-loadable.
-        // The library is replaced with a custom one that supports synchronous return value from loader.
         var maybePromise = getExtensionModuleNodeMaybePreloaded(extensionProvider, extensionType, extensionKey);
         if (maybePromise instanceof Promise) {
           return maybePromise.then(function (node) {
@@ -125,11 +123,12 @@ function getNodeRenderer(extensionProvider, extensionType, extensionKey) {
           });
         } else {
           var _renderSync, _ref;
-          // maybePromise is sync here
           var preloaded = maybePromise === null || maybePromise === void 0 || (_renderSync = (_ref = maybePromise).renderSync) === null || _renderSync === void 0 ? void 0 : _renderSync.call(_ref);
-          // Note resolveImport is still async but we are not waiting on a already-fulfilled value.
-          // It is fast enough to not flip back to loading.
-          return (0, _manifestHelpers.resolveImport)(preloaded ? preloaded : maybePromise.render());
+          // Only product implemented preloading will return sync result
+          // However the out-of-box won't handle this. Confluence uses a custom implementation
+          return preloaded
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          ? (0, _manifestHelpers.resolveImportSync)(preloaded) : (0, _manifestHelpers.resolveImport)(maybePromise.render());
         }
       } else {
         return getExtensionModuleNode(extensionProvider, extensionType, extensionKey).then(function (node) {

package/dist/cjs/extensions/manifest-helpers.js

@@ -8,7 +8,7 @@ exports.FORGE_EXTENSION_TYPE = void 0;
 exports.buildAction = buildAction;
 exports.buildExtensionKeyAndNodeKey = void 0;
 exports.buildNode = buildNode;
-exports.resolveImport = exports.getExtensionKeyAndNodeKey = void 0;
+exports.resolveImportSync = exports.resolveImport = exports.getExtensionKeyAndNodeKey = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -44,18 +44,21 @@ function buildAction(action, manifest) {
     return buildNode(action, manifest);
   }
 }
+var resolveImportSync = exports.resolveImportSync = function resolveImportSync(importedModule) {
+  return importedModule && importedModule.__esModule ? importedModule.default : importedModule;
+};
 var resolveImport = exports.resolveImport = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(importPromise) {
-    var importedModule;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.next = 2;
+          _context.t0 = resolveImportSync;
+          _context.next = 3;
           return importPromise;
-        case 2:
-          importedModule = _context.sent;
-          return _context.abrupt("return", importedModule && importedModule.__esModule ? importedModule.default : importedModule);
-        case 4:
+        case 3:
+          _context.t1 = _context.sent;
+          return _context.abrupt("return", (0, _context.t0)(_context.t1));
+        case 5:
         case "end":
           return _context.stop();
       }

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "105.9.0";
+var packageVersion = "105.9.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/ui/DropList/index.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "105.9.0";
+var packageVersion = "105.9.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/es2019/extensions/extension-handlers.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import Loadable from 'react-loadable';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { getExtensionKeyAndNodeKey, resolveImport } from './manifest-helpers';
+import { getExtensionKeyAndNodeKey, resolveImport, resolveImportSync } from './manifest-helpers';
 function getNodeFromManifest(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 manifest, extKey, nodeKey, extensionType, extensionKey) {
@@ -60,18 +60,17 @@ export function getNodeRenderer(extensionProvider, extensionType, extensionKey)
   return Loadable({
     loader: () => {
       if (fg('confluence_preload_extension_providers')) {
-        // Logic here is specific to Confluence because it doesn't use the original react-loadable.
-        // The library is replaced with a custom one that supports synchronous return value from loader.
         const maybePromise = getExtensionModuleNodeMaybePreloaded(extensionProvider, extensionType, extensionKey);
         if (maybePromise instanceof Promise) {
           return maybePromise.then(node => resolveImport(node.render()));
         } else {
           var _renderSync, _ref;
-          // maybePromise is sync here
           const preloaded = maybePromise === null || maybePromise === void 0 ? void 0 : (_renderSync = (_ref = maybePromise).renderSync) === null || _renderSync === void 0 ? void 0 : _renderSync.call(_ref);
-          // Note resolveImport is still async but we are not waiting on a already-fulfilled value.
-          // It is fast enough to not flip back to loading.
-          return resolveImport(preloaded ? preloaded : maybePromise.render());
+          // Only product implemented preloading will return sync result
+          // However the out-of-box won't handle this. Confluence uses a custom implementation
+          return preloaded
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          ? resolveImportSync(preloaded) : resolveImport(maybePromise.render());
         }
       } else {
         return getExtensionModuleNode(extensionProvider, extensionType, extensionKey).then(node => resolveImport(node.render()));

package/dist/es2019/extensions/manifest-helpers.js

@@ -23,10 +23,12 @@ export function buildAction(action, manifest) {
     return buildNode(action, manifest);
   }
 }
-export const resolveImport = async importPromise => {
-  const importedModule = await importPromise;
+export const resolveImportSync = importedModule => {
   return importedModule && importedModule.__esModule ? importedModule.default : importedModule;
 };
+export const resolveImport = async importPromise => {
+  return resolveImportSync(await importPromise);
+};
 export function buildNode(action, manifest) {
   if (!manifest.modules.nodes) {
     return;

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "105.9.0";
+const packageVersion = "105.9.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/ui/DropList/index.js

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "105.9.0";
+const packageVersion = "105.9.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/esm/extensions/extension-handlers.js

@@ -4,7 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
 import Loadable from 'react-loadable';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { getExtensionKeyAndNodeKey, resolveImport } from './manifest-helpers';
+import { getExtensionKeyAndNodeKey, resolveImport, resolveImportSync } from './manifest-helpers';
 function getNodeFromManifest(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 manifest, extKey, nodeKey, extensionType, extensionKey) {
@@ -106,8 +106,6 @@ export function getNodeRenderer(extensionProvider, extensionType, extensionKey)
   return Loadable({
     loader: function loader() {
       if (fg('confluence_preload_extension_providers')) {
-        // Logic here is specific to Confluence because it doesn't use the original react-loadable.
-        // The library is replaced with a custom one that supports synchronous return value from loader.
         var maybePromise = getExtensionModuleNodeMaybePreloaded(extensionProvider, extensionType, extensionKey);
         if (maybePromise instanceof Promise) {
           return maybePromise.then(function (node) {
@@ -115,11 +113,12 @@ export function getNodeRenderer(extensionProvider, extensionType, extensionKey)
           });
         } else {
           var _renderSync, _ref;
-          // maybePromise is sync here
           var preloaded = maybePromise === null || maybePromise === void 0 || (_renderSync = (_ref = maybePromise).renderSync) === null || _renderSync === void 0 ? void 0 : _renderSync.call(_ref);
-          // Note resolveImport is still async but we are not waiting on a already-fulfilled value.
-          // It is fast enough to not flip back to loading.
-          return resolveImport(preloaded ? preloaded : maybePromise.render());
+          // Only product implemented preloading will return sync result
+          // However the out-of-box won't handle this. Confluence uses a custom implementation
+          return preloaded
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          ? resolveImportSync(preloaded) : resolveImport(maybePromise.render());
         }
       } else {
         return getExtensionModuleNode(extensionProvider, extensionType, extensionKey).then(function (node) {

package/dist/esm/extensions/manifest-helpers.js

@@ -33,18 +33,21 @@ export function buildAction(action, manifest) {
     return buildNode(action, manifest);
   }
 }
+export var resolveImportSync = function resolveImportSync(importedModule) {
+  return importedModule && importedModule.__esModule ? importedModule.default : importedModule;
+};
 export var resolveImport = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(importPromise) {
-    var importedModule;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.next = 2;
+          _context.t0 = resolveImportSync;
+          _context.next = 3;
           return importPromise;
-        case 2:
-          importedModule = _context.sent;
-          return _context.abrupt("return", importedModule && importedModule.__esModule ? importedModule.default : importedModule);
-        case 4:
+        case 3:
+          _context.t1 = _context.sent;
+          return _context.abrupt("return", (0, _context.t0)(_context.t1));
+        case 5:
         case "end":
           return _context.stop();
       }

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "105.9.0";
+var packageVersion = "105.9.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/ui/DropList/index.js

@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "105.9.0";
+var packageVersion = "105.9.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/types/extensions/manifest-helpers.d.ts

@@ -5,5 +5,6 @@ export declare const FORGE_EXTENSION_TYPE = "com.atlassian.ecosystem";
 export declare const getExtensionKeyAndNodeKey: (extensionKey: ExtensionKey, extensionType: ExtensionType) => string[];
 export declare const buildExtensionKeyAndNodeKey: (extensionKey: ExtensionKey, nodeKey?: ExtensionModuleKey) => string;
 export declare function buildAction<T extends Parameters>(action: ExtensionModuleAction<T>, manifest: ExtensionManifest<T>): ADFEntity | import("./types/extension-manifest").ExtensionModuleActionHandler | undefined;
-export declare const resolveImport: <T extends Parameters>(importPromise: Module<T>) => Promise<T>;
+export declare const resolveImportSync: <T extends Parameters>(importedModule: Module<T>) => T;
+export declare const resolveImport: <T extends Parameters>(importPromise: Promise<Module<T>> | Module<T>) => Promise<T>;
 export declare function buildNode<T extends Parameters>(action: ExtensionModuleActionObject<T>, manifest: ExtensionManifest<T>): ADFEntity | undefined;

package/dist/types-ts4.5/extensions/manifest-helpers.d.ts

@@ -5,5 +5,6 @@ export declare const FORGE_EXTENSION_TYPE = "com.atlassian.ecosystem";
 export declare const getExtensionKeyAndNodeKey: (extensionKey: ExtensionKey, extensionType: ExtensionType) => string[];
 export declare const buildExtensionKeyAndNodeKey: (extensionKey: ExtensionKey, nodeKey?: ExtensionModuleKey) => string;
 export declare function buildAction<T extends Parameters>(action: ExtensionModuleAction<T>, manifest: ExtensionManifest<T>): ADFEntity | import("./types/extension-manifest").ExtensionModuleActionHandler | undefined;
-export declare const resolveImport: <T extends Parameters>(importPromise: Module<T>) => Promise<T>;
+export declare const resolveImportSync: <T extends Parameters>(importedModule: Module<T>) => T;
+export declare const resolveImport: <T extends Parameters>(importPromise: Promise<Module<T>> | Module<T>) => Promise<T>;
 export declare function buildNode<T extends Parameters>(action: ExtensionModuleActionObject<T>, manifest: ExtensionManifest<T>): ADFEntity | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "105.9.0",
+	"version": "105.9.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"