rspack-plugin-mock 0.3.4 → 0.4.1

package/README.md

@@ -7,8 +7,8 @@ Implement a mock-dev-server in `rspack` and `rsbuild` that is fully consistent w
 <p align="center">
   <a href="https://www.npmjs.com/package/rspack-plugin-mock"><img alt="npm" src="https://img.shields.io/npm/v/rspack-plugin-mock?style=flat-square&colorA=564341&colorB=EDED91"></a>
   <img alt="node-current" src="https://img.shields.io/node/v/rspack-plugin-mock?style=flat-square&colorA=564341&colorB=EDED91">
-  <img alt="npm peer dependency version" src="https://img.shields.io/npm/dependency-version/rspack-plugin-mock/peer/@rspack/core?style=flat-square&colorA=564341&colorB=EDED91">
-  <img alt="npm peer dependency version" src="https://img.shields.io/npm/dependency-version/rspack-plugin-mock/peer/@rsbuild/core?style=flat-square&colorA=564341&colorB=EDED91">
+  <img alt="npm peer dependency version" src="https://img.shields.io/npm/dependency-version/rspack-plugin-mock/peer/@rspack/core?style=flat-square&colorA=564341&colorB=EDED91&label=rspack">
+  <img alt="npm peer dependency version" src="https://img.shields.io/npm/dependency-version/rspack-plugin-mock/peer/@rsbuild/core?style=flat-square&colorA=564341&colorB=EDED91&label=rsbuild">
   <img alt="npm" src="https://img.shields.io/npm/dm/rspack-plugin-mock?style=flat-square&colorA=564341&colorB=EDED91">
   <img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/pengzhanbo/rspack-plugin-mock/lint.yml?style=flat-square&colorA=564341&colorB=EDED91">
 </p>

package/README.zh-CN.md

@@ -7,8 +7,8 @@
 <p align="center">
   <a href="https://www.npmjs.com/package/rspack-plugin-mock"><img alt="npm" src="https://img.shields.io/npm/v/rspack-plugin-mock?style=flat-square&colorA=564341&colorB=EDED91"></a>
   <img alt="node-current" src="https://img.shields.io/node/v/rspack-plugin-mock?style=flat-square&colorA=564341&colorB=EDED91">
-  <img alt="npm peer dependency version" src="https://img.shields.io/npm/dependency-version/rspack-plugin-mock/peer/@rspack/core?style=flat-square&colorA=564341&colorB=EDED91">
-  <img alt="npm peer dependency version" src="https://img.shields.io/npm/dependency-version/rspack-plugin-mock/peer/@rsbuild/core?style=flat-square&colorA=564341&colorB=EDED91">
+  <img alt="npm peer dependency version" src="https://img.shields.io/npm/dependency-version/rspack-plugin-mock/peer/@rspack/core?style=flat-square&colorA=564341&colorB=EDED91&label=rspack">
+  <img alt="npm peer dependency version" src="https://img.shields.io/npm/dependency-version/rspack-plugin-mock/peer/@rsbuild/core?style=flat-square&colorA=564341&colorB=EDED91&label=rsbuild">
   <img alt="npm" src="https://img.shields.io/npm/dm/rspack-plugin-mock?style=flat-square&colorA=564341&colorB=EDED91">
   <img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/pengzhanbo/rspack-plugin-mock/lint.yml?style=flat-square&colorA=564341&colorB=EDED91">
 </p>

package/dist/{chunk-O6PRDW23.js → chunk-4XOUX6CL.js}

@@ -9,121 +9,23 @@ import {
   transformRawData,
   urlParse,
   vfs
-} from "./chunk-EY46RSAC.js";
-
-// src/core/mockMiddleware.ts
-import cors from "cors";
-import { pathToRegexp } from "path-to-regexp";
-function createMockMiddleware(compiler, options) {
-  function mockMiddleware(middlewares, reload) {
-    middlewares.unshift(baseMiddleware(compiler, options));
-    const corsMiddleware = createCorsMiddleware(compiler, options);
-    if (corsMiddleware) {
-      middlewares.unshift(corsMiddleware);
-    }
-    if (options.reload) {
-      compiler.on("update", () => reload?.());
-    }
-    return middlewares;
-  }
-  return mockMiddleware;
-}
-function createCorsMiddleware(compiler, options) {
-  let corsOptions = {};
-  const enabled = options.cors !== false;
-  if (enabled) {
-    corsOptions = {
-      ...corsOptions,
-      ...typeof options.cors === "boolean" ? {} : options.cors
-    };
-  }
-  const proxies = options.proxies;
-  return !enabled ? void 0 : function(req, res, next) {
-    const { pathname } = urlParse(req.url);
-    if (!pathname || proxies.length === 0 || !proxies.some(
-      (context) => doesProxyContextMatchUrl(context, req.url, req)
-    )) {
-      return next();
-    }
-    const mockData = compiler.mockData;
-    const mockUrl = Object.keys(mockData).find(
-      (key) => pathToRegexp(key).test(pathname)
-    );
-    if (!mockUrl)
-      return next();
-    cors(corsOptions)(req, res, next);
-  };
-}
-
-// src/core/resolvePluginOptions.ts
-import process from "process";
-import { isBoolean, toArray } from "@pengzhanbo/utils";
-function resolvePluginOptions({
-  prefix = [],
-  wsPrefix = [],
-  cwd,
-  include = ["mock/**/*.mock.{js,ts,cjs,mjs,json,json5}"],
-  exclude = ["**/node_modules/**", "**/.vscode/**", "**/.git/**"],
-  reload = false,
-  log = "info",
-  cors: cors2 = true,
-  formidableOptions = {},
-  build = false,
-  cookiesOptions = {},
-  bodyParserOptions = {},
-  priority = {}
-} = {}, { alias, context, plugins, proxies }) {
-  const logger = createLogger(
-    "rspack:mock",
-    isBoolean(log) ? log ? "info" : "error" : log
-  );
-  return {
-    prefix,
-    wsPrefix,
-    cwd: cwd || context || process.cwd(),
-    include,
-    exclude,
-    reload,
-    cors: cors2,
-    cookiesOptions,
-    log,
-    formidableOptions: {
-      multiples: true,
-      ...formidableOptions
-    },
-    bodyParserOptions,
-    priority,
-    build: build ? Object.assign(
-      {
-        serverPort: 8080,
-        dist: "mockServer",
-        log: "error"
-      },
-      typeof build === "object" ? build : {}
-    ) : false,
-    alias,
-    plugins,
-    proxies,
-    wsProxies: toArray(wsPrefix),
-    logger
-  };
-}
+} from "./chunk-JMXFIX5Q.js";
 
 // src/core/build.ts
 import fs from "fs";
 import fsp from "fs/promises";
 import path from "path";
-import process2 from "process";
-import fg from "fast-glob";
+import process from "process";
+import { toArray } from "@pengzhanbo/utils";
 import { createFilter } from "@rollup/pluginutils";
+import fg from "fast-glob";
 import color2 from "picocolors";
-import { toArray as toArray2 } from "@pengzhanbo/utils";
 
 // src/core/createRspackCompiler.ts
 import { createRequire } from "module";
 import * as rspackCore from "@rspack/core";
-import color from "picocolors";
 import isCore from "is-core-module";
+import color from "picocolors";
 var require2 = createRequire(import.meta.url);
 function createCompiler(options, callback) {
   const rspackOptions = resolveRspackOptions(options);
@@ -199,6 +101,9 @@ function resolveRspackOptions({
   watch = false
 }) {
   const targets = ["node >= 18.0.0"];
+  if (alias && "@swc/helpers" in alias) {
+    delete alias["@swc/helpers"];
+  }
   return {
     mode: "production",
     context: cwd,
@@ -206,7 +111,6 @@ function resolveRspackOptions({
     watch,
     target: "node18.0",
     externalsType: isEsm ? "module" : "commonjs2",
-    externals: /^[^./].*/,
     resolve: {
       alias,
       extensions: [".js", ".ts", ".cjs", ".mjs", ".json5", ".json"]
@@ -257,7 +161,7 @@ function resolveRspackOptions({
 
 // src/core/build.ts
 async function buildMockServer(options, outputDir) {
-  const entryFile = path.resolve(process2.cwd(), "node_modules/.cache/mock-server/mock-server.ts");
+  const entryFile = path.resolve(process.cwd(), "node_modules/.cache/mock-server/mock-server.ts");
   const mockFileList = await getMockFileList(options);
   await writeMockEntryFile(entryFile, mockFileList, options.cwd);
   const { code, externals } = await transformWithRspack({
@@ -274,7 +178,7 @@ async function buildMockServer(options, outputDir) {
   ];
   const dist = path.resolve(outputDir, options.build.dist);
   options.logger.info(
-    `${color2.green("\u2713")} generate mock server in ${color2.cyan(path.relative(process2.cwd(), dist))}`
+    `${color2.green("\u2713")} generate mock server in ${color2.cyan(path.relative(process.cwd(), dist))}`
   );
   if (!fs.existsSync(dist)) {
     await fsp.mkdir(dist, { recursive: true });
@@ -332,7 +236,7 @@ const app = connect();
 const server = createServer(app);
 const logger = createLogger('mock-server', '${log}');
 const proxies = ${JSON.stringify(proxies)};
-const wsProxies = ${JSON.stringify(toArray2(wsPrefix))};
+const wsProxies = ${JSON.stringify(toArray(wsPrefix))};
 const cookiesOptions = ${JSON.stringify(cookiesOptions)};
 const bodyParserOptions = ${JSON.stringify(bodyParserOptions)};
 const priority = ${JSON.stringify(priority)};
@@ -408,16 +312,16 @@ function getHostDependencies(context) {
 
 // src/core/mockCompiler.ts
 import EventEmitter from "events";
-import process3 from "process";
 import path3 from "path";
-import fastGlob from "fast-glob";
-import chokidar from "chokidar";
+import process2 from "process";
+import { toArray as toArray2 } from "@pengzhanbo/utils";
 import { createFilter as createFilter2 } from "@rollup/pluginutils";
-import { toArray as toArray3 } from "@pengzhanbo/utils";
+import chokidar from "chokidar";
+import fastGlob from "fast-glob";
 
 // src/core/loadFromCode.ts
-import path2 from "path";
 import fs2, { promises as fsp2 } from "fs";
+import path2 from "path";
 import { pathToFileURL } from "url";
 async function loadFromCode({
   filepath,
@@ -426,17 +330,16 @@ async function loadFromCode({
   cwd
 }) {
   filepath = path2.resolve(cwd, filepath);
-  const fileBase = `${filepath}.timestamp-${Date.now()}`;
   const ext = isESM ? ".mjs" : ".cjs";
-  const fileNameTmp = `${fileBase}${ext}`;
-  const fileUrl = pathToFileURL(fileNameTmp).toString();
-  await fsp2.writeFile(fileNameTmp, code, "utf8");
+  const filepathTmp = `${filepath}.timestamp-${Date.now()}${ext}`;
+  const file = pathToFileURL(filepathTmp).toString();
+  await fsp2.writeFile(filepathTmp, code, "utf8");
   try {
-    const result = await import(fileUrl);
-    return result.default || result;
+    const mod = await import(file);
+    return mod.default || mod;
   } finally {
     try {
-      fs2.unlinkSync(fileNameTmp);
+      fs2.unlinkSync(filepathTmp);
     } catch {
     }
   }
@@ -450,7 +353,7 @@ var MockCompiler = class extends EventEmitter {
   constructor(options) {
     super();
     this.options = options;
-    this.cwd = options.cwd || process3.cwd();
+    this.cwd = options.cwd || process2.cwd();
     const { include, exclude } = this.options;
     this.fileFilter = createFilter2(include, exclude, { resolve: false });
     try {
@@ -458,7 +361,7 @@ var MockCompiler = class extends EventEmitter {
       this.moduleType = !!pkg && JSON.parse(pkg).type === "module" ? "esm" : "cjs";
     } catch {
     }
-    this.entryFile = path3.resolve(process3.cwd(), "node_modules/.cache/mock-server/mock-server.ts");
+    this.entryFile = path3.resolve(process2.cwd(), "node_modules/.cache/mock-server/mock-server.ts");
   }
   cwd;
   mockWatcher;
@@ -521,7 +424,7 @@ var MockCompiler = class extends EventEmitter {
   }
   watchMockFiles() {
     const { include } = this.options;
-    const [firstGlob, ...otherGlob] = toArray3(include);
+    const [firstGlob, ...otherGlob] = toArray2(include);
     const watcher = this.mockWatcher = chokidar.watch(firstGlob, {
       ignoreInitial: true,
       cwd: this.cwd
@@ -546,10 +449,109 @@ var MockCompiler = class extends EventEmitter {
   }
 };
 
+// src/core/mockMiddleware.ts
+import cors from "cors";
+import { pathToRegexp } from "path-to-regexp";
+function createMockMiddleware(compiler, options) {
+  function mockMiddleware(middlewares, reload) {
+    middlewares.unshift(baseMiddleware(compiler, options));
+    const corsMiddleware = createCorsMiddleware(compiler, options);
+    if (corsMiddleware) {
+      middlewares.unshift(corsMiddleware);
+    }
+    if (options.reload) {
+      compiler.on("update", () => reload?.());
+    }
+    return middlewares;
+  }
+  return mockMiddleware;
+}
+function createCorsMiddleware(compiler, options) {
+  let corsOptions = {};
+  const enabled = options.cors !== false;
+  if (enabled) {
+    corsOptions = {
+      ...corsOptions,
+      ...typeof options.cors === "boolean" ? {} : options.cors
+    };
+  }
+  const proxies = options.proxies;
+  return !enabled ? void 0 : function(req, res, next) {
+    const { pathname } = urlParse(req.url);
+    if (!pathname || proxies.length === 0 || !proxies.some(
+      (context) => doesProxyContextMatchUrl(context, req.url, req)
+    )) {
+      return next();
+    }
+    const mockData = compiler.mockData;
+    const mockUrl = Object.keys(mockData).find(
+      (key) => pathToRegexp(key).test(pathname)
+    );
+    if (!mockUrl)
+      return next();
+    cors(corsOptions)(req, res, next);
+  };
+}
+
+// src/core/resolvePluginOptions.ts
+import process3 from "process";
+import { isBoolean, toArray as toArray3 } from "@pengzhanbo/utils";
+function resolvePluginOptions({
+  prefix = [],
+  wsPrefix = [],
+  cwd,
+  include = ["mock/**/*.mock.{js,ts,cjs,mjs,json,json5}"],
+  exclude = ["**/node_modules/**", "**/.vscode/**", "**/.git/**"],
+  reload = false,
+  log = "info",
+  cors: cors2 = true,
+  formidableOptions = {},
+  build = false,
+  cookiesOptions = {},
+  bodyParserOptions = {},
+  priority = {}
+} = {}, { alias, context, plugins, proxies }) {
+  const logger = createLogger(
+    "rspack:mock",
+    isBoolean(log) ? log ? "info" : "error" : log
+  );
+  prefix = toArray3(prefix);
+  return {
+    prefix,
+    wsPrefix,
+    cwd: cwd || context || process3.cwd(),
+    include,
+    exclude,
+    reload,
+    cors: cors2,
+    cookiesOptions,
+    log,
+    formidableOptions: {
+      multiples: true,
+      ...formidableOptions
+    },
+    bodyParserOptions,
+    priority,
+    build: build ? Object.assign(
+      {
+        serverPort: 8080,
+        dist: "mockServer",
+        log: "error"
+      },
+      typeof build === "object" ? build : {}
+    ) : false,
+    alias,
+    plugins,
+    proxies: [...proxies, ...prefix],
+    wsProxies: toArray3(wsPrefix),
+    logger
+  };
+}
+
 export {
-  createMockMiddleware,
-  resolvePluginOptions,
   buildMockServer,
   createMockCompiler,
-  MockCompiler
+  MockCompiler,
+  createMockMiddleware,
+  resolvePluginOptions
 };