Merge pull request #2406 from tf/entry-state-external

Bundle entryState as a separate package export

Author: tf

entry_types/scrolled/package/.eslintignore

@@ -3,6 +3,7 @@
 /node_modules
 /contentElements
 /editor.js
+/entryState.js
 /frontend
 /frontend-server.js
 /contentElements-editor.js

entry_types/scrolled/package/.eslintrc.js

@@ -22,6 +22,32 @@ module.exports = {
         'jest/globals': true,
       },
       "extends": ["plugin:jest/recommended"]
+    },
+    {
+      // Content elements, widgets and the editor are bundled
+      // separately and need to import from 'pageflow-scrolled/frontend'
+      // and 'pageflow-scrolled/entryState' to keep that code external.
+      // Stories are excluded because they legitimately import the
+      // content element's sibling './frontend' aggregator via
+      // '../frontend'.
+      "files": ["src/contentElements/**/*.js", "src/widgets/**/*.js", "src/editor/**/*.js"],
+      "excludedFiles": ["src/**/stories.js"],
+      "rules": {
+        "no-restricted-imports": ["error", {
+          "patterns": ["**/frontend/**", "../**/frontend", "**/entryState/**"]
+        }]
+      }
+    },
+    {
+      // The frontend is bundled separately from entryState and needs
+      // to use 'pageflow-scrolled/entryState' to keep that code
+      // external.
+      "files": ["src/frontend/**/*.js"],
+      "rules": {
+        "no-restricted-imports": ["error", {
+          "patterns": ["**/entryState/**", "../**/entryState"]
+        }]
+      }
     }
   ]
 };

entry_types/scrolled/package/.gitignore

@@ -2,6 +2,7 @@
 /contentElements
 /editor.js
 /editor.css
+/entryState.js
 /frontend
 /frontend-server.js
 /contentElements-editor.js

entry_types/scrolled/package/.storybook/main.js

@@ -36,6 +36,7 @@ module.exports = {
           ...config.resolve.alias,
           'pageflow/frontend': path.resolve(__dirname, '../../../../package/src/frontend'),
           'pageflow/review': path.resolve(__dirname, '../../../../package/src/review'),
+          'pageflow-scrolled/entryState': path.resolve(__dirname, '../src/entryState'),
           'pageflow-scrolled/frontend': path.resolve(__dirname, '../src/frontend'),
           'pageflow-scrolled/review': path.resolve(__dirname, '../src/review'),
           'pageflow-scrolled/testHelpers': path.resolve(__dirname, '../src/testHelpers')

entry_types/scrolled/package/src/contentElements/inlineAudio/editor.js

@@ -3,6 +3,7 @@ import {FileInputView, CheckBoxInputView} from 'pageflow/editor';
 import {SelectInputView, SeparatorView, ColorInputView} from 'pageflow/ui';
 import I18n from 'i18n-js';
 
+// eslint-disable-next-line no-restricted-imports
 import {
   defaultRemainingWaveformColor,
   defaultRemainingWaveformColorInverted,

entry_types/scrolled/package/src/editor/controllers/PreviewMessageController.js

@@ -1,6 +1,6 @@
 import {Object} from 'pageflow/ui';
 import {ReviewMessageHandler} from 'pageflow-scrolled/review';
-import {watchCollections} from '../../entryState';
+import {watchCollections} from 'pageflow-scrolled/entryState';
 import {InsertContentElementDialogView} from '../views/InsertContentElementDialogView'
 import {SelectLinkDestinationDialogView} from '../views/SelectLinkDestinationDialogView'
 

entry_types/scrolled/package/src/editor/views/EditSectionTransitionView.js

@@ -1,7 +1,7 @@
 import {EditConfigurationView} from 'pageflow/editor';
 import {EditSectionTransitionEffectView} from './EditSectionTransitionEffectView';
 import {getAvailableTransitionNames} from 'pageflow-scrolled/frontend';
-import {normalizeSectionConfigurationData} from '../../entryState';
+import {normalizeSectionConfigurationData} from 'pageflow-scrolled/entryState';
 
 export const EditSectionTransitionView = EditConfigurationView.extend({
   translationKeyPrefix: 'pageflow_scrolled.editor.edit_section_transition',

entry_types/scrolled/package/src/editor/views/SectionThumbnailView.js

@@ -3,7 +3,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 
 import {cssModulesUtils} from 'pageflow/ui';
-import {watchCollections} from '../../entryState';
+import {watchCollections} from 'pageflow-scrolled/entryState';
 import {StandaloneSectionThumbnail} from 'pageflow-scrolled/frontend'
 
 import styles from './SectionThumbnailView.module.css';

entry_types/scrolled/package/src/editor/views/inputs/TypographyVariantSelectInputView.js

@@ -5,7 +5,7 @@ import Backbone from 'backbone';
 import styles from './TypographyVariantSelectInputView.module.css';
 
 import {ListboxInputView} from './ListboxInputView';
-import {watchCollections} from '../../../entryState';
+import {watchCollections} from 'pageflow-scrolled/entryState';
 import {StandaloneSectionThumbnail} from 'pageflow-scrolled/frontend'
 
 export const TypographyVariantSelectInputView = ListboxInputView.extend({

entry_types/scrolled/package/src/entryState/index.js

@@ -17,7 +17,8 @@ export {
   useChapters,
   useChapter,
   useSectionForegroundContentElements,
-  useContentElement
+  useContentElement,
+  useMainStoryline
 } from './structure';
 export {useFile} from './useFile';
 export {useFileWithInlineRights} from './useFileWithInlineRights';