@atlaskit/editor-plugin-layout 15.0.4 → 15.1.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-layout
 
+## 15.1.0
+
+### Minor Changes
+
+- [`da5eaf0bc37da`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/da5eaf0bc37da) -
+  Clean up the platform_editor_editor_ssr_streaming experiment. The SSR streaming code paths are now
+  permanent and the isSSRStreaming() utility has been removed from
+  @atlaskit/editor-common/core-utils.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 15.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 15.0.4
 
 ### Patch Changes

package/compass.yml

@@ -1,7 +1,7 @@
 configVersion: 1
 id: ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:component/c5751cc6-3513-4070-9deb-af31e86aed34/62465bbb-a5c8-4a63-b621-06ee9616feb5
 name: '@atlaskit/editor-plugin-layout'
-ownerId: ari:cloud:identity::team/2484e1f6-f62c-4a70-95f1-8e5695c51b6b # Editor Jenga
+ownerId: ari:cloud:identity::team/cf6a670b-5252-4c68-a769-9207de366beb # Editor Developers
 labels:
   - platform-code
   - platform-afm
@@ -16,14 +16,14 @@ links:
     url: https://bitbucket.org/atlassian/atlassian-frontend-monorepo/src/master
   - name: Slack Channel
     type: CHAT_CHANNEL
-    url: https://atlassian.enterprise.slack.com/archives/C061GUMN3NY # #team-cc-editor-exp-cloud-native
+    url: https://atlassian.enterprise.slack.com/archives/CFG3PSQ9E # #help-editor
   - name: Editor Plugin Layout
     type: REPOSITORY
     url: https://bitbucket.org/atlassian/atlassian-frontend-monorepo/src/master/platform/packages/editor/editor-plugin-layout
 customFields:
   - name: Department
     type: text
-    value: Eng - Editor Autonomy - Jenga
+    value: Editor Developers
   - name: Trusted Reviewer Teams
     type: text
     value: ari:cloud:identity::team/cf6a670b-5252-4c68-a769-9207de366beb

package/dist/cjs/nodeviews/index.js

@@ -247,7 +247,7 @@ var LayoutSectionView = exports.LayoutSectionView = /*#__PURE__*/function (_Reac
       // LayoutSSRReactContextsProvider wraps the placeholder to inject the
       // editor's IntlShape, defending against any descendants that call
       // `useIntl()` during renderToStaticMarkup.
-      if ((0, _coreUtils.isSSR)() && (0, _coreUtils.isSSRStreaming)()) {
+      if ((0, _coreUtils.isSSR)()) {
         return /*#__PURE__*/_react.default.createElement(_LayoutSSRReactContextsProvider.LayoutSSRReactContextsProvider, {
           intl: this.intl
         }, /*#__PURE__*/_react.default.createElement(_reactNodeView.NodeViewContentHole, {

package/dist/cjs/pm-plugins/resizing.js

@@ -29,7 +29,7 @@ var pluginKey = exports.pluginKey = new _state.PluginKey('layoutResizingPlugin')
  * PM transactions) are not "corrected" back by ProseMirror's DOM reconciliation.
  */
 var isLayoutElementLike = function isLayoutElementLike(element) {
-  if ((0, _coreUtils.isSSR)() && (0, _coreUtils.isSSRStreaming)()) {
+  if ((0, _coreUtils.isSSR)()) {
     // In SSR environments, `HTMLElement` is undefined globally so a plain
     // `instanceof HTMLElement` check is always `false`. That makes the
     // `DOMSerializer.renderSpec(...)` result get rejected by the guard below and
@@ -38,9 +38,8 @@ var isLayoutElementLike = function isLayoutElementLike(element) {
     // `data-column-width`, plus the inner `<div data-layout-content="true">`
     // wrapper) and breaking the layout's flex sizing in SSR output.
     //
-    // To unblock SSR streaming without changing CSR semantics, we gate the check:
-    // - In SSR (and only when `platform_editor_editor_ssr_streaming` is enabled),
-    //   use a duck-typed check that mirrors `safe-plugin`'s `isHTMLElement`.
+    // To unblock SSR without changing CSR semantics, we gate the check:
+    // - In SSR, use a duck-typed check that mirrors `safe-plugin`'s `isHTMLElement`.
     // - Everywhere else, keep the original `instanceof HTMLElement` check exactly
     //   as it was so we don't accidentally widen acceptance in CSR.
     if (element === null || element === undefined) {
@@ -112,7 +111,7 @@ var _default = exports.default = function _default(options, pluginInjectionApi,
             intl: intl
           }).init();
         }
-      }, (0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true) || (0, _coreUtils.isSSR)() && (0, _coreUtils.isSSRStreaming)() ? {
+      }, (0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true) || (0, _coreUtils.isSSR)() ? {
         layoutColumn: function layoutColumn(node, view, getPos) {
           return new LayoutColumnView(node, view, getPos);
         }

package/dist/cjs/ui/LayoutSSRReactContextsProvider.js

@@ -22,7 +22,7 @@ var _coreUtils = require("@atlaskit/editor-common/core-utils");
 function LayoutSSRReactContextsProvider(_ref) {
   var children = _ref.children,
     intl = _ref.intl;
-  if (!(0, _coreUtils.isSSRStreaming)() || !(0, _coreUtils.isSSR)()) {
+  if (!(0, _coreUtils.isSSR)()) {
     return children;
   }
   if (!intl) {

package/dist/es2019/nodeviews/index.js

@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { isSSR, isSSRStreaming } from '@atlaskit/editor-common/core-utils';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import ReactNodeView, { NodeViewContentHole } from '@atlaskit/editor-common/react-node-view';
 import { BreakoutResizer, ignoreResizerMutations } from '@atlaskit/editor-common/resizer';
@@ -220,7 +220,7 @@ export class LayoutSectionView extends ReactNodeView {
     // LayoutSSRReactContextsProvider wraps the placeholder to inject the
     // editor's IntlShape, defending against any descendants that call
     // `useIntl()` during renderToStaticMarkup.
-    if (isSSR() && isSSRStreaming()) {
+    if (isSSR()) {
       return /*#__PURE__*/React.createElement(LayoutSSRReactContextsProvider, {
         intl: this.intl
       }, /*#__PURE__*/React.createElement(NodeViewContentHole, {

package/dist/es2019/pm-plugins/resizing.js

@@ -1,4 +1,4 @@
-import { isSSR, isSSRStreaming } from '@atlaskit/editor-common/core-utils';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
@@ -16,7 +16,7 @@ export const pluginKey = new PluginKey('layoutResizingPlugin');
  * PM transactions) are not "corrected" back by ProseMirror's DOM reconciliation.
  */
 const isLayoutElementLike = element => {
-  if (isSSR() && isSSRStreaming()) {
+  if (isSSR()) {
     // In SSR environments, `HTMLElement` is undefined globally so a plain
     // `instanceof HTMLElement` check is always `false`. That makes the
     // `DOMSerializer.renderSpec(...)` result get rejected by the guard below and
@@ -25,9 +25,8 @@ const isLayoutElementLike = element => {
     // `data-column-width`, plus the inner `<div data-layout-content="true">`
     // wrapper) and breaking the layout's flex sizing in SSR output.
     //
-    // To unblock SSR streaming without changing CSR semantics, we gate the check:
-    // - In SSR (and only when `platform_editor_editor_ssr_streaming` is enabled),
-    //   use a duck-typed check that mirrors `safe-plugin`'s `isHTMLElement`.
+    // To unblock SSR without changing CSR semantics, we gate the check:
+    // - In SSR, use a duck-typed check that mirrors `safe-plugin`'s `isHTMLElement`.
     // - Everywhere else, keep the original `instanceof HTMLElement` check exactly
     //   as it was so we don't accidentally widen acceptance in CSR.
     if (element === null || element === undefined) {
@@ -100,11 +99,11 @@ export default ((options, pluginInjectionApi, portalProviderAPI, eventDispatcher
       //    suppress style-attribute MutationObserver callbacks during
       //    drag, allowing direct flex-basis writes without PM
       //    interference).
-      // 2. SSR streaming is enabled — the column node view stamps
+      // 2. Rendering on the server — the column node view stamps
       //    `container-type: inline-size` inline on each column dom so
       //    that the SSR-rendered table inside the column constrains
       //    its width to the column (see comment in the constructor).
-      ...(editorExperiment('platform_editor_layout_column_resize_handle', true) || isSSR() && isSSRStreaming() ? {
+      ...(editorExperiment('platform_editor_layout_column_resize_handle', true) || isSSR() ? {
         layoutColumn: (node, view, getPos) => new LayoutColumnView(node, view, getPos)
       } : {})
     }

package/dist/es2019/ui/LayoutSSRReactContextsProvider.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RawIntlProvider } from 'react-intl';
-import { isSSR, isSSRStreaming } from '@atlaskit/editor-common/core-utils';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 /**
  * Wraps the layout section nodeview children with the editor's actual
  * IntlProvider during SSR streaming (renderToStaticMarkup). This ensures any
@@ -16,7 +16,7 @@ export function LayoutSSRReactContextsProvider({
   children,
   intl
 }) {
-  if (!isSSRStreaming() || !isSSR()) {
+  if (!isSSR()) {
     return children;
   }
   if (!intl) {

package/dist/esm/nodeviews/index.js

@@ -9,7 +9,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React, { useCallback } from 'react';
-import { isSSR, isSSRStreaming } from '@atlaskit/editor-common/core-utils';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import ReactNodeView, { NodeViewContentHole } from '@atlaskit/editor-common/react-node-view';
 import { BreakoutResizer, ignoreResizerMutations } from '@atlaskit/editor-common/resizer';
@@ -238,7 +238,7 @@ export var LayoutSectionView = /*#__PURE__*/function (_ReactNodeView) {
       // LayoutSSRReactContextsProvider wraps the placeholder to inject the
       // editor's IntlShape, defending against any descendants that call
       // `useIntl()` during renderToStaticMarkup.
-      if (isSSR() && isSSRStreaming()) {
+      if (isSSR()) {
         return /*#__PURE__*/React.createElement(LayoutSSRReactContextsProvider, {
           intl: this.intl
         }, /*#__PURE__*/React.createElement(NodeViewContentHole, {

package/dist/esm/pm-plugins/resizing.js

@@ -4,7 +4,7 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _typeof from "@babel/runtime/helpers/typeof";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { isSSR, isSSRStreaming } from '@atlaskit/editor-common/core-utils';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
@@ -22,7 +22,7 @@ export var pluginKey = new PluginKey('layoutResizingPlugin');
  * PM transactions) are not "corrected" back by ProseMirror's DOM reconciliation.
  */
 var isLayoutElementLike = function isLayoutElementLike(element) {
-  if (isSSR() && isSSRStreaming()) {
+  if (isSSR()) {
     // In SSR environments, `HTMLElement` is undefined globally so a plain
     // `instanceof HTMLElement` check is always `false`. That makes the
     // `DOMSerializer.renderSpec(...)` result get rejected by the guard below and
@@ -31,9 +31,8 @@ var isLayoutElementLike = function isLayoutElementLike(element) {
     // `data-column-width`, plus the inner `<div data-layout-content="true">`
     // wrapper) and breaking the layout's flex sizing in SSR output.
     //
-    // To unblock SSR streaming without changing CSR semantics, we gate the check:
-    // - In SSR (and only when `platform_editor_editor_ssr_streaming` is enabled),
-    //   use a duck-typed check that mirrors `safe-plugin`'s `isHTMLElement`.
+    // To unblock SSR without changing CSR semantics, we gate the check:
+    // - In SSR, use a duck-typed check that mirrors `safe-plugin`'s `isHTMLElement`.
     // - Everywhere else, keep the original `instanceof HTMLElement` check exactly
     //   as it was so we don't accidentally widen acceptance in CSR.
     if (element === null || element === undefined) {
@@ -105,7 +104,7 @@ export default (function (options, pluginInjectionApi, portalProviderAPI, eventD
             intl: intl
           }).init();
         }
-      }, editorExperiment('platform_editor_layout_column_resize_handle', true) || isSSR() && isSSRStreaming() ? {
+      }, editorExperiment('platform_editor_layout_column_resize_handle', true) || isSSR() ? {
         layoutColumn: function layoutColumn(node, view, getPos) {
           return new LayoutColumnView(node, view, getPos);
         }

package/dist/esm/ui/LayoutSSRReactContextsProvider.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RawIntlProvider } from 'react-intl';
-import { isSSR, isSSRStreaming } from '@atlaskit/editor-common/core-utils';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 /**
  * Wraps the layout section nodeview children with the editor's actual
  * IntlProvider during SSR streaming (renderToStaticMarkup). This ensures any
@@ -15,7 +15,7 @@ import { isSSR, isSSRStreaming } from '@atlaskit/editor-common/core-utils';
 export function LayoutSSRReactContextsProvider(_ref) {
   var children = _ref.children,
     intl = _ref.intl;
-  if (!isSSRStreaming() || !isSSR()) {
+  if (!isSSR()) {
     return children;
   }
   if (!intl) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "15.0.4",
+	"version": "15.1.0",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,24 +32,24 @@
 		"@atlaskit/editor-plugin-interaction": "^25.0.0",
 		"@atlaskit/editor-plugin-selection": "^14.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^11.0.0",
-		"@atlaskit/editor-plugin-ui-control-registry": "^8.0.0",
+		"@atlaskit/editor-plugin-ui-control-registry": "^8.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^12.0.0",
 		"@atlaskit/editor-plugin-width": "^15.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-shared-styles": "^4.0.0",
 		"@atlaskit/editor-toolbar": "^2.4.0",
-		"@atlaskit/editor-ui-control-model": "^2.4.0",
+		"@atlaskit/editor-ui-control-model": "^2.6.0",
 		"@atlaskit/icon": "^37.3.0",
 		"@atlaskit/icon-lab": "^7.5.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^146.0.0",
-		"@atlaskit/tokens": "^16.6.0",
+		"@atlaskit/tmp-editor-statsig": "^147.1.0",
+		"@atlaskit/tokens": "^16.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^118.4.0",
+		"@atlaskit/editor-common": "^118.12.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -89,11 +89,6 @@
 			]
 		}
 	},
-	"stricter": {
-		"no-unused-dependencies": {
-			"checkDevDependencies": true
-		}
-	},
 	"platform-feature-flags": {
 		"platform_editor_element_browser_analytic": {
 			"type": "boolean"