Skip to content

Commit 1993339

Browse files
committed
Support blank siteRoot
1 parent 8d711cf commit 1993339

File tree

5 files changed

+49
-44
lines changed

5 files changed

+49
-44
lines changed

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"scripts": {
2525
"unit-test": "",
26-
"build": "webdoc --tutorials ./tutorials --site-root example-documentation",
26+
"build": "webdoc --tutorials ./tutorials",
2727
"build-next": "cd .. && webdoc && cd example",
2828
"build-pixi-api": "cd ../../pixi-api && webdoc --site-root docs && cd ../webdoc/example",
2929
"build-pixi-api-prod": "cd ../../pixi-api && webdoc --site-root pixi-api && cd ../webdoc/example"

packages/webdoc-default-template/src/app/components/Explorer/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ export default connect(({explorerOpen}) => ({
2222
const {root} = useExplorerStyles();
2323
const toggleOpen = React.useCallback(() => setOpen(!isOpen), [isOpen]);
2424
const children = [];
25+
const sitePrefix = window.appData.siteRoot ? "/" + window.appData.siteRoot + "/" : "/";
2526

2627
if (!fetched) {
27-
fetch("/" + window.appData.siteRoot + "/explorer/reference.json")
28+
fetch(sitePrefix + "explorer/reference.json")
2829
.then((response) => {
2930
if (response.ok) {
3031
response.json().then((idata) => {

packages/webdoc-default-template/static/scripts/default-template.js

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4495,6 +4495,44 @@ function ExplorerHeader(_ref) {
44954495
className: "explorer__header__title"
44964496
}, "{ ", React.createElement("i", null, "webdoc"), " }"));
44974497
}
4498+
// CONCATENATED MODULE: ./src/app/components/Explorer/useExplorerStyles.js
4499+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
4500+
4501+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
4502+
4503+
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
4504+
4505+
4506+
var itemStyle = {
4507+
label: {
4508+
alignItems: "center",
4509+
display: "flex",
4510+
color: "#333333",
4511+
fontSize: 12,
4512+
height: "24px",
4513+
lineHeight: "14px"
4514+
},
4515+
labelLinks: {
4516+
color: "#333333"
4517+
},
4518+
iconContainer: {
4519+
color: "#333333",
4520+
fontSize: 8,
4521+
marginRight: 0
4522+
},
4523+
selected: {
4524+
backgroundColor: "none"
4525+
},
4526+
root: {
4527+
padding: "0 8px"
4528+
}
4529+
};
4530+
var useExplorerStyles = styles_makeStyles(itemStyle);
4531+
var useExplorerCategoryStyles = styles_makeStyles(_objectSpread(_objectSpread({}, itemStyle), {}, {
4532+
label: _objectSpread(_objectSpread({}, itemStyle.label), {}, {
4533+
fontWeight: "bold"
4534+
})
4535+
}));
44984536
// CONCATENATED MODULE: /Users/shukantpal/Web Projects/webdoc/common/temp/node_modules/.pnpm/registry.npmjs.org/@material-ui/core/4.11.2_react-dom@16.14.0+react@16.14.0/node_modules/@material-ui/core/esm/Typography/Typography.js
44994537

45004538

@@ -5812,44 +5850,6 @@ var TreeItem_TreeItem = /*#__PURE__*/external_React_["forwardRef"](function Tree
58125850
var cuid = __webpack_require__(26);
58135851
var cuid_default = /*#__PURE__*/__webpack_require__.n(cuid);
58145852

5815-
// CONCATENATED MODULE: ./src/app/components/Explorer/useExplorerStyles.js
5816-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
5817-
5818-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
5819-
5820-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
5821-
5822-
5823-
var itemStyle = {
5824-
label: {
5825-
alignItems: "center",
5826-
display: "flex",
5827-
color: "#333333",
5828-
fontSize: 12,
5829-
height: "24px",
5830-
lineHeight: "14px"
5831-
},
5832-
labelLinks: {
5833-
color: "#333333"
5834-
},
5835-
iconContainer: {
5836-
color: "#333333",
5837-
fontSize: 8,
5838-
marginRight: 0
5839-
},
5840-
selected: {
5841-
backgroundColor: "none"
5842-
},
5843-
root: {
5844-
padding: "0 8px"
5845-
}
5846-
};
5847-
var useExplorerStyles = styles_makeStyles(itemStyle);
5848-
var useExplorerCategoryStyles = styles_makeStyles(_objectSpread(_objectSpread({}, itemStyle), {}, {
5849-
label: _objectSpread(_objectSpread({}, itemStyle.label), {}, {
5850-
fontWeight: "bold"
5851-
})
5852-
}));
58535853
// CONCATENATED MODULE: ./src/app/components/Explorer/ExplorerCategoryItem.js
58545854

58555855

@@ -8701,9 +8701,10 @@ var fetched = false;
87018701
return setOpen(!isOpen);
87028702
}, [isOpen]);
87038703
var children = [];
8704+
var sitePrefix = window.appData.siteRoot ? "/" + window.appData.siteRoot + "/" : "/";
87048705

87058706
if (!fetched) {
8706-
fetch("/" + window.appData.siteRoot + "/explorer/reference.json").then(function (response) {
8707+
fetch(sitePrefix + "explorer/reference.json").then(function (response) {
87078708
if (response.ok) {
87088709
response.json().then(function (idata) {
87098710
setData(idata || {});

packages/webdoc-default-template/tmpl/layout.tmpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
*/
55
const rootData = obj;
66
const siteRoot = this.getPlugin("linker").siteRoot;
7+
const sitePrefix = siteRoot ? siteRoot + "/" : siteRoot;
78
?>
89
<!DOCTYPE html>
910
<html lang="en">
1011
<head>
1112
<meta charset="utf-8" />
1213
<title>webdoc: <?js= title ?></title>
1314

14-
<link type="text/css" rel="stylesheet" href="/<?js= siteRoot ?>/styles/index.css" />
15+
<link type="text/css" rel="stylesheet" href="/<?js= sitePrefix ?>styles/index.css" />
1516
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
1617
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono:300,400,500,700&display=swap" />
1718
<link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.0.3/styles/googlecode.min.css">
@@ -23,7 +24,7 @@ const siteRoot = this.getPlugin("linker").siteRoot;
2324
siteRoot: "<?js= siteRoot ?>",
2425
};
2526
</script>
26-
<script src="/<?js= siteRoot ?>/scripts/default-template.js"></script>
27+
<script src="/<?js= sitePrefix ?>scripts/default-template.js"></script>
2728
</head>
2829
<body class="root">
2930
<div class="docs">

packages/webdoc-template-library/src/template-plugins/LinkerPlugin.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,9 @@ function LinkerPluginShell() {
368368
*/
369369
processInternalURI(uri: string, options: { outputRelative?: boolean } = {}): string {
370370
if (!options.outputRelative) {
371-
uri = uri.replace("%3CsiteRoot%3E", this.siteRoot);
371+
uri = uri
372+
.replace("%3CsiteRoot%3E", this.siteRoot)
373+
.replace("//", "/");// needed if siteRoot = "";
372374
} else {
373375
uri = uri.replace("/%3CsiteRoot%3E/", "");
374376
}

0 commit comments

Comments
 (0)