pageflow 17.1.0 → 17.2.0

data/entry_types/scrolled/package/widgets/mainStorylineSheet.js

@@ -2,138 +2,94 @@ import { useIsomorphicLayoutEffect, frontend } from 'pageflow-scrolled/frontend'
 import React, { useState, useRef } from 'react';
 import classNames from 'classnames';
 
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
-function _arrayWithHoles(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-
-function _iterableToArrayLimit(arr, i) {
-  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
-  var _arr = [];
-  var _n = true;
-  var _d = false;
-  var _e = undefined;
-
-  try {
-    for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
-      _arr.push(_s.value);
-
-      if (i && _arr.length === i) break;
-    }
-  } catch (err) {
-    _d = true;
-    _e = err;
-  } finally {
-    try {
-      if (!_n && _i["return"] != null) _i["return"]();
-    } finally {
-      if (_d) throw _e;
-    }
-  }
-
-  return _arr;
-}
-
-function _arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-
-  for (var i = 0, arr2 = new Array(len); i < len; i++) {
-    arr2[i] = arr[i];
-  }
-
-  return arr2;
-}
-
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(n);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
-
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-
-function _slicedToArray(arr, i) {
-  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-}
-
-var styles = {"inactive":"MainStorylineSheet-module_inactive__1Ji-y","scaler":"MainStorylineSheet-module_scaler__jscn7"};
+var styles = {"inactive":"MainStorylineSheet-module_inactive__1Ji-y","scaler":"MainStorylineSheet-module_scaler__jscn7","fixedPositioningContainingBlock":"MainStorylineSheet-module_fixedPositioningContainingBlock__3Pz_y"};
 
 var _jsxFileName = "/home/tfischbach/code/pageflow/entry_types/scrolled/package/src/widgets/mainStorylineSheet/MainStorylineSheet.js";
-function MainStorylineSheet(_ref) {
-  var activeExcursion = _ref.activeExcursion,
-    children = _ref.children;
-  var excursionActive = !!activeExcursion;
-  var activeExcursionId = activeExcursion === null || activeExcursion === void 0 ? void 0 : activeExcursion.id;
-  var _useState = useState(0),
-    _useState2 = _slicedToArray(_useState, 2),
-    previousScrollY = _useState2[0],
-    setPreviousScrollY = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    inactive = _useState4[0],
-    setInactive = _useState4[1];
-  var previousThemeColorRef = useRef();
-  useIsomorphicLayoutEffect(function () {
-    var themeColorMeta = document.querySelector('meta[name="theme-color"]');
+function MainStorylineSheet({
+  activeExcursion,
+  children
+}) {
+  const excursionActive = !!activeExcursion;
+  const activeExcursionId = activeExcursion === null || activeExcursion === void 0 ? void 0 : activeExcursion.id;
+  const [previousScrollY, setPreviousScrollY] = useState(null);
+  const [inactive, setInactive] = useState(false);
+  const [fixedPositioningContainingBlock, setFixedPositioningContainingBlock] = useState(false);
+  const previousThemeColorRef = useRef();
+  const transitionTimeoutRef = useRef();
+  useIsomorphicLayoutEffect(() => {
+    const themeColorMeta = document.querySelector('meta[name="theme-color"]');
     if (excursionActive) {
       setPreviousScrollY(window.scrollY);
       setInactive(true);
+      applyFixedPositioningContainingBlockOffset();
       previousThemeColorRef.current = themeColorMeta.getAttribute('content');
       themeColorMeta.setAttribute('content', '#000');
     } else {
       setInactive(false);
-      themeColorMeta.setAttribute('content', previousThemeColorRef.current);
+      scheduleFixedPositioningContainingBlockReset();
+      if (previousThemeColorRef.current) {
+        themeColorMeta.setAttribute('content', previousThemeColorRef.current);
+      }
+    }
+    function applyFixedPositioningContainingBlockOffset() {
+      setFixedPositioningContainingBlock(true);
+      if (transitionTimeoutRef.current) {
+        clearTimeout(transitionTimeoutRef.current);
+      }
+    }
+    function scheduleFixedPositioningContainingBlockReset() {
+      const prefersReducedMotion = window.matchMedia('(prefers-reduced-motion: reduce)').matches;
+      if (prefersReducedMotion) {
+        setFixedPositioningContainingBlock(false);
+      } else {
+        const transitionDuration = 300;
+        const buffer = 100;
+        transitionTimeoutRef.current = setTimeout(() => {
+          setFixedPositioningContainingBlock(false);
+        }, transitionDuration + buffer);
+      }
     }
   }, [excursionActive]);
-  useIsomorphicLayoutEffect(function () {
+  useIsomorphicLayoutEffect(() => {
     if (activeExcursionId) {
       window.scrollTo(0, 0);
     } else {
-      setPreviousScrollY(function (previousScrollY) {
-        window.queueMicrotask(function () {
-          return window.scrollTo(0, previousScrollY);
-        });
+      setPreviousScrollY(previousScrollY => {
+        if (previousScrollY !== null) {
+          window.queueMicrotask(() => window.scrollTo(0, previousScrollY));
+        }
         return previousScrollY;
       });
     }
   }, [activeExcursionId]);
+  function resetFixedPositioningContainingBlock(event) {
+    if (event.propertyName === 'filter' && event.target === event.currentTarget && !inactive) {
+      clearTimeout(transitionTimeoutRef.current);
+      setFixedPositioningContainingBlock(false);
+    }
+  }
   return /*#__PURE__*/React.createElement("div", {
     inert: inactive ? 'true' : undefined,
     style: {
-      '--previous-scroll-y': "".concat(previousScrollY, "px")
+      '--previous-scroll-y': `${previousScrollY || 0}px`
     },
-    className: classNames(styles.wrapper, _defineProperty({}, styles.inactive, inactive)),
+    className: classNames({
+      [styles.inactive]: inactive,
+      [styles.fixedPositioningContainingBlock]: fixedPositioningContainingBlock
+    }),
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 47,
+      lineNumber: 87,
       columnNumber: 5
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.scaler,
+    onTransitionEnd: fixedPositioningContainingBlock ? resetFixedPositioningContainingBlock : undefined,
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 50,
+      lineNumber: 93,
       columnNumber: 7
     }
   }, children));

data/entry_types/scrolled/package/widgets/textInlineFileRights.css

@@ -1 +1 @@
-.colors-module_contentColorScope__3ypcw{--theme-light-content-surface-color:var(--root-light-content-surface-color);--theme-dark-content-surface-color:var(--root-dark-content-surface-color);--theme-light-content-text-color:var(--root-light-content-text-color);--theme-dark-content-text-color:var(--root-dark-content-text-color)}.TextInlineFileRights-module_text__1tT0W{font-size:14px;position:relative;z-index:1;color:var(--content-text-color)}.TextInlineFileRights-module_text__1tT0W li{text-align:right;padding-top:.2em}.TextInlineFileRights-module_text__1tT0W li:before{content:"\A9  ";opacity:.7}.TextInlineFileRights-module_text__1tT0W:not(:has(li:nth-child(2))) span{display:none}.TextInlineFileRights-module_withBackdrop__2cRu8 li{padding:.1em .3em;border-radius:.25rem;margin:.2em 0 0 auto;background-color:color-mix(in srgb,var(--theme-light-content-surface-color,#fff),transparent);color:var(--theme-dark-content-text-color,#222);width:-moz-fit-content;width:fit-content}.TextInlineFileRights-module_withBackdrop__2cRu8.TextInlineFileRights-module_darkBackground__3oIUp li{background-color:color-mix(in srgb,var(--theme-dark-content-surface-color,#101010),transparent);color:var(--theme-light-content-text-color,#fff)}.TextInlineFileRights-module_forSection__22xHD{position:absolute;bottom:0;right:0}.TextInlineFileRights-module_forSection__22xHD li{margin:0 .2em .1em auto}.TextInlineFileRights-module_text__1tT0W a{color:inherit;-webkit-text-decoration-color:color-mix(in srgb,currentColor,transparent);text-decoration-color:color-mix(in srgb,currentColor,transparent)}.TextInlineFileRights-module_text__1tT0W span{opacity:.7}
+.colors-module_contentColorScope__3ypcw{--theme-light-content-surface-color:var(--root-light-content-surface-color);--theme-dark-content-surface-color:var(--root-dark-content-surface-color);--theme-light-content-text-color:var(--root-light-content-text-color);--theme-dark-content-text-color:var(--root-dark-content-text-color)}.TextInlineFileRights-module_text__1tT0W{font-size:14px;position:relative;z-index:2;color:var(--content-text-color);--ai-indicator-letter-color:var(--theme-light-content-surface-color,#fff)}.TextInlineFileRights-module_text__1tT0W.TextInlineFileRights-module_darkBackground__3oIUp{--ai-indicator-letter-color:var(--theme-dark-content-surface-color,#101010)}.TextInlineFileRights-module_text__1tT0W li{text-align:right;justify-content:flex-end;padding-top:.2em}.TextInlineFileRights-module_text__1tT0W li[data-rights] [data-part=rights]:before{content:"\A9  ";opacity:.7}.TextInlineFileRights-module_text__1tT0W li:only-child [data-label]{display:none}.TextInlineFileRights-module_withBackdrop__2cRu8 li{padding:.1em .3em;border-radius:.25rem;margin:.2em 0 0 auto;background-color:color-mix(in srgb,var(--theme-light-content-surface-color,#fff),transparent);color:var(--theme-dark-content-text-color,#222);width:-moz-fit-content;width:fit-content}.TextInlineFileRights-module_withBackdrop__2cRu8.TextInlineFileRights-module_darkBackground__3oIUp li{background-color:color-mix(in srgb,var(--theme-dark-content-surface-color,#101010),transparent);color:var(--theme-light-content-text-color,#fff)}.TextInlineFileRights-module_forSection__22xHD{position:absolute;bottom:0;right:0}.TextInlineFileRights-module_forSection__22xHD li{margin:0 .2em .1em auto}.TextInlineFileRights-module_text__1tT0W a{color:inherit;-webkit-text-decoration-color:color-mix(in srgb,currentColor,transparent);text-decoration-color:color-mix(in srgb,currentColor,transparent)}.TextInlineFileRights-module_text__1tT0W [data-label]{opacity:.7}

data/entry_types/scrolled/package/widgets/textInlineFileRights.js

@@ -2,38 +2,26 @@ import { useDarkBackground, useContentElementEditorState, frontend } from 'pagef
 import React, { useEffect } from 'react';
 import classNames from 'classnames';
 
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
+var styles = {"darkContentSurfaceColor":"var(--theme-dark-content-surface-color, #101010)","lightContentSurfaceColor":"var(--theme-light-content-surface-color, #fff)","darkContentTextColor":"var(--theme-dark-content-text-color, #222)","lightContentTextColor":"var(--theme-light-content-text-color, #fff)","text":"TextInlineFileRights-module_text__1tT0W","darkBackground":"TextInlineFileRights-module_darkBackground__3oIUp","withBackdrop":"TextInlineFileRights-module_withBackdrop__2cRu8","forSection":"TextInlineFileRights-module_forSection__22xHD"};
 
-var styles = {"darkContentSurfaceColor":"var(--theme-dark-content-surface-color, #101010)","lightContentSurfaceColor":"var(--theme-light-content-surface-color, #fff)","darkContentTextColor":"var(--theme-dark-content-text-color, #222)","lightContentTextColor":"var(--theme-light-content-text-color, #fff)","contentColorScope":"colors-module_contentColorScope__3ypcw","text":"TextInlineFileRights-module_text__1tT0W","withBackdrop":"TextInlineFileRights-module_withBackdrop__2cRu8","darkBackground":"TextInlineFileRights-module_darkBackground__3oIUp","forSection":"TextInlineFileRights-module_forSection__22xHD"};
-
-function TextInlineFileRights(_ref) {
-  var configuration = _ref.configuration,
-    context = _ref.context,
-    children = _ref.children;
-  var darkBackground = useDarkBackground();
-  var _useContentElementEdi = useContentElementEditorState(),
-    setTransientState = _useContentElementEdi.setTransientState;
-  var supported = context !== 'insideElement' && context !== 'playerControls';
-  useEffect(function () {
+var _jsxFileName = "/home/tfischbach/code/pageflow/entry_types/scrolled/package/src/widgets/textInlineFileRights/TextInlineFileRights.js";
+function TextInlineFileRights({
+  configuration,
+  context,
+  children
+}) {
+  const darkBackground = useDarkBackground();
+  const {
+    setTransientState
+  } = useContentElementEditorState();
+  const supported = context !== 'insideElement' && context !== 'playerControls';
+  useEffect(() => {
     if (supported) {
       setTransientState({
         hasFileRights: true
       });
     }
-    return function () {
+    return () => {
       if (supported) {
         setTransientState({
           hasFileRights: false
@@ -45,8 +33,25 @@ function TextInlineFileRights(_ref) {
     return null;
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames(styles.text, _defineProperty(_defineProperty(_defineProperty({}, styles.forSection, context === 'section'), styles.withBackdrop, context === 'section' || configuration.showTextInlineFileRightsBackdrop), styles.darkBackground, darkBackground))
-  }, /*#__PURE__*/React.createElement("div", null, children));
+    className: classNames(styles.text, {
+      [styles.forSection]: context === 'section',
+      [styles.withBackdrop]: context === 'section' || configuration.showTextInlineFileRightsBackdrop,
+      [styles.darkBackground]: darkBackground
+    }),
+    __self: this,
+    __source: {
+      fileName: _jsxFileName,
+      lineNumber: 29,
+      columnNumber: 5
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    __self: this,
+    __source: {
+      fileName: _jsxFileName,
+      lineNumber: 34,
+      columnNumber: 7
+    }
+  }, children));
 }
 
 frontend.widgetTypes.register('textInlineFileRights', {

data/entry_types/scrolled/package/widgets-server.js

@@ -3,3 +3,4 @@ import 'pageflow-scrolled/widgets/consentBar';
 import 'pageflow-scrolled/widgets/iconInlineFileRights';
 import 'pageflow-scrolled/widgets/textInlineFileRights';
 import 'pageflow-scrolled/widgets/iconScrollIndicator';
+import 'pageflow-scrolled/widgets/mainStorylineSheet';

data/entry_types/scrolled/spec/factories/lottie_files.rb

@@ -0,0 +1,29 @@
+module PageflowScrolled
+  FactoryBot.define do
+    factory :lottie_file, class: LottieFile do
+      entry
+      uploader { create(:user) }
+
+      attachment { File.open(Engine.root.join('spec', 'fixtures', 'animation.lottie')) }
+      state { 'uploaded' }
+
+      transient do
+        used_in { nil }
+        with_configuration { nil }
+      end
+
+      before(:create) do |file, evaluator|
+        file.entry = evaluator.used_in.entry if evaluator.used_in
+      end
+
+      after(:create) do |file, evaluator|
+        if evaluator.used_in
+          create(:file_usage,
+                 file:,
+                 revision: evaluator.used_in,
+                 configuration: evaluator.with_configuration)
+        end
+      end
+    end
+  end
+end

data/lib/generators/pageflow/resque/resque_generator.rb

@@ -10,8 +10,6 @@ module Pageflow
 
       def create_initializers
         template 'resque.rb', 'config/initializers/resque.rb'
-        template 'resque_enqueue_after_commit_patch.rb',
-                 'config/initializers/resque_enqueue_after_commit_patch.rb'
         template 'resque.rake', 'lib/tasks/resque.rake'
 
         inject_into_file 'config/application.rb', after: /config.load_defaults .*\n/ do

data/lib/pageflow/configuration.rb

@@ -120,6 +120,20 @@ module Pageflow
     # @return [fileImporters]
     attr_reader :file_importers
 
+    # Used to register different structured data types for entries.
+    #
+    # @example
+    #
+    #   config.entry_structured_data_types.register(:about_page, lambda do |entry|
+    #     {
+    #       '@type' => 'AboutPage',
+    #       breadcrumb: entry.configuration['breadcrumb']
+    #     }
+    #   end)
+    #
+    # @return [EntryStructuredDataTypes]
+    attr_reader :entry_structured_data_types
+
     # Used to add new sections to the help dialog displayed in the
     # editor.
     #
@@ -473,6 +487,19 @@ module Pageflow
     # @since 17.1
     attr_accessor :entry_translator_url
 
+    # Registry for oEmbed providers that can be used to resolve URLs.
+    #
+    # @example
+    #
+    #     config.oembed_providers.register(
+    #       :bluesky,
+    #       endpoint: 'https://bsky.app/oembed.{format}',
+    #       url_patterns: ['https://bsky.app/profile/*/post/*']
+    #     )
+    # @since 17.2
+    # @return [OembedProviders]
+    attr_reader :oembed_providers
+
     def initialize(target_type_name = nil)
       @target_type_name = target_type_name
 
@@ -510,6 +537,13 @@ module Pageflow
       @file_types = FileTypes.new
       @widget_types = WidgetTypes.new
       @file_importers = FileImporters.new
+      @entry_structured_data_types = EntryStructuredDataTypes.new
+      @entry_structured_data_types.register(:article, lambda do |_entry|
+        {
+          '@type' => 'Article',
+          articleSection: 'longform'
+        }
+      end, default: true)
       @help_entries = HelpEntries.new
       @revision_components = RevisionComponents.new
 
@@ -562,6 +596,13 @@ module Pageflow
       @permissions = Permissions.new
 
       @edit_lock_polling_interval = 15.seconds
+
+      @oembed_providers = OembedProviders.new
+      @oembed_providers.register(
+        :bluesky,
+        endpoint: 'https://embed.bsky.app/oembed',
+        url_patterns: ['https://bsky.app/profile/*/post/*']
+      )
     end
 
     # Activate a plugin.
@@ -584,10 +625,9 @@ module Pageflow
 
     # @deprecated Use `config.page_types.register` instead.
     def register_page_type(page_type)
-      ActiveSupport::Deprecation.warn(
+      Pageflow::Deprecation.warn(
         'Pageflow::Configuration#register_page_type is deprecated. ' \
-        'Use config.page_types.register instead.',
-        caller
+        'Use config.page_types.register instead.'
       )
       page_types.register(page_type)
     end
@@ -595,14 +635,14 @@ module Pageflow
     # @deprecated Pageflow now supports direct uploads to S3 via signed post requests.
     # Please change your forms accordingly.
     def paperclip_filesystem_root
-      ActiveSupport::Deprecation.warn(
-        'Pageflow::Configuration#paperclip_filesystem_root is deprecated.', caller
+      Pageflow::Deprecation.warn(
+        'Pageflow::Configuration#paperclip_filesystem_root is deprecated.'
       )
     end
 
     def paperclip_filesystem_root=(_val)
-      ActiveSupport::Deprecation.warn(
-        'Pageflow::Configuration#paperclip_filesystem_root is deprecated.', caller
+      Pageflow::Deprecation.warn(
+        'Pageflow::Configuration#paperclip_filesystem_root is deprecated.'
       )
     end
 
@@ -687,10 +727,12 @@ module Pageflow
       delegate :page_types, to: :config
       delegate :themes, to: :config
       delegate :widget_types, to: :config
+      delegate :entry_structured_data_types, to: :config
       delegate :public_entry_cache_control_header=, to: :config
       delegate :additional_public_entry_headers, to: :config
       delegate :cutoff_modes, to: :config
       delegate :entry_translator_url=, to: :config
+      delegate :public_entry_redirect=, to: :config
       delegate :public_entry_url_options=, to: :config
 
       delegate :for_entry_type, to: :config

data/lib/pageflow/deprecation.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'active_support/deprecation'
+require 'pageflow/version'
+
+module Pageflow
+  # @api private
+  module Deprecation
+    module_function
+
+    def warn(message, callstack = nil)
+      deprecator.warn(message, callstack || caller_locations(2))
+    end
+
+    def deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new(Pageflow::VERSION, 'Pageflow')
+    end
+  end
+end

data/lib/pageflow/engine.rb

@@ -22,10 +22,10 @@ require 'jquery-layout-rails'
 require 'backbone-rails'
 require 'marionette-rails'
 require 'jquery-fileupload-rails'
-require 'jquery-minicolors-rails'
 require 'i18n-js'
 require 'http_accept_language'
 require 'pageflow-public-i18n'
+require 'oembed'
 
 require 'pageflow_paged'
 require 'pageflow_scrolled'

data/lib/pageflow/entries_controller_env_helper.rb

@@ -28,9 +28,39 @@ module Pageflow
       EntriesControllerEnvHelper.get_pageflow_hash(env)['entry_mode']
     end
 
+    # Returns `true` if the entry is being rendered as an embed. The
+    # information will be placed in the request env by the Pageflow
+    # engine before delegating to the entry type's frontend app.
+    #
+    # Use {EntriesControllerTestHelper} to set up the request
+    # environment in controller tests.
+    def get_embed_from_env(env = request.env)
+      EntriesControllerEnvHelper.get_pageflow_hash(env)['embed']
+    end
+
+    # Returns the locale of the signed in user, i.e. the locale any
+    # user interface displayed on top of the entry shall use. Returns
+    # `nil` for published entries since those are not rendered for a
+    # specific user. Entry types are expected to render the entry
+    # itself in the locale of the entry, no matter which locale is
+    # returned here.
+    #
+    # Use {EntriesControllerTestHelper} to set up the request
+    # environment in controller tests.
+    #
+    # @since 17.2
+    def get_ui_locale_from_env(env = request.env)
+      EntriesControllerEnvHelper.get_pageflow_hash(env)['ui_locale']
+    end
+
     # @api private
-    def self.add_entry_info_to_env(env, entry:, mode: nil)
-      env['pageflow'] = {'published_entry' => entry, 'entry_mode' => mode}
+    def self.add_entry_info_to_env(env, entry:, mode: nil, embed: false, ui_locale: nil)
+      env['pageflow'] = {
+        'published_entry' => entry,
+        'entry_mode' => mode,
+        'embed' => embed,
+        'ui_locale' => ui_locale
+      }
     end
 
     # @api private

data/lib/pageflow/entry_export_import/entry_serialization.rb

@@ -14,10 +14,10 @@ module Pageflow
           # to prevent it from showing up in Active Admin JSON exports.
           # It is included separately as part of the entry export.
           'entry' => entry
-            .as_json(except: [:folder_id, :password_digest, :users_count])
-            .merge('features_configuration' => entry.features_configuration,
-                   'draft' => RevisionSerialization.dump(entry.draft),
-                   'last_publication' => dump_publication(publication))
+                     .as_json(except: [:folder_id, :password_digest, :users_count])
+                     .merge('features_configuration' => entry.features_configuration,
+                            'draft' => RevisionSerialization.dump(entry.draft),
+                            'last_publication' => dump_publication(publication))
         }
       end
 

data/lib/pageflow/entry_export_import/page_type_versions.rb

@@ -7,8 +7,8 @@ module Pageflow
       class IncompatibleVersionsError < StandardError; end
 
       def dump
-        Pageflow.config.page_types.each_with_object({}) do |page_type, version_requirements|
-          version_requirements[page_type.name] = page_type.export_version
+        Pageflow.config.page_types.to_h do |page_type|
+          [page_type.name, page_type.export_version]
         end
       end
 

data/lib/pageflow/entry_export_import/revision_serialization/import.rb

@@ -19,6 +19,7 @@ module Pageflow
 
             create_widgets(revision, data['widgets'])
             create_revision_components(revision, data['components'])
+            create_file_folders(revision, data['file_folders'])
             create_files(revision, data['file_usages'])
 
             revision
@@ -31,6 +32,7 @@ module Pageflow
 
         def create_revision(data)
           revision_attributes = data.except('storylines',
+                                            'file_folders',
                                             'file_usages',
                                             'widgets',
                                             'components',
@@ -51,6 +53,14 @@ module Pageflow
           end
         end
 
+        # File usages refer to their folder by perma id, so folders have to
+        # exist before the usages which point at them are created.
+        def create_file_folders(revision, file_folders_data)
+          file_folders_data.each do |file_folder_data|
+            revision.file_folders.create!(file_folder_data.except(*DEFAULT_REMOVAL_COLUMNS))
+          end
+        end
+
         def create_revision_components(revision, revision_components_data)
           revision_components_data.each do |component_data|
             nested_compontents_data = component_data.delete('components')

data/lib/pageflow/entry_export_import/revision_serialization.rb

@@ -10,6 +10,9 @@ module Pageflow
           widgets: {
             except: [:subject_id, :subject_type]
           },
+          file_folders: {
+            except: [:revision_id]
+          },
           file_usages: {
             except: [:revision_id],
             include: {

data/lib/pageflow/entry_structured_data_types.rb

@@ -0,0 +1,43 @@
+module Pageflow
+  # Registry for structured data types that can be used in entries.
+  class EntryStructuredDataTypes
+    def initialize
+      @types = {}
+      @default_name = nil
+    end
+
+    # Register a structured data type for entries.
+    #
+    # @param name [Symbol] The name of the structured data type
+    # @param callable [Proc] A lambda that receives a {PublishedEntry} and returns
+    #   a hash of structured data properties including @type
+    # @param options [Hash] Optional configuration
+    # @option options [Boolean] :default (false) Set this type as the default
+    #   when no structured_data_type_name is specified on the entry
+    #
+    # @example
+    #   config.entry_structured_data_types.register(:video_object, lambda do |entry|
+    #     {
+    #       '@type' => 'VideoObject',
+    #       videoSection: 'documentary'
+    #     }
+    #   end, default: true)
+    def register(name, callable, options = {})
+      @types[name.to_s] = callable
+      @default_name = name.to_s if options[:default]
+    end
+
+    # @api private
+    def names
+      @types.keys
+    end
+
+    # @api private
+    def for(entry)
+      structured_data_type =
+        @types[entry.structured_data_type_name] || @types[@default_name]
+
+      structured_data_type ? structured_data_type.call(entry) : {}
+    end
+  end
+end

data/lib/pageflow/entry_type_configuration.rb

@@ -20,6 +20,7 @@ module Pageflow
     delegate :widget_types, to: :@config
     delegate :transform_theme_customization_overrides=, to: :@config
     delegate :transform_theme_customization_files=, to: :@config
+    delegate :entry_structured_data_types, to: :@config
 
     def plugin(plugin)
       plugin.configure(self)

data/lib/pageflow/file_type.rb

@@ -153,8 +153,8 @@ module Pageflow
 
     def convert_custom_attributes_option(custom_attributes)
       if custom_attributes.is_a?(Array)
-        custom_attributes.each_with_object({}) do |attribute_name, result|
-          result[attribute_name] = {permitted_create_param: true}
+        custom_attributes.to_h do |attribute_name|
+          [attribute_name, {permitted_create_param: true}]
         end
       elsif custom_attributes.is_a?(Hash)
         custom_attributes