rasengan 1.0.0-beta.30 → 1.0.0-beta.32

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.
Files changed (6) hide show
  1. package/lib/esm/index.js +1 -2
  2. package/lib/esm/server/functions/netlify/functions/api.js +25 -14
  3. package/lib/esm/server/functions/vercel/api/index.js +26 -15
  4. package/lib/types/index.d.ts +1 -2
  5. package/package.json +1 -1
  6. package/vite.config.ts +2 -2
package/lib/esm/index.js CHANGED
@@ -1,9 +1,8 @@
1
1
  // Imports
2
2
  import createFetchRequest from "./server/utils/createFetchRequest.js";
3
- import { handleRequest } from "./server/utils/handleRequest.js";
4
3
  // Exports
5
4
  // export * from "./decorators/index.js";
6
5
  export * from "./core/index.js";
7
6
  export * from "./routing/index.js";
8
7
  export * from "./config/index.js";
9
- export { createFetchRequest, handleRequest };
8
+ export { createFetchRequest };
package/lib/esm/server/functions/netlify/functions/api.js CHANGED
@@ -54,12 +54,12 @@ import { createFetchRequest } from "rasengan";
54
54
  // // @ts-ignore
55
55
  // import type { Context } from "@netlify/functions"
56
56
  export default (function (req, context) { return __awaiter(void 0, void 0, void 0, function () {
57
- var url, host, appPath, err_1, segments, segmentsWithoutOrigin, _i, segments_1, segment, filePath, file, file, templateHtml, serverFilePath, bootstrapDirPath, entry, bootstrap, styles, render, staticRoutes, loadTemplateHtml, handler, fetchRequest, context_1, status_1, redirect, helmetContext, router, rendered, html, e_1;
57
+ var url, host, appPath, err_1, segments, segmentsWithoutOrigin, _i, segments_1, segment, filePath, file, otherFile, file, templateHtml, serverFilePath, bootstrapDirPath, entry, bootstrap, styles, render, staticRoutes, loadTemplateHtml, handler, fetchRequest, context_1, status_1, redirect, helmetContext, router, rendered, html, e_1;
58
58
  var _a;
59
59
  return __generator(this, function (_b) {
60
60
  switch (_b.label) {
61
61
  case 0:
62
- _b.trys.push([0, 12, , 13]);
62
+ _b.trys.push([0, 13, , 14]);
63
63
  url = req.url;
64
64
  host = req.headers.get("host");
65
65
  appPath = process.cwd();
@@ -83,7 +83,7 @@ export default (function (req, context) { return __awaiter(void 0, void 0, void
83
83
  if (url === "/manifest.json") {
84
84
  return [2 /*return*/, new Response(path.resolve(join(appPath, "dist/client/manifest.json")))];
85
85
  }
86
- if (!(url.includes("/assets") && (url.endsWith(".js") || url.endsWith(".css")))) return [3 /*break*/, 6];
86
+ if (!url.includes("/assets")) return [3 /*break*/, 7];
87
87
  segments = url.split("/");
88
88
  segmentsWithoutOrigin = __spreadArray([], segments, true);
89
89
  for (_i = 0, segments_1 = segments; _i < segments_1.length; _i++) {
@@ -97,16 +97,27 @@ export default (function (req, context) { return __awaiter(void 0, void 0, void
97
97
  return [4 /*yield*/, fs.readFile(filePath, "utf-8")];
98
98
  case 5:
99
99
  file = _b.sent();
100
- return [2 /*return*/, new Response(file, {
100
+ if (url.endsWith(".js") || url.endsWith(".css")) {
101
+ return [2 /*return*/, new Response(file, {
102
+ headers: {
103
+ "Content-Type": url.endsWith(".js") ? "text/javascript" : "text/css",
104
+ "Cache-Control": "max-age=31536000",
105
+ },
106
+ })];
107
+ }
108
+ return [4 /*yield*/, fs.readFile(filePath)];
109
+ case 6:
110
+ otherFile = _b.sent();
111
+ return [2 /*return*/, new Response(otherFile, {
101
112
  headers: {
102
- "Content-Type": url.endsWith(".js") ? "text/javascript" : "text/css",
113
+ "Content-Type": "application/octet-stream",
103
114
  "Cache-Control": "max-age=31536000",
104
115
  },
105
116
  })];
106
- case 6:
107
- if (!(url.endsWith(".js") || url.endsWith(".css"))) return [3 /*break*/, 8];
108
- return [4 /*yield*/, fs.readFile(url, "utf-8")];
109
117
  case 7:
118
+ if (!(url.endsWith(".js") || url.endsWith(".css"))) return [3 /*break*/, 9];
119
+ return [4 /*yield*/, fs.readFile(url, "utf-8")];
120
+ case 8:
110
121
  file = _b.sent();
111
122
  return [2 /*return*/, new Response(file, {
112
123
  headers: {
@@ -114,12 +125,12 @@ export default (function (req, context) { return __awaiter(void 0, void 0, void
114
125
  "Cache-Control": "max-age=31536000",
115
126
  },
116
127
  })];
117
- case 8:
128
+ case 9:
118
129
  templateHtml = "";
119
130
  serverFilePath = join(appPath, "dist/server/entry-server.js");
120
131
  bootstrapDirPath = join(appPath, "dist/client/assets");
121
132
  return [4 /*yield*/, import(serverFilePath)];
122
- case 9:
133
+ case 10:
123
134
  entry = _b.sent();
124
135
  bootstrap = "/assets/" +
125
136
  fsSync
@@ -133,7 +144,7 @@ export default (function (req, context) { return __awaiter(void 0, void 0, void
133
144
  handler = createStaticHandler(staticRoutes);
134
145
  fetchRequest = createFetchRequest(req, host);
135
146
  return [4 /*yield*/, handler.query(fetchRequest)];
136
- case 10:
147
+ case 11:
137
148
  context_1 = _b.sent();
138
149
  status_1 = context_1.status;
139
150
  if (status_1 === 302) {
@@ -145,7 +156,7 @@ export default (function (req, context) { return __awaiter(void 0, void 0, void
145
156
  helmetContext = {};
146
157
  router = createStaticRouter(handler.dataRoutes, context_1);
147
158
  return [4 /*yield*/, render(router, context_1, helmetContext)];
148
- case 11:
159
+ case 12:
149
160
  rendered = _b.sent();
150
161
  // Load template html
151
162
  if (!templateHtml) {
@@ -160,13 +171,13 @@ export default (function (req, context) { return __awaiter(void 0, void 0, void
160
171
  "Cache-Control": "max-age=31536000",
161
172
  },
162
173
  })];
163
- case 12:
174
+ case 13:
164
175
  e_1 = _b.sent();
165
176
  console.log(e_1.stack);
166
177
  return [2 /*return*/, new Response(e_1.stack, {
167
178
  status: 500,
168
179
  })];
169
- case 13: return [2 /*return*/];
180
+ case 14: return [2 /*return*/];
170
181
  }
171
182
  });
172
183
  }); });
package/lib/esm/server/functions/vercel/api/index.js CHANGED
@@ -53,11 +53,11 @@ import { createFetchRequest } from "rasengan";
53
53
  export default function handler(req, res) {
54
54
  var _a;
55
55
  return __awaiter(this, void 0, void 0, function () {
56
- var url, host, appPath, err_1, segments, segmentsWithoutOrigin, _i, segments_1, segment, filePath, file, file, templateHtml, serverFilePath, bootstrapDirPath, entry, bootstrap, styles, render, staticRoutes, loadTemplateHtml, handler_1, fetchRequest, context, status_1, redirect, helmetContext, router, rendered, html, e_1;
56
+ var url, host, appPath, err_1, segments, segmentsWithoutOrigin, _i, segments_1, segment, filePath, file, otherFile, file, templateHtml, serverFilePath, bootstrapDirPath, entry, bootstrap, styles, render, staticRoutes, loadTemplateHtml, handler_1, fetchRequest, context, status_1, redirect, helmetContext, router, rendered, html, e_1;
57
57
  return __generator(this, function (_b) {
58
58
  switch (_b.label) {
59
59
  case 0:
60
- _b.trys.push([0, 12, , 13]);
60
+ _b.trys.push([0, 13, , 14]);
61
61
  url = req.url;
62
62
  host = req.headers.host;
63
63
  appPath = process.cwd();
@@ -81,7 +81,7 @@ export default function handler(req, res) {
81
81
  if (url === "/manifest.json") {
82
82
  return [2 /*return*/, res.send(path.resolve(join(appPath, "dist/client/manifest.json")))];
83
83
  }
84
- if (!(url.includes("/assets") && (url.endsWith(".js") || url.endsWith(".css")))) return [3 /*break*/, 6];
84
+ if (!url.includes("/assets")) return [3 /*break*/, 7];
85
85
  segments = url.split("/");
86
86
  segmentsWithoutOrigin = __spreadArray([], segments, true);
87
87
  for (_i = 0, segments_1 = segments; _i < segments_1.length; _i++) {
@@ -95,28 +95,39 @@ export default function handler(req, res) {
95
95
  return [4 /*yield*/, fs.readFile(filePath, "utf-8")];
96
96
  case 5:
97
97
  file = _b.sent();
98
- return [2 /*return*/, new Response(file, {
98
+ if (url.endsWith(".js") || url.endsWith(".css")) {
99
+ return [2 /*return*/, new Response(file, {
100
+ headers: {
101
+ "Content-Type": url.endsWith(".js") ? "text/javascript" : "text/css",
102
+ "Cache-Control": "max-age=31536000",
103
+ },
104
+ })];
105
+ }
106
+ return [4 /*yield*/, fs.readFile(filePath)];
107
+ case 6:
108
+ otherFile = _b.sent();
109
+ return [2 /*return*/, new Response(otherFile, {
99
110
  headers: {
100
- "Content-Type": url.endsWith(".js") ? "text/javascript" : "text/css",
111
+ "Content-Type": "application/octet-stream",
101
112
  "Cache-Control": "max-age=31536000",
102
113
  },
103
114
  })];
104
- case 6:
105
- if (!(url.endsWith(".js") || url.endsWith(".css"))) return [3 /*break*/, 8];
106
- return [4 /*yield*/, fs.readFile(url, "utf-8")];
107
115
  case 7:
116
+ if (!(url.endsWith(".js") || url.endsWith(".css"))) return [3 /*break*/, 9];
117
+ return [4 /*yield*/, fs.readFile(url, "utf-8")];
118
+ case 8:
108
119
  file = _b.sent();
109
120
  return [2 /*return*/, res
110
121
  .status(200)
111
122
  .setHeader("Content-Type", url.endsWith(".js") ? "text/javascript" : "text/css")
112
123
  .setHeader("Cache-Control", "max-age=31536000")
113
124
  .end(file)];
114
- case 8:
125
+ case 9:
115
126
  templateHtml = "";
116
127
  serverFilePath = join(appPath, "dist/server/entry-server.js");
117
128
  bootstrapDirPath = join(appPath, "dist/client/assets");
118
129
  return [4 /*yield*/, import(serverFilePath)];
119
- case 9:
130
+ case 10:
120
131
  entry = _b.sent();
121
132
  bootstrap = "/assets/" +
122
133
  fsSync
@@ -130,7 +141,7 @@ export default function handler(req, res) {
130
141
  handler_1 = createStaticHandler(staticRoutes);
131
142
  fetchRequest = createFetchRequest(req, host);
132
143
  return [4 /*yield*/, handler_1.query(fetchRequest)];
133
- case 10:
144
+ case 11:
134
145
  context = _b.sent();
135
146
  status_1 = context.status;
136
147
  if (status_1 === 302) {
@@ -141,7 +152,7 @@ export default function handler(req, res) {
141
152
  helmetContext = {};
142
153
  router = createStaticRouter(handler_1.dataRoutes, context);
143
154
  return [4 /*yield*/, render(router, context, helmetContext)];
144
- case 11:
155
+ case 12:
145
156
  rendered = _b.sent();
146
157
  // Load template html
147
158
  if (!templateHtml) {
@@ -154,12 +165,12 @@ export default function handler(req, res) {
154
165
  .setHeader("Content-Type", "text/html")
155
166
  .setHeader("Cache-Control", "max-age=31536000")
156
167
  .end(html)];
157
- case 12:
168
+ case 13:
158
169
  e_1 = _b.sent();
159
170
  console.log(e_1.stack);
160
171
  res.status(500).end(e_1.stack);
161
- return [3 /*break*/, 13];
162
- case 13: return [2 /*return*/];
172
+ return [3 /*break*/, 14];
173
+ case 14: return [2 /*return*/];
163
174
  }
164
175
  });
165
176
  });
package/lib/types/index.d.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import createFetchRequest from "./server/utils/createFetchRequest.js";
2
- import { handleRequest } from "./server/utils/handleRequest.js";
3
2
  export * from "./core/index.js";
4
3
  export * from "./routing/index.js";
5
4
  export * from "./config/index.js";
6
- export { createFetchRequest, handleRequest };
5
+ export { createFetchRequest };
7
6
  export type { AppConfig } from "./config/type.js";
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "rasengan",
3
3
  "private": false,
4
- "version": "1.0.0-beta.30",
4
+ "version": "1.0.0-beta.32",
5
5
  "description": "The modern frontend framework for React",
6
6
  "type": "module",
7
7
  "main": "lib/esm/index.js",
package/vite.config.ts CHANGED
@@ -18,8 +18,8 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
18
18
  const __pathToRoot = path.resolve(__dirname, "./../../");
19
19
 
20
20
  const external = [
21
- `${__pathToRoot}/node_modules/rasengan/lib/esm/server/utils/handleRequest.js`,
22
- `${__pathToRoot}/node_modules/rasengan/lib/cjs/server/utils/handleRequest.js`,
21
+ // `${__pathToRoot}/node_modules/rasengan/lib/esm/server/utils/handleRequest.js`,
22
+ // `${__pathToRoot}/node_modules/rasengan/lib/cjs/server/utils/handleRequest.js`,
23
23
  ]
24
24
 
25
25
  export default defineConfig({