Skip to content
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.

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

refactor: remove SSG exports from bundles #17

Merged
merged 5 commits into from
Oct 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The Preact Framework for Deno. Dext.ts is heavily inspired by Next.js.

- Zero config
- Pre-render pages at build time (SSG)
- Tiny (example is only 6.2KB of JS)
- Tiny (example is only 5.9KB of JS)
- Client hydration
- Built-in routing
- Zero config TypeScript support
Expand Down
1 change: 1 addition & 0 deletions cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ async function build(_options: unknown, root?: string) {
JSON.stringify(pages.pages.map((page) => ({
name: page.name,
route: page.route,
hasGetStaticPaths: page.hasGetStaticPaths,
}))),
);

Expand Down
6 changes: 4 additions & 2 deletions src/bundle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,11 @@ export async function bundle(
) as OutputChunk[];

for (const out of chunks) {
const page = pages.pages.find((p) => p.path === out.facadeModuleId!);
const filename = `/${out.fileName}`;
if (page) {
if (out.facadeModuleId && out.facadeModuleId.startsWith("dext-page://")) {
const page = pages.pages.find((p) =>
p.path === out.facadeModuleId!.substring("dext-page://".length)
)!;
const imports = [
flattenImports(chunks, out.fileName),
...out.implicitlyLoadedBefore,
Expand Down
16 changes: 13 additions & 3 deletions src/plugins/dext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export function dextPlugin(
for (const component in pageMap) {
implicitlyLoadedAfterOneOf.push(component);
this.emitFile({
id: component,
name: pageMap[component].name.replace("/", "-"),
id: "dext-page://" + component,
type: "chunk",
});
}
Expand All @@ -41,9 +41,17 @@ export function dextPlugin(
},
resolveId(source, referrer) {
if (referrer === "dext:///main.js") return source;
if (referrer?.startsWith("dext-page://")) {
return this.resolve(source, referrer.substring("dext-page://".length));
}
return null;
},
load(id) {
if (id.startsWith("dext-page://")) {
return `export { default } from "${
id.substring("dext-page://".length)
}";`;
}
if (id == "dext:///main.js") {
const bundle =
`import { h, hydrate, Router, Route, AsyncRoute, Error404, loadComponent } from "${runtimeURL}";
Expand All @@ -57,7 +65,7 @@ function Dext() {
<Router>
${
Object.entries(pageMap).map(([id, page]) => {
return `<AsyncRoute path="${page.route}" getComponent={(path) => loadComponent(import("${id}"), ${
return `<AsyncRoute path="${page.route}" getComponent={(path) => loadComponent(import("dext-page://${id}"), ${
page.hasGetStaticData ? "true" : "false"
}, path)} />`;
}).join("\n ")
Expand All @@ -77,7 +85,9 @@ hydrate(<Dext />, document.getElementById("__dext")!);`;
for (const name in bundle) {
const file = bundle[name];
if (file.type === "chunk" && file.isEntry) {
const component = file.facadeModuleId!;
const component = file.facadeModuleId!.substring(
"dext-page://".length,
);
const page = pageMap[component];

const imports = [
Expand Down
10 changes: 7 additions & 3 deletions tests/integration_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ integrationTest({
JSON.parse(
await Deno.readTextFile(join(ctx.dir, ".dext", "pagemap.json")),
),
[{ name: "index", route: "/" }],
[{ name: "index", route: "/", hasGetStaticPaths: false }],
);

const staticdir = join(ctx.dir, ".dext", "static");
Expand Down Expand Up @@ -46,8 +46,12 @@ integrationTest({
await Deno.readTextFile(join(ctx.dir, ".dext", "pagemap.json")),
),
[
{ name: "index", route: "/" },
{ name: "uppercase/[str]", route: "/uppercase/:str" },
{ name: "index", route: "/", hasGetStaticPaths: false },
{
name: "uppercase/[str]",
route: "/uppercase/:str",
hasGetStaticPaths: true,
},
],
);

Expand Down