Consolidate markup helpers module
This commit is contained in:
parent
f3ecddea47
commit
d84a0296b2
|
@ -4,11 +4,13 @@ import semver from 'semver';
|
||||||
import AutoIndexApp from '../client/autoIndex/App.js';
|
import AutoIndexApp from '../client/autoIndex/App.js';
|
||||||
|
|
||||||
import MainTemplate from './utils/MainTemplate.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 getEntryPoint from './utils/getEntryPoint.js';
|
||||||
import getGlobalScripts from './utils/getGlobalScripts.js';
|
import getGlobalScripts from './utils/getGlobalScripts.js';
|
||||||
|
import {
|
||||||
|
createElement,
|
||||||
|
createHTML,
|
||||||
|
createScript
|
||||||
|
} from './utils/markupHelpers.js';
|
||||||
|
|
||||||
const doctype = '<!DOCTYPE html>';
|
const doctype = '<!DOCTYPE html>';
|
||||||
const globalURLs =
|
const globalURLs =
|
||||||
|
|
|
@ -3,11 +3,13 @@ import { renderToString, renderToStaticMarkup } from 'react-dom/server';
|
||||||
import MainApp from '../client/main/App.js';
|
import MainApp from '../client/main/App.js';
|
||||||
|
|
||||||
import MainTemplate from './utils/MainTemplate.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 getEntryPoint from './utils/getEntryPoint.js';
|
||||||
import getGlobalScripts from './utils/getGlobalScripts.js';
|
import getGlobalScripts from './utils/getGlobalScripts.js';
|
||||||
|
import {
|
||||||
|
createElement,
|
||||||
|
createHTML,
|
||||||
|
createScript
|
||||||
|
} from './utils/markupHelpers.js';
|
||||||
|
|
||||||
const doctype = '<!DOCTYPE html>';
|
const doctype = '<!DOCTYPE html>';
|
||||||
const globalURLs =
|
const globalURLs =
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
|
|
||||||
import e from './createElement.js';
|
import {
|
||||||
import h from './createHTML.js';
|
createElement as e,
|
||||||
import x from './createScript.js';
|
createHTML as h,
|
||||||
|
createScript as x
|
||||||
|
} from './markupHelpers.js';
|
||||||
|
|
||||||
const promiseShim =
|
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>\')';
|
'window.Promise || document.write(\'\\x3Cscript src="/es6-promise@4.2.5/dist/es6-promise.min.js">\\x3C/script>\\x3Cscript>ES6Promise.polyfill()\\x3C/script>\')';
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
export { createElement as default } from 'react';
|
|
|
@ -1,3 +0,0 @@
|
||||||
export default function createHTML(code) {
|
|
||||||
return { __html: code };
|
|
||||||
}
|
|
|
@ -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)
|
|
||||||
});
|
|
||||||
}
|
|
|
@ -1,4 +1,4 @@
|
||||||
import createElement from './createElement.js';
|
import { createElement } from './markupHelpers.js';
|
||||||
|
|
||||||
export default function getGlobalScripts(entryPoint, globalURLs) {
|
export default function getGlobalScripts(entryPoint, globalURLs) {
|
||||||
return entryPoint.globalImports.map(id => {
|
return entryPoint.globalImports.map(id => {
|
||||||
|
|
|
@ -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)
|
||||||
|
});
|
||||||
|
}
|
Loading…
Reference in New Issue