@lynx-js/rspeedy 0.8.2 → 0.8.4

package/lib/index.d.ts

@@ -17,6 +17,7 @@
 export type { ExposedAPI } from './api.js';
 export { createRspeedy, type RspeedyInstance, type CreateRspeedyOptions, } from './create-rspeedy.js';
 export { logger } from '@rsbuild/core';
+export { mergeRspeedyConfig } from './config/mergeRspeedyConfig.js';
 export { defineConfig } from './config/defineConfig.js';
 export { loadConfig, type LoadConfigOptions, type LoadConfigResult, } from './config/loadConfig.js';
 export type { Config } from './config/index.js';

package/lib/index.js

@@ -1,5 +1,6 @@
 export { createRspeedy, } from './create-rspeedy.js';
 export { logger } from '@rsbuild/core';
+export { mergeRspeedyConfig } from './config/mergeRspeedyConfig.js';
 // Config
 export { defineConfig } from './config/defineConfig.js';
 export { loadConfig, } from './config/loadConfig.js';

package/lib/plugins/dev.plugin.d.ts

@@ -2,4 +2,4 @@ import type { RsbuildPlugin } from '@rsbuild/core';
 import type { Dev } from '../config/dev/index.js';
 import type { Server } from '../config/server/index.js';
 export declare function pluginDev(options?: Dev, server?: Server): RsbuildPlugin;
-export declare function findIp(family: 'v4' | 'v6'): Promise<string>;
+export declare function findIp(family: 'v4' | 'v6', isInternal?: boolean): Promise<string>;

package/lib/plugins/dev.plugin.js

@@ -39,6 +39,12 @@ export function pluginDev(options, server) {
                     break;
                 }
             }
+            if (server?.base) {
+                if (assetPrefix.endsWith('/')) {
+                    assetPrefix = assetPrefix.slice(0, -1);
+                }
+                assetPrefix = `${assetPrefix}${server.base}/`;
+            }
             debug(`dev.assetPrefix is normalized to ${assetPrefix}`);
             api.modifyRsbuildConfig((config, { mergeRsbuildConfig }) => {
                 return mergeRsbuildConfig(config, {
@@ -91,40 +97,41 @@ export function pluginDev(options, server) {
         },
     };
 }
-export async function findIp(family) {
-    const [{ default: defaultGateway }, { default: ipaddr }, os,] = await Promise.all([
-        import('default-gateway'),
+export async function findIp(family, isInternal = false) {
+    const [{ default: ipaddr }, os,] = await Promise.all([
         import('ipaddr.js'),
         import('node:os'),
     ]);
-    const gateway = await (async () => {
-        if (family === 'v4') {
-            const { gateway } = await defaultGateway.gateway4async();
-            return gateway;
+    let host;
+    Object.values(os.networkInterfaces())
+        .flatMap((networks) => networks ?? [])
+        .filter((network) => {
+        if (!network || !network.address) {
+            return false;
         }
-        else {
-            const { gateway } = await defaultGateway.gateway6async();
-            return gateway;
+        if (network.family !== `IP${family}`) {
+            return false;
         }
-    })();
-    const gatewayIp = ipaddr.parse(gateway);
-    // Look for the matching interface in all local interfaces.
-    for (const addresses of Object.values(os.networkInterfaces())) {
-        if (!addresses) {
-            continue;
+        if (network.internal !== isInternal) {
+            return false;
         }
-        for (const { cidr, internal } of addresses) {
-            if (!cidr || internal) {
-                continue;
-            }
-            const net = ipaddr.parseCIDR(cidr);
-            if (net[0]
-                && net[0].kind() === gatewayIp.kind()
-                && gatewayIp.match(net)) {
-                return net[0].toString();
+        if (family === 'v6') {
+            const range = ipaddr.parse(network.address).range();
+            if (range !== 'ipv4Mapped' && range !== 'uniqueLocal') {
+                return false;
             }
         }
+        return network.address;
+    })
+        .forEach((network) => {
+        host = network.address;
+        if (host.includes(':')) {
+            host = `[${host}]`;
+        }
+    });
+    if (!host) {
+        throw new Error(`No valid IP found`);
     }
-    throw new Error(`No valid IP found for the default gateway ${gateway}`);
+    return host;
 }
 //# sourceMappingURL=dev.plugin.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynx-js/rspeedy",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "A webpack/rspack-based frontend toolchain for Lynx",
   "keywords": [
     "webpack",
@@ -8,6 +8,11 @@
     "Lynx",
     "ReactLynx"
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lynx-family/lynx-stack.git",
+    "directory": "packages/rspeedy/core"
+  },
   "license": "Apache-2.0",
   "author": {
     "name": "Qingyu Wang",
@@ -43,31 +48,29 @@
     "README.md"
   ],
   "dependencies": {
-    "@microsoft/api-extractor": "7.51.0",
-    "@rsbuild/core": "1.2.11",
+    "@microsoft/api-extractor": "7.51.1",
+    "@rsbuild/core": "1.2.19",
     "@rsbuild/plugin-css-minimizer": "1.0.2",
-    "@rsdoctor/rspack-plugin": "^0.4.13",
+    "@rsdoctor/rspack-plugin": "1.0.0-rc.0",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",
-    "default-gateway": "^7.2.2",
     "exit-hook": "^4.0.0",
     "ipaddr.js": "^2.2.0",
     "javascript-stringify": "^2.1.0",
     "picocolors": "^1.1.1",
     "tiny-invariant": "^1.3.3",
-    "ts-blank-space": "^0.6.0",
+    "ts-blank-space": "^0.6.1",
     "typia": "7.6.4",
-    "@lynx-js/chunk-loading-webpack-plugin": "^0.1.6",
-    "@lynx-js/webpack-dev-transport": "^0.1.0",
-    "@lynx-js/websocket": "^0.0.3"
+    "@lynx-js/chunk-loading-webpack-plugin": "^0.1.7",
+    "@lynx-js/webpack-dev-transport": "^0.1.2",
+    "@lynx-js/websocket": "^0.0.4"
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "^12.1.2",
     "@rsbuild/webpack": "1.2.3",
-    "@types/default-gateway": "^7.2.2",
     "eventemitter3": "^5.0.1",
-    "type-fest": "^4.35.0",
-    "vitest": "^3.0.7",
+    "type-fest": "^4.37.0",
+    "vitest": "^3.0.8",
     "webpack": "^5.98.0",
     "@lynx-js/vitest-setup": "0.0.0"
   },