diff --git a/.nvmrc b/.nvmrc
index 3caeb5f170592a1978528f923bb47cb9b8e1a75e..8b3ed1b235e33456fe0f27c0f6ab7cc4db7fd5ef 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-14.15.5
+16.19.1
diff --git a/editors/demo/package.json b/editors/demo/package.json
index 6fb584d9f33b19264c8077e33fd73bd6b581da42..1c34e59dec32134fdc035c318fe17310154655b3 100644
--- a/editors/demo/package.json
+++ b/editors/demo/package.json
@@ -35,7 +35,9 @@
"not op_mini all"
],
"resolutions": {
- "styled-components": "5.3.1"
+ "styled-components": "5.3.1",
+ "prosemirror-model": "1.19.0",
+ "prosemirror-transform": "1.7.1"
},
"devDependencies": {
"babel-eslint": "10.0.3",
diff --git a/package.json b/package.json
index 1034b8ea1fb69fe379e637ba4e718accaba38046..96a604cf075d0b1171d86931087c507fd294102e 100644
--- a/package.json
+++ b/package.json
@@ -44,10 +44,11 @@
"devDependencies": {
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-proposal-decorators": "^7.0.0",
+ "@babel/plugin-transform-runtime": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
- "@babel/plugin-transform-runtime": "^7.0.0",
"@coko/lint": "^1.1.0",
+ "@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^11.0.2",
"babel-plugin-parameter-decorator": "1.0.12",
"css-loader": "^0.28.11",
@@ -56,12 +57,14 @@
"lodash": "^4.17.19",
"react-app-rewired": "^2.1.2",
"rollup": "^2.2.0",
- "@rollup/plugin-babel": "^6.0.4",
+ "rollup-plugin-import-css": "^3.0.2",
"rollup-plugin-peer-deps-external": "^2.2.2",
"rollup-plugin-terser": "^5.3.0",
- "rollup-plugin-import-css": "^3.0.2",
"style-loader": "^0.23.1",
"styled-components": "^5.3.1",
"svg-inline-loader": "^0.8.0"
+ },
+ "dependencies": {
+ "packages": "^0.0.8"
}
}
diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index 879a2fa691c68f6088832bd5b52e2482a8848905..9a99c4107b7ec3b2264ae13ea77b7ecf88df2a94 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -8,6 +8,7 @@ export { default as Service } from './src/Service';
/* Context & ComponentPlugin */
export { WaxContext, useInjection } from './src/WaxContext';
+export { ApplicationContext } from './src/ApplicationContext';
export { StateContext } from './src/StateContext';
export { PortalContext } from './src/PortalContext';
export { default as ComponentPlugin } from './src/ComponentPlugin';
diff --git a/wax-prosemirror-core/src/ApplicationContext.js b/wax-prosemirror-core/src/ApplicationContext.js
new file mode 100644
index 0000000000000000000000000000000000000000..f91e2c47e5bc41cf907459d7a8eef15aa58740c4
--- /dev/null
+++ b/wax-prosemirror-core/src/ApplicationContext.js
@@ -0,0 +1,22 @@
+/* eslint react/prop-types: 0 */
+/* eslint react/destructuring-assignment: 0 */
+import React, { useEffect, useState } from 'react';
+
+export const ApplicationContext = React.createContext({
+ app: null,
+ getPlugins: null,
+});
+
+export default ({ app, children }) => {
+ const [application, setApplication] = useState(app);
+
+ useEffect(() => {
+ setApplication({ ...app });
+ }, [app]);
+
+ return (
+ <ApplicationContext.Provider value={{ app: application }}>
+ {children}
+ </ApplicationContext.Provider>
+ );
+};
diff --git a/wax-prosemirror-core/src/ComponentPlugin.js b/wax-prosemirror-core/src/ComponentPlugin.js
index e236bf12285573b11f55e1db710b049c10df3112..35af3d57d4d9f9da742bbb4b2e520253c961da13 100644
--- a/wax-prosemirror-core/src/ComponentPlugin.js
+++ b/wax-prosemirror-core/src/ComponentPlugin.js
@@ -1,12 +1,18 @@
/* eslint-disable react/jsx-props-no-spreading */
/* eslint-disable react/no-array-index-key */
-import React from 'react';
-import { useInjection } from './WaxContext';
+import React, { useContext } from 'react';
+// import { useInjection } from './WaxContext';
+// eslint-disable-next-line import/no-named-as-default
+import { ApplicationContext } from './ApplicationContext';
const ComponentPlugin = renderArea => layoutProps => {
- const { instance } = useInjection('Layout');
+ const { app } = useContext(ApplicationContext);
- const components = instance.render(renderArea);
+ const inject = app?.container.isBound('Layout')
+ ? { instance: app?.container.get('Layout') }
+ : null;
+
+ const components = inject ? inject.instance.render(renderArea) : [];
return components
? components.map(({ component: Component, componentProps }, key) => {
diff --git a/wax-prosemirror-core/src/StateContext.js b/wax-prosemirror-core/src/StateContext.js
index ba327fd44219ecae80ddf8ce686c00670998af18..b292bb1d80238d3d03cc4c3f4ca729c62ba0beb9 100644
--- a/wax-prosemirror-core/src/StateContext.js
+++ b/wax-prosemirror-core/src/StateContext.js
@@ -6,24 +6,22 @@ export const StateContext = React.createContext({
state: null,
});
-export default props => {
- const [context, setContext] = useState({
- state: props.state,
- });
+export default ({ state, children }) => {
+ const [context, setContext] = useState(state);
return (
<StateContext.Provider
value={{
...context,
- updateState: state => {
+ updateState: st => {
setContext({
...context,
- state,
+ state: st,
});
},
}}
>
- {props.children}
+ {children}
</StateContext.Provider>
);
};
diff --git a/wax-prosemirror-core/src/Wax.js b/wax-prosemirror-core/src/Wax.js
index cf035dba61e2605bf5b8e2881ba9486caad3c5b2..a0fd093ae5e4643cdc18b72f049cb92546524c40 100644
--- a/wax-prosemirror-core/src/Wax.js
+++ b/wax-prosemirror-core/src/Wax.js
@@ -1,12 +1,13 @@
/* eslint-disable react/jsx-props-no-spreading */
/* eslint-disable react/prop-types */
-import React, { useEffect, useState, forwardRef, useMemo } from 'react';
+import React, { useEffect, useState, forwardRef } from 'react';
import { DOMSerializer } from 'prosemirror-model';
import CryptoJS from 'crypto-js';
import stringify from 'safe-stable-stringify';
import DefaultSchema from './utilities/schema/DefaultSchema';
import WaxProvider from './WaxContext';
import PortalProvider from './PortalContext';
+import ApplicationProvider from './ApplicationContext';
import Application from './Application';
import helpers from './helpers/helpers';
@@ -56,14 +57,14 @@ const Wax = forwardRef((props, innerViewRef) => {
const [application, setApplication] = useState();
const [WaxLayout, setWaxLayout] = useState(null);
const configHash = createConfigWithHash(config);
- console.log(configHash);
+
useEffect(() => {
const newApplication = createApplication(props);
+ if (application) application.resetApp();
setApplication(newApplication);
const Layout = newApplication.container.get('Layout');
if (layout) Layout.setLayout(layout);
setWaxLayout(Layout.layoutComponent);
- setTimeout(() => {}, 100);
}, [configHash]);
const finalOnChange = content => {
@@ -72,40 +73,38 @@ const Wax = forwardRef((props, innerViewRef) => {
helpers.saveContent(content, onChange, schema, serializer, targetFormat);
};
- const WaxLayoutRender = useMemo(() => {
- if (!application || !WaxLayout) return null;
- return (
- <WaxLayout
- autoFocus={autoFocus}
- browserSpellCheck={browserSpellCheck}
- className={className}
- configHash={configHash}
- customValues={customValues}
- fileUpload={fileUpload}
- innerViewRef={innerViewRef}
- onChange={finalOnChange || (() => true)}
- placeholder={placeholder}
- readonly={readonly}
- scrollMargin={scrollMargin}
- scrollThreshold={scrollThreshold}
- serializer={serializer}
- targetFormat={targetFormat}
- TrackChange={
- application.config.get('config.EnableTrackChangeService') || undefined
- }
- user={user}
- value={value}
- {...props}
- />
- );
- }, [application?.id, { ...props }]);
-
if (!application || !WaxLayout) return null;
return (
- <WaxProvider app={application}>
- <PortalProvider>{WaxLayoutRender}</PortalProvider>
- </WaxProvider>
+ <ApplicationProvider app={application}>
+ <WaxProvider>
+ <PortalProvider>
+ <WaxLayout
+ app={application}
+ autoFocus={autoFocus}
+ browserSpellCheck={browserSpellCheck}
+ className={className}
+ customValues={customValues}
+ fileUpload={fileUpload}
+ innerViewRef={innerViewRef}
+ onChange={finalOnChange || (() => true)}
+ placeholder={placeholder}
+ readonly={readonly}
+ scrollMargin={scrollMargin}
+ scrollThreshold={scrollThreshold}
+ serializer={serializer}
+ targetFormat={targetFormat}
+ TrackChange={
+ application.config.get('config.EnableTrackChangeService') ||
+ undefined
+ }
+ user={user}
+ value={value}
+ {...props}
+ />
+ </PortalProvider>
+ </WaxProvider>
+ </ApplicationProvider>
);
});
diff --git a/wax-prosemirror-core/src/WaxContext.js b/wax-prosemirror-core/src/WaxContext.js
index bf8823fbc67459fa556d367411086e2642ad70ad..216c0a56d079adc232b8b32b1760bbed5d1710be 100644
--- a/wax-prosemirror-core/src/WaxContext.js
+++ b/wax-prosemirror-core/src/WaxContext.js
@@ -1,23 +1,21 @@
/* eslint react/prop-types: 0 */
/* eslint react/destructuring-assignment: 0 */
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useState } from 'react';
+// eslint-disable-next-line import/no-named-as-default
+import ApplicationContext from './ApplicationContext';
export const WaxContext = React.createContext({
pmViews: {},
activeView: {},
activeViewId: null,
- app: null,
updateView: null,
updateState: null,
- state: null,
updateActiveView: null,
removeView: null,
});
export default props => {
const [context, setContext] = useState({
- app: props.app,
- state: props.state,
pmViews: props.view || {},
activeView: props.activeView || {},
activeViewId: props.activeViewId || {},
@@ -25,25 +23,10 @@ export default props => {
transaction: {},
});
- useEffect(() => {
- if (context.app.id !== props.app.id) {
- setContext({
- ...context,
- app: props.app,
- });
- }
- }, [props.app.id]);
-
return (
<WaxContext.Provider
value={{
...context,
- updateState: state => {
- setContext({
- ...context,
- state,
- });
- },
updateView: (newView, activeViewId) => {
const pmViews = Object.assign(context.pmViews, newView);
const activeView = pmViews[activeViewId || context.activeViewId];
@@ -54,6 +37,7 @@ export default props => {
activeViewId: activeViewId || context.activeViewId,
});
},
+
setTransaction: tr => {
Object.assign(context.transaction, tr);
},
@@ -71,15 +55,13 @@ export default props => {
};
export const useInjection = identifier => {
- const {
- app: { container },
- } = useContext(WaxContext);
+ const context = useContext(ApplicationContext);
- if (!container) {
+ if (!context.app.container) {
throw new Error();
}
- return container.isBound(identifier)
- ? { instance: container.get(identifier) }
+ return context.app.container.isBound(identifier)
+ ? { instance: context.app.container.get(identifier) }
: null;
};
diff --git a/wax-prosemirror-core/src/components/Button.js b/wax-prosemirror-core/src/components/Button.js
index 5a35a8deb7c1dfba8466a6a3077a7fc4ad54a931..43c19799600591bcffd9dd0810a95949d2707ba6 100644
--- a/wax-prosemirror-core/src/components/Button.js
+++ b/wax-prosemirror-core/src/components/Button.js
@@ -19,8 +19,6 @@ const Button = ({ view = {}, item }) => {
return editable;
});
- const { state } = view;
-
const handleMouseDown = e => {
e.preventDefault();
run(activeView.state, activeView.dispatch, activeView, context);
@@ -28,7 +26,7 @@ const Button = ({ view = {}, item }) => {
const isActive = !!(
active(activeView.state, activeViewId) &&
- select(state, activeViewId, activeView)
+ select(activeView.state, activeViewId, activeView)
);
let isDisabled = !select(
diff --git a/wax-prosemirror-core/src/components/tabs/CustomTagBlockComponent.js b/wax-prosemirror-core/src/components/tabs/CustomTagBlockComponent.js
index d2e4798b56aeb32bf1b24282ac2dfb58ff614079..d399863c505e41dbd66456894f26fb34ab0d5e60 100644
--- a/wax-prosemirror-core/src/components/tabs/CustomTagBlockComponent.js
+++ b/wax-prosemirror-core/src/components/tabs/CustomTagBlockComponent.js
@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next';
import { v4 as uuidv4 } from 'uuid';
import MenuButton from '../ui/MenuButton';
import { WaxContext } from '../../WaxContext';
+import { ApplicationContext } from '../../ApplicationContext';
const activeStyles = css`
pointer-events: none;
@@ -74,9 +75,8 @@ const CustomTagBlockComponent = ({ isShowTag, item }) => {
const { t, i18n } = useTranslation();
const ref = useRef();
const [inputValue, setInputValue] = useState('');
-
+ const { app } = useContext(ApplicationContext);
const {
- app,
pmViews: { main },
activeView,
activeViewId,
diff --git a/wax-prosemirror-core/src/components/tabs/OENToolGroup.js b/wax-prosemirror-core/src/components/tabs/OENToolGroup.js
index 9f51a59fe924bdcfe1b2a848f3ef440f1047f62d..ef58dfbc0a60076f974d4b21355e3d9f35baf3ab 100644
--- a/wax-prosemirror-core/src/components/tabs/OENToolGroup.js
+++ b/wax-prosemirror-core/src/components/tabs/OENToolGroup.js
@@ -5,6 +5,7 @@ import { v4 as uuidv4 } from 'uuid';
import { liftTarget } from 'prosemirror-transform';
import MenuButton from '../ui/MenuButton';
import { WaxContext } from '../../WaxContext';
+import { ApplicationContext } from '../../ApplicationContext';
const activeStyles = css`
pointer-events: none;
@@ -43,8 +44,8 @@ const StyledButton = styled(MenuButton)`
`;
const OENToolGroup = ({ item }) => {
+ const { app } = useContext(ApplicationContext);
const {
- app,
pmViews: { main },
activeView,
activeViewId,
diff --git a/wax-prosemirror-core/src/config/defaultConfig.js b/wax-prosemirror-core/src/config/defaultConfig.js
index 457cb38f0798b7e1a552abe7a8861a7a0d0e2dd4..8b5f98f721ab61fd2f13294ee4d803b9a4c87463 100644
--- a/wax-prosemirror-core/src/config/defaultConfig.js
+++ b/wax-prosemirror-core/src/config/defaultConfig.js
@@ -5,7 +5,6 @@ import LayoutService from './defaultServices/LayoutService/LayoutService';
import PortalService from './defaultServices/PortalService/PortalService';
import MenuService from './defaultServices/MenuService/MenuService';
import OverlayService from './defaultServices/OverlayService/OverlayService';
-import CorePluginsService from './defaultServices/CorePluginsService/CorePluginsService';
export default () => ({
services: [
@@ -16,6 +15,5 @@ export default () => ({
new PortalService(),
new MenuService(),
new OverlayService(),
- new CorePluginsService(),
],
});
diff --git a/wax-prosemirror-core/src/config/defaultServices/CorePluginsService/CorePluginsService.js b/wax-prosemirror-core/src/config/defaultServices/CorePluginsService/CorePluginsService.js
deleted file mode 100644
index 70935410d9dee519d24a42ae81482fabd431bb92..0000000000000000000000000000000000000000
--- a/wax-prosemirror-core/src/config/defaultServices/CorePluginsService/CorePluginsService.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Service from '../../../Service';
-import FakeCursorPlugin from '../../plugins/FakeCursorPlugin';
-
-export default class CorePluginsService extends Service {
- boot() {
- // this.app.PmPlugins.add(
- // 'fakeCursorPlugin',
- // FakeCursorPlugin('fakeCursorPlugin'),
- // );
- }
-}
diff --git a/wax-prosemirror-core/src/config/defaultServices/LayoutService/components/componentPlugin.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/components/componentPlugin.js
index 98bee0d051ad0f078076be00c384032079da2074..3750a6a3b330a777ccfaa81f08a66e1893839f3f 100644
--- a/wax-prosemirror-core/src/config/defaultServices/LayoutService/components/componentPlugin.js
+++ b/wax-prosemirror-core/src/config/defaultServices/LayoutService/components/componentPlugin.js
@@ -1,10 +1,14 @@
/* eslint-disable react/jsx-props-no-spreading */
/* eslint-disable react/no-array-index-key */
import React from 'react';
-import { useInjection } from '../../../../WaxContext';
+// import { useInjection } from '../../../../WaxContext';
const ComponentPlugin = renderArea => layoutProps => {
- const { instance } = useInjection('Layout');
+ // const { instance } = useInjection('Layout');
+
+ const instance = layoutProps.app.container.isBound('Layout')
+ ? { instance: context.app.container.get('Layout') }
+ : null;
const components = instance.render(renderArea);
return components
diff --git a/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
index 9b159bc8b4d70fd4e75b64d32d30c91683b370ca..861f991b4608a5388e57c208be45d753add787de 100644
--- a/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
@@ -12,7 +12,6 @@ class MenuService extends Service {
const { menus } = this.container.get('MenuCollection');
const layout = this.container.get('Layout');
- // console.log(layout.components.mainMenuToolBar);
menus.forEach(menu => {
if (layout.components[menu.config.templateArea]) {
layout.components[menu.config.templateArea].clear();
diff --git a/wax-prosemirror-core/src/helpers/helpers.js b/wax-prosemirror-core/src/helpers/helpers.js
index 82ccbad3eff47d6101e52948c1d4b9378eb19ec8..1c2c7393e0685c968f80b39d5a01b35175001440 100644
--- a/wax-prosemirror-core/src/helpers/helpers.js
+++ b/wax-prosemirror-core/src/helpers/helpers.js
@@ -37,11 +37,11 @@ const getDocContent = (schema, serializer, targetFormat, context) => {
if (targetFormat === 'JSON') {
content = {
type: 'doc',
- content: context.app.context.pmViews.main.state.doc.content.toJSON(),
+ content: context.pmViews.main.state.doc.content.toJSON(),
};
} else {
const serialize = serializer(schema);
- content = serialize(context.app.context.pmViews.main.state.doc.content);
+ content = serialize(context.pmViews.main.state.doc.content);
}
revertNotesSchema(schema);
diff --git a/wax-prosemirror-core/src/useWaxView.js b/wax-prosemirror-core/src/useWaxView.js
index 8844d350485884724101a6de97825c0ae4c30085..59195f4d7eb05225671b63cb3f8461bd1e25f078 100644
--- a/wax-prosemirror-core/src/useWaxView.js
+++ b/wax-prosemirror-core/src/useWaxView.js
@@ -1,3 +1,4 @@
+/* eslint-disable import/no-named-as-default */
import { useContext, useEffect, useImperativeHandle, useState } from 'react';
import { EditorState } from 'prosemirror-state';
import { EditorView } from 'prosemirror-view';
@@ -9,17 +10,16 @@ import helpers from './helpers/helpers';
import './styles/styles.css';
let previousDoc;
-let currentCofingHash;
const useWaxView = props => {
const {
browserSpellCheck,
customValues,
readonly,
- autoFocus,
user,
+ app,
+ autoFocus,
innerViewRef,
- configHash,
targetFormat,
serializer,
scrollMargin,
@@ -27,32 +27,31 @@ const useWaxView = props => {
onChange,
} = props;
+ let view;
+
const context = useContext(WaxContext);
const [WaxView, setWaxView] = useState(null);
const { createPortal } = useContext(PortalContext);
- context.app.setContext({ ...context, createPortal });
- const schema = context.app.getSchema();
- let view;
+ app.setContext({ ...context, createPortal });
+ const schema = app.getSchema();
useEffect(() => {
- context.app.bootServices();
- context.app.getShortCuts();
- context.app.getRules();
+ app.bootServices();
+ app.getShortCuts();
+ app.getRules();
const options = WaxOptions({
...props,
schema,
- plugins: context.app.getPlugins(),
+ plugins: app.getPlugins(),
});
- console.log('in view');
view = new EditorView(null, {
editable: () => !readonly,
customValues,
state: EditorState.create(options),
- dispatchTransaction,
disallowedTools: [],
user,
scrollMargin: scrollMargin || 200,
@@ -62,7 +61,32 @@ const useWaxView = props => {
},
});
- setWaxView(view);
+ view.setProps({
+ dispatchTransaction: transaction => {
+ const { TrackChange } = props;
+ const tr =
+ TrackChange && TrackChange.enabled
+ ? trackedTransaction(transaction, view.state, user, app)
+ : transaction;
+
+ previousDoc = view.state.doc;
+ const state = view.state.apply(tr);
+ view.updateState(state);
+
+ context.setTransaction(transaction);
+ if (!transaction.getMeta('outsideView')) {
+ context.updateView({}, 'main');
+ }
+
+ const docContent =
+ targetFormat === 'JSON' ? state.doc.toJSON() : state.doc.content;
+ if (!previousDoc.eq(view.state.doc) || tr.getMeta('forceUpdate'))
+ onChange(docContent);
+ },
+ });
+
+ setWaxView({ ...view });
+
context.updateView(
{
main: view,
@@ -75,7 +99,7 @@ const useWaxView = props => {
view.focus();
}
}, 500);
- }, [readonly, customValues, context.app.id]);
+ }, [readonly, customValues, app.id]);
useEffect(() => {
return () => (view = null);
@@ -87,39 +111,6 @@ const useWaxView = props => {
},
}));
- const dispatchTransaction = transaction => {
- if (currentCofingHash === configHash) {
- const { TrackChange } = props;
- const tr =
- TrackChange && TrackChange.enabled
- ? trackedTransaction(transaction, view.state, user, context)
- : transaction;
-
- if (!view) return;
-
- previousDoc = view.state.doc;
- const state = view.state.apply(tr);
- view.updateState(state);
-
- context.setTransaction(transaction);
-
- context.updateView(
- {
- main: view,
- },
- 'main',
- );
-
- const docContent =
- targetFormat === 'JSON' ? state.doc.toJSON() : state.doc.content;
- if (!previousDoc.eq(view.state.doc) || tr.getMeta('forceUpdate'))
- onChange(docContent);
- }
- setTimeout(() => {
- currentCofingHash = configHash;
- }, 100);
- };
-
return WaxView;
};
diff --git a/wax-prosemirror-core/src/utilities/track-changes/trackedTransaction.js b/wax-prosemirror-core/src/utilities/track-changes/trackedTransaction.js
index 7373eb3a25fa47f6507d3e4e46c178c29e7378b9..19d3c08701c40bebb62189725988d7e2b80bccda 100644
--- a/wax-prosemirror-core/src/utilities/track-changes/trackedTransaction.js
+++ b/wax-prosemirror-core/src/utilities/track-changes/trackedTransaction.js
@@ -17,7 +17,7 @@ const trackedTransaction = (
tr,
state,
user,
- context,
+ app,
group = 'main',
viewId = 'main',
) => {
@@ -186,7 +186,7 @@ const trackedTransaction = (
!isEmpty(tr.meta) &&
Object.keys(tr.meta).every(meta => meta.includes('imagePlaceHolder'))
) {
- const imagePlaceholder = context.app.PmPlugins.get('imagePlaceHolder');
+ const imagePlaceholder = app.PmPlugins.get('imagePlaceHolder');
return newTr.setMeta(imagePlaceholder, { remove: { id: {} } });
}
return newTr;
diff --git a/wax-prosemirror-services/src/AiService/components/AskAIOverlay.js b/wax-prosemirror-services/src/AiService/components/AskAIOverlay.js
index d784e8479c608c9cd5c14def786e1fd3858b7381..0893771dd4ddc407fd41038b4f3bbfd5b65ad3be 100644
--- a/wax-prosemirror-services/src/AiService/components/AskAIOverlay.js
+++ b/wax-prosemirror-services/src/AiService/components/AskAIOverlay.js
@@ -4,7 +4,7 @@ import React, { useRef, useLayoutEffect, useContext, useState } from 'react';
import styled from 'styled-components';
import { capitalize, debounce, isEmpty, keys } from 'lodash';
import { useTranslation } from 'react-i18next';
-import { WaxContext, icons } from 'wax-prosemirror-core';
+import { WaxContext, ApplicationContext, icons } from 'wax-prosemirror-core';
import { PropTypes } from 'prop-types';
import replaceSelectedText from '../ReplaceSelectedText';
import PromptOptions from './AiSettingsMenu';
@@ -369,8 +369,8 @@ const AskAIOverlay = ({ setPosition, position, config }) => {
// #region HOOKS & INIT ------------------------
const { t, i18n } = useTranslation();
const ctx = useContext(WaxContext);
+ const { app } = useContext(ApplicationContext);
const {
- app,
pmViews: { main },
options,
} = ctx;
diff --git a/wax-prosemirror-services/src/AiService/components/ToggleAiComponent.js b/wax-prosemirror-services/src/AiService/components/ToggleAiComponent.js
index b730ea0763650ff342529e6f3dbce9e01873872b..da56184fb500a94c9dc4d80a6826eb7d3e83dafc 100644
--- a/wax-prosemirror-services/src/AiService/components/ToggleAiComponent.js
+++ b/wax-prosemirror-services/src/AiService/components/ToggleAiComponent.js
@@ -1,12 +1,12 @@
import React, { useContext, useEffect, useMemo, useState } from 'react';
-import { WaxContext, MenuButton } from 'wax-prosemirror-core';
+import { WaxContext, ApplicationContext, MenuButton } from 'wax-prosemirror-core';
import PropTypes from 'prop-types';
const ToggleAiComponent = ({ item }) => {
const [checked, setChecked] = useState(false);
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
const {
- app,
pmViews: { main },
} = context;
diff --git a/wax-prosemirror-services/src/BaseService/components/UndoRedoButton.js b/wax-prosemirror-services/src/BaseService/components/UndoRedoButton.js
index 6c390008ddb74e05afa3ac02905eb1c6cff36cbf..8d8da424cdba2b16e7d61480b3c4e9d9cf8229c9 100644
--- a/wax-prosemirror-services/src/BaseService/components/UndoRedoButton.js
+++ b/wax-prosemirror-services/src/BaseService/components/UndoRedoButton.js
@@ -20,9 +20,9 @@ const UndoRedoButton = ({ view = {}, item }) => {
const { state } = view;
- const handleMouseDown = (e, editorState, editorDispatch) => {
+ const handleMouseDown = (e) => {
e.preventDefault();
- run(editorState, editorDispatch);
+ run(main.state, main.dispatch);
};
const isActive = !!(
@@ -40,7 +40,8 @@ const UndoRedoButton = ({ view = {}, item }) => {
disabled={isDisabled}
iconName={icon}
label={label}
- onMouseDown={e => handleMouseDown(e, main.state, main.dispatch)}
+ onMouseDown={e => handleMouseDown(e)}
+ // onMouseDown={e => handleMouseDown(e, main.state, main.dispatch)}
title={
!isEmpty(i18n) && i18n.exists(`Wax.Base.${title}`)
? t(`Wax.Base.${title}`)
diff --git a/wax-prosemirror-services/src/CommentsService/CommentsService.js b/wax-prosemirror-services/src/CommentsService/CommentsService.js
index 197aeeb3d24425c52df60cfe52405b9c8e6cfe61..0a6074ae3a0047ac900bd1fa902d6e94236034b4 100644
--- a/wax-prosemirror-services/src/CommentsService/CommentsService.js
+++ b/wax-prosemirror-services/src/CommentsService/CommentsService.js
@@ -28,7 +28,7 @@ export default class CommentsService extends Service {
commentsDataMap: this.app.config.get('config.YjsService')
? this.app.context.options.currentYdoc.getMap('commentsDataMap')
: new Map(),
- context: this.app.context,
+ context: { ...this.app.context, app: this.app },
onSelectionChange: items => {
this.allCommentsFromStates = this.allCommentsFromStates.filter(
comm =>
diff --git a/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js b/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
index bc3680bf739ca2d6275a920adf3327f0ce43d5bb..551d7a07b38a64445417af881518cf6b0a9bd1be 100644
--- a/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
+++ b/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
@@ -3,7 +3,7 @@
import React, { useContext, useMemo, useState, useEffect } from 'react';
import { TextSelection } from 'prosemirror-state';
import styled from 'styled-components';
-import { WaxContext } from 'wax-prosemirror-core';
+import { WaxContext, ApplicationContext } from 'wax-prosemirror-core';
import { override } from '@pubsweet/ui-toolkit';
import CommentBox from './ui/comments/CommentBox';
import { CommentDecorationPluginKey } from '../plugins/CommentDecorationPlugin';
@@ -22,6 +22,7 @@ const ConnectedCommentStyled = styled.div`
`;
export default ({ comment, top, commentId, users, activeComment }) => {
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
const {
pmViews,
@@ -30,14 +31,13 @@ export default ({ comment, top, commentId, users, activeComment }) => {
props: { user },
},
},
- app,
activeView,
} = context;
const [isActive, setIsActive] = useState(false);
const [clickPost, setClickPost] = useState(false);
- const { state, dispatch } = activeView;
+ const { state } = activeView;
const { viewId, conversation } = comment.data;
const styles = {
top: `${top}px`,
diff --git a/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js b/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js
index a8f9af7934402724c0915c56bb1857a9bcd1894e..8675562f4c290640f372819c9da05d9c18dff75a 100644
--- a/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js
+++ b/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js
@@ -1,7 +1,11 @@
/* eslint react/prop-types: 0 */
import React, { useContext, useMemo, useState, useEffect } from 'react';
import styled from 'styled-components';
-import { WaxContext, DocumentHelpers } from 'wax-prosemirror-core';
+import {
+ WaxContext,
+ ApplicationContext,
+ DocumentHelpers,
+} from 'wax-prosemirror-core';
import { last, maxBy } from 'lodash';
import { TextSelection } from 'prosemirror-state';
import TrackChangesBox from './ui/trackChanges/TrackChangesBox';
@@ -18,11 +22,12 @@ const ConnectedTrackChangeStyled = styled.div`
`;
export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
- const { app, activeView, pmViews } = context;
+ const { activeView, pmViews } = context;
const user = app.config.get('user');
const [isActive, setIsActive] = useState(false);
- const { state, dispatch } = activeView;
+ const { dispatch } = activeView;
const viewId = trackChange.attrs
? trackChange.attrs.viewid
: trackChange.node.attrs.viewid;
diff --git a/wax-prosemirror-services/src/CommentsService/components/RightArea.js b/wax-prosemirror-services/src/CommentsService/components/RightArea.js
index 5a601e20c761c863e3ef6478a7cf86acf1dd0940..6cbd3035b0410f93a534c1a3fd72af0d08826ce6 100644
--- a/wax-prosemirror-services/src/CommentsService/components/RightArea.js
+++ b/wax-prosemirror-services/src/CommentsService/components/RightArea.js
@@ -3,16 +3,20 @@
import React, { useContext, useState, useMemo, useCallback } from 'react';
import useDeepCompareEffect from 'use-deep-compare-effect';
import { each, uniqBy, sortBy, groupBy } from 'lodash';
-import { WaxContext, DocumentHelpers } from 'wax-prosemirror-core';
+import {
+ WaxContext,
+ ApplicationContext,
+ DocumentHelpers,
+} from 'wax-prosemirror-core';
import BoxList from './BoxList';
import { CommentDecorationPluginKey } from '../plugins/CommentDecorationPlugin';
export default ({ area, users }) => {
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
const {
pmViews,
pmViews: { main },
- app,
activeView,
options: { activeComment },
} = context;
diff --git a/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/RejectTrackChange.js b/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/RejectTrackChange.js
index 49a75f7ed8c6f9ec356ffc868c181d1d6496a711..6424d137557d8148bf7c3bbbfaec7fc9b2f5a81f 100644
--- a/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/RejectTrackChange.js
+++ b/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/RejectTrackChange.js
@@ -39,7 +39,6 @@ const rejectTrackChange = (
if (trackData?.node?.type?.name === 'figure') {
to = activeTrackChange.from + 3;
}
- console.log(activeTrackChange, trackData);
tr.setMeta('AcceptReject', true);
const map = new Mapping();
diff --git a/wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineOverlayComponent.js b/wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineOverlayComponent.js
index f1ffa7706e49a1b06f092c90b3d9de126c718f58..945a194abdd553973f85508171dfffeebf1222f0 100644
--- a/wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineOverlayComponent.js
+++ b/wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineOverlayComponent.js
@@ -8,7 +8,7 @@ import React, {
} from 'react';
import styled from 'styled-components';
import { grid, th } from '@pubsweet/ui-toolkit';
-import { WaxContext, Icon } from 'wax-prosemirror-core';
+import { WaxContext, ApplicationContext, Icon } from 'wax-prosemirror-core';
import { v4 as uuidv4 } from 'uuid';
const IconRemove = styled(Icon)`
@@ -88,8 +88,8 @@ const CustomTagInlineOverlayComponent = ({ mark }) => {
JSON.parse(localStorage.getItem('isInline')),
);
+ const { app } = useContext(ApplicationContext);
const {
- app,
pmViews: { main },
} = useContext(WaxContext);
const { state, dispatch } = main;
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/components/TitleButton.js b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/components/TitleButton.js
index 7fdfedf860cb3ec657b5095561a76e843289e7f0..415bc3b03031334a82f4fc8c2f2ead840b9446bd 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/components/TitleButton.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/components/TitleButton.js
@@ -2,14 +2,19 @@
import React, { useContext, useMemo, useEffect } from 'react';
import { isEmpty } from 'lodash';
import { useTranslation } from 'react-i18next';
-import { WaxContext, DocumentHelpers, MenuButton } from 'wax-prosemirror-core';
+import {
+ WaxContext,
+ ApplicationContext,
+ DocumentHelpers,
+ MenuButton,
+} from 'wax-prosemirror-core';
const TitleButton = ({ view = {}, item }) => {
const { t, i18n } = useTranslation();
const { active, icon, label, run, select, title } = item;
+ const { app } = useContext(ApplicationContext);
const {
- app,
pmViews: { main },
activeViewId,
activeView,
diff --git a/wax-prosemirror-services/src/EditingSuggestingService/components/EditingSuggestingDropDown.js b/wax-prosemirror-services/src/EditingSuggestingService/components/EditingSuggestingDropDown.js
index 3a7ac47e2d127322e1e05ceb3a455163cf135890..179a80ad03ef80cad140bf58e7e2684dcaedcbe7 100644
--- a/wax-prosemirror-services/src/EditingSuggestingService/components/EditingSuggestingDropDown.js
+++ b/wax-prosemirror-services/src/EditingSuggestingService/components/EditingSuggestingDropDown.js
@@ -3,7 +3,12 @@ import React, { useMemo, useContext } from 'react';
import styled from 'styled-components';
import { isEmpty } from 'lodash';
import { useTranslation } from 'react-i18next';
-import { WaxContext, ReactDropDownStyles, Icon } from 'wax-prosemirror-core';
+import {
+ WaxContext,
+ ApplicationContext,
+ ReactDropDownStyles,
+ Icon,
+} from 'wax-prosemirror-core';
import Dropdown from 'react-dropdown';
const Wrapper = styled.span`
@@ -49,7 +54,8 @@ const StyledIcon = styled(Icon)`
// eslint-disable-next-line no-unused-vars
const EditingSuggesting = ({ view: { dispatch, state }, item }) => {
- const { app, activeView, pmViews } = useContext(WaxContext);
+ const { activeView, pmViews } = useContext(WaxContext);
+ const { app } = useContext(ApplicationContext);
const { t, i18n } = useTranslation();
const enableService = app.config.get('config.EnableTrackChangeService')
? app.config.get('config.EnableTrackChangeService')
diff --git a/wax-prosemirror-services/src/FindAndReplaceService/components/ExpandedFindAndReplaceComponent.js b/wax-prosemirror-services/src/FindAndReplaceService/components/ExpandedFindAndReplaceComponent.js
index 9f21d3c788841304b0cbad96bf398e9dc57daf71..bf7e4719edc959e4e1497e02e6a9a8bf5f0a798c 100644
--- a/wax-prosemirror-services/src/FindAndReplaceService/components/ExpandedFindAndReplaceComponent.js
+++ b/wax-prosemirror-services/src/FindAndReplaceService/components/ExpandedFindAndReplaceComponent.js
@@ -4,6 +4,7 @@ import { each, eachRight, isEmpty } from 'lodash';
import { useTranslation } from 'react-i18next';
import {
WaxContext,
+ ApplicationContext,
DocumentHelpers,
useDebounce,
Icon,
@@ -148,7 +149,8 @@ const ExpandedFindAndReplaceComponent = ({
setMatchCaseValue,
}) => {
const { t, i18n } = useTranslation();
- const { app, pmViews, activeViewId } = useContext(WaxContext);
+ const { app } = useContext(ApplicationContext);
+ const { pmViews, activeViewId } = useContext(WaxContext);
const searchRef = useRef(null);
const replaceRef = useRef(null);
const [searchValue, setSearchValue] = useState(nonExpandedText);
diff --git a/wax-prosemirror-services/src/FindAndReplaceService/components/FindComponent.js b/wax-prosemirror-services/src/FindAndReplaceService/components/FindComponent.js
index 1a7eaba5573ed757767296a92942865452fd4e89..5766c807d0e0d5b3dd90fab4ae33576048c18496 100644
--- a/wax-prosemirror-services/src/FindAndReplaceService/components/FindComponent.js
+++ b/wax-prosemirror-services/src/FindAndReplaceService/components/FindComponent.js
@@ -5,7 +5,12 @@ import { each, eachRight, isEmpty } from 'lodash';
import { useTranslation } from 'react-i18next';
import styled from 'styled-components';
import { grid } from '@pubsweet/ui-toolkit';
-import { WaxContext, useDebounce, Icon } from 'wax-prosemirror-core';
+import {
+ WaxContext,
+ ApplicationContext,
+ useDebounce,
+ Icon,
+} from 'wax-prosemirror-core';
import helpers from './helpers';
const Wrapper = styled.div`
@@ -111,8 +116,8 @@ const FindComponent = ({
findNextMatch,
findPreviousMatch,
}) => {
+ const { app } = useContext(ApplicationContext);
const {
- app,
pmViews,
activeViewId,
pmViews: { main },
diff --git a/wax-prosemirror-services/src/ImageService/AltComponent.js b/wax-prosemirror-services/src/ImageService/AltComponent.js
index 826e6e9e8113c157e2198fdff8e5f92f8c43b358..2bcd86b80b9513b52db50721bed321e7341bd1e0 100644
--- a/wax-prosemirror-services/src/ImageService/AltComponent.js
+++ b/wax-prosemirror-services/src/ImageService/AltComponent.js
@@ -1,7 +1,7 @@
/* eslint-disable react/prop-types */
import React, { useContext, useLayoutEffect, useRef, useState } from 'react';
import styled from 'styled-components';
-import { WaxContext } from 'wax-prosemirror-core';
+import { WaxContext, ApplicationContext } from 'wax-prosemirror-core';
const StyledInputAlt = styled.input`
background: #e2ebff;
@@ -25,8 +25,8 @@ export default ({ setPosition, position }) => {
const altRef = useRef(null);
const [altText, setAltText] = useState('');
const context = useContext(WaxContext);
+ const { app } = useContext(ApplicationContext);
const {
- app,
activeView,
pmViews: { main },
} = context;
diff --git a/wax-prosemirror-services/src/ImageService/LongDescComponent.js b/wax-prosemirror-services/src/ImageService/LongDescComponent.js
index ca3a9b1c678f062e49d4c04c63fe86ff21afa2b2..02153b1fa1a064223f16a02cfa20faf4eb978e76 100644
--- a/wax-prosemirror-services/src/ImageService/LongDescComponent.js
+++ b/wax-prosemirror-services/src/ImageService/LongDescComponent.js
@@ -1,7 +1,7 @@
/* eslint-disable react/prop-types */
import React, { useContext, useLayoutEffect, useRef, useState } from 'react';
import styled from 'styled-components';
-import { WaxContext } from 'wax-prosemirror-core';
+import { ApplicationContext, WaxContext } from 'wax-prosemirror-core';
const StyledInputLongDesc = styled.textarea`
background: #e2ebff;
@@ -26,8 +26,8 @@ export default ({ setPosition, position }) => {
const longDescRef = useRef(null);
const [longDescText, setLongDescText] = useState('');
const context = useContext(WaxContext);
+ const { app } = useContext(ApplicationContext);
const {
- app,
activeView,
pmViews: { main },
} = context;
diff --git a/wax-prosemirror-services/src/ImageService/components/ImageUpload.js b/wax-prosemirror-services/src/ImageService/components/ImageUpload.js
index 899b7d219365bca0713f6d0765d14dd923903526..35ad6c0f9b7f77fbdd9abebe73632f0cca691a77 100644
--- a/wax-prosemirror-services/src/ImageService/components/ImageUpload.js
+++ b/wax-prosemirror-services/src/ImageService/components/ImageUpload.js
@@ -3,7 +3,12 @@ import React, { useContext, useRef, useMemo } from 'react';
import { TextSelection } from 'prosemirror-state';
import { isEmpty } from 'lodash';
import { useTranslation } from 'react-i18next';
-import { WaxContext, DocumentHelpers, MenuButton } from 'wax-prosemirror-core';
+import {
+ WaxContext,
+ ApplicationContext,
+ DocumentHelpers,
+ MenuButton,
+} from 'wax-prosemirror-core';
import styled from 'styled-components';
import insertImage from './Upload';
@@ -16,9 +21,9 @@ const Wrapper = styled.div`
const ImageUpload = ({ item, fileUpload, view }) => {
const { t, i18n } = useTranslation();
const { title } = item;
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
const {
- app,
activeView,
activeViewId,
pmViews: { main },
diff --git a/wax-prosemirror-services/src/ImageService/components/ImageUploadComponent.js b/wax-prosemirror-services/src/ImageService/components/ImageUploadComponent.js
index bc9add6fb03bb6744133a6188065fce69796a1e2..b85970df661251976e3d3d8786d90af803e682cf 100644
--- a/wax-prosemirror-services/src/ImageService/components/ImageUploadComponent.js
+++ b/wax-prosemirror-services/src/ImageService/components/ImageUploadComponent.js
@@ -1,13 +1,14 @@
/* eslint-disable react/prop-types */
import React, { useContext } from 'react';
import { v4 as uuidv4 } from 'uuid';
-import { WaxContext } from 'wax-prosemirror-core';
+import { WaxContext, ApplicationContext } from 'wax-prosemirror-core';
import { isEmpty } from 'lodash';
import fileUpload from '../fileUpload';
import ImageUpload from './ImageUpload';
const ImageUploadComponent = ({ view, displayed, config, pmplugins, item }) => {
const context = useContext(WaxContext);
+ const { app } = useContext(ApplicationContext);
if (isEmpty(view)) return null;
const upload = fileUpload(
@@ -15,6 +16,7 @@ const ImageUploadComponent = ({ view, displayed, config, pmplugins, item }) => {
config.get('fileUpload'),
pmplugins.get('imagePlaceHolder'),
context,
+ app,
);
return displayed ? (
<ImageUpload
diff --git a/wax-prosemirror-services/src/ImageService/fileUpload.js b/wax-prosemirror-services/src/ImageService/fileUpload.js
index 8f42e1afd0859c934ed0fe68a9d33a38a155fe7f..e661b47474c81f99a154c072c76ca9767f13f000 100644
--- a/wax-prosemirror-services/src/ImageService/fileUpload.js
+++ b/wax-prosemirror-services/src/ImageService/fileUpload.js
@@ -7,9 +7,9 @@ const findPlaceholder = (state, id, placeholderPlugin) => {
return found.length ? found[0].from : null;
};
-export default (view, fileUpload, placeholderPlugin, context) => file => {
+export default (view, fileUpload, placeholderPlugin, context, app) => file => {
// const { state } = view;
- const trackChange = context.app.config.get('config.EnableTrackChangeService');
+ const trackChange = app.config.get('config.EnableTrackChangeService');
if (trackChange?.enabled)
if (
context.pmViews.main.state.doc.resolve(
diff --git a/wax-prosemirror-services/src/NoteService/Editor.js b/wax-prosemirror-services/src/NoteService/Editor.js
index fa60ceeedd16487287586192e464a762cbea1e04..2eb329545364e9c05333669d9526be92b526a79f 100644
--- a/wax-prosemirror-services/src/NoteService/Editor.js
+++ b/wax-prosemirror-services/src/NoteService/Editor.js
@@ -10,6 +10,7 @@ import { keymap } from 'prosemirror-keymap';
import { undo, redo } from 'prosemirror-history';
import {
WaxContext,
+ ApplicationContext,
ComponentPlugin,
DocumentHelpers,
trackedTransaction,
@@ -26,6 +27,7 @@ let WaxOverlays = () => true;
export default ({ node, view }) => {
const editorRef = useRef();
const context = useContext(WaxContext);
+ const { app } = useContext(ApplicationContext);
const noteId = node.attrs.id;
let noteView;
let clickInNote = false;
@@ -48,7 +50,7 @@ export default ({ node, view }) => {
editable: () => isEditable,
state: EditorState.create({
doc: node,
- plugins: [keymap(createKeyBindings()), ...context.app.getPlugins()],
+ plugins: [keymap(createKeyBindings()), ...app.PmPlugins.getAll()],
}),
dispatchTransaction,
disallowedTools: ['Tables', 'Images', 'Lists', 'CodeBlock'],
@@ -94,9 +96,7 @@ export default ({ node, view }) => {
const dispatchTransaction = transaction => {
const { user } = view.props;
- const TrackChange = context.app.config.get(
- 'config.EnableTrackChangeService',
- );
+ const TrackChange = app.config.get('config.EnableTrackChangeService');
let tr = transaction;
@@ -135,7 +135,7 @@ export default ({ node, view }) => {
context.updateView({}, noteId);
}, 20);
- const findReplace = context.app.PmPlugins.get('findAndReplacePlugin');
+ const findReplace = app.PmPlugins.get('findAndReplacePlugin');
if (findReplace) {
const matches = findReplace.getState(noteView.state).allMatches;
diff --git a/wax-prosemirror-services/src/SpecialCharactersService/components/SpecialCharactersComponent.js b/wax-prosemirror-services/src/SpecialCharactersService/components/SpecialCharactersComponent.js
index 8cdebefe25741f2f91db83dede4ae9ce9c3c067e..324f6764a41e2b762025e1bd56ed75b5fb0a7c2e 100644
--- a/wax-prosemirror-services/src/SpecialCharactersService/components/SpecialCharactersComponent.js
+++ b/wax-prosemirror-services/src/SpecialCharactersService/components/SpecialCharactersComponent.js
@@ -11,7 +11,7 @@ import { filter, groupBy, debounce, isEmpty } from 'lodash';
import { useTranslation } from 'react-i18next';
import { grid, th, override } from '@pubsweet/ui-toolkit';
import { v4 as uuidv4 } from 'uuid';
-import { WaxContext } from 'wax-prosemirror-core';
+import { WaxContext, ApplicationContext } from 'wax-prosemirror-core';
const Wrapper = styled.div`
width: 400px;
@@ -110,7 +110,8 @@ const SpecialCharactersComponent = () => {
const { t, i18n } = useTranslation();
const searchRef = useRef(null);
- const { activeView, app } = useContext(WaxContext);
+ const { app } = useContext(ApplicationContext);
+ const { activeView } = useContext(WaxContext);
const [searchValue, setSearchValue] = useState('');
const [isFirstRun, setFirstRun] = useState(true);
diff --git a/wax-prosemirror-services/src/TrackChangeService/components/TrackChangeOptionsComponent.js b/wax-prosemirror-services/src/TrackChangeService/components/TrackChangeOptionsComponent.js
index e2fadce39342df903e4ad44f10a3cbdb87f402fe..a55522ef47d0ed7583138af044f8c31d20a555f0 100644
--- a/wax-prosemirror-services/src/TrackChangeService/components/TrackChangeOptionsComponent.js
+++ b/wax-prosemirror-services/src/TrackChangeService/components/TrackChangeOptionsComponent.js
@@ -4,7 +4,12 @@ import styled from 'styled-components';
import { each, isEmpty } from 'lodash';
import { useTranslation } from 'react-i18next';
import { grid } from '@pubsweet/ui-toolkit';
-import { WaxContext, DocumentHelpers, MenuButton } from 'wax-prosemirror-core';
+import {
+ WaxContext,
+ ApplicationContext,
+ DocumentHelpers,
+ MenuButton,
+} from 'wax-prosemirror-core';
const Wrapper = styled.div`
background: #fff;
@@ -188,7 +193,8 @@ const TrackChangeOptionsComponent = ({
// const [isShownTrack, setIsShownTrack] = useState(false);
const { t, i18n } = useTranslation();
const menuItems = groups[0].items;
- const { app, pmViews, activeView, activeViewId } = useContext(WaxContext);
+ const { pmViews, activeView, activeViewId } = useContext(WaxContext);
+ const { app } = useContext(ApplicationContext);
const { state } = activeView;
const user = app.config.get('user');
const hideShowPlugin = app.PmPlugins.get('hideShowPlugin');
diff --git a/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/authorTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/authorTrackNode.js
index 3531c3ec08391b27c1ea86414a198d25e5e6a60d..f3271e9b72c552613fd53ce1ca536513953e1247 100644
--- a/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/authorTrackNode.js
+++ b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/authorTrackNode.js
@@ -26,7 +26,6 @@ const author = {
},
],
toDOM(hook, next) {
- console.log(hook);
if (hook.node.attrs.track && hook.node.attrs.track.length) {
Object.assign(hook.value[1], {
'data-id': hook.node.attrs.id,
diff --git a/wax-prosemirror-services/src/WaxToolGroups/BlockDropDownToolGroupService/BlockDropDownComponent.js b/wax-prosemirror-services/src/WaxToolGroups/BlockDropDownToolGroupService/BlockDropDownComponent.js
index 0d30b98e797064ac0c95c36a7a48f7e622558532..9f382ab1e3f49024e078dbf8cf6a696fa0820b71 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/BlockDropDownToolGroupService/BlockDropDownComponent.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/BlockDropDownToolGroupService/BlockDropDownComponent.js
@@ -13,6 +13,7 @@ import { useTranslation } from 'react-i18next';
import {
DocumentHelpers,
WaxContext,
+ ApplicationContext,
Icon,
useOnClickOutside,
} from 'wax-prosemirror-core';
@@ -116,9 +117,9 @@ const BlockDropDownComponent = ({ view, tools }) => {
// },
];
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
const {
- app,
activeView,
activeViewId,
pmViews: { main },
diff --git a/wax-prosemirror-services/src/YjsService/YjsService.js b/wax-prosemirror-services/src/YjsService/YjsService.js
index d203214bd99d872f0ab2ae497da616b63a9b1c13..c9655c093086351a94014a09301ba78de928496f 100644
--- a/wax-prosemirror-services/src/YjsService/YjsService.js
+++ b/wax-prosemirror-services/src/YjsService/YjsService.js
@@ -40,6 +40,7 @@ class YjsService extends Service {
});
const type = ydoc.getXmlFragment(YjsType || 'prosemirror');
+ console.log('dsf');
this.app.PmPlugins.add('ySyncPlugin', ySyncPlugin(type));
diff --git a/wax-questions-service/src/FillTheGapQuestionService/components/ContainerEditor.js b/wax-questions-service/src/FillTheGapQuestionService/components/ContainerEditor.js
index f2988a4c85df77095c6876aa7b6c30c6a9106338..012790eb37849c5aa9e5261c228be34fb87a4a96 100644
--- a/wax-questions-service/src/FillTheGapQuestionService/components/ContainerEditor.js
+++ b/wax-questions-service/src/FillTheGapQuestionService/components/ContainerEditor.js
@@ -7,7 +7,7 @@ import { StepMap } from 'prosemirror-transform';
import { keymap } from 'prosemirror-keymap';
import { baseKeymap } from 'prosemirror-commands';
import { undo, redo } from 'prosemirror-history';
-import { WaxContext } from 'wax-prosemirror-core';
+import { WaxContext, ApplicationContext } from 'wax-prosemirror-core';
const EditorWrapper = styled.div`
> .ProseMirror {
@@ -39,9 +39,9 @@ const ContainerEditor = ({
}) => {
const editorRef = useRef();
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
const {
- app,
pmViews: { main },
} = context;
@@ -70,7 +70,7 @@ const ContainerEditor = ({
};
};
- const plugins = [keymap(createKeyBindings()), ...app.getPlugins()];
+ const plugins = [keymap(createKeyBindings()), ...app.PmPlugins.getAll()];
finalPlugins = finalPlugins.concat([...plugins]);
diff --git a/wax-questions-service/src/FillTheGapQuestionService/components/EditorComponent.js b/wax-questions-service/src/FillTheGapQuestionService/components/EditorComponent.js
index 4f58272465df29153b666197f43d20753c13333b..ed3efb69f5fd50c946d2229bcbd7965fb4467cfc 100644
--- a/wax-questions-service/src/FillTheGapQuestionService/components/EditorComponent.js
+++ b/wax-questions-service/src/FillTheGapQuestionService/components/EditorComponent.js
@@ -6,7 +6,7 @@ import { StepMap } from 'prosemirror-transform';
import { keymap } from 'prosemirror-keymap';
import { baseKeymap } from 'prosemirror-commands';
import { undo, redo } from 'prosemirror-history';
-import { WaxContext } from 'wax-prosemirror-core';
+import { WaxContext, ApplicationContext } from 'wax-prosemirror-core';
import InputComponent from './InputComponent';
const EditorWrapper = styled.span`
@@ -56,9 +56,9 @@ const CorrectAnswers = styled.span`
const EditorComponent = ({ node, view, getPos }) => {
const editorRef = useRef();
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
const {
- app,
pmViews: { main },
} = context;
@@ -87,7 +87,7 @@ const EditorComponent = ({ node, view, getPos }) => {
};
};
- const plugins = [keymap(createKeyBindings()), ...app.getPlugins()];
+ const plugins = [keymap(createKeyBindings()), ...app.PmPlugins.getAll()];
finalPlugins = finalPlugins.concat([...plugins]);
diff --git a/wax-questions-service/src/MatchingService/components/ContainerEditor.js b/wax-questions-service/src/MatchingService/components/ContainerEditor.js
index f1f51e1780f298cdf0dffc5ce2cdfc2c75a73d05..f60cb99fc5b06ea2228d3b161b3243a3d7337b07 100644
--- a/wax-questions-service/src/MatchingService/components/ContainerEditor.js
+++ b/wax-questions-service/src/MatchingService/components/ContainerEditor.js
@@ -3,7 +3,7 @@ import styled from 'styled-components';
import { EditorView } from 'prosemirror-view';
import { EditorState } from 'prosemirror-state';
import { StepMap } from 'prosemirror-transform';
-import { WaxContext } from 'wax-prosemirror-core';
+import { WaxContext, ApplicationContext } from 'wax-prosemirror-core';
const EditorWrapper = styled.div`
width: 100% !important;
@@ -28,9 +28,8 @@ const EditorWrapper = styled.div`
const ContainerEditor = ({ node, view, getPos }) => {
const editorRef = useRef();
-
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
- const { app } = context;
let containerView;
const questionId = node.attrs.id;
@@ -44,7 +43,7 @@ const ContainerEditor = ({ node, view, getPos }) => {
editable: () => false,
state: EditorState.create({
doc: node,
- plugins: [...app.getPlugins()],
+ plugins: [...app.PmPlugins.getAll()],
}),
dispatchTransaction,
disallowedTools: [
diff --git a/wax-questions-service/src/MatchingService/components/EditorComponent.js b/wax-questions-service/src/MatchingService/components/EditorComponent.js
index 4168ecc3847ecb81bf22e0544bc52d1855dca2d0..e7e107bf9a2ed675d07e76a5074b5da2918870d6 100644
--- a/wax-questions-service/src/MatchingService/components/EditorComponent.js
+++ b/wax-questions-service/src/MatchingService/components/EditorComponent.js
@@ -6,7 +6,11 @@ import { StepMap } from 'prosemirror-transform';
import { keymap } from 'prosemirror-keymap';
import { baseKeymap } from 'prosemirror-commands';
import { undo, redo } from 'prosemirror-history';
-import { WaxContext, FakeCursorPlugin } from 'wax-prosemirror-core';
+import {
+ WaxContext,
+ ApplicationContext,
+ FakeCursorPlugin,
+} from 'wax-prosemirror-core';
import Placeholder from '../../MultipleChoiceQuestionService/plugins/placeholder';
const EditorWrapper = styled.div`
@@ -57,9 +61,9 @@ const EditorWrapper = styled.div`
const EditorComponent = ({ node, view, getPos }) => {
const editorRef = useRef();
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
const {
- app,
pmViews: { main },
} = context;
let questionView;
@@ -85,7 +89,7 @@ const EditorComponent = ({ node, view, getPos }) => {
};
};
- const plugins = [keymap(createKeyBindings()), ...app.getPlugins()];
+ const plugins = [keymap(createKeyBindings()), ...app.PmPlugins.getAll()];
const createPlaceholder = placeholder => {
return Placeholder({
diff --git a/wax-questions-service/src/MatchingService/components/MatchingContainerComponent.js b/wax-questions-service/src/MatchingService/components/MatchingContainerComponent.js
index 05900e8b1b87fb7e3b3fcaadcf56a67b13e93b70..bb566dbc1754266585e232980bd1856a6fbf8d10 100644
--- a/wax-questions-service/src/MatchingService/components/MatchingContainerComponent.js
+++ b/wax-questions-service/src/MatchingService/components/MatchingContainerComponent.js
@@ -227,7 +227,6 @@ export default ({ node, view, getPos }) => {
const allNodes = getNodes(context.pmViews.main);
// const allNodesOptions = getOptionsNodes(context.pmViews.main);
- // console.log(allNodesOptions);
allNodes.forEach(singleNode => {
if (singleNode.node.attrs.id === node.attrs.id) {
@@ -244,7 +243,7 @@ export default ({ node, view, getPos }) => {
// correct: '',
// }),
// );
- // console.log(allNodesOptions);
+ //
// });
/* eslint-disable-next-line no-param-reassign */
diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/components/EditorComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/components/EditorComponent.js
index d17e822c19f6a922176f74289187bd60976a6da8..43b862e8d2feabb51857a220bbe1def5a655a8c8 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/components/EditorComponent.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/components/EditorComponent.js
@@ -12,6 +12,7 @@ import { baseKeymap, chainCommands } from 'prosemirror-commands';
import { undo, redo } from 'prosemirror-history';
import {
WaxContext,
+ ApplicationContext,
ComponentPlugin,
DocumentHelpers,
Icon,
@@ -99,10 +100,9 @@ const QuestionEditorComponent = ({
showDelete = false,
}) => {
const editorRef = useRef();
-
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
const {
- app,
pmViews: { main },
} = context;
@@ -156,7 +156,7 @@ const QuestionEditorComponent = ({
};
};
- const plugins = [keymap(createKeyBindings()), ...app.getPlugins()];
+ const plugins = [keymap(createKeyBindings()), ...app.PmPlugins.getAll()];
const createPlaceholder = placeholder => {
return Placeholder({
@@ -199,15 +199,6 @@ const QuestionEditorComponent = ({
),
),
);
- // context.pmViews[activeViewId].dispatch(
- // context.pmViews[activeViewId].state.tr.setSelection(
- // TextSelection.between(
- // context.pmViews[activeViewId].state.selection.$anchor,
- // context.pmViews[activeViewId].state.selection.$head,
- // ),
- // ),
- // );
-
context.updateView({}, questionId);
if (questionView.hasFocus()) questionView.focus();
@@ -243,10 +234,6 @@ const QuestionEditorComponent = ({
questionView.updateState(state);
context.updateView({}, questionId);
- // setTimeout(() => {
- // context.updateView({}, questionId);
- // });
-
if (!tr.getMeta('fromOutside')) {
const outerTr = view.state.tr;
const offsetMap = StepMap.offset(getPos() + 1);
diff --git a/wax-questions-service/src/MultipleDropDownService/components/ContainerEditor.js b/wax-questions-service/src/MultipleDropDownService/components/ContainerEditor.js
index e3a8f472b4bc44b73d423fef6947e9d233cc4e23..90c39a1142108418b4947504e9665a34ec54095e 100644
--- a/wax-questions-service/src/MultipleDropDownService/components/ContainerEditor.js
+++ b/wax-questions-service/src/MultipleDropDownService/components/ContainerEditor.js
@@ -11,7 +11,11 @@ import {
import { keymap } from 'prosemirror-keymap';
import { baseKeymap, chainCommands } from 'prosemirror-commands';
import { undo, redo } from 'prosemirror-history';
-import { WaxContext, ComponentPlugin } from 'wax-prosemirror-core';
+import {
+ WaxContext,
+ ApplicationContext,
+ ComponentPlugin,
+} from 'wax-prosemirror-core';
import FakeCursorPlugin from '../plugins/FakeCursorPlugin';
const EditorWrapper = styled.div`
@@ -47,9 +51,9 @@ let WaxOverlays = () => true;
const ContainerEditor = ({ node, view, getPos }) => {
const editorRef = useRef();
+ const { app } = useContext(ApplicationContext);
const context = useContext(WaxContext);
const {
- app,
pmViews: { main },
} = context;
@@ -107,7 +111,7 @@ const ContainerEditor = ({ node, view, getPos }) => {
};
};
- const plugins = [keymap(createKeyBindings()), ...app.getPlugins()];
+ const plugins = [keymap(createKeyBindings()), ...app.PmPlugins.getAll()];
finalPlugins = finalPlugins.concat([...plugins]);
useEffect(() => {
diff --git a/yarn.lock b/yarn.lock
index f625a5b3f2072644d76c23e989450a078e243c09..d4009306237cc8c01bd61ffe253e501b55d92051 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2859,6 +2859,11 @@ base@^0.11.1:
mixin-deep "^1.2.0"
pascalcase "^0.1.1"
+batch@0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/batch/-/batch-0.5.0.tgz#fd2e05a7a5d696b4db9314013e285d8ff3557ec3"
+ integrity sha512-avtDJBSxllB5QGphW1OXYF+ujhy/yIGgeFsvK6UiZLU86nWlqsNcZotUKd001wrl9MmZ9QIyVy8WFVEEpRIc5A==
+
batch@0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -3090,6 +3095,11 @@ bser@2.1.1:
dependencies:
node-int64 "^0.4.0"
+buffer-crc32@0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.1.tgz#be3e5382fc02b6d6324956ac1af98aa98b08534c"
+ integrity sha512-vMfBIRp/wjlpueSz7Sb0OmO7C5SH58SSmbsT8G4D48YfO/Zgbr29xNXMpZVSC14ujVJfrZZH1Bl+kXYRQPuvfQ==
+
buffer-from@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -3140,6 +3150,11 @@ byline@^5.0.0:
resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
+bytes@0.2.1, bytes@~0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/bytes/-/bytes-0.2.1.tgz#555b08abcb063f8975905302523e4cd4ffdfdf31"
+ integrity sha512-odbk8/wGazOuC1v8v4phoV285/yx8UN5kfQhhuxaVcceig4OUiCZQBtaEtmA1Q78QSTN9iXOQ7X2EViybrEvtQ==
+
bytes@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -3749,6 +3764,13 @@ command-join@^2.0.0:
dependencies:
"@improved/node" "^1.0.0"
+commander@1.3.2:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-1.3.2.tgz#8a8f30ec670a6fdd64af52f1914b907d79ead5b5"
+ integrity sha512-uoVVA5dchmxZeTMv2Qsd0vhn/RebJYsWo4all1qtrUL3BBhQFn4AQDF4PL+ZvOeK7gczXKEZaSCyMDMwFBlpBg==
+ dependencies:
+ keypress "0.1.x"
+
commander@2.9.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
@@ -3876,6 +3898,27 @@ connect-history-api-fallback@^1.6.0:
resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
+connect@2.12.0:
+ version "2.12.0"
+ resolved "https://registry.yarnpkg.com/connect/-/connect-2.12.0.tgz#31d8fa0dcacdf1908d822bd2923be8a2d2a7ed9a"
+ integrity sha512-i3poGdQamCEvDhvaFuG99KUDCU1Cvv7S2T6YfpY4X2+a0+uDrUcpRk08AQEge3NhtidVKfODQfpoMW4xlbQ0LQ==
+ dependencies:
+ batch "0.5.0"
+ buffer-crc32 "0.2.1"
+ bytes "0.2.1"
+ cookie "0.1.0"
+ cookie-signature "1.0.1"
+ debug ">= 0.7.3 < 1"
+ fresh "0.2.0"
+ methods "0.1.0"
+ multiparty "2.2.0"
+ negotiator "0.3.0"
+ pause "0.0.1"
+ qs "0.6.6"
+ raw-body "1.1.2"
+ send "0.1.4"
+ uid2 "0.0.3"
+
console-browserify@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
@@ -4114,11 +4157,21 @@ convert-source-map@^0.3.3:
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
integrity sha1-8dgClQr33SYxof6+BZZVDIarMZA=
+cookie-signature@1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.1.tgz#44e072148af01e6e8e24afbf12690d68ae698ecb"
+ integrity sha512-FMG5ziBzXZ5d4j5obbWOH1X7AtIpsU9ce9mQ+lHo/I1++kzz/isNarOj6T1lBPRspP3mZpuIutc7OVDVcaN1Kg==
+
cookie-signature@1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+cookie@0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.1.0.tgz#90eb469ddce905c866de687efc43131d8801f9d0"
+ integrity sha512-YSNOBX085/nzHvrTLEHYHoNdkvpLU1MPjU3r1IGawudZJjfuqnRNIFrcOJJ7bfwC+HWbHL1Y4yMkC0O+HWjV7w==
+
cookie@0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
@@ -4693,6 +4746,13 @@ dateformat@^3.0.0:
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
+debug@*, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.2:
+ version "4.3.5"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
+ integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
+ dependencies:
+ ms "2.1.2"
+
debug@2.6.8:
version "2.6.8"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
@@ -4707,6 +4767,11 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
dependencies:
ms "2.0.0"
+"debug@>= 0.7.3 < 1":
+ version "0.8.1"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-0.8.1.tgz#20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"
+ integrity sha512-HlXEJm99YsRjLJ8xmuz0Lq8YUwrv7hAJkTEr6/Em3sUlSUNl0UdFA+1SrY4fnykeq1FVkUEUtwRGHs9VvlYbGA==
+
debug@^3.1.1, debug@^3.2.5:
version "3.2.6"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
@@ -4714,13 +4779,6 @@ debug@^3.1.1, debug@^3.2.5:
dependencies:
ms "^2.1.1"
-debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.2:
- version "4.3.4"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
- integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
- dependencies:
- ms "2.1.2"
-
decamelize-keys@^1.0.0, decamelize-keys@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -5171,6 +5229,13 @@ encoding-down@^6.3.0:
level-codec "^9.0.0"
level-errors "^2.0.0"
+encoding@*:
+ version "0.1.13"
+ resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+ integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+ dependencies:
+ iconv-lite "^0.6.2"
+
end-of-stream@^1.0.0, end-of-stream@^1.1.0:
version "1.4.4"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -5870,6 +5935,24 @@ express@^4.17.1:
utils-merge "1.0.1"
vary "~1.1.2"
+express@~3.4.0:
+ version "3.4.8"
+ resolved "https://registry.yarnpkg.com/express/-/express-3.4.8.tgz#aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1"
+ integrity sha512-NC6Ff/tlg4JNjGTrw0is0aOe9k7iAnb3Ra6mF3Be15UscxZKpbP7XCMmXx9EiNpHe9IClbHo6EDslH9eJNo1HQ==
+ dependencies:
+ buffer-crc32 "0.2.1"
+ commander "1.3.2"
+ connect "2.12.0"
+ cookie "0.1.0"
+ cookie-signature "1.0.1"
+ debug ">= 0.7.3 < 1"
+ fresh "0.2.0"
+ merge-descriptors "0.0.1"
+ methods "0.1.0"
+ mkdirp "0.3.5"
+ range-parser "0.0.4"
+ send "0.1.4"
+
ext@^1.1.2:
version "1.4.0"
resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
@@ -5939,6 +6022,14 @@ extsprintf@^1.2.0:
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+factories@0.0.x:
+ version "0.0.8"
+ resolved "https://registry.yarnpkg.com/factories/-/factories-0.0.8.tgz#6eb17d34910b870429ed3e07504891d238f5832c"
+ integrity sha512-p9H82s7B4qoIpaC0IJBcu/lxwgboj0jozyWc9b+GWog1dsdNNyf/LgjrN4z1xkxS7V32whyHNdNNtbT4JO4BTA==
+ dependencies:
+ protoclass "0.0.x"
+ type-component "0.0.x"
+
faker@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f"
@@ -6026,6 +6117,13 @@ fb-watchman@^2.0.0:
dependencies:
bser "2.1.1"
+fetch@~0.3.6:
+ version "0.3.6"
+ resolved "https://registry.yarnpkg.com/fetch/-/fetch-0.3.6.tgz#37543718c22a8ac03c7c7b1c5137bb37f63d83d8"
+ integrity sha512-MFBYJw1kc89ctsJZIthwHYB3Vsoc0Zsi29VxV9Huz/NlrcSwVb6WQ4F6k11icOHnM/HLeCjy2MKNoA9xWe/cvw==
+ dependencies:
+ encoding "*"
+
figgy-pudding@^3.5.1:
version "3.5.2"
resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
@@ -6308,6 +6406,11 @@ fragment-cache@^0.2.1:
dependencies:
map-cache "^0.2.2"
+fresh@0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.2.0.tgz#bfd9402cf3df12c4a4c310c79f99a3dde13d34a7"
+ integrity sha512-ckGdAuSRr1wBmnq7CsW7eU37DBwQxHx3vW8foJUIrF56rkOy8Osm6Fe8KSwemwyKejivKki7jVBgpBpBJexmrw==
+
fresh@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -7136,6 +7239,13 @@ iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24:
dependencies:
safer-buffer ">= 2.1.2 < 3"
+iconv-lite@^0.6.2:
+ version "0.6.3"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+ integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+ dependencies:
+ safer-buffer ">= 2.1.2 < 3.0.0"
+
icss-replace-symbols@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -7854,6 +7964,11 @@ is-wsl@^2.1.1:
dependencies:
is-docker "^2.0.0"
+isarray@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+ integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
+
isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -8519,6 +8634,11 @@ jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3, jsx-ast-utils@^2.4.1:
array-includes "^3.1.1"
object.assign "^4.1.0"
+keypress@0.1.x:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/keypress/-/keypress-0.1.0.tgz#4a3188d4291b66b4f65edb99f806aa9ae293592a"
+ integrity sha512-x0yf9PL/nx9Nw9oLL8ZVErFAk85/lslwEP7Vz7s5SI1ODXZIgit3C5qyWjw4DxOuO/3Hb4866SQh28a1V1d+WA==
+
killable@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -9363,6 +9483,11 @@ merge-deep@^3.0.2:
clone-deep "^0.2.4"
kind-of "^3.0.2"
+merge-descriptors@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-0.0.1.tgz#2ff0980c924cf81d0b5d1fb601177cb8bb56c0d0"
+ integrity sha512-1VjrOxz6kouIMS/jZ+oQTAUsXufrF8hVzkfzSxqBh0Wy/KzEqZSvy3OZe/Ntrd5QeHtNCUF1bE0bIRLslzHCcw==
+
merge-descriptors@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -9383,6 +9508,11 @@ merge@^1.2.1:
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+methods@0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/methods/-/methods-0.1.0.tgz#335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"
+ integrity sha512-N4cn4CbDqu7Fp3AT4z3AsO19calgczhsmCGzXLCiUOrWg9sjb1B+yKFKOrnnPGKKvjyJBmw+k6b3adFN2LbuBw==
+
methods@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -9448,6 +9578,11 @@ mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
dependencies:
mime-db "1.44.0"
+mime@1.2.11, mime@~1.2.9:
+ version "1.2.11"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
+ integrity sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==
+
mime@1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -9597,6 +9732,11 @@ mj-context-menu@^0.6.1:
resolved "https://registry.yarnpkg.com/mj-context-menu/-/mj-context-menu-0.6.1.tgz#a043c5282bf7e1cf3821de07b13525ca6f85aa69"
integrity sha512-7NO5s6n10TIV96d4g2uDpG7ZDpIhMh0QNfGdJw/W47JswFcosz457wqz/b5sAKvl12sxINGFCn80NZHKwxQEXA==
+mkdirp@0.3.5:
+ version "0.3.5"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7"
+ integrity sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==
+
mkdirp@0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -9679,6 +9819,14 @@ multicast-dns@^6.0.1:
dns-packet "^1.3.1"
thunky "^1.0.2"
+multiparty@2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/multiparty/-/multiparty-2.2.0.tgz#a567c2af000ad22dc8f2a653d91978ae1f5316f4"
+ integrity sha512-fiFMI4tSze1TsrWFZNABRwy7kF/VycEWz4t0UFESOoP5IdJh29AUFmbirWXv/Ih/rNw62OO2YaQpQEiw1BFQpQ==
+ dependencies:
+ readable-stream "~1.1.9"
+ stream-counter "~0.2.0"
+
mute-stream@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@@ -9721,6 +9869,11 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+negotiator@0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.3.0.tgz#706d692efeddf574d57ea9fb1ab89a4fa7ee8f60"
+ integrity sha512-q9wF64uB31BDZQ44DWf+8gE7y8xSpBdREAsJfnBO2WX9ecsutfUO6S9uWEdixlDLOlWaqnlnFXXwZxUUmyLfgg==
+
negotiator@0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -10256,6 +10409,17 @@ package-json@^4.0.1:
registry-url "^3.0.3"
semver "^5.1.0"
+packages@^0.0.8:
+ version "0.0.8"
+ resolved "https://registry.yarnpkg.com/packages/-/packages-0.0.8.tgz#f32d0cd71d49e47bed486614cd1969e2745732c8"
+ integrity sha512-rstHZWH1UyHUAwtU8GI4JSIFWTYUEkRf+MseFG/p3lO/HgZHvXGZR7XN+1eA/Km7JDnItW4mgn5zfpP23aITgQ==
+ dependencies:
+ express "~3.4.0"
+ factories "0.0.x"
+ resolver "~0.1.11"
+ toarray "0.0.1"
+ type-component "0.0.1"
+
pako@~1.0.5:
version "1.0.11"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
@@ -10457,6 +10621,11 @@ path-type@^4.0.0:
resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+pause@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
+ integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==
+
pbkdf2@^3.0.3:
version "3.1.1"
resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
@@ -11729,6 +11898,13 @@ prosemirror-model@1.19.0, prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, p
dependencies:
orderedmap "^2.0.0"
+prosemirror-model@^1.21.0:
+ version "1.21.3"
+ resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.21.3.tgz#97fa434d670331c1ab25f75964b1bcd7a948ce61"
+ integrity sha512-nt2Xs/RNGepD9hrrkzXvtCm1mpGJoQfFSPktGa0BF/aav6XsnmVGZ9sTXNWRLupAz5SCLa3EyKlFeK7zJWROKg==
+ dependencies:
+ orderedmap "^2.0.0"
+
prosemirror-schema-basic@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.1.2.tgz#4bde5c339c845e0d08ec8fe473064e372ca51ae3"
@@ -11763,19 +11939,19 @@ prosemirror-test-builder@^1.0.1:
prosemirror-schema-basic "^1.0.0"
prosemirror-schema-list "^1.0.0"
-prosemirror-transform@1.7.1:
+prosemirror-transform@1.7.1, prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0:
version "1.7.1"
resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.7.1.tgz#b516e818c3add0bdf960f4ca8ccb9d057a3ba21b"
integrity sha512-VteoifAfpt46z0yEt6Fc73A5OID9t/y2QIeR5MgxEwTuitadEunD/V0c9jQW8ziT8pbFM54uTzRLJ/nLuQjMxg==
dependencies:
prosemirror-model "^1.0.0"
-prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.7.3:
- version "1.7.3"
- resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.7.3.tgz#cc2225cd1bf88a3c62404b9eb051ff73e9c716a6"
- integrity sha512-qDapyx5lqYfxVeUWEw0xTGgeP2S8346QtE7DxkalsXlX89lpzkY6GZfulgfHyk1n4tf74sZ7CcXgcaCcGjsUtA==
+prosemirror-transform@^1.7.3:
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.9.0.tgz#81fd1fbd887929a95369e6dd3d240c23c19313f8"
+ integrity sha512-5UXkr1LIRx3jmpXXNKDhv8OyAOeLTGuXNwdVfg8x27uASna/wQkr9p6fD3eupGOi4PLJfbezxTyi/7fSJypXHg==
dependencies:
- prosemirror-model "^1.0.0"
+ prosemirror-model "^1.21.0"
prosemirror-view@1.30.2, prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.27.0, prosemirror-view@^1.5.1:
version "1.30.2"
@@ -11786,6 +11962,11 @@ prosemirror-view@1.30.2, prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prose
prosemirror-state "^1.0.0"
prosemirror-transform "^1.1.0"
+protoclass@0.0.x:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/protoclass/-/protoclass-0.0.6.tgz#d740bbe6844d101a4b65c5c5c43d93e74378391f"
+ integrity sha512-V+eGEAC7KI3NhZL5Vl2rcxwKMAgvDkGKPhfrJDLBVP7kW/+mS48bloIpo3L+7MtSiVN2Q+kwrasBxzZU34HmPw==
+
proxy-addr@~2.0.5:
version "2.0.6"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
@@ -11866,6 +12047,11 @@ q@^1.1.2, q@^1.4.1, q@^1.5.1:
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+qs@0.6.6:
+ version "0.6.6"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-0.6.6.tgz#6e015098ff51968b8a3c819001d5f2c89bc4b107"
+ integrity sha512-kN+yNdAf29Jgp+AYHUmC7X4QdJPR8czuMWLNLc0aRxkQ7tB3vJQEONKKT9ou/rW7EbqVec11srC9q9BiVbcnHA==
+
qs@6.7.0:
version "6.7.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
@@ -11936,11 +12122,23 @@ randomfill@^1.0.3:
randombytes "^2.0.5"
safe-buffer "^5.1.0"
+range-parser@0.0.4:
+ version "0.0.4"
+ resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-0.0.4.tgz#c0427ffef51c10acba0782a46c9602e744ff620b"
+ integrity sha512-okJVEq9DbZyg+5lD8pr6ooQmeA0uu8DYIyAU7VK1WUUK7hctI1yw2ZHhKiKjB6RXaDrYRmTR4SsIHkyiQpaLMA==
+
range-parser@^1.2.1, range-parser@~1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+raw-body@1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.2.tgz#c74b3004dea5defd1696171106ac740ec31d62be"
+ integrity sha512-9Vyxam2+QrtmNIc3mFrwazAXOeQdxgFvS3vvkvH02R5YbdsaSqL4N9M93s0znkh0q4cGBk8CbrqOSGkz3BUeDg==
+ dependencies:
+ bytes "~0.2.1"
+
raw-body@2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
@@ -12244,6 +12442,16 @@ read-pkg@^5.2.0:
string_decoder "^1.1.1"
util-deprecate "^1.0.1"
+readable-stream@~1.1.8, readable-stream@~1.1.9:
+ version "1.1.14"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+ integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.1"
+ isarray "0.0.1"
+ string_decoder "~0.10.x"
+
readdirp@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -12633,6 +12841,14 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.1
dependencies:
path-parse "^1.0.6"
+resolver@~0.1.11:
+ version "0.1.12"
+ resolved "https://registry.yarnpkg.com/resolver/-/resolver-0.1.12.tgz#d0d24d698f211f0d5fe24393a55fc3e0b5c93090"
+ integrity sha512-cZ4vkMkZZvL2t7Tgs6omCfyQWN1G5SmTk2O84xBFXT5B2mlIz8whJAPBvINThd3adrM2V2iu1m9qXrHpxEoJ4w==
+ dependencies:
+ fetch "~0.3.6"
+ mime "1.2.11"
+
restore-cursor@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -12826,7 +13042,7 @@ safe-stable-stringify@^2.4.3:
resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
version "2.1.2"
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -12942,6 +13158,16 @@ semver@^7.3.2:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+send@0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/send/-/send-0.1.4.tgz#be70d8d1be01de61821af13780b50345a4f71abd"
+ integrity sha512-NJnIaB29/EcNqkNneUAm16oEVnzM2LeNBc/hmgKuExv2k9pCZQEw8SHJeCdjqesHJTyWAr7x5HjeOmRFS4BoFw==
+ dependencies:
+ debug "*"
+ fresh "0.2.0"
+ mime "~1.2.9"
+ range-parser "0.0.4"
+
send@0.17.1:
version "0.17.1"
resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -13438,6 +13664,13 @@ stream-browserify@^2.0.1:
inherits "~2.0.1"
readable-stream "^2.0.2"
+stream-counter@~0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/stream-counter/-/stream-counter-0.2.0.tgz#ded266556319c8b0e222812b9cf3b26fa7d947de"
+ integrity sha512-GjA2zKc2iXUUKRcOxXQmhEx0Ev3XHJ6c8yWGqhQjWwhGrqNwSsvq9YlRLgoGtZ5Kx2Ln94IedaqJ5GUG6aBbxA==
+ dependencies:
+ readable-stream "~1.1.8"
+
stream-each@^1.1.0:
version "1.2.3"
resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
@@ -13558,6 +13791,11 @@ string_decoder@^1.0.0, string_decoder@^1.1.1:
dependencies:
safe-buffer "~5.2.0"
+string_decoder@~0.10.x:
+ version "0.10.31"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+ integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
+
string_decoder@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -14124,6 +14362,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
regex-not "^1.0.2"
safe-regex "^1.1.0"
+toarray@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/toarray/-/toarray-0.0.1.tgz#a115430a84a4be91b2746f62b9e07c83a3fb8c45"
+ integrity sha512-4EEt1cngMyDQvStibtjwHav7mCYf0mLAXYQ3z03zNacXjWjIHN01j1AtjGpEuCKX5sea+ZzyZcDXgjitxOVaww==
+
toidentifier@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
@@ -14225,6 +14468,11 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"
+type-component@0.0.1, type-component@0.0.x:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/type-component/-/type-component-0.0.1.tgz#952a6c81c21efd24d13d811d0c8498cb860e1956"
+ integrity sha512-mDZRBQS2yZkwRQKfjJvQ8UIYJeBNNWCq+HBNstl9N5s9jZ4dkVYXEGkVPsSCEh5Ld4JM1kmrZTzjnrqSAIQ7dw==
+
type-fest@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
@@ -14295,16 +14543,16 @@ typeface-vollkorn@^0.0.54:
resolved "https://registry.yarnpkg.com/typeface-vollkorn/-/typeface-vollkorn-0.0.54.tgz#1288bcd7d81c3dd7cd419e4448580d2a0b0640b2"
integrity sha512-eVTGPinLEnT9IJdL/5HhNaily6de5zWB4w2VQyL2u67R4cdvh4i+cE7LVusef9YE5KW6wT4ZU9UQ8lS6qD7wuA==
-typescript@^4.8.4:
- version "4.9.4"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"
- integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==
-
uglify-js@^3.1.4:
version "3.10.0"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.0.tgz#397a7e6e31ce820bfd1cb55b804ee140c587a9e7"
integrity sha512-Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA==
+uid2@0.0.3:
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
+ integrity sha512-5gSP1liv10Gjp8cMEnFd6shzkL/D6W1uhXSFNCxDC+YI8+L8wkCYCbJ7n77Ezb4wE/xzMogecE+DtamEe9PZjg==
+
unicode-canonical-property-names-ecmascript@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -15178,13 +15426,12 @@ y-leveldb@^0.1.0:
level "^6.0.1"
lib0 "^0.2.31"
-y-prosemirror@1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/y-prosemirror/-/y-prosemirror-1.2.0.tgz#84771bd350834bc7759e946cd14c62ec26243a5c"
- integrity sha512-t3uxuX4HIkb1GNt8jV+dplRbNH2OmQD/BNeCCbjLD3Mq0o6JEXxHedv58ZIPFDE6ma24jljlL+u8pGvN6B37XQ==
+y-prosemirror@1.2.9:
+ version "1.2.9"
+ resolved "https://registry.yarnpkg.com/y-prosemirror/-/y-prosemirror-1.2.9.tgz#0202b5f6b164fa35d80bdbcdc876d81fe6da7ac2"
+ integrity sha512-fThGIVmSqrqnG/ckywEGlHM9ElfILC4TcMZd5zxWPe/i+UuP97TEr4swsopRKG3Y+KHBVt4Y/5NVBC3AAsUoUg==
dependencies:
lib0 "^0.2.42"
- typescript "^4.8.4"
y-protocols@1.0.5, y-protocols@^1.0.5:
version "1.0.5"