From 684d38d6c8c2e384348b0f2a003fc6c4bad74acd Mon Sep 17 00:00:00 2001 From: Kevin Jahns Date: Sun, 13 May 2018 13:07:24 +0200 Subject: [PATCH] make compatible with webpack and less sophisticated module bundlers --- src/Bindings/DomBinding/domToType.js | 4 +++- src/Types/YXml/YXml.js | 12 ------------ src/Types/YXml/YXmlElement.js | 4 +++- src/Util/structReferences.js | 5 ++++- src/Y.dist.js | 5 ++++- 5 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 src/Types/YXml/YXml.js diff --git a/src/Bindings/DomBinding/domToType.js b/src/Bindings/DomBinding/domToType.js index a81583f7..c1d81d2a 100644 --- a/src/Bindings/DomBinding/domToType.js +++ b/src/Bindings/DomBinding/domToType.js @@ -1,5 +1,7 @@ -import { YXmlText, YXmlElement, YXmlHook } from '../../Types/YXml/YXml.js' +import YXmlText from '../../Types/YXml/YXmlText.js' +import YXmlHook from '../../Types/YXml/YXmlHook.js' +import YXmlElement from '../../Types/YXml/YXmlElement.js' import { createAssociation, domsToTypes } from './util.js' import { filterDomAttributes, defaultFilter } from './filter.js' diff --git a/src/Types/YXml/YXml.js b/src/Types/YXml/YXml.js deleted file mode 100644 index 67eab29d..00000000 --- a/src/Types/YXml/YXml.js +++ /dev/null @@ -1,12 +0,0 @@ - -import YXmlFragment from './YXmlFragment.js' -import YXmlElement from './YXmlElement.js' -import YXmlHook from './YXmlHook.js' - -export { default as YXmlFragment } from './YXmlFragment.js' -export { default as YXmlElement } from './YXmlElement.js' -export { default as YXmlText } from './YXmlText.js' -export { default as YXmlHook } from './YXmlHook.js' - -YXmlFragment._YXmlElement = YXmlElement -YXmlFragment._YXmlHook = YXmlHook diff --git a/src/Types/YXml/YXmlElement.js b/src/Types/YXml/YXmlElement.js index 43f73e13..9c7280f7 100644 --- a/src/Types/YXml/YXmlElement.js +++ b/src/Types/YXml/YXmlElement.js @@ -1,5 +1,5 @@ import YMap from '../YMap/YMap.js' -import { YXmlFragment } from './YXml.js' +import YXmlFragment from './YXmlFragment.js' import { createAssociation } from '../../Bindings/DomBinding/util.js' /** @@ -186,3 +186,5 @@ export default class YXmlElement extends YXmlFragment { return dom } } + +YXmlFragment._YXmlElement = YXmlElement diff --git a/src/Util/structReferences.js b/src/Util/structReferences.js index 0c4f7182..3f03c974 100644 --- a/src/Util/structReferences.js +++ b/src/Util/structReferences.js @@ -1,7 +1,10 @@ import YArray from '../Types/YArray/YArray.js' import YMap from '../Types/YMap/YMap.js' import YText from '../Types/YText/YText.js' -import { YXmlFragment, YXmlElement, YXmlText, YXmlHook } from '../Types/YXml/YXml.js' +import YXmlText from '../Types/YXml/YXmlText.js' +import YXmlHook from '../Types/YXml/YXmlHook.js' +import YXmlFragment from '../Types/YXml/YXmlFragment.js' +import YXmlElement from '../Types/YXml/YXmlElement.js' import Delete from '../Struct/Delete.js' import ItemJSON from '../Struct/ItemJSON.js' diff --git a/src/Y.dist.js b/src/Y.dist.js index 6074cf0e..fbf2445a 100644 --- a/src/Y.dist.js +++ b/src/Y.dist.js @@ -10,7 +10,10 @@ import Persistence from './Persistence.js' import YArray from './Types/YArray/YArray.js' import YMap from './Types/YMap/YMap.js' import YText from './Types/YText/YText.js' -import { YXmlFragment, YXmlElement, YXmlText, YXmlHook } from './Types/YXml/YXml.js' +import YXmlText from './Types/YXml/YXmlText.js' +import YXmlHook from './Types/YXml/YXmlHook.js' +import YXmlFragment from './Types/YXml/YXmlFragment.js' +import YXmlElement from './Types/YXml/YXmlElement.js' import BinaryDecoder from './Util/Binary/Decoder.js' import { getRelativePosition, fromRelativePosition } from './Util/relativePosition.js' import { registerStruct } from './Util/structReferences.js'