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.

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

breaking: server bundling #36

Merged
merged 37 commits into from
May 22, 2023
Merged

breaking: server bundling #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
19ba08d
wip: server bundling
dai-shi May 11, 2023
08a4ef7
rename rsc-renderer to rsc-handler
dai-shi May 14, 2023
fc0f8fe
refactor rsc-plugin
dai-shi May 14, 2023
53aab62
prefetcher in dev
dai-shi May 14, 2023
1d56a46
wip prefetcherRSC in builder
dai-shi May 14, 2023
9a29c23
wip: naive build
dai-shi May 14, 2023
1a63495
still wip comment
dai-shi May 14, 2023
a231b50
eliminate server entries and simplify
dai-shi May 15, 2023
3f8e2e6
3-pass build
dai-shi May 15, 2023
bb0f5cf
prerender with bad design...
dai-shi May 15, 2023
b853d3c
wip wip buildRSC
dai-shi May 16, 2023
a7d262f
use getBuilder in example 01-06
dai-shi May 16, 2023
e1090d0
wip remove prefetcher and prerenderer
dai-shi May 16, 2023
c9b8468
migrate router for new api, still wip
dai-shi May 16, 2023
d12e871
refactor avoid double promise.all
dai-shi May 16, 2023
4fb4ab7
wip: graceful shutdown & use client in router client
dai-shi May 16, 2023
68d5f53
refactor without CMD
dai-shi May 16, 2023
37b5531
@fs hack
dai-shi May 17, 2023
fdd93b9
uninstall tsx
dai-shi May 18, 2023
ce74065
trying to fix some issues
dai-shi May 18, 2023
be0bcd6
wip
dai-shi May 20, 2023
dfa953b
Revert "wip"
dai-shi May 20, 2023
cd9a909
take care of node_modules client modules
dai-shi May 20, 2023
7510284
Revert "take care of node_modules client modules"
dai-shi May 20, 2023
523528b
wip: transpile node_modules for server
dai-shi May 20, 2023
6d40113
hack for react-server-dom-webpack
dai-shi May 20, 2023
2269bf9
use vite module graph for client entries in DEV
dai-shi May 20, 2023
cb22eec
wip: a workaround for router for now
dai-shi May 20, 2023
57d69e2
we need node 18
dai-shi May 20, 2023
9783fd8
configurable routes path
dai-shi May 21, 2023
8078d81
do not set search prop for intermediate routes (tentative)
dai-shi May 21, 2023
d59e6fd
uninstall nodemon
dai-shi May 21, 2023
cabd78c
support hmr and server reload
dai-shi May 21, 2023
3128743
no need to check root importers, and it does not work with router
dai-shi May 21, 2023
d9f37be
add comments
dai-shi May 21, 2023
3b51df5
clean up unused code
dai-shi May 22, 2023
9f235c3
run prettier
dai-shi May 22, 2023
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
3 changes: 1 addition & 2 deletions .swcrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
"syntax": "typescript"
},
"target": "esnext"
},
"minify": true
}
}
12 changes: 1 addition & 11 deletions cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
#!/usr/bin/env node

import { Worker } from "node:worker_threads";

const cmd = process.argv[2];
process.env.WAKUWORK_CMD = cmd;
const execArgv = [
...(cmd === "dev" ? ["--experimental-loader", "tsx"] : []),
"--experimental-loader",
"wakuwork/node-loader",
"--experimental-loader",
"react-server-dom-webpack/node-loader",
];
new Worker(new URL(`dist/cli-${cmd}.js`, import.meta.url), { execArgv });
import(`./dist/cli-${cmd}.js`);
21 changes: 5 additions & 16 deletions examples/01_counter/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { GetEntry, Prefetcher, Prerenderer } from "wakuwork/server";
import type { GetEntry, GetBuilder } from "wakuwork/server";

export const getEntry: GetEntry = async (id) => {
switch (id) {
Expand All @@ -9,21 +9,10 @@ export const getEntry: GetEntry = async (id) => {
}
};

export const prefetcher: Prefetcher = async (path) => {
switch (path) {
case "/":
return {
entryItems: [["App", { name: "Wakuwork" }]],
clientModules: [(await import("./src/Counter.js")).Counter],
};
default:
return {};
}
};

export const prerenderer: Prerenderer = async () => {
export const getBuilder: GetBuilder = async () => {
return {
entryItems: [["App", { name: "Wakuwork" }]],
paths: ["/"],
"/": {
elements: [["App", { name: "Wakuwork" }]],
},
};
};
1 change: 0 additions & 1 deletion examples/01_counter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"react": "18.3.0-canary-aef7ce554-20230503",
"react-dom": "18.3.0-canary-aef7ce554-20230503",
"react-server-dom-webpack": "18.3.0-canary-aef7ce554-20230503",
"tsx": "^3.12.7",
"wakuwork": "~0.9.4"
},
"devDependencies": {
Expand Down
21 changes: 5 additions & 16 deletions examples/02_async/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { GetEntry, Prefetcher, Prerenderer } from "wakuwork/server";
import type { GetEntry, GetBuilder } from "wakuwork/server";

export const getEntry: GetEntry = async (id) => {
switch (id) {
Expand All @@ -9,21 +9,10 @@ export const getEntry: GetEntry = async (id) => {
}
};

export const prefetcher: Prefetcher = async (path) => {
switch (path) {
case "/":
return {
entryItems: [["App", { name: "Wakuwork" }]],
clientModules: [(await import("./src/Counter.js")).Counter],
};
default:
return {};
}
};

export const prerenderer: Prerenderer = async () => {
export const getBuilder: GetBuilder = async () => {
return {
entryItems: [["App", { name: "Wakuwork" }]],
paths: ["/"],
"/": {
elements: [["App", { name: "Wakuwork" }]],
},
};
};
1 change: 0 additions & 1 deletion examples/02_async/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"react": "18.3.0-canary-aef7ce554-20230503",
"react-dom": "18.3.0-canary-aef7ce554-20230503",
"react-server-dom-webpack": "18.3.0-canary-aef7ce554-20230503",
"tsx": "^3.12.7",
"wakuwork": "~0.9.4"
},
"devDependencies": {
Expand Down
21 changes: 5 additions & 16 deletions examples/03_promise/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { GetEntry, Prefetcher, Prerenderer } from "wakuwork/server";
import type { GetEntry, GetBuilder } from "wakuwork/server";

export const getEntry: GetEntry = async (id) => {
switch (id) {
Expand All @@ -9,21 +9,10 @@ export const getEntry: GetEntry = async (id) => {
}
};

export const prefetcher: Prefetcher = async (path) => {
switch (path) {
case "/":
return {
entryItems: [["App", { name: "Wakuwork" }]],
clientModules: [(await import("./src/Counter.js")).Counter],
};
default:
return {};
}
};

export const prerenderer: Prerenderer = async () => {
export const getBuilder: GetBuilder = async () => {
return {
entryItems: [["App", { name: "Wakuwork" }]],
paths: ["/"],
"/": {
elements: [["App", { name: "Wakuwork" }]],
},
};
};
1 change: 0 additions & 1 deletion examples/03_promise/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"react": "18.3.0-canary-aef7ce554-20230503",
"react-dom": "18.3.0-canary-aef7ce554-20230503",
"react-server-dom-webpack": "18.3.0-canary-aef7ce554-20230503",
"tsx": "^3.12.7",
"wakuwork": "~0.9.4"
},
"devDependencies": {
Expand Down
21 changes: 5 additions & 16 deletions examples/04_callserver/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { GetEntry, Prefetcher, Prerenderer } from "wakuwork/server";
import type { GetEntry, GetBuilder } from "wakuwork/server";

export const getEntry: GetEntry = async (id) => {
switch (id) {
Expand All @@ -9,21 +9,10 @@ export const getEntry: GetEntry = async (id) => {
}
};

export const prefetcher: Prefetcher = async (path) => {
switch (path) {
case "/":
return {
entryItems: [["App", { name: "Wakuwork" }]],
clientModules: [(await import("./src/Counter.js")).Counter],
};
default:
return {};
}
};

export const prerenderer: Prerenderer = async () => {
export const getBuilder: GetBuilder = async () => {
return {
entryItems: [["App", { name: "Wakuwork" }]],
paths: ["/"],
"/": {
elements: [["App", { name: "Wakuwork" }]],
},
};
};
1 change: 0 additions & 1 deletion examples/04_callserver/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"react": "18.3.0-canary-aef7ce554-20230503",
"react-dom": "18.3.0-canary-aef7ce554-20230503",
"react-server-dom-webpack": "18.3.0-canary-aef7ce554-20230503",
"tsx": "^3.12.7",
"wakuwork": "~0.9.4"
},
"devDependencies": {
Expand Down
21 changes: 5 additions & 16 deletions examples/05_mutation/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { GetEntry, Prefetcher, Prerenderer } from "wakuwork/server";
import type { GetEntry, GetBuilder } from "wakuwork/server";

export const getEntry: GetEntry = async (id) => {
switch (id) {
Expand All @@ -9,21 +9,10 @@ export const getEntry: GetEntry = async (id) => {
}
};

export const prefetcher: Prefetcher = async (path) => {
switch (path) {
case "/":
return {
entryItems: [["App", { name: "Wakuwork" }]],
clientModules: [(await import("./src/Counter.js")).Counter],
};
default:
return {};
}
};

export const prerenderer: Prerenderer = async () => {
export const getBuilder: GetBuilder = async () => {
return {
entryItems: [["App", { name: "Wakuwork" }]],
paths: ["/"],
"/": {
elements: [["App", { name: "Wakuwork" }]],
},
};
};
1 change: 0 additions & 1 deletion examples/05_mutation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"react": "18.3.0-canary-aef7ce554-20230503",
"react-dom": "18.3.0-canary-aef7ce554-20230503",
"react-server-dom-webpack": "18.3.0-canary-aef7ce554-20230503",
"tsx": "^3.12.7",
"wakuwork": "~0.9.4"
},
"devDependencies": {
Expand Down
40 changes: 13 additions & 27 deletions examples/06_nesting/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { GetEntry, Prefetcher, Prerenderer } from "wakuwork/server";
import type { GetEntry, GetBuilder } from "wakuwork/server";

export const getEntry: GetEntry = async (id) => {
switch (id) {
Expand All @@ -11,32 +11,18 @@ export const getEntry: GetEntry = async (id) => {
}
};

export const prefetcher: Prefetcher = async (path) => {
switch (path) {
case "/":
return {
entryItems: [
["App", { name: "Wakuwork" }],
["InnerApp", { count: 0 }],
],
clientModules: [(await import("./src/Counter.js")).Counter],
};
default:
return {};
}
};

export const prerenderer: Prerenderer = async () => {
export const getBuilder: GetBuilder = async () => {
return {
entryItems: [
["App", { name: "Wakuwork" }],
["InnerApp", { count: 0 }],
["InnerApp", { count: 1 }],
["InnerApp", { count: 2 }],
["InnerApp", { count: 3 }],
["InnerApp", { count: 4 }],
["InnerApp", { count: 5 }],
],
paths: ["/"],
"/": {
elements: [
["App", { name: "Wakuwork" }],
["InnerApp", { count: 0 }],
["InnerApp", { count: 1 }, true],
["InnerApp", { count: 2 }, true],
["InnerApp", { count: 3 }, true],
["InnerApp", { count: 4 }, true],
["InnerApp", { count: 5 }, true],
],
},
};
};
1 change: 0 additions & 1 deletion examples/06_nesting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"react": "18.3.0-canary-aef7ce554-20230503",
"react-dom": "18.3.0-canary-aef7ce554-20230503",
"react-server-dom-webpack": "18.3.0-canary-aef7ce554-20230503",
"tsx": "^3.12.7",
"wakuwork": "~0.9.4"
},
"devDependencies": {
Expand Down
5 changes: 3 additions & 2 deletions examples/07_router/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import url from "node:url";

import { fileRouter } from "wakuwork/router/server";

export const { getEntry, prefetcher, prerenderer } = fileRouter(
path.join(path.dirname(url.fileURLToPath(import.meta.url)), "routes")
export const { getEntry, getBuilder, getCustomModules } = fileRouter(
path.dirname(url.fileURLToPath(import.meta.url)),
"routes"
);
1 change: 0 additions & 1 deletion examples/07_router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"react": "18.3.0-canary-aef7ce554-20230503",
"react-dom": "18.3.0-canary-aef7ce554-20230503",
"react-server-dom-webpack": "18.3.0-canary-aef7ce554-20230503",
"tsx": "^3.12.7",
"wakuwork": "~0.9.4"
},
"devDependencies": {
Expand Down
15 changes: 6 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
},
"exports": {
"./package.json": "./package.json",
"./node-loader": "./dist/node-loader.js",
".": {
"types": "./dist/main.d.ts",
"default": "./dist/main.js"
Expand Down Expand Up @@ -48,29 +47,30 @@
"compile:types": "tsc --project tsconfig.build.json",
"test": "tsc --project . --noEmit",
"e2e": "cd e2e/01 && playwright test && cd ../02 && playwright test",
"examples:dev": "WAKUWORK_CONFIG=\"{\\\"devServer\\\":{\\\"dir\\\":\\\"./examples/${NAME}\\\"}}\" nodemon --ext ts,tsx --ignore ./examples/${NAME}/src/Counter.tsx --exec 'npm run compile:code && ./cli.js dev'",
"examples:dev": "npm run compile:code && WAKUWORK_CONFIG=\"{\\\"devServer\\\":{\\\"dir\\\":\\\"./examples/${NAME}\\\"}}\" ./cli.js dev",
"examples:dev:01_counter": "NAME=01_counter npm run examples:dev",
"examples:dev:02_async": "NAME=02_async npm run examples:dev",
"examples:dev:03_promise": "NAME=03_promise npm run examples:dev",
"examples:dev:04_callserver": "NAME=04_callserver npm run examples:dev",
"examples:dev:05_mutation": "NAME=05_mutation npm run examples:dev",
"examples:dev:06_nesting": "NAME=06_nesting npm run examples:dev",
"examples:dev:07_router": "NAME=07_router npm run examples:dev",
"examples:prd": "npm run compile:code && WAKUWORK_CONFIG=\"{\\\"build\\\":{\\\"dir\\\":\\\"./examples/${NAME}\\\"}}\" ./cli.js build && WAKUWORK_CONFIG=\"{\\\"prdServer\\\":{\\\"dir\\\":\\\"./examples/${NAME}/dist\\\"}}\" ./cli.js start",
"examples:build": "npm run compile:code && WAKUWORK_CONFIG=\"{\\\"build\\\":{\\\"dir\\\":\\\"./examples/${NAME}\\\"}}\" ./cli.js build",
"examples:prd": "npm run examples:build && WAKUWORK_CONFIG=\"{\\\"prdServer\\\":{\\\"dir\\\":\\\"./examples/${NAME}/dist\\\"}}\" ./cli.js start",
"examples:prd:01_counter": "NAME=01_counter npm run examples:prd",
"examples:prd:02_async": "NAME=02_async npm run examples:prd",
"examples:prd:03_promise": "NAME=03_promise npm run examples:prd",
"examples:prd:04_callserver": "NAME=04_callserver npm run examples:prd",
"examples:prd:05_mutation": "NAME=05_mutation npm run examples:prd",
"examples:prd:06_nesting": "NAME=06_nesting npm run examples:prd",
"examples:prd:07_router": "NAME=07_router npm run examples:prd",
"website:dev": "WAKUWORK_CONFIG=\"{\\\"devServer\\\":{\\\"dir\\\":\\\"./website\\\"}}\" nodemon --ext ts,tsx --exec 'npm run compile:code && ./cli.js dev'",
"website:dev": "npm run compile:code && WAKUWORK_CONFIG=\"{\\\"devServer\\\":{\\\"dir\\\":\\\"./website\\\"}}\" ./cli.js dev",
"website:build": "npm run compile:code && WAKUWORK_CONFIG=\"{\\\"build\\\":{\\\"dir\\\":\\\"./website\\\"}}\" ./cli.js build",
"website:prd": "npm run website:build && WAKUWORK_CONFIG=\"{\\\"prdServer\\\":{\\\"dir\\\":\\\"./website/dist\\\"}}\" ./cli.js start"
},
"license": "MIT",
"engines": {
"node": ">=16.17.0"
"node": ">=18.0.0"
},
"dependencies": {
"@swc/core": "1.3.56",
Expand All @@ -89,19 +89,16 @@
"@types/react": "^18.2.5",
"@types/react-dom": "^18.2.3",
"autoprefixer": "^10.4.14",
"nodemon": "^2.0.22",
"postcss": "^8.4.23",
"react": "18.3.0-canary-aef7ce554-20230503",
"react-dom": "18.3.0-canary-aef7ce554-20230503",
"react-server-dom-webpack": "18.3.0-canary-aef7ce554-20230503",
"tailwindcss": "^3.3.2",
"tsx": "^3.12.7",
"typescript": "^5.0.4",
"wakuwork": "link:."
},
"peerDependencies": {
"react": "18.3.0-canary-aef7ce554-20230503",
"react-server-dom-webpack": "18.3.0-canary-aef7ce554-20230503",
"tsx": "^3.12.6"
"react-server-dom-webpack": "18.3.0-canary-aef7ce554-20230503"
}
}
Loading