@modern-js/server 2.65.5 → 2.66.0

package/dist/cjs/createDevServer.js

@@ -59,6 +59,7 @@ async function createDevServer(options, applyPlugins) {
   } else {
     nodeServer = await (0, import_node.createNodeServer)(server.handle.bind(server));
   }
+  const promise = (0, import_helpers.getDevAssetPrefix)(builder);
   const builderDevServer = await (builder === null || builder === void 0 ? void 0 : builder.createDevServer({
     runCompile: options.runCompile,
     compiler: options.compilier
@@ -69,6 +70,10 @@ async function createDevServer(options, applyPlugins) {
       builderDevServer
     })
   ]);
+  const assetPrefix = await promise;
+  if (assetPrefix) {
+    prodServerOptions.config.output.assetPrefix = assetPrefix;
+  }
   await applyPlugins(server, prodServerOptions, nodeServer);
   await server.init();
   const afterListen = async () => {

package/dist/cjs/dev.js

@@ -39,12 +39,12 @@ const devPlugin = (options) => ({
         connectWebSocket && nodeServer && connectWebSocket({
           server: nodeServer
         });
-        const runner = api.useHookRunners();
+        const hooks = api.getHooks();
         builder === null || builder === void 0 ? void 0 : builder.onDevCompileDone(({ stats }) => {
           if (stats.toJson({
             all: false
           }).name !== "server") {
-            (0, import_helpers.onRepack)(distDirectory, runner);
+            (0, import_helpers.onRepack)(distDirectory, hooks);
           }
         });
         if (dev.watch) {

package/dist/cjs/helpers/devOptions.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var devOptions_exports = {};
 __export(devOptions_exports, {
+  getDevAssetPrefix: () => getDevAssetPrefix,
   getDevOptions: () => getDevOptions
 });
 module.exports = __toCommonJS(devOptions_exports);
@@ -28,7 +29,31 @@ const getDevOptions = (options) => {
   const defaultOptions = (0, import_constants.getDefaultDevOptions)();
   return (0, import_lodash.merge)(defaultOptions, devOptions);
 };
+const getDevAssetPrefix = (builder) => {
+  return new Promise((resolve) => {
+    if (!builder) {
+      return resolve("");
+    }
+    builder === null || builder === void 0 ? void 0 : builder.onAfterCreateCompiler((params) => {
+      let webCompiler;
+      if ("compilers" in params.compiler) {
+        webCompiler = params.compiler.compilers.find((c) => {
+          return c.name === "web" || c.name === "client";
+        });
+      } else {
+        webCompiler = params.compiler;
+      }
+      const publicPath = webCompiler.options.output.publicPath;
+      if (publicPath && typeof publicPath === "string") {
+        const formatPublicPath = publicPath.replace(/^https?:\/\/[^/]+/, "");
+        return resolve(formatPublicPath);
+      }
+      return resolve("");
+    });
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getDevAssetPrefix,
   getDevOptions
 });

package/dist/cjs/helpers/index.js

@@ -45,7 +45,7 @@ __reExport(helpers_exports, require("./mock"), module.exports);
 async function onServerChange({ pwd, filepath, event, server }) {
   const { mock } = import_server_core.AGGRED_DIR;
   const mockPath = import_path.default.normalize(import_path.default.join(pwd, mock));
-  const { runner } = server;
+  const { hooks } = server;
   if (filepath.startsWith(mockPath)) {
     await (0, import_mock.initOrUpdateMockMiddlewares)(pwd);
     import_utils.logger.info("Finish update the mock handlers");
@@ -60,7 +60,7 @@ async function onServerChange({ pwd, filepath, event, server }) {
           }
         ]
       };
-      await runner.reset({
+      await hooks.onReset.call({
         event: fileChangeEvent
       });
       (0, import_utils2.debug)(`Finish reload server, trigger by ${filepath} ${event}`);

package/dist/cjs/helpers/repack.js

@@ -29,10 +29,10 @@ const cleanSSRCache = (distDir) => {
     }
   });
 };
-const onRepack = (distDir, runner) => {
+const onRepack = (distDir, hooks) => {
   cleanSSRCache(distDir);
   import_fileReader.fileReader.reset();
-  runner.reset({
+  hooks.onReset.call({
     event: {
       type: "repack"
     }

package/dist/esm/createDevServer.js

@@ -7,13 +7,13 @@ import path from "node:path";
 import { createServerBase } from "@modern-js/server-core";
 import { createNodeServer, loadServerRuntimeConfig } from "@modern-js/server-core/node";
 import { devPlugin } from "./dev";
-import { getDevOptions } from "./helpers";
+import { getDevAssetPrefix, getDevOptions } from "./helpers";
 function createDevServer(options, applyPlugins) {
   return _createDevServer.apply(this, arguments);
 }
 function _createDevServer() {
   _createDevServer = _async_to_generator(function(options, applyPlugins) {
-    var _config_output_distPath, config, pwd, serverConfigFile, serverConfigPath, builder, dev, distDir, serverConfig, prodServerOptions, server, devHttpsOption, nodeServer, genHttpsOptions, httpsOptions, builderDevServer, afterListen;
+    var _config_output_distPath, config, pwd, serverConfigFile, serverConfigPath, builder, dev, distDir, serverConfig, prodServerOptions, server, devHttpsOption, nodeServer, genHttpsOptions, httpsOptions, promise, builderDevServer, assetPrefix, afterListen;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -70,6 +70,7 @@ function _createDevServer() {
           nodeServer = _state.sent();
           _state.label = 7;
         case 7:
+          promise = getDevAssetPrefix(builder);
           return [
             4,
             builder === null || builder === void 0 ? void 0 : builder.createDevServer({
@@ -86,15 +87,24 @@ function _createDevServer() {
           ]);
           return [
             4,
-            applyPlugins(server, prodServerOptions, nodeServer)
+            promise
           ];
         case 9:
+          assetPrefix = _state.sent();
+          if (assetPrefix) {
+            prodServerOptions.config.output.assetPrefix = assetPrefix;
+          }
+          return [
+            4,
+            applyPlugins(server, prodServerOptions, nodeServer)
+          ];
+        case 10:
           _state.sent();
           return [
             4,
             server.init()
           ];
-        case 10:
+        case 11:
           _state.sent();
           afterListen = function() {
             var _ref = _async_to_generator(function() {

package/dist/esm/dev.js

@@ -14,7 +14,7 @@ var devPlugin = function(options) {
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _dev_after, _dev_before, _ref, builderMiddlewares, close, connectWebSocket, _api_useAppContext, middlewares, distDirectory, nodeServer, apiDirectory, sharedDirectory, serverBase, runner, watchOptions, watcher, before, after, _dev_setupMiddlewares, setupMiddlewares, mockMiddleware;
+            var _dev_after, _dev_before, _ref, builderMiddlewares, close, connectWebSocket, _api_useAppContext, middlewares, distDirectory, nodeServer, apiDirectory, sharedDirectory, serverBase, hooks, watchOptions, watcher, before, after, _dev_setupMiddlewares, setupMiddlewares, mockMiddleware;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -24,13 +24,13 @@ var devPlugin = function(options) {
                   connectWebSocket && nodeServer && connectWebSocket({
                     server: nodeServer
                   });
-                  runner = api.useHookRunners();
+                  hooks = api.getHooks();
                   builder === null || builder === void 0 ? void 0 : builder.onDevCompileDone(function(param) {
                     var stats = param.stats;
                     if (stats.toJson({
                       all: false
                     }).name !== "server") {
-                      onRepack(distDirectory, runner);
+                      onRepack(distDirectory, hooks);
                     }
                   });
                   if (dev.watch) {

package/dist/esm/helpers/devOptions.js

@@ -5,6 +5,30 @@ var getDevOptions = function(options) {
   var defaultOptions = getDefaultDevOptions();
   return merge(defaultOptions, devOptions);
 };
+var getDevAssetPrefix = function(builder) {
+  return new Promise(function(resolve) {
+    if (!builder) {
+      return resolve("");
+    }
+    builder === null || builder === void 0 ? void 0 : builder.onAfterCreateCompiler(function(params) {
+      var webCompiler;
+      if ("compilers" in params.compiler) {
+        webCompiler = params.compiler.compilers.find(function(c) {
+          return c.name === "web" || c.name === "client";
+        });
+      } else {
+        webCompiler = params.compiler;
+      }
+      var publicPath = webCompiler.options.output.publicPath;
+      if (publicPath && typeof publicPath === "string") {
+        var formatPublicPath = publicPath.replace(/^https?:\/\/[^/]+/, "");
+        return resolve(formatPublicPath);
+      }
+      return resolve("");
+    });
+  });
+};
 export {
+  getDevAssetPrefix,
   getDevOptions
 };

package/dist/esm/helpers/index.js

@@ -15,14 +15,14 @@ function onServerChange(_) {
 }
 function _onServerChange() {
   _onServerChange = _async_to_generator(function(param) {
-    var pwd, filepath, event, server, mock, mockPath, runner, fileChangeEvent, e;
+    var pwd, filepath, event, server, mock, mockPath, hooks, fileChangeEvent, e;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           pwd = param.pwd, filepath = param.filepath, event = param.event, server = param.server;
           mock = AGGRED_DIR.mock;
           mockPath = path.normalize(path.join(pwd, mock));
-          runner = server.runner;
+          hooks = server.hooks;
           if (!filepath.startsWith(mockPath))
             return [
               3,
@@ -57,7 +57,7 @@ function _onServerChange() {
           };
           return [
             4,
-            runner.reset({
+            hooks.onReset.call({
               event: fileChangeEvent
             })
           ];

package/dist/esm/helpers/repack.js

@@ -6,10 +6,10 @@ var cleanSSRCache = function(distDir) {
     }
   });
 };
-var onRepack = function(distDir, runner) {
+var onRepack = function(distDir, hooks) {
   cleanSSRCache(distDir);
   fileReader.reset();
-  runner.reset({
+  hooks.onReset.call({
     event: {
       type: "repack"
     }

package/dist/esm-node/createDevServer.js

@@ -2,7 +2,7 @@ import path from "node:path";
 import { createServerBase } from "@modern-js/server-core";
 import { createNodeServer, loadServerRuntimeConfig } from "@modern-js/server-core/node";
 import { devPlugin } from "./dev";
-import { getDevOptions } from "./helpers";
+import { getDevAssetPrefix, getDevOptions } from "./helpers";
 async function createDevServer(options, applyPlugins) {
   var _config_output_distPath;
   const { config, pwd, serverConfigFile, serverConfigPath, builder } = options;
@@ -26,6 +26,7 @@ async function createDevServer(options, applyPlugins) {
   } else {
     nodeServer = await createNodeServer(server.handle.bind(server));
   }
+  const promise = getDevAssetPrefix(builder);
   const builderDevServer = await (builder === null || builder === void 0 ? void 0 : builder.createDevServer({
     runCompile: options.runCompile,
     compiler: options.compilier
@@ -36,6 +37,10 @@ async function createDevServer(options, applyPlugins) {
       builderDevServer
     })
   ]);
+  const assetPrefix = await promise;
+  if (assetPrefix) {
+    prodServerOptions.config.output.assetPrefix = assetPrefix;
+  }
   await applyPlugins(server, prodServerOptions, nodeServer);
   await server.init();
   const afterListen = async () => {

package/dist/esm-node/dev.js

@@ -16,12 +16,12 @@ const devPlugin = (options) => ({
         connectWebSocket && nodeServer && connectWebSocket({
           server: nodeServer
         });
-        const runner = api.useHookRunners();
+        const hooks = api.getHooks();
         builder === null || builder === void 0 ? void 0 : builder.onDevCompileDone(({ stats }) => {
           if (stats.toJson({
             all: false
           }).name !== "server") {
-            onRepack(distDirectory, runner);
+            onRepack(distDirectory, hooks);
           }
         });
         if (dev.watch) {

package/dist/esm-node/helpers/devOptions.js

@@ -5,6 +5,30 @@ const getDevOptions = (options) => {
   const defaultOptions = getDefaultDevOptions();
   return merge(defaultOptions, devOptions);
 };
+const getDevAssetPrefix = (builder) => {
+  return new Promise((resolve) => {
+    if (!builder) {
+      return resolve("");
+    }
+    builder === null || builder === void 0 ? void 0 : builder.onAfterCreateCompiler((params) => {
+      let webCompiler;
+      if ("compilers" in params.compiler) {
+        webCompiler = params.compiler.compilers.find((c) => {
+          return c.name === "web" || c.name === "client";
+        });
+      } else {
+        webCompiler = params.compiler;
+      }
+      const publicPath = webCompiler.options.output.publicPath;
+      if (publicPath && typeof publicPath === "string") {
+        const formatPublicPath = publicPath.replace(/^https?:\/\/[^/]+/, "");
+        return resolve(formatPublicPath);
+      }
+      return resolve("");
+    });
+  });
+};
 export {
+  getDevAssetPrefix,
   getDevOptions
 };

package/dist/esm-node/helpers/index.js

@@ -11,7 +11,7 @@ export * from "./mock";
 async function onServerChange({ pwd, filepath, event, server }) {
   const { mock } = AGGRED_DIR;
   const mockPath = path.normalize(path.join(pwd, mock));
-  const { runner } = server;
+  const { hooks } = server;
   if (filepath.startsWith(mockPath)) {
     await initOrUpdateMockMiddlewares(pwd);
     logger.info("Finish update the mock handlers");
@@ -26,7 +26,7 @@ async function onServerChange({ pwd, filepath, event, server }) {
           }
         ]
       };
-      await runner.reset({
+      await hooks.onReset.call({
         event: fileChangeEvent
       });
       debug(`Finish reload server, trigger by ${filepath} ${event}`);

package/dist/esm-node/helpers/repack.js

@@ -6,10 +6,10 @@ const cleanSSRCache = (distDir) => {
     }
   });
 };
-const onRepack = (distDir, runner) => {
+const onRepack = (distDir, hooks) => {
   cleanSSRCache(distDir);
   fileReader.reset();
-  runner.reset({
+  hooks.onReset.call({
     event: {
       type: "repack"
     }

package/dist/types/createDevServer.d.ts

@@ -1,9 +1,7 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import type { ApplyPlugins, ModernDevServerOptions } from './types';
 export declare function createDevServer(options: ModernDevServerOptions, applyPlugins: ApplyPlugins): Promise<{
     server: (import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>) & {
-        getRequestListener: () => (req: import("http").IncomingMessage, res: import("http").ServerResponse) => Promise<void>;
+        getRequestListener: () => ReturnType<(handler: import("@modern-js/server-core/dist/types/types").RequestHandler) => (req: import("@modern-js/server-core/dist/types/types").NodeRequest, res: import("@modern-js/server-core/dist/types/types").NodeResponse) => Promise<void>>;
         getRequestHandler: () => import("@modern-js/server-core/dist/types/types").RequestHandler;
     };
     afterListen: () => Promise<void>;

package/dist/types/dev-tools/https/index.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-import type Buffer from 'buffer';
 import type { DevServerHttpsOptions } from '../../types';
 export declare const genHttpsOptions: (userOptions: DevServerHttpsOptions, pwd: string) => Promise<{
     key?: Buffer | string;

package/dist/types/dev-tools/watcher/dependencyTree.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare const defaultIgnores: string[];
 export interface DependencyTreeOptions {
     root: string;

package/dist/types/dev.d.ts

@@ -1,9 +1,9 @@
-import type { ServerBaseOptions, ServerPlugin } from '@modern-js/server-core';
+import type { ServerBaseOptions, ServerPluginLegacy } from '@modern-js/server-core';
 import type { UniBuilderInstance } from '@modern-js/uni-builder';
 import type { ModernDevServerOptions } from './types';
 type BuilderDevServer = Awaited<ReturnType<UniBuilderInstance['createDevServer']>>;
 export type DevPluginOptions = ModernDevServerOptions<ServerBaseOptions> & {
     builderDevServer?: BuilderDevServer;
 };
-export declare const devPlugin: (options: DevPluginOptions) => ServerPlugin;
+export declare const devPlugin: (options: DevPluginOptions) => ServerPluginLegacy;
 export {};

package/dist/types/helpers/devOptions.d.ts

@@ -1,5 +1,7 @@
+import type { UniBuilderInstance } from '@modern-js/uni-builder';
 import type { ModernDevServerOptions } from '../types';
 export declare const getDevOptions: (options: ModernDevServerOptions) => import("@modern-js/types/server/devServer").DevServerOptions & Pick<import("@modern-js/types/server/devServer").DevServerOptions, "watch" | "https"> & {
-    port?: number | undefined;
-    host?: string | undefined;
+    port?: number;
+    host?: string;
 };
+export declare const getDevAssetPrefix: (builder?: UniBuilderInstance) => Promise<string>;

package/dist/types/helpers/mock.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { type InternalRequest, type Middleware } from '@modern-js/server-core';
 import type { NextFunction } from '@modern-js/types';

package/dist/types/helpers/repack.d.ts

@@ -1,2 +1,2 @@
-import type { ServerHookRunner } from '@modern-js/server-core';
-export declare const onRepack: (distDir: string, runner: ServerHookRunner) => void;
+import type { ServerPluginHooks } from '@modern-js/server-core';
+export declare const onRepack: (distDir: string, hooks: ServerPluginHooks) => void;

package/dist/types/types.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="node" />
+import type { Server as NodeServer } from 'node:http';
 import type { DevServerHttpsOptions, DevServerOptions } from '@modern-js/types';
 import type { Rspack, UniBuilderInstance } from '@modern-js/uni-builder';
-import type { NodeServer, ServerBase, ServerBaseOptions } from '@modern-js/server-core';
+import type { ServerBase, ServerBaseOptions } from '@modern-js/server-core';
 export type { DevServerOptions, DevServerHttpsOptions };
 export type ExtraOptions = {
     dev: Pick<DevServerOptions, 'watch' | 'https'> & {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.65.5",
+  "version": "2.66.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -48,11 +48,11 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.13.0",
-    "@modern-js/server-core": "2.65.5",
-    "@modern-js/server-utils": "2.65.5",
-    "@modern-js/types": "2.65.5",
-    "@modern-js/runtime-utils": "2.65.5",
-    "@modern-js/utils": "2.65.5"
+    "@modern-js/runtime-utils": "2.66.0",
+    "@modern-js/server-core": "2.66.0",
+    "@modern-js/server-utils": "2.66.0",
+    "@modern-js/types": "2.66.0",
+    "@modern-js/utils": "2.66.0"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -67,9 +67,9 @@
     "typescript": "^5",
     "webpack": "^5.98.0",
     "websocket": "^1",
-    "@scripts/jest-config": "2.65.5",
-    "@scripts/build": "2.65.5",
-    "@modern-js/uni-builder": "2.65.5"
+    "@modern-js/uni-builder": "2.66.0",
+    "@scripts/jest-config": "2.66.0",
+    "@scripts/build": "2.66.0"
   },
   "peerDependencies": {
     "devcert": "^1.2.2",