@h3ravel/http 11.15.0-alpha.16 → 11.17.0

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 /// <reference path="./app.globals.d.ts" />
 import { Command } from "@h3ravel/musket";
 import { CacheOptions, ClassConstructor, DotNestedKeys, DotNestedValue, GenericObject, IApplication, IHeaderBag, IHttpContext, IHttpResponse, IMiddleware, IParamBag, IRequest, IResponsable, IResponse, IRoute, ISessionManager, IUrl, MessagesForRules, RequestMethod, RequestObject, ResponseObject, RulesForData } from "@h3ravel/contracts";
+import { ResponseCodes } from "@h3ravel/foundation";
 import { DateTime } from "@h3ravel/support";
 import { EventHandlerRequest, H3Event, HTTPResponse } from "h3";
-import { ResponseCodes } from "@h3ravel/foundation";
 
 //#region src/Commands/FireCommand.d.ts
 declare class FireCommand extends Command {
@@ -1445,9 +1445,6 @@ declare class HttpRequest {
    *
    * The base URL never ends with a /.
    *
-   * This is similar to getBasePath(), except that it also includes the
-   * script filename (e.g. index.php) if one exists.
-   *
    * @return string The raw URL (i.e. not urldecoded)
    */
   getBaseUrl(): string;

package/dist/index.js

@@ -8,8 +8,6 @@ import { HTTP_RESPONSE_CACHE_CONTROL_DIRECTIVES, Injectable, ResponseCodes, stat
 import { Response as Response$1 } from "@h3ravel/support/facades";
 import { Arr, DateTime, InvalidArgumentException, Obj, RuntimeException, Str, data_get, data_set, safeDot } from "@h3ravel/support";
 import { H3Event, getQuery, getRequestIP, getRequestProtocol, getRouterParams, parseCookies } from "h3";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
 //#region src/Commands/FireCommand.ts
 var FireCommand = class extends Command {
 	/**
@@ -2337,10 +2335,6 @@ var InputBag = class extends ParamBag {
 	}
 };
 //#endregion
-//#region ../../node_modules/.pnpm/tsdown@0.22.2_tsx@4.20.6_typescript@6.0.3_unrun@0.2.15_@emnapi+core@1.11.0_@emnapi+runtime@1.11.0_/node_modules/tsdown/esm-shims.js
-const getFilename = () => fileURLToPath(import.meta.url);
-const __filename = /* @__PURE__ */ getFilename();
-//#endregion
 //#region src/Utilities/FileBag.ts
 /**
 * FileBag is a container for uploaded files
@@ -2898,9 +2892,6 @@ var HttpRequest = class HttpRequest {
 	*
 	* The base URL never ends with a /.
 	*
-	* This is similar to getBasePath(), except that it also includes the
-	* script filename (e.g. index.php) if one exists.
-	*
 	* @return string The raw URL (i.e. not urldecoded)
 	*/
 	getBaseUrl() {
@@ -2928,12 +2919,6 @@ var HttpRequest = class HttpRequest {
 	* Prepares the base URL.
 	*/
 	prepareBaseUrl() {
-		const requestUri = this.getRequestUri() ?? "";
-		const baseUrl = "/" + path.basename(__filename);
-		const normalizedRequestUri = requestUri.startsWith("/") ? requestUri : "/" + requestUri;
-		if (normalizedRequestUri.startsWith(baseUrl)) return baseUrl;
-		const dirBase = path.dirname(baseUrl);
-		if (normalizedRequestUri.startsWith(dirBase)) return dirBase.replace(/[/\\]+$/, "");
 		return "";
 	}
 	/**
@@ -2963,15 +2948,7 @@ var HttpRequest = class HttpRequest {
 	* Prepares the base path.
 	*/
 	prepareBasePath() {
-		const baseUrl = this.getBaseUrl();
-		if (!baseUrl) return "";
-		const scriptFilename = this._server.get("SCRIPT_FILENAME") ?? "";
-		const filename = path.basename(scriptFilename);
-		let basePath;
-		if (path.basename(baseUrl) === filename) basePath = path.dirname(baseUrl);
-		else basePath = baseUrl;
-		basePath = basePath.replace(/\\/g, "/");
-		return basePath.replace(/\/+$/, "");
+		return Str.rtrim(this.getBaseUrl(), "/");
 	}
 	/**
 	* Prepares the path info.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/http",
-  "version": "11.15.0-alpha.16",
+  "version": "11.17.0",
   "description": "HTTP kernel, middleware pipeline, request/response classes for H3ravel.",
   "h3ravel": {
     "providers": [
@@ -8,9 +8,7 @@
     ]
   },
   "type": "module",
-  "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
-  "module": "./dist/index.js",
   "exports": {
     ".": {
       "import": "./dist/index.js",
@@ -41,24 +39,24 @@
     "laravel"
   ],
   "dependencies": {
-    "@h3ravel/contracts": "^1.29.0-alpha.16",
-    "@h3ravel/support": "^1.29.0-alpha.16",
+    "@h3ravel/contracts": "^2.0.0",
+    "@h3ravel/support": "^2.0.0",
     "@h3ravel/musket": "^1.29.0-alpha.15",
-    "@h3ravel/shared": "^1.29.0-alpha.16",
-    "@h3ravel/session": "^1.29.0-alpha.16",
+    "@h3ravel/shared": "^2.0.0",
+    "@h3ravel/session": "^2.0.0",
     "h3": "2.0.1-rc.5",
     "srvx": "^0.8.2"
   },
   "peerDependencies": {
-    "@h3ravel/validation": "^1.29.0-alpha.16",
-    "@h3ravel/foundation": "^1.29.0-alpha.16"
+    "@h3ravel/validation": "^2.0.0",
+    "@h3ravel/foundation": "^2.0.0"
   },
   "devDependencies": {
     "typescript": "^6.0.0"
   },
   "scripts": {
     "build": "tsdown --config-loader unrun",
-    "dev": "tsx watch src/index.ts",
+    "dev": "tsdown --watch --config-loader unrun",
     "start": "node dist/index.js",
     "lint": "eslint . --ext .ts",
     "test": "jest --passWithNoTests",