@torpor/build 0.1.3 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +15 -0
- package/package.json +5 -5
- package/src/site/clientEntry.ts +1 -1
- package/src/site/manifest.ts +6 -4
- package/src/site/serverEntry.ts +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# @torpor/build
|
|
2
2
|
|
|
3
|
+
## 0.1.5
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 5c9d90f: Fix: double check server rendering from Vite options
|
|
8
|
+
- Updated dependencies [a8ead36]
|
|
9
|
+
- @torpor/view@0.0.8
|
|
10
|
+
- @torpor/unplugin@0.1.1
|
|
11
|
+
|
|
12
|
+
## 0.1.4
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- 20ddf6c: Fix: better/less console.logging
|
|
17
|
+
|
|
3
18
|
## 0.1.3
|
|
4
19
|
|
|
5
20
|
### Patch Changes
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@torpor/build",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.5",
|
|
4
4
|
"description": "A framework for building sites and apps with Torpor",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.cjs",
|
|
@@ -53,16 +53,16 @@
|
|
|
53
53
|
"dependencies": {
|
|
54
54
|
"cookie": "^1.0.2",
|
|
55
55
|
"dotenv": "^16.4.7",
|
|
56
|
-
"vite": "^6.2.
|
|
56
|
+
"vite": "^6.2.5",
|
|
57
57
|
"vite-tsconfig-paths": "^5.1.4",
|
|
58
|
-
"@torpor/
|
|
59
|
-
"@torpor/
|
|
58
|
+
"@torpor/unplugin": "^0.1.1",
|
|
59
|
+
"@torpor/view": "^0.0.8"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
62
|
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
|
|
63
63
|
"tsup": "^8.4.0",
|
|
64
64
|
"tsx": "^4.19.3",
|
|
65
|
-
"typescript": "^5.8.
|
|
65
|
+
"typescript": "^5.8.3",
|
|
66
66
|
"vitest": "^3.1.1"
|
|
67
67
|
},
|
|
68
68
|
"scripts": {
|
package/src/site/clientEntry.ts
CHANGED
|
@@ -43,7 +43,7 @@ async function navigateToLocation(location: Location, firstTime = false) {
|
|
|
43
43
|
}
|
|
44
44
|
|
|
45
45
|
async function navigate(path: string, query: URLSearchParams, firstTime = false): Promise<boolean> {
|
|
46
|
-
console.log(`navigating to '${path}'${query.size ? ` with ${query}` : ""}`);
|
|
46
|
+
//console.log(`navigating to '${path}'${query.size ? ` with ${query}` : ""}`);
|
|
47
47
|
|
|
48
48
|
const parent = document.getElementById("app");
|
|
49
49
|
if (!parent) {
|
package/src/site/manifest.ts
CHANGED
|
@@ -20,16 +20,18 @@ export default function manifest(site: Site, server = false): Plugin {
|
|
|
20
20
|
}
|
|
21
21
|
},
|
|
22
22
|
},
|
|
23
|
-
|
|
23
|
+
// @ts-ignore
|
|
24
|
+
load(id, viteOptions) {
|
|
24
25
|
if (id === moduleId) {
|
|
26
|
+
let serverRequest = server && !!viteOptions?.ssr;
|
|
25
27
|
return `
|
|
26
|
-
${!
|
|
28
|
+
${!serverRequest ? "const load = { default: { load: true } };" : ""}
|
|
27
29
|
export default {
|
|
28
30
|
routes: [
|
|
29
31
|
${site.routes
|
|
30
32
|
.map((r) => {
|
|
31
|
-
if (
|
|
32
|
-
return `{ path: "${r.path}", file: "${r.file}", type: ${r.type}, endPoint: ${
|
|
33
|
+
if (serverRequest || !/server\.(ts|js)$/.test(r.file)) {
|
|
34
|
+
return `{ path: "${r.path}", file: "${r.file}", type: ${r.type}, endPoint: ${serverRequest || !/server\.(ts|js)$/.test(r.file) ? `() => import(/* @vite-ignore */ "${path.join(site.root, r.file)}")` : "undefined"} }`;
|
|
33
35
|
} else {
|
|
34
36
|
// On the client, for a server route, we need to check
|
|
35
37
|
// whether there's a load function and set a dummy endPoint
|
package/src/site/serverEntry.ts
CHANGED
|
@@ -26,7 +26,7 @@ import Router from "./Router.ts";
|
|
|
26
26
|
const router = new Router();
|
|
27
27
|
router.addPages(manifest.routes);
|
|
28
28
|
|
|
29
|
-
console.log(`routes:\n ${router.routes.map((r) => r.path).join("\n ")}`);
|
|
29
|
+
//console.log(`routes:\n ${router.routes.map((r) => r.path).join("\n ")}`);
|
|
30
30
|
|
|
31
31
|
export async function load(ev: ServerEvent, template: string) {
|
|
32
32
|
//const url = new URL(`http://${process.env.HOST ?? "localhost"}${ev.request.url}`);
|
|
@@ -34,7 +34,7 @@ export async function load(ev: ServerEvent, template: string) {
|
|
|
34
34
|
const path = url.pathname;
|
|
35
35
|
const query = url.searchParams;
|
|
36
36
|
|
|
37
|
-
console.log(`handling ${ev.request.method} for '${path}'${query.size ? ` with ${query}` : ""}`);
|
|
37
|
+
//console.log(`handling ${ev.request.method} for '${path}'${query.size ? ` with ${query}` : ""}`);
|
|
38
38
|
|
|
39
39
|
const route = router.match(path, query);
|
|
40
40
|
if (!route) {
|