@vuepress/utils 2.0.0-beta.7 → 2.0.0-rc.0

package/dist/index.d.ts

@@ -0,0 +1,123 @@
+export { default as debug } from 'debug';
+export { default as fs } from 'fs-extra';
+export { globby } from 'globby';
+export { default as hash } from 'hash-sum';
+import { Ora } from 'ora';
+export { default as ora } from 'ora';
+export { default as colors } from 'picocolors';
+export { default as path } from 'upath';
+import { HeadConfig, HeadAttrsConfig } from '@vuepress/shared';
+
+/**
+ * Format millisecond
+ */
+declare const formatMs: (ms: number) => string;
+
+declare const info: (...args: any[]) => void;
+declare const tip: (...args: any[]) => void;
+declare const success: (...args: any[]) => void;
+declare const warn: (...args: any[]) => void;
+declare const error: (...args: any[]) => void;
+declare const createError: (message?: string | undefined) => Error;
+declare const logger: {
+    info: (...args: any[]) => void;
+    tip: (...args: any[]) => void;
+    success: (...args: any[]) => void;
+    warn: (...args: any[]) => void;
+    error: (...args: any[]) => void;
+    createError: (message?: string | undefined) => Error;
+};
+
+declare const withSpinner: (msg: string) => <T>(target: (spinner?: Ora) => Promise<T>) => Promise<T>;
+
+declare const getDirname: (importMetaUrl: string) => string;
+
+/**
+ * A helper for dynamically importing a file path
+ *
+ * We need to use `pathToFileURL` to transform file path wo compat with windows
+ */
+declare const importFile: <T>(filePath: string) => Promise<T>;
+/**
+ * A wrapper of `importFile` and returns the default export
+ */
+declare const importFileDefault: <T>(filePath: string) => Promise<T>;
+
+/**
+ * Check if `child` is a sub path of `parent` or not. Return `true` if
+ * they are the same path
+ */
+declare const isChildPath: (child: string, parent: string) => boolean;
+
+declare const sanitizeFileName: (name: string) => string;
+
+/**
+ * Render head config to string
+ */
+declare const renderHead: ([tag, attrs, innerHTML,]: HeadConfig) => string;
+
+/**
+ * Render head attrs config to string
+ */
+declare const renderHeadAttrs: (attrs: HeadAttrsConfig) => string;
+
+/**
+ * HTML outlets of the template renderer
+ */
+declare const TEMPLATE_RENDERER_OUTLETS: {
+    CONTENT: string;
+    HEAD: string;
+    LANG: string;
+    PREFETCH: string;
+    PRELOAD: string;
+    SCRIPTS: string;
+    STYLES: string;
+    VERSION: string;
+};
+/**
+ * Context type of the template renderer
+ */
+interface TemplateRendererContext {
+    /**
+     * The rendered page content. Typically to be put inside `<div id="app"></div>`
+     */
+    content: string;
+    /**
+     * The rendered page head. Typically to be put inside `<head></head>`
+     */
+    head: string;
+    /**
+     * The language of the page. Typically to be put inside `<html lang="{{ lang }}">`
+     */
+    lang: string;
+    /**
+     * The rendered prefetch links. Typically to be put inside `<head></head>`
+     */
+    prefetch: string;
+    /**
+     * The rendered preload links. Typically to be put inside `<head></head>`
+     */
+    preload: string;
+    /**
+     * The rendered scripts. Typically to be put before `</body>`
+     */
+    scripts: string;
+    /**
+     * The rendered styles. Typically to be put inside `<head></head>`
+     */
+    styles: string;
+    /**
+     * The version of VuePress
+     */
+    version: string;
+}
+/**
+ * Type of the template renderer function
+ */
+type TemplateRenderer = (template: string, context: TemplateRendererContext) => string | Promise<string>;
+/**
+ * The default template renderer implementation
+ */
+declare const templateRenderer: TemplateRenderer;
+
+export { TEMPLATE_RENDERER_OUTLETS, TemplateRenderer, TemplateRendererContext, createError, error, formatMs, getDirname, importFile, importFileDefault, info, isChildPath, logger, renderHead, renderHeadAttrs, sanitizeFileName, success, templateRenderer, tip, warn, withSpinner };

package/dist/index.js

@@ -0,0 +1,153 @@
+// src/index.ts
+import debug from "debug";
+import fs from "fs-extra";
+import { globby } from "globby";
+import hash from "hash-sum";
+import ora2 from "ora";
+import colors2 from "picocolors";
+import path3 from "upath";
+
+// src/console/formatMs.ts
+var formatMs = (ms) => {
+  if (ms < 1e3)
+    return `${ms}ms`;
+  return `${(ms / 1e3).toFixed(2)}s`;
+};
+
+// src/console/logger.ts
+import colors from "picocolors";
+var info = (...args) => {
+  console.log(colors.cyan("info"), ...args);
+};
+var tip = (...args) => {
+  console.log(colors.blue("tip"), ...args);
+};
+var success = (...args) => {
+  console.log(colors.green("success"), ...args);
+};
+var warn = (...args) => {
+  console.warn(colors.yellow("warning"), ...args);
+};
+var error = (...args) => {
+  console.error(colors.red("error"), ...args);
+};
+var createError = (message) => {
+  error(message);
+  return new Error(message);
+};
+var logger = {
+  info,
+  tip,
+  success,
+  warn,
+  error,
+  createError
+};
+
+// src/console/withSpinner.ts
+import process from "process";
+import ora from "ora";
+var withSpinner = (msg) => async (target) => {
+  if (process.env.DEBUG) {
+    return target();
+  }
+  const start = Date.now();
+  const spinner = ora();
+  try {
+    spinner.start(msg);
+    const result = await target(spinner);
+    spinner.succeed(`${msg} - done in ${formatMs(Date.now() - start)}`);
+    return result;
+  } catch (e) {
+    spinner.fail(`${msg} - failed in ${formatMs(Date.now() - start)}`);
+    throw e;
+  }
+};
+
+// src/module/getDirname.ts
+import { fileURLToPath } from "url";
+import path from "upath";
+var getDirname = (importMetaUrl) => path.dirname(fileURLToPath(importMetaUrl));
+
+// src/module/importFile.ts
+import { pathToFileURL } from "url";
+var importFile = (filePath) => import(pathToFileURL(filePath).toString());
+var importFileDefault = (filePath) => importFile(filePath).then((m) => m.default);
+
+// src/module/isChildPath.ts
+import path2 from "upath";
+var isChildPath = (child, parent) => {
+  const childPath = path2.normalize(child);
+  const parentPath = path2.normalize(parent);
+  if (!path2.win32.isAbsolute(childPath) || !path2.win32.isAbsolute(parentPath)) {
+    return false;
+  }
+  const relativePath = path2.relative(parentPath, childPath);
+  return relativePath === "" || !relativePath.startsWith("..");
+};
+
+// src/module/sanitizeFileName.ts
+var INVALID_CHAR_REGEX = /[\x00-\x1F\x7F<>*#"{}|^[\]`;?:&=+$,]/g;
+var DRIVE_LETTER_REGEX = /^[a-z]:/i;
+var sanitizeFileName = (name) => {
+  const driveLetter = DRIVE_LETTER_REGEX.exec(name)?.[0] || "";
+  return driveLetter + name.substring(driveLetter.length).replace(INVALID_CHAR_REGEX, "_").replace(/^_+/, "");
+};
+
+// src/ssr/renderHeadAttrs.ts
+var renderHeadAttrs = (attrs) => Object.entries(attrs).filter((item) => item[1] !== false).map(
+  ([key, value]) => value === true ? ` ${key}` : ` ${key}="${attrs[key]}"`
+).join("");
+
+// src/ssr/renderHead.ts
+var renderHead = ([
+  tag,
+  attrs,
+  innerHTML = ""
+]) => {
+  const openTag = `<${tag}${renderHeadAttrs(attrs)}>`;
+  if (tag === "link" || tag === "meta" || tag === "base") {
+    return openTag;
+  }
+  return `${openTag}${innerHTML}</${tag}>`;
+};
+
+// src/ssr/templateRenderer.ts
+var TEMPLATE_RENDERER_OUTLETS = {
+  CONTENT: "<!--vuepress-ssr-content-->",
+  HEAD: "<!--vuepress-ssr-head-->",
+  LANG: "{{ lang }}",
+  PREFETCH: "<!--vuepress-ssr-prefetch-->",
+  PRELOAD: "<!--vuepress-ssr-preload-->",
+  SCRIPTS: "<!--vuepress-ssr-scripts-->",
+  STYLES: "<!--vuepress-ssr-styles-->",
+  VERSION: "{{ version }}"
+};
+var templateRenderer = (template, { content, head, lang, prefetch, preload, scripts, styles, version }) => template.replace(TEMPLATE_RENDERER_OUTLETS.CONTENT, () => content).replace(TEMPLATE_RENDERER_OUTLETS.HEAD, head).replace(TEMPLATE_RENDERER_OUTLETS.LANG, lang).replace(TEMPLATE_RENDERER_OUTLETS.PREFETCH, prefetch).replace(TEMPLATE_RENDERER_OUTLETS.PRELOAD, preload).replace(TEMPLATE_RENDERER_OUTLETS.SCRIPTS, scripts).replace(TEMPLATE_RENDERER_OUTLETS.STYLES, styles).replace(TEMPLATE_RENDERER_OUTLETS.VERSION, version);
+export {
+  TEMPLATE_RENDERER_OUTLETS,
+  colors2 as colors,
+  createError,
+  debug,
+  error,
+  formatMs,
+  fs,
+  getDirname,
+  globby,
+  hash,
+  importFile,
+  importFileDefault,
+  info,
+  isChildPath,
+  logger,
+  ora2 as ora,
+  path3 as path,
+  renderHead,
+  renderHeadAttrs,
+  sanitizeFileName,
+  success,
+  templateRenderer,
+  tip,
+  warn,
+  withSpinner
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/utils",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-rc.0",
   "description": "Utils package of VuePress",
   "keywords": [
     "vuepress",
@@ -15,31 +15,49 @@
     "url": "git+https://github.com/vuepress/vuepress-next.git"
   },
   "license": "MIT",
-  "author": "Evan You",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "author": "meteorlxy",
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js",
+    "./package.json": "./package.json"
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "files": [
-    "lib"
+    "dist"
   ],
-  "scripts": {
-    "build": "tsc -b tsconfig.build.json",
-    "clean": "rimraf lib *.tsbuildinfo"
-  },
   "dependencies": {
-    "@types/debug": "^4.1.5",
-    "@types/fs-extra": "^9.0.9",
-    "@types/hash-sum": "^1.0.0",
-    "@vuepress/shared": "2.0.0-beta.7",
-    "chalk": "^4.1.0",
-    "debug": "^4.3.1",
-    "fs-extra": "^9.1.0",
-    "globby": "^11.0.3",
+    "@types/debug": "^4.1.12",
+    "@types/fs-extra": "^11.0.4",
+    "@types/hash-sum": "^1.0.2",
+    "debug": "^4.3.4",
+    "fs-extra": "^11.1.1",
+    "globby": "^14.0.0",
     "hash-sum": "^2.0.0",
-    "ora": "^5.4.0",
-    "upath": "^2.0.1"
+    "ora": "^7.0.1",
+    "picocolors": "^1.0.0",
+    "upath": "^2.0.1",
+    "@vuepress/shared": "2.0.0-rc.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f798c4df7489d7fbf27bf430ea547413e8655af4"
-}
+  "tsup": {
+    "clean": true,
+    "dts": "./src/index.ts",
+    "entry": [
+      "./src/index.ts"
+    ],
+    "format": [
+      "esm"
+    ],
+    "outDir": "./dist",
+    "sourcemap": false,
+    "target": "es2022",
+    "tsconfig": "../tsconfig.dts.json"
+  },
+  "scripts": {
+    "build": "tsup",
+    "clean": "rimraf dist"
+  }
+}

package/CHANGELOG.md

@@ -1,137 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [2.0.0-beta.7](https://github.com/vuepress/vuepress-next/compare/v2.0.0-beta.6...v2.0.0-beta.7) (2021-04-09)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-beta.5](https://github.com/vuepress/vuepress-next/compare/v2.0.0-beta.4...v2.0.0-beta.5) (2021-03-26)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-beta.4](https://github.com/vuepress/vuepress-next/compare/v2.0.0-beta.3...v2.0.0-beta.4) (2021-03-20)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-beta.1](https://github.com/vuepress/vuepress-next/compare/v2.0.0-beta.0...v2.0.0-beta.1) (2021-03-13)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-beta.0](https://github.com/vuepress/vuepress-next/compare/v2.0.0-alpha.26...v2.0.0-beta.0) (2021-03-13)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-alpha.25](https://github.com/vuepress/vuepress-next/compare/v2.0.0-alpha.24...v2.0.0-alpha.25) (2021-02-20)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-alpha.24](https://github.com/vuepress/vuepress-next/compare/v2.0.0-alpha.23...v2.0.0-alpha.24) (2021-02-13)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-alpha.20](https://github.com/vuepress/vuepress-next/compare/v2.0.0-alpha.19...v2.0.0-alpha.20) (2021-02-04)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-alpha.19](https://github.com/vuepress/vuepress-next/compare/v2.0.0-alpha.18...v2.0.0-alpha.19) (2021-01-24)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-alpha.18](https://github.com/vuepress/vuepress-next/compare/v2.0.0-alpha.17...v2.0.0-alpha.18) (2021-01-17)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-alpha.15](https://github.com/vuepress/vuepress-next/compare/v2.0.0-alpha.14...v2.0.0-alpha.15) (2021-01-04)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-alpha.13](https://github.com/vuepress/vuepress-next/compare/v2.0.0-alpha.12...v2.0.0-alpha.13) (2020-12-23)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-alpha.7](https://github.com/vuepress/vuepress-next/compare/v2.0.0-alpha.6...v2.0.0-alpha.7) (2020-12-09)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-alpha.6](https://github.com/vuepress/vuepress-next/compare/v2.0.0-alpha.5...v2.0.0-alpha.6) (2020-12-09)
-
-**Note:** Version bump only for package @vuepress/utils
-
-
-
-
-
-# [2.0.0-alpha.4](https://github.com/vuepress/vuepress-next/compare/v2.0.0-alpha.3...v2.0.0-alpha.4) (2020-12-02)
-
-
-### Features
-
-* **utils:** add hasExportDefault util ([575a9c5](https://github.com/vuepress/vuepress-next/commit/575a9c5d9eee44c0ce20b0712830e2eb2a303780))
-
-
-
-
-
-# 2.0.0-alpha.1 (2020-12-01)
-
-
-### Features
-
-* **utils:** add logger and debug utils ([203d58d](https://github.com/vuepress/vuepress-next/commit/203d58d8d97c6a3158d4a783188ce2b64e54f19c))
-* **utils:** add ora util ([f67b4d3](https://github.com/vuepress/vuepress-next/commit/f67b4d3f62fee077f947362c975c08c81470b0b0))
-* **utils:** add withSpinner util ([82c6bb5](https://github.com/vuepress/vuepress-next/commit/82c6bb5d3e3a76088ee286fc10dabd9da4d59b22))
-* **utils:** disable withSpinner if DEBUG env is set ([af19507](https://github.com/vuepress/vuepress-next/commit/af1950784fb17c258a4c07dbaf7439cf0ec2c762))

package/lib/hasExportDefault.d.ts

@@ -1,6 +0,0 @@
-/**
- * Check if a module is esm with `export default`
- */
-export declare const hasExportDefault: <T = any>(mod: unknown) => mod is {
-    default: T;
-};

package/lib/hasExportDefault.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasExportDefault = void 0;
-const shared_1 = require("@vuepress/shared");
-/**
- * Check if a module is esm with `export default`
- */
-const hasExportDefault = (mod) => shared_1.isPlainObject(mod) &&
-    !!mod.__esModule &&
-    Object.prototype.hasOwnProperty.call(mod, 'default');
-exports.hasExportDefault = hasExportDefault;

package/lib/index.d.ts

@@ -1,14 +0,0 @@
-import * as debug from 'debug';
-import * as chalk from 'chalk';
-import * as fs from 'fs-extra';
-import * as globby from 'globby';
-import * as ora from 'ora';
-import * as path from 'upath';
-import hash = require('hash-sum');
-export { debug, chalk, fs, globby, hash, ora, path };
-export * from './hasExportDefault';
-export * from './logger';
-export * from './renderHead';
-export * from './renderHeadAttrs';
-export * from './requireResolve';
-export * from './withSpinner';

package/lib/index.js

@@ -1,33 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.path = exports.ora = exports.hash = exports.globby = exports.fs = exports.chalk = exports.debug = void 0;
-const debug = require("debug");
-exports.debug = debug;
-const chalk = require("chalk");
-exports.chalk = chalk;
-const fs = require("fs-extra");
-exports.fs = fs;
-const globby = require("globby");
-exports.globby = globby;
-const ora = require("ora");
-exports.ora = ora;
-const path = require("upath");
-exports.path = path;
-const hash = require("hash-sum");
-exports.hash = hash;
-__exportStar(require("./hasExportDefault"), exports);
-__exportStar(require("./logger"), exports);
-__exportStar(require("./renderHead"), exports);
-__exportStar(require("./renderHeadAttrs"), exports);
-__exportStar(require("./requireResolve"), exports);
-__exportStar(require("./withSpinner"), exports);

package/lib/logger.d.ts

@@ -1,12 +0,0 @@
-export declare const info: (...args: any[]) => void;
-export declare const tip: (...args: any[]) => void;
-export declare const success: (...args: any[]) => void;
-export declare const warn: (...args: any[]) => void;
-export declare const error: (...args: any[]) => void;
-export declare const logger: {
-    info: (...args: any[]) => void;
-    tip: (...args: any[]) => void;
-    success: (...args: any[]) => void;
-    warn: (...args: any[]) => void;
-    error: (...args: any[]) => void;
-};

package/lib/logger.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = exports.error = exports.warn = exports.success = exports.tip = exports.info = void 0;
-const chalk = require("chalk");
-const info = (...args) => {
-    console.log(chalk.cyan('info'), ...args);
-};
-exports.info = info;
-const tip = (...args) => {
-    console.log(chalk.blue('tip'), ...args);
-};
-exports.tip = tip;
-const success = (...args) => {
-    console.log(chalk.green('success'), ...args);
-};
-exports.success = success;
-const warn = (...args) => {
-    console.warn(chalk.yellow('warning'), ...args);
-};
-exports.warn = warn;
-const error = (...args) => {
-    console.error(chalk.red('error'), ...args);
-};
-exports.error = error;
-exports.logger = {
-    info: exports.info,
-    tip: exports.tip,
-    success: exports.success,
-    warn: exports.warn,
-    error: exports.error,
-};

package/lib/renderHead.d.ts

@@ -1,5 +0,0 @@
-import type { HeadConfig } from '@vuepress/shared';
-/**
- * Render head config to string
- */
-export declare const renderHead: ([tag, attrs, innerHTML,]: HeadConfig) => string;

package/lib/renderHead.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderHead = void 0;
-const renderHeadAttrs_1 = require("./renderHeadAttrs");
-/**
- * Render head config to string
- */
-const renderHead = ([tag, attrs, innerHTML = '',]) => {
-    const openTag = `<${tag}${renderHeadAttrs_1.renderHeadAttrs(attrs)}>`;
-    if (tag === 'link' || tag === 'meta' || tag === 'base') {
-        return openTag;
-    }
-    return `${openTag}${innerHTML}</${tag}>`;
-};
-exports.renderHead = renderHead;

package/lib/renderHeadAttrs.d.ts

@@ -1,5 +0,0 @@
-import type { HeadAttrsConfig } from '@vuepress/shared';
-/**
- * Render head attrs config to string
- */
-export declare const renderHeadAttrs: (attrs: HeadAttrsConfig) => string;

package/lib/renderHeadAttrs.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderHeadAttrs = void 0;
-/**
- * Render head attrs config to string
- */
-const renderHeadAttrs = (attrs) => Object.entries(attrs)
-    .filter((item) => item[1] !== false)
-    .map(([key, value]) => value === true ? ` ${key}` : ` ${key}="${attrs[key]}"`)
-    .join('');
-exports.renderHeadAttrs = renderHeadAttrs;

package/lib/requireResolve.d.ts

@@ -1,7 +0,0 @@
-/**
- * Wrapper of `require.resolve` of nodejs
- *
- * Return `null` if the module cannot be resolved
- * instead of throwing an error
- */
-export declare const requireResolve: (request: string) => string | null;

package/lib/requireResolve.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.requireResolve = void 0;
-/**
- * Wrapper of `require.resolve` of nodejs
- *
- * Return `null` if the module cannot be resolved
- * instead of throwing an error
- */
-const requireResolve = (request) => {
-    try {
-        return require.resolve(request);
-    }
-    catch (_a) {
-        return null;
-    }
-};
-exports.requireResolve = requireResolve;

package/lib/withSpinner.d.ts

@@ -1 +0,0 @@
-export declare const withSpinner: (msg: string) => <T>(target: () => Promise<T>) => Promise<T>;

package/lib/withSpinner.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSpinner = void 0;
-const ora = require("ora");
-const withSpinner = (msg) => async (target) => {
-    if (process.env.DEBUG) {
-        return target();
-    }
-    const spinner = ora();
-    try {
-        spinner.start(msg);
-        const result = await target();
-        spinner.succeed(`${msg} - done`);
-        return result;
-    }
-    catch (e) {
-        spinner.fail(`${msg} - failed`);
-        throw e;
-    }
-};
-exports.withSpinner = withSpinner;