@rspack/dev-middleware 2.0.0-beta.2 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/dev-middleware",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.1",
   "description": "A development middleware for Rspack",
   "keywords": [
     "rspack",
@@ -23,6 +23,7 @@
     "build": "rslib --syntax es2023 && pnpm run build:types",
     "build:types": "tsc --declaration --emitDeclarationOnly --outDir types && prettier \"types/**/*.ts\" --write",
     "lint": "npm-run-all -l -p \"lint:**\"",
+    "lint:rslint": "rslint",
     "lint:prettier": "prettier --cache --list-different .",
     "lint:spelling": "cspell --cache --no-must-find-files --quiet \"**/*.*\"",
     "lint:types": "tsc --pretty --noEmit",
@@ -32,34 +33,33 @@
     "bump": "npx bumpp"
   },
   "devDependencies": {
-    "@hapi/hapi": "^21.3.7",
-    "@hono/node-server": "^1.12.0",
-    "@rslib/core": "^0.20.0",
-    "@rspack/core": "2.0.0-beta.5",
-    "@rstest/core": "0.9.2",
-    "@types/connect": "^3.4.35",
-    "@types/express": "^5.0.2",
+    "@hapi/hapi": "^21.4.8",
+    "@hono/node-server": "^1.19.14",
+    "@rslib/core": "^0.21.1",
+    "@rslint/core": "^0.4.2",
+    "@rspack/core": "2.0.0-rc.2",
+    "@rstest/core": "0.9.7",
+    "@types/express": "^5.0.6",
     "@types/node": "^22.3.0",
-    "@types/on-finished": "^2.3.4",
+    "@types/on-finished": "^2.3.5",
     "@types/range-parser": "^1.2.7",
-    "connect": "^3.7.0",
-    "cspell": "^9.6.2",
-    "deepmerge": "^4.2.2",
-    "execa": "^5.1.1",
-    "express": "^5.1.0",
-    "file-loader": "^6.2.0",
-    "finalhandler": "^2.1.0",
+    "connect-next": "^4.0.1",
+    "cspell": "^10.0.0",
+    "deepmerge": "^4.3.1",
+    "execa": "^9.6.1",
+    "express": "^5.2.1",
+    "finalhandler": "^2.1.1",
     "hono": "^4.4.13",
-    "koa": "^3.0.0",
-    "memfs": "^4.43.1",
+    "koa": "^3.2.0",
+    "memfs": "^4.57.1",
     "mrmime": "^2.0.1",
     "npm-run-all": "^4.1.5",
     "on-finished": "^2.4.1",
-    "prettier": "^3.6.0",
+    "prettier": "^3.8.3",
     "range-parser": "^1.2.1",
     "router": "^2.2.0",
-    "supertest": "^7.0.0",
-    "typescript": "^5.3.3"
+    "supertest": "^7.2.2",
+    "typescript": "^6.0.2"
   },
   "peerDependencies": {
     "@rspack/core": "^2.0.0-0"

package/types/index.d.ts

@@ -95,23 +95,22 @@
  * @property {"weak" | "strong"=} etag options to generate etag header
  * @property {boolean=} lastModified options to generate last modified header
  * @property {(boolean | number | string | { maxAge?: number, immutable?: boolean })=} cacheControl options to generate cache headers
- * @property {boolean=} cacheImmutable is cache immutable
+ * @property {boolean=} cacheImmutable enable immutable cache headers for immutable assets (defaults to false when omitted)
  */
 /**
  * @template {IncomingMessage} [RequestInternal=IncomingMessage]
  * @template {ServerResponse} [ResponseInternal=ServerResponse]
  * @callback Middleware
- * @param {RequestInternal} req
- * @param {ResponseInternal} res
- * @param {NextFunction} next
+ * @param {RequestInternal} req request
+ * @param {ResponseInternal} res response
+ * @param {NextFunction} next next function
  * @returns {Promise<void>}
  */
-/** @typedef {import("./utils/getFilenameFromUrl").Extra} Extra */
+/** @typedef {import("./utils/getFilenameFromUrl.js").Extra} Extra */
 /**
  * @callback GetFilenameFromUrl
- * @param {string} url
- * @param {Extra=} extra
- * @returns {string | undefined}
+ * @param {string} url request URL
+ * @returns {{ filename: string, extra: Extra } | undefined} a filename with additional information, or `undefined` if nothing is found
  */
 /**
  * @callback WaitUntilValid
@@ -364,7 +363,7 @@ export type Options<
       )
     | undefined;
   /**
-   * is cache immutable
+   * enable immutable cache headers for immutable assets (defaults to false when omitted)
    */
   cacheImmutable?: boolean | undefined;
 };
@@ -376,11 +375,13 @@ export type Middleware<
   res: ResponseInternal,
   next: NextFunction,
 ) => Promise<void>;
-export type Extra = import("./utils/getFilenameFromUrl").Extra;
-export type GetFilenameFromUrl = (
-  url: string,
-  extra?: Extra | undefined,
-) => string | undefined;
+export type Extra = import("./utils/getFilenameFromUrl.js").Extra;
+export type GetFilenameFromUrl = (url: string) =>
+  | {
+      filename: string;
+      extra: Extra;
+    }
+  | undefined;
 export type WaitUntilValid = (callback: Callback) => any;
 export type Invalidate = (callback: Callback) => any;
 export type Close = (callback: (err: Error | null | undefined) => void) => any;

package/types/middleware.d.ts

@@ -14,20 +14,27 @@ export type SendErrorOptions<
    * modify response data callback
    */
   modifyResponseData?:
-    | import("./index").ModifyResponseData<Request, Response>
+    | import("./index.js").ModifyResponseData<Request, Response>
     | undefined;
 };
 export type NextFunction = import("./index.js").NextFunction;
 export type IncomingMessage = import("./index.js").IncomingMessage;
 export type ServerResponse = import("./index.js").ServerResponse;
 export type NormalizedHeaders = import("./index.js").NormalizedHeaders;
+export type FilenameError =
+  import("./utils/getFilenameFromUrl.js").FilenameError;
+export type Extra = import("./utils/getFilenameFromUrl.js").Extra;
 export type ReadStream = import("fs").ReadStream;
+export type FilenameWithExtra = {
+  filename: string;
+  extra: Extra;
+};
 /**
  * @template {IncomingMessage} Request
  * @template {ServerResponse} Response
  * @typedef {object} SendErrorOptions send error options
  * @property {Record<string, number | string | string[] | undefined>=} headers headers
- * @property {import("./index").ModifyResponseData<Request, Response>=} modifyResponseData modify response data callback
+ * @property {import("./index.js").ModifyResponseData<Request, Response>=} modifyResponseData modify response data callback
  */
 /**
  * @template {IncomingMessage} Request

package/types/utils/compatibleAPI.d.ts

@@ -1,7 +1,7 @@
-export type IncomingMessage = import("../index").IncomingMessage;
-export type ServerResponse = import("../index").ServerResponse;
-export type OutputFileSystem = import("../index").OutputFileSystem;
-export type EXPECTED_ANY = import("../index").EXPECTED_ANY;
+export type IncomingMessage = import("../index.js").IncomingMessage;
+export type ServerResponse = import("../index.js").ServerResponse;
+export type OutputFileSystem = import("../index.js").OutputFileSystem;
+export type EXPECTED_ANY = import("../index.js").EXPECTED_ANY;
 export type ExpectedIncomingMessage = {
   /**
    * get header extra method
@@ -111,10 +111,10 @@ export function getHeadersSent<
 export function getOutgoing<
   Response extends ServerResponse & ExpectedServerResponse,
 >(res: Response): Response;
-/** @typedef {import("../index").IncomingMessage} IncomingMessage */
-/** @typedef {import("../index").ServerResponse} ServerResponse */
-/** @typedef {import("../index").OutputFileSystem} OutputFileSystem */
-/** @typedef {import("../index").EXPECTED_ANY} EXPECTED_ANY */
+/** @typedef {import("../index.js").IncomingMessage} IncomingMessage */
+/** @typedef {import("../index.js").ServerResponse} ServerResponse */
+/** @typedef {import("../index.js").OutputFileSystem} OutputFileSystem */
+/** @typedef {import("../index.js").EXPECTED_ANY} EXPECTED_ANY */
 /**
  * @typedef {object} ExpectedIncomingMessage
  * @property {((name: string) => string | string[] | undefined)=} getHeader get header extra method

package/types/utils/getFilenameFromUrl.d.ts

@@ -1,25 +1,31 @@
 export default getFilenameFromUrl;
 export type IncomingMessage = import("../index.js").IncomingMessage;
+export type OutputFileSystem = import("../index.js").OutputFileSystem;
 export type ServerResponse = import("../index.js").ServerResponse;
+export type FSStats = import("fs").Stats;
+export type FilenameWithExtra = {
+  filename: string;
+  extra: Extra;
+};
 export type Extra = {
   /**
    * stats
    */
-  stats?: import("fs").Stats | undefined;
-  /**
-   * error code
-   */
-  errorCode?: number | undefined;
+  stats: FSStats;
   /**
    * true when immutable, otherwise false
    */
   immutable?: boolean | undefined;
+  /**
+   * output file system
+   */
+  outputFileSystem: OutputFileSystem;
 };
 /**
  * @typedef {object} Extra
- * @property {import("fs").Stats=} stats stats
- * @property {number=} errorCode error code
+ * @property {FSStats} stats stats
  * @property {boolean=} immutable true when immutable, otherwise false
+ * @property {OutputFileSystem} outputFileSystem output file system
  */
 /**
  * decodeURIComponent.
@@ -28,13 +34,20 @@ export type Extra = {
  * @param {string} input
  * @returns {string}
  */
+export class FilenameError extends Error {
+  /**
+   * @param {string} message message
+   * @param {number=} code error code
+   */
+  constructor(message: string, code?: number | undefined);
+  statusCode: number | undefined;
+}
 /**
  * @template {IncomingMessage} Request
  * @template {ServerResponse} Response
  * @param {import("../index.js").FilledContext<Request, Response>} context context
  * @param {string} url url
- * @param {Extra=} extra extra
- * @returns {string | undefined} filename
+ * @returns {FilenameWithExtra | undefined} result of get filename from url
  */
 declare function getFilenameFromUrl<
   Request extends IncomingMessage,
@@ -42,5 +55,4 @@ declare function getFilenameFromUrl<
 >(
   context: import("../index.js").FilledContext<Request, Response>,
   url: string,
-  extra?: Extra | undefined,
-): string | undefined;
+): FilenameWithExtra | undefined;

package/types/utils/getPaths.d.ts

@@ -1,23 +1,25 @@
 export default getPaths;
 export type Compiler = import("@rspack/core").Compiler;
+export type Compilation = import("@rspack/core").Compilation;
 export type Stats = import("@rspack/core").Stats;
 export type MultiStats = import("@rspack/core").MultiStats;
-export type Asset = import("@rspack/core").Asset;
 export type DevServerOption = import("../index.js").DevServerOption;
 export type IncomingMessage = import("../index.js").IncomingMessage;
+export type OutputFileSystem = import("../index.js").OutputFileSystem;
 export type ServerResponse = import("../index.js").ServerResponse;
 /** @typedef {import("@rspack/core").Compiler} Compiler */
+/** @typedef {import("@rspack/core").Compilation} Compilation */
 /** @typedef {import("@rspack/core").Stats} Stats */
 /** @typedef {import("@rspack/core").MultiStats} MultiStats */
-/** @typedef {import("@rspack/core").Asset} Asset */
 /** @typedef {import("../index.js").DevServerOption} DevServerOption */
 /** @typedef {import("../index.js").IncomingMessage} IncomingMessage */
+/** @typedef {import("../index.js").OutputFileSystem} OutputFileSystem */
 /** @typedef {import("../index.js").ServerResponse} ServerResponse */
 /**
  * @template {IncomingMessage} Request
  * @template {ServerResponse} Response
  * @param {import("../index.js").FilledContext<Request, Response>} context context
- * @returns {{ outputPath: string, publicPath: string, assetsInfo: Map<string, Asset["info"]> | undefined }[]} paths
+ * @returns {{ compilation: Compilation, outputPath: string, outputFileSystem: OutputFileSystem, publicPath: string }[]} paths
  */
 declare function getPaths<
   Request extends IncomingMessage,
@@ -25,7 +27,8 @@ declare function getPaths<
 >(
   context: import("../index.js").FilledContext<Request, Response>,
 ): {
+  compilation: Compilation;
   outputPath: string;
+  outputFileSystem: OutputFileSystem;
   publicPath: string;
-  assetsInfo: Map<string, Asset["info"]> | undefined;
 }[];

package/types/utils/memorize.d.ts

@@ -1,6 +1,6 @@
 export default memorize;
 export type FunctionReturning<T> = (...args: EXPECTED_ANY) => T;
-export type EXPECTED_ANY = import("../index").EXPECTED_ANY;
+export type EXPECTED_ANY = import("../index.js").EXPECTED_ANY;
 /**
  * @template T
  * @typedef {(...args: EXPECTED_ANY) => T} FunctionReturning

package/dist/rslib-runtime.js

@@ -1,29 +0,0 @@
-var __webpack_modules__ = {};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
-__webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.d = (exports, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
-            enumerable: true,
-            get: definition[key]
-        });
-    };
-})();
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
-(()=>{
-    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
-})();
-export { __webpack_require__ };