Skip to content

Preload All Scripts #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 3, 2020
Merged

Preload All Scripts #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
901fc02
feat: preload all scripts
shadowtime2000 Nov 3, 2020
fbd3b5f
refactor: a refactor
shadowtime2000 Nov 3, 2020
82e6d68
feat: preload aleph library files
shadowtime2000 Nov 3, 2020
f94257c
fix: modulepreload aleph library files
shadowtime2000 Nov 3, 2020
db1cd35
refactor: move preloading of library files to project.ts
shadowtime2000 Nov 3, 2020
c7ce5b3
refactor: inject preload scripts with function call
shadowtime2000 Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 59 additions & 38 deletions html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,86 @@
import util from './util.ts'
import util from "./util.ts";

export function createHtml({
lang = 'en',
lang = "en",
head = [],
scripts = [],
body,
minify = false
minify = false,
}: {
lang?: string,
head?: string[],
scripts?: (string | { id?: string, type?: string, src?: string, innerText?: string, nomodule?: boolean, async?: boolean, preload?: boolean })[],
body: string,
minify?: boolean
lang?: string;
head?: string[];
scripts?:
(string | {
id?: string;
type?: string;
src?: string;
innerText?: string;
nomodule?: boolean;
async?: boolean;
preload?: boolean;
})[];
body: string;
minify?: boolean;
}) {
const eol = minify ? '' : '\n'
const indent = minify ? '' : ' '.repeat(4)
const headTags = head.map(tag => tag.trim())
.concat(scripts.map(v => {
const eol = minify ? "" : "\n";
const indent = minify ? "" : " ".repeat(4);
const headTags = head.map((tag) => tag.trim())
.concat(scripts.map((v) => {
if (!util.isString(v) && util.isNEString(v.src)) {
if (v.type === 'module') {
return `<link rel="modulepreload" href=${JSON.stringify(v.src)} />`
} else if (v.async === true) {
return `<link rel="preload" href=${JSON.stringify(v.src)} as="script" />`
if (v.type === "module") {
return `<link rel="modulepreload" href=${JSON.stringify(v.src)} />`;
}
return `<link rel="preload" href=${JSON.stringify(v.src)
} as="script" />`;
}
return ''
})).filter(Boolean)
const scriptTags = scripts.map(v => {
return "";
}))
/*.concat(
[
"/_aleph/-/deno.land/x/aleph/error.js",
"/_aleph/-/deno.land/x/aleph/aleph.js",
"/_aleph/-/deno.land/x/aleph/context.js",
"/_aleph/-/deno.land/x/aleph/events.js"
].map((v) =>
`<link rel="modulepreload" href=${JSON.stringify(v)} as="script" />`
),
)*/
.filter(Boolean);
const scriptTags = scripts.map((v) => {
if (util.isString(v)) {
return `<script>${v}</script>`
return `<script>${v}</script>`;
} else if (util.isNEString(v.innerText)) {
const { innerText, ...rest } = v
return `<script${attrString(rest)}>${eol}${innerText}${eol}${indent}</script>`
const { innerText, ...rest } = v;
return `<script${attrString(rest)
}>${eol}${innerText}${eol}${indent}</script>`;
} else if (util.isNEString(v.src) && !v.preload) {
return `<script${attrString(v)}></script>`
return `<script${attrString(v)}></script>`;
} else {
return ''
return "";
}
}).filter(Boolean)
}).filter(Boolean);

return [
'<!DOCTYPE html>',
"<!DOCTYPE html>",
`<html lang="${lang}">`,
'<head>',
"<head>",
indent + '<meta charSet="utf-8" />',
...headTags.map(tag => indent + tag),
'</head>',
'<body>',
...headTags.map((tag) => indent + tag),
"</head>",
"<body>",
indent + body,
...scriptTags.map(tag => indent + tag),
'</body>',
'</html>'
].join(eol)
...scriptTags.map((tag) => indent + tag),
"</body>",
"</html>",
].join(eol);
}

function attrString(v: any): string {
return Object.keys(v).map(k => {
return Object.keys(v).map((k) => {
if (v[k] === true) {
return ` ${k}`
return ` ${k}`;
} else {
return ` ${k}=${JSON.stringify(String(v[k]))}`
return ` ${k}=${JSON.stringify(String(v[k]))}`;
}
}).join('')
}).join("");
}
16 changes: 15 additions & 1 deletion project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,18 @@ export class Project {
return [status, data]
}

getPreloadScripts(baseUrl: string) {
const scripts = [
'-/deno.land/x/aleph/aleph.js',
'-/deno.land/x/aleph/context.js',
'-/deno.land/x/aleph/error.js',
'-/deno.land/x/aleph/events.js',
'-/deno.land/x/aleph/routing.js,',
'-/deno.land/x/aleph/util.js'
]
return scripts.map(src => ({ src: `${baseUrl}${src}`, type: 'module', preload: true }))
}

async getPageHtml(loc: { pathname: string, search?: string }): Promise<[number, string, Record<string, string> | null]> {
if (!this.isSSRable(loc.pathname)) {
const [url] = this.#routing.createRouter(loc)
Expand All @@ -275,7 +287,7 @@ export class Project {
scripts: [
data ? { type: 'application/json', innerText: JSON.stringify(data), id: 'ssr-data' } : '',
{ src: util.cleanPath(`${baseUrl}/_aleph/main.${mainModule.hash.slice(0, hashShort)}.js`), type: 'module' },
{ src: util.cleanPath(`${baseUrl}/_aleph/-/deno.land/x/aleph/nomodule.js${this.isDev ? '?dev' : ''}`), nomodule: true },
...this.getPreloadScripts(baseUrl),
...scripts
],
body,
Expand All @@ -293,6 +305,7 @@ export class Project {
scripts: [
{ src: util.cleanPath(`${baseUrl}/_aleph/main.${mainModule.hash.slice(0, hashShort)}.js`), type: 'module' },
{ src: util.cleanPath(`${baseUrl}/_aleph/-/deno.land/x/aleph/nomodule.js${this.isDev ? '?dev' : ''}`), nomodule: true },
...this.getPreloadScripts(baseUrl)
],
head: customLoading?.head || [],
body: `<main>${customLoading?.body || ''}</main>`,
Expand Down Expand Up @@ -379,6 +392,7 @@ export class Project {
data ? { type: 'application/json', innerText: JSON.stringify(data), id: 'ssr-data' } : '',
{ src: util.cleanPath(`${baseUrl}/_aleph/main.${mainModule.hash.slice(0, hashShort)}.js`), type: 'module' },
{ src: util.cleanPath(`${baseUrl}/_aleph/-/deno.land/x/aleph/nomodule.js${this.isDev ? '?dev' : ''}`), nomodule: true },
...this.getPreloadScripts(baseUrl),
...scripts
],
body,
Expand Down