diff --git a/modules/actions/serveAutoIndexPage.js b/modules/actions/serveAutoIndexPage.js index 1686d58..29fe6ff 100644 --- a/modules/actions/serveAutoIndexPage.js +++ b/modules/actions/serveAutoIndexPage.js @@ -4,11 +4,13 @@ import semver from 'semver'; import AutoIndexApp from '../client/autoIndex/App.js'; import MainTemplate from './utils/MainTemplate.js'; -import createElement from './utils/createElement.js'; -import createHTML from './utils/createHTML.js'; -import createScript from './utils/createScript.js'; import getEntryPoint from './utils/getEntryPoint.js'; import getGlobalScripts from './utils/getGlobalScripts.js'; +import { + createElement, + createHTML, + createScript +} from './utils/markupHelpers.js'; const doctype = ''; const globalURLs = diff --git a/modules/actions/serveMainPage.js b/modules/actions/serveMainPage.js index 85aadaa..178e990 100644 --- a/modules/actions/serveMainPage.js +++ b/modules/actions/serveMainPage.js @@ -3,11 +3,13 @@ import { renderToString, renderToStaticMarkup } from 'react-dom/server'; import MainApp from '../client/main/App.js'; import MainTemplate from './utils/MainTemplate.js'; -import createElement from './utils/createElement.js'; -import createHTML from './utils/createHTML.js'; -import createScript from './utils/createScript.js'; import getEntryPoint from './utils/getEntryPoint.js'; import getGlobalScripts from './utils/getGlobalScripts.js'; +import { + createElement, + createHTML, + createScript +} from './utils/markupHelpers.js'; const doctype = ''; const globalURLs = diff --git a/modules/actions/utils/MainTemplate.js b/modules/actions/utils/MainTemplate.js index 7df4d62..f3a4cd1 100644 --- a/modules/actions/utils/MainTemplate.js +++ b/modules/actions/utils/MainTemplate.js @@ -1,8 +1,10 @@ import PropTypes from 'prop-types'; -import e from './createElement.js'; -import h from './createHTML.js'; -import x from './createScript.js'; +import { + createElement as e, + createHTML as h, + createScript as x +} from './markupHelpers.js'; const promiseShim = 'window.Promise || document.write(\'\\x3Cscript src="/es6-promise@4.2.5/dist/es6-promise.min.js">\\x3C/script>\\x3Cscript>ES6Promise.polyfill()\\x3C/script>\')'; diff --git a/modules/actions/utils/createElement.js b/modules/actions/utils/createElement.js deleted file mode 100644 index a617356..0000000 --- a/modules/actions/utils/createElement.js +++ /dev/null @@ -1 +0,0 @@ -export { createElement as default } from 'react'; diff --git a/modules/actions/utils/createHTML.js b/modules/actions/utils/createHTML.js deleted file mode 100644 index 0ab37de..0000000 --- a/modules/actions/utils/createHTML.js +++ /dev/null @@ -1,3 +0,0 @@ -export default function createHTML(code) { - return { __html: code }; -} diff --git a/modules/actions/utils/createScript.js b/modules/actions/utils/createScript.js deleted file mode 100644 index 67bd1c7..0000000 --- a/modules/actions/utils/createScript.js +++ /dev/null @@ -1,8 +0,0 @@ -import createElement from './createElement.js'; -import createHTML from './createHTML.js'; - -export default function createScript(script) { - return createElement('script', { - dangerouslySetInnerHTML: createHTML(script) - }); -} diff --git a/modules/actions/utils/getGlobalScripts.js b/modules/actions/utils/getGlobalScripts.js index 9bfe540..99037d0 100644 --- a/modules/actions/utils/getGlobalScripts.js +++ b/modules/actions/utils/getGlobalScripts.js @@ -1,4 +1,4 @@ -import createElement from './createElement.js'; +import { createElement } from './markupHelpers.js'; export default function getGlobalScripts(entryPoint, globalURLs) { return entryPoint.globalImports.map(id => { diff --git a/modules/actions/utils/markupHelpers.js b/modules/actions/utils/markupHelpers.js new file mode 100644 index 0000000..cfa35a3 --- /dev/null +++ b/modules/actions/utils/markupHelpers.js @@ -0,0 +1,13 @@ +import { createElement } from 'react'; + +export { createElement }; + +export function createHTML(code) { + return { __html: code }; +} + +export function createScript(script) { + return createElement('script', { + dangerouslySetInnerHTML: createHTML(script) + }); +}