@rsbuild/core 0.0.21 → 0.0.23

package/dist/rspack-provider/plugins/{rspack-profile.js → rspackProfile.js}

@@ -26,12 +26,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var rspack_profile_exports = {};
-__export(rspack_profile_exports, {
+var rspackProfile_exports = {};
+__export(rspackProfile_exports, {
   pluginRspackProfile: () => pluginRspackProfile,
   stopProfiler: () => stopProfiler
 });
-module.exports = __toCommonJS(rspack_profile_exports);
+module.exports = __toCommonJS(rspackProfile_exports);
 var import_path = __toESM(require("path"));
 var import_core = require("@rspack/core");
 var import_inspector = __toESM(require("inspector"));

package/dist/rspack-provider/plugins/swc.js

@@ -71,7 +71,7 @@ const pluginSwc = () => ({
           isServer,
           isServiceWorker
         });
-        const rule = chain.module.rule(CHAIN_ID.RULE.JS).test((0, import_shared.mergeRegex)(import_shared.JS_REGEX, import_shared.TS_REGEX)).type("javascript/auto");
+        const rule = chain.module.rule(CHAIN_ID.RULE.JS).test(import_shared.SCRIPT_REGEX).type("javascript/auto");
         (0, import_shared.applyScriptCondition)({
           rule,
           config,

package/dist/rspack-provider/provider.js

@@ -37,7 +37,6 @@ var import_initConfigs = require("./core/initConfigs");
 var import_initPlugins = require("./core/initPlugins");
 var import_plugin = require("./shared/plugin");
 var import_rspackVersion = require("./shared/rspackVersion");
-var import_server = require("../server");
 function rspackProvider({
   rsbuildConfig: originalRsbuildConfig
 }) {
@@ -73,15 +72,17 @@ function rspackProvider({
         });
       },
       async startDevServer(options) {
-        const { startDevCompile } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));
-        return (0, import_server.startDevServer)(
+        const { startDevServer } = await Promise.resolve().then(() => __toESM(require("../server/devServer")));
+        const { createDevMiddleware } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));
+        return startDevServer(
           { context, pluginStore, rsbuildOptions },
-          startDevCompile,
+          createDevMiddleware,
           options
         );
       },
       async preview(options) {
-        return (0, import_server.startProdServer)(context, context.config, options);
+        const { startProdServer } = await Promise.resolve().then(() => __toESM(require("../server/prodServer")));
+        return startProdServer(context, context.config, options);
       },
       async build(options) {
         const { build: buildImpl, rspackBuild } = await Promise.resolve().then(() => __toESM(require("./core/build")));

package/dist/rspack-provider/shared/plugin.js

@@ -54,7 +54,6 @@ const applyDefaultPlugins = (plugins) => (0, import_shared.awaitableGetter)([
   Promise.resolve().then(() => __toESM(require("../plugins/less"))).then((m) => m.pluginLess()),
   Promise.resolve().then(() => __toESM(require("../plugins/sass"))).then((m) => m.pluginSass()),
   Promise.resolve().then(() => __toESM(require("../plugins/minimize"))).then((m) => m.pluginMinimize()),
-  plugins.rem(),
   Promise.resolve().then(() => __toESM(require("../plugins/hmr"))).then((m) => m.pluginHMR()),
   Promise.resolve().then(() => __toESM(require("../plugins/progress"))).then((m) => m.pluginProgress()),
   Promise.resolve().then(() => __toESM(require("../plugins/swc"))).then((m) => m.pluginSwc()),
@@ -68,9 +67,7 @@ const applyDefaultPlugins = (plugins) => (0, import_shared.awaitableGetter)([
   plugins.networkPerformance(),
   plugins.preloadOrPrefetch(),
   plugins.performance(),
-  Promise.resolve().then(() => __toESM(require("../plugins/rspack-profile"))).then((m) => m.pluginRspackProfile()),
-  Promise.resolve().then(() => __toESM(require("../plugins/fallback"))).then((m) => m.pluginFallback())
-  // fallback should be the last plugin
+  Promise.resolve().then(() => __toESM(require("../plugins/rspackProfile"))).then((m) => m.pluginRspackProfile())
 ]);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/rspack-provider/types/plugin.d.ts

@@ -1,4 +1,4 @@
 import type { RsbuildConfig, NormalizedConfig, DefaultRsbuildPluginAPI, RsbuildPlugin as BaseRsbuildPlugin } from '@rsbuild/shared';
 import type { RspackConfig, RspackCompiler, RspackMultiCompiler } from '@rsbuild/shared';
 export interface RsbuildPluginAPI extends DefaultRsbuildPluginAPI<RsbuildConfig, NormalizedConfig, RspackConfig, RspackCompiler | RspackMultiCompiler> {}
-export type RsbuildPlugin = BaseRsbuildPlugin<RsbuildPluginAPI>;
+export type RsbuildPlugin<T = RsbuildPluginAPI> = BaseRsbuildPlugin<T>;

package/dist/server/dev-middleware/index.d.ts

@@ -10,12 +10,14 @@ type Options = {
 export default class DevMiddleware extends EventEmitter {
   middleware?: DevMiddlewareAPI;
   private devOptions;
+  private devMiddleware?;
   private socketServer;
   constructor({
     dev,
     devMiddleware
   }: Options);
   init(app: Server): void;
+  close(): void;
   sockWrite(type: string, data?: Record<string, any> | string | boolean): void;
   private setupDevMiddleware;
 }

package/dist/server/dev-middleware/index.js

@@ -40,7 +40,7 @@ function getHMRClientPath(client) {
   const host = (client == null ? void 0 : client.host) ? `&host=${client.host}` : "";
   const path = (client == null ? void 0 : client.path) ? `&path=${client.path}` : "";
   const port = (client == null ? void 0 : client.port) ? `&port=${client.port}` : "";
-  const clientEntry = `${require.resolve("@rsbuild/core/hmr-client")}?${host}${path}${port}${protocol}`;
+  const clientEntry = `${require.resolve("@rsbuild/core/client/hmr")}?${host}${path}${port}${protocol}`;
   return clientEntry;
 }
 class DevMiddleware extends import_events.EventEmitter {
@@ -48,19 +48,20 @@ class DevMiddleware extends import_events.EventEmitter {
     super();
     this.devOptions = dev;
     this.socketServer = new import_socketServer.default(dev);
-    if (devMiddleware) {
-      this.middleware = this.setupDevMiddleware(devMiddleware);
-    }
+    this.devMiddleware = devMiddleware;
   }
   init(app) {
+    if (this.devMiddleware) {
+      this.middleware = this.setupDevMiddleware(this.devMiddleware);
+    }
     app.on("listening", () => {
       this.socketServer.prepare(app);
     });
-    app.on("close", async () => {
-      var _a;
-      (_a = this.middleware) == null ? void 0 : _a.close(noop);
-      this.socketServer.close();
-    });
+  }
+  close() {
+    var _a;
+    this.socketServer.close();
+    (_a = this.middleware) == null ? void 0 : _a.close(noop);
   }
   sockWrite(type, data) {
     this.socketServer.sockWrite(type, data);

package/dist/server/devServer.d.ts

@@ -4,7 +4,7 @@
 import { Server } from 'http';
 import type { ListenOptions } from 'net';
 import { RsbuildDevServerOptions, CreateDevServerOptions, DevServerContext, StartDevServerOptions, StartServerResult } from '@rsbuild/shared';
-import connect from 'connect';
+import connect from '@rsbuild/shared/connect';
 export declare class RsbuildDevServer {
   private readonly dev;
   private readonly devMiddleware;
@@ -22,7 +22,7 @@ export declare class RsbuildDevServer {
 }
 export declare function startDevServer<Options extends {
   context: DevServerContext;
-}>(options: Options, startDevCompile: (options: Options, compiler: StartDevServerOptions['compiler']) => Promise<CreateDevServerOptions['devMiddleware']>, {
+}>(options: Options, createDevMiddleware: (options: Options, compiler: StartDevServerOptions['compiler']) => Promise<CreateDevServerOptions['devMiddleware']>, {
   open,
   compiler,
   printURLs,

package/dist/server/devServer.js

@@ -37,7 +37,7 @@ var import_https = require("https");
 var import_url = __toESM(require("url"));
 var import_shared = require("@rsbuild/shared");
 var import_dev_middleware = __toESM(require("./dev-middleware"));
-var import_connect = __toESM(require("connect"));
+var import_connect = __toESM(require("@rsbuild/shared/connect"));
 var import_proxy = require("./proxy");
 var import_middlewares = require("./middlewares");
 var import_path = require("path");
@@ -82,7 +82,7 @@ class RsbuildDevServer {
   async applyDefaultMiddlewares(app) {
     const { dev, devMiddleware } = this;
     if (dev.compress) {
-      const { default: compression } = await Promise.resolve().then(() => __toESM(require("http-compression")));
+      const { default: compression } = await Promise.resolve().then(() => __toESM(require("../../compiled/http-compression")));
       this.middlewares.use((req, res, next) => {
         compression({
           gzip: true,
@@ -121,9 +121,8 @@ class RsbuildDevServer {
       })
     );
     if (dev.historyApiFallback) {
-      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("connect-history-api-fallback")));
+      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("../../compiled/connect-history-api-fallback")));
       const historyApiFallbackMiddleware = connectHistoryApiFallback(
-        // @ts-expect-error
         typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback
       );
       this.middlewares.use(historyApiFallbackMiddleware);
@@ -154,10 +153,11 @@ class RsbuildDevServer {
     }
   }
   close() {
+    this.devMiddleware.close();
     this.app.close();
   }
 }
-async function startDevServer(options, startDevCompile, {
+async function startDevServer(options, createDevMiddleware, {
   open,
   compiler,
   printURLs = true,
@@ -188,17 +188,8 @@ async function startDevServer(options, startDevCompile, {
     options.context.entry,
     (_c = (_b = rsbuildConfig.output) == null ? void 0 : _b.distPath) == null ? void 0 : _c.html
   );
-  if (printURLs) {
-    if ((0, import_shared.isFunction)(printURLs)) {
-      urls = printURLs(urls);
-      if (!Array.isArray(urls)) {
-        throw new Error("Please return an array in the `printURLs` function.");
-      }
-    }
-    (0, import_shared.printServerURLs)(urls, routes, logger);
-  }
   (0, import_shared.debug)("create dev server");
-  const devMiddleware = await startDevCompile(options, compiler);
+  const devMiddleware = await createDevMiddleware(options, compiler);
   const server = new RsbuildDevServer({
     pwd: options.context.rootPath,
     devMiddleware,
@@ -211,6 +202,15 @@ async function startDevServer(options, startDevCompile, {
   (0, import_shared.debug)("create dev server done");
   await options.context.hooks.onBeforeStartDevServerHook.call();
   const httpServer = await server.createHTTPServer();
+  if (printURLs) {
+    if ((0, import_shared.isFunction)(printURLs)) {
+      urls = printURLs(urls);
+      if (!Array.isArray(urls)) {
+        throw new Error("Please return an array in the `printURLs` function.");
+      }
+    }
+    (0, import_shared.printServerURLs)(urls, routes, logger);
+  }
   await server.onInit(httpServer);
   (0, import_shared.debug)("listen dev server");
   return new Promise((resolve) => {
@@ -233,7 +233,7 @@ async function startDevServer(options, startDevCompile, {
           port,
           urls: urls.map((item) => item.url),
           server: {
-            close: () => {
+            close: async () => {
               server.close();
             }
           }

package/dist/server/prodServer.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import type { ListenOptions } from 'net';
 import { Server } from 'http';
-import connect from 'connect';
+import connect from '@rsbuild/shared/connect';
 import { Context, RsbuildConfig, StartServerResult, PreviewServerOptions } from '@rsbuild/shared';
 type RsbuildProdServerOptions = {
   pwd: string;

package/dist/server/prodServer.js

@@ -33,7 +33,7 @@ __export(prodServer_exports, {
 });
 module.exports = __toCommonJS(prodServer_exports);
 var import_http = require("http");
-var import_connect = __toESM(require("connect"));
+var import_connect = __toESM(require("@rsbuild/shared/connect"));
 var import_path = require("path");
 var import_sirv = __toESM(require("sirv"));
 var import_shared = require("@rsbuild/shared");
@@ -130,7 +130,7 @@ async function startProdServer(context, rsbuildConfig, { printURLs = true } = {}
           port,
           urls: urls.map((item) => item.url),
           server: {
-            close: () => {
+            close: async () => {
               server.close();
             }
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "Unleash the power of Rspack with the out-of-the-box build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -21,9 +21,9 @@
       "types": "./dist/server/index.d.ts",
       "default": "./dist/server/index.js"
     },
-    "./hmr-client": {
-      "types": "./dist/server/dev-middleware/hmr-client/index.d.ts",
-      "default": "./dist/server/dev-middleware/hmr-client/index.js"
+    "./client/*": {
+      "types": "./dist/client/*.d.ts",
+      "default": "./dist/client/*.js"
     },
     "./cli": {
       "types": "./dist/cli/index.d.ts",
@@ -54,30 +54,22 @@
     "bin",
     "dist",
     "static",
+    "compiled",
     "types.d.ts"
   ],
   "dependencies": {
-    "@rspack/core": "0.3.11",
-    "connect": "3.7.0",
-    "connect-history-api-fallback": "^2.0.0",
-    "commander": "^10.0.1",
+    "@rspack/core": "0.3.12",
     "core-js": "~3.32.2",
-    "gzip-size": "^6.0.0",
     "html-webpack-plugin": "npm:html-rspack-plugin@5.5.5",
-    "http-compression": "1.0.6",
     "http-proxy-middleware": "^2.0.1",
     "jiti": "^1.20.0",
-    "open": "^8.4.0",
     "postcss": "8.4.31",
-    "rslog": "^1.1.0",
     "semver": "^7.5.4",
     "sirv": "^2.0.3",
     "ws": "^8.2.0",
-    "@rsbuild/shared": "0.0.21"
+    "@rsbuild/shared": "0.0.23"
   },
   "devDependencies": {
-    "@types/connect": "3.4.35",
-    "@types/connect-history-api-fallback": "^1.3.5",
     "@types/node": "^16",
     "@types/ws": "^8.2.0",
     "@types/semver": "^7.5.4",

package/dist/plugins/rem.d.ts

@@ -1,2 +0,0 @@
-import { type DefaultRsbuildPlugin } from '@rsbuild/shared';
-export declare const pluginRem: () => DefaultRsbuildPlugin;

package/dist/plugins/rem.js

@@ -1,103 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var rem_exports = {};
-__export(rem_exports, {
-  pluginRem: () => pluginRem
-});
-module.exports = __toCommonJS(rem_exports);
-var import_shared = require("@rsbuild/shared");
-var import_shared2 = require("@rsbuild/shared");
-const defaultOptions = {
-  enableRuntime: true,
-  rootFontSize: 50
-};
-const pluginRem = () => ({
-  name: "plugin-rem",
-  pre: ["plugin-css", "plugin-less", "plugin-sass", "plugin-stylus"],
-  setup(api) {
-    api.modifyBundlerChain(
-      async (chain, { CHAIN_ID, isServer, isWebWorker, HtmlPlugin }) => {
-        const config = api.getNormalizedConfig();
-        const {
-          output: { convertToRem }
-        } = config;
-        if (!convertToRem || isServer || isWebWorker) {
-          return;
-        }
-        const userOptions = {
-          ...defaultOptions,
-          ...typeof convertToRem === "boolean" ? {} : convertToRem
-        };
-        const { default: PxToRemPlugin } = await Promise.resolve().then(() => __toESM(require((0, import_shared.getSharedPkgCompiledPath)("postcss-pxtorem"))));
-        const applyRules = [
-          CHAIN_ID.RULE.CSS,
-          CHAIN_ID.RULE.LESS,
-          CHAIN_ID.RULE.SASS,
-          CHAIN_ID.RULE.STYLUS
-        ];
-        const getPxToRemPlugin = () => PxToRemPlugin({
-          rootValue: userOptions.rootFontSize,
-          unitPrecision: 5,
-          propList: ["*"],
-          ...userOptions.pxtorem ? (0, import_shared2.cloneDeep)(userOptions.pxtorem) : {}
-        });
-        applyRules.forEach((name) => {
-          chain.module.rules.has(name) && chain.module.rule(name).use(CHAIN_ID.USE.POSTCSS).tap((options = {}) => {
-            var _a;
-            return {
-              ...options,
-              postcssOptions: {
-                ...options.postcssOptions || {},
-                plugins: [
-                  ...((_a = options.postcssOptions) == null ? void 0 : _a.plugins) || [],
-                  getPxToRemPlugin()
-                ]
-              }
-            };
-          });
-        });
-        if (!userOptions.enableRuntime) {
-          return;
-        }
-        const entries = Object.keys(chain.entryPoints.entries() || {});
-        const distDir = (0, import_shared.getDistPath)(config.output, "js");
-        chain.plugin(CHAIN_ID.PLUGIN.AUTO_SET_ROOT_SIZE).use(import_shared.AutoSetRootFontSizePlugin, [
-          userOptions,
-          entries,
-          HtmlPlugin,
-          distDir
-        ]);
-      }
-    );
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  pluginRem
-});

package/dist/rspack-provider/plugins/fallback.d.ts

@@ -1,2 +0,0 @@
-import type { RsbuildPlugin } from '../types';
-export declare const pluginFallback: () => RsbuildPlugin;

package/dist/rspack-provider/plugins/fallback.js

@@ -1,52 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var fallback_exports = {};
-__export(fallback_exports, {
-  pluginFallback: () => pluginFallback
-});
-module.exports = __toCommonJS(fallback_exports);
-var import_path = require("path");
-var import_shared = require("@rsbuild/shared");
-const pluginFallback = () => ({
-  name: "plugin-fallback",
-  setup(api) {
-    api.modifyRspackConfig((config, { isProd }) => {
-      var _a;
-      const rsbuildConfig = api.getNormalizedConfig();
-      if (!rsbuildConfig.output.enableAssetFallback) {
-        return;
-      }
-      const distDir = (0, import_shared.getDistPath)(rsbuildConfig.output, "media");
-      const filename = (0, import_shared.getFilename)(rsbuildConfig.output, "media", isProd);
-      (0, import_shared.setConfig)(config, "output.assetModuleFilename", (0, import_path.join)(distDir, filename));
-      if (!config.module) {
-        return;
-      }
-      (0, import_shared.setConfig)(
-        config,
-        "module.rules",
-        (0, import_shared.resourceRuleFallback)((_a = config.module) == null ? void 0 : _a.rules)
-      );
-    });
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  pluginFallback
-});

package/dist/server/dev-middleware/hmr-client/createSocketUrl.js

@@ -1,68 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var createSocketUrl_exports = {};
-__export(createSocketUrl_exports, {
-  HMR_SOCK_PATH: () => HMR_SOCK_PATH,
-  createSocketUrl: () => createSocketUrl,
-  formatURL: () => formatURL
-});
-module.exports = __toCommonJS(createSocketUrl_exports);
-const HMR_SOCK_PATH = "/rsbuild-hmr";
-function createSocketUrl(resourceQuery) {
-  const searchParams = resourceQuery.substr(1).split("&");
-  const options = {};
-  for (const pair of searchParams) {
-    const ary = pair.split("=");
-    options[ary[0]] = decodeURIComponent(ary[1]);
-  }
-  const currentLocation = self.location;
-  return getSocketUrl(options, currentLocation);
-}
-function formatURL({
-  port,
-  protocol,
-  hostname,
-  pathname
-}) {
-  if (window.URL) {
-    const url = new URL("http://localhost");
-    url.port = port;
-    url.hostname = hostname;
-    url.protocol = protocol;
-    url.pathname = pathname;
-    return url.toString();
-  }
-  const colon = protocol.indexOf(":") === -1 ? ":" : "";
-  return `${protocol}${colon}//${hostname}:${port}${pathname}`;
-}
-function getSocketUrl(urlParts, location) {
-  const { host, port, path, protocol } = urlParts;
-  return formatURL({
-    protocol: protocol || (location.protocol === "https:" ? "wss" : "ws"),
-    hostname: host || location.hostname,
-    port: port || location.port,
-    pathname: path || HMR_SOCK_PATH
-  });
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  HMR_SOCK_PATH,
-  createSocketUrl,
-  formatURL
-});