@storybook/server 7.0.0-alpha.1 → 7.0.0-alpha.4

package/dist/cjs/index.js

@@ -5,49 +5,49 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "addDecorator", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _preview.addDecorator;
   }
 });
 Object.defineProperty(exports, "addParameters", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _preview.addParameters;
   }
 });
 Object.defineProperty(exports, "configure", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _preview.configure;
   }
 });
 Object.defineProperty(exports, "forceReRender", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _preview.forceReRender;
   }
 });
 Object.defineProperty(exports, "getStorybook", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _preview.getStorybook;
   }
 });
 Object.defineProperty(exports, "raw", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _preview.raw;
   }
 });
 Object.defineProperty(exports, "setAddon", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _preview.setAddon;
   }
 });
 Object.defineProperty(exports, "storiesOf", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _preview.storiesOf;
   }
 });

package/dist/cjs/preview/config.js

@@ -6,20 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.parameters = void 0;
 Object.defineProperty(exports, "render", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _render.render;
   }
 });
 Object.defineProperty(exports, "renderToDOM", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _render.renderToDOM;
   }
 });
 
 var _render = require("./render");
 
-var parameters = {
+const parameters = {
   framework: 'server'
 };
 exports.parameters = parameters;

package/dist/cjs/preview/globals.js

@@ -4,5 +4,7 @@ var _global = _interopRequireDefault(require("global"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var globalWindow = _global.default.window;
+const {
+  window: globalWindow
+} = _global.default;
 globalWindow.STORYBOOK_ENV = 'SERVER';

package/dist/cjs/preview/index.js

@@ -5,48 +5,43 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.storiesOf = exports.setAddon = exports.raw = exports.getStorybook = exports.forceReRender = exports.configure = exports.clearDecorators = exports.addParameters = exports.addDecorator = void 0;
 
-require("core-js/modules/es.array.concat.js");
-
 var _coreClient = require("@storybook/core-client");
 
 require("./globals");
 
 var _render = require("./render");
 
-var framework = 'server';
-var api = (0, _coreClient.start)(_render.renderToDOM, {
+const framework = 'server';
+const api = (0, _coreClient.start)(_render.renderToDOM, {
   render: _render.render
 });
 
-var storiesOf = function storiesOf(kind, m) {
+const storiesOf = (kind, m) => {
   return api.clientApi.storiesOf(kind, m).addParameters({
-    framework: framework
+    framework
   });
 };
 
 exports.storiesOf = storiesOf;
 
-var configure = function configure() {
-  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-    args[_key] = arguments[_key];
-  }
-
-  return api.configure.apply(api, [framework].concat(args));
-};
+const configure = (...args) => api.configure(framework, ...args);
 
 exports.configure = configure;
-var _api$clientApi = api.clientApi,
-    addDecorator = _api$clientApi.addDecorator,
-    addParameters = _api$clientApi.addParameters,
-    clearDecorators = _api$clientApi.clearDecorators,
-    setAddon = _api$clientApi.setAddon,
-    getStorybook = _api$clientApi.getStorybook,
-    raw = _api$clientApi.raw;
+const {
+  addDecorator,
+  addParameters,
+  clearDecorators,
+  setAddon,
+  getStorybook,
+  raw
+} = api.clientApi;
 exports.raw = raw;
 exports.getStorybook = getStorybook;
 exports.setAddon = setAddon;
 exports.clearDecorators = clearDecorators;
 exports.addParameters = addParameters;
 exports.addDecorator = addDecorator;
-var forceReRender = api.forceReRender;
+const {
+  forceReRender
+} = api;
 exports.forceReRender = forceReRender;

package/dist/cjs/preview/render.js

@@ -1,120 +1,41 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-require("core-js/modules/es.symbol.js");
-
-require("core-js/modules/es.symbol.description.js");
-
-require("core-js/modules/es.symbol.iterator.js");
-
-require("core-js/modules/es.symbol.async-iterator.js");
-
-require("core-js/modules/es.symbol.to-string-tag.js");
-
-require("core-js/modules/es.json.to-string-tag.js");
-
-require("core-js/modules/es.math.to-string-tag.js");
-
-require("core-js/modules/es.object.get-prototype-of.js");
-
-require("core-js/modules/es.array.slice.js");
-
-require("core-js/modules/es.object.freeze.js");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.render = void 0;
 exports.renderToDOM = renderToDOM;
 
-require("core-js/modules/es.object.to-string.js");
-
-require("core-js/modules/es.promise.js");
-
-require("core-js/modules/es.array.iterator.js");
-
-require("core-js/modules/es.string.iterator.js");
-
-require("core-js/modules/web.dom-collections.iterator.js");
-
-require("core-js/modules/web.url.js");
-
-require("core-js/modules/web.url-search-params.js");
-
-require("core-js/modules/es.array.concat.js");
-
-require("core-js/modules/es.regexp.exec.js");
-
-require("core-js/modules/es.string.search.js");
-
-require("core-js/modules/es.regexp.to-string.js");
-
-require("core-js/modules/es.object.assign.js");
-
-require("core-js/modules/web.dom-collections.for-each.js");
-
-require("core-js/modules/es.object.keys.js");
-
-require("core-js/modules/es.function.name.js");
-
 var _global = _interopRequireDefault(require("global"));
 
 var _tsDedent = _interopRequireDefault(require("ts-dedent"));
 
 var _previewWeb = require("@storybook/preview-web");
 
-var _templateObject;
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-var fetch = _global.default.fetch,
-    Node = _global.default.Node;
-
-var defaultFetchStoryHtml = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, path, params, storyContext) {
-    var fetchUrl, response;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            fetchUrl = new URL("".concat(url, "/").concat(path));
-            fetchUrl.search = new URLSearchParams(Object.assign({}, storyContext.globals, params)).toString();
-            _context.next = 4;
-            return fetch(fetchUrl);
-
-          case 4:
-            response = _context.sent;
-            return _context.abrupt("return", response.text());
-
-          case 6:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function defaultFetchStoryHtml(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var buildStoryArgs = function buildStoryArgs(args, argTypes) {
-  var storyArgs = Object.assign({}, args);
-  Object.keys(argTypes).forEach(function (key) {
-    var argType = argTypes[key];
-    var control = argType.control;
-    var controlType = control && control.type.toLowerCase();
-    var argValue = storyArgs[key];
+/* eslint-disable no-param-reassign */
+const {
+  fetch,
+  Node
+} = _global.default;
+
+const defaultFetchStoryHtml = async (url, path, params, storyContext) => {
+  const fetchUrl = new URL(`${url}/${path}`);
+  fetchUrl.search = new URLSearchParams(Object.assign({}, storyContext.globals, params)).toString();
+  const response = await fetch(fetchUrl);
+  return response.text();
+};
+
+const buildStoryArgs = (args, argTypes) => {
+  const storyArgs = Object.assign({}, args);
+  Object.keys(argTypes).forEach(key => {
+    const argType = argTypes[key];
+    const {
+      control
+    } = argType;
+    const controlType = control && control.type.toLowerCase();
+    const argValue = storyArgs[key];
 
     switch (controlType) {
       case 'date':
@@ -133,78 +54,60 @@ var buildStoryArgs = function buildStoryArgs(args, argTypes) {
   return storyArgs;
 };
 
-var render = function render(args) {};
+const render = args => {};
 
 exports.render = render;
 
-function renderToDOM(_x5, _x6) {
-  return _renderToDOM.apply(this, arguments);
-}
-
-function _renderToDOM() {
-  _renderToDOM = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2, domElement) {
-    var id, title, name, showMain, showError, forceRemount, storyFn, storyContext, _ref2$storyContext, parameters, args, argTypes, storyArgs, _parameters$server, url, storyId, _parameters$server$fe, fetchStoryHtml, params, fetchId, storyParams, element;
-
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            id = _ref2.id, title = _ref2.title, name = _ref2.name, showMain = _ref2.showMain, showError = _ref2.showError, forceRemount = _ref2.forceRemount, storyFn = _ref2.storyFn, storyContext = _ref2.storyContext, _ref2$storyContext = _ref2.storyContext, parameters = _ref2$storyContext.parameters, args = _ref2$storyContext.args, argTypes = _ref2$storyContext.argTypes;
-            // Some addons wrap the storyFn so we need to call it even though Server doesn't need the answer
-            storyFn();
-            storyArgs = buildStoryArgs(args, argTypes);
-            _parameters$server = parameters.server, url = _parameters$server.url, storyId = _parameters$server.id, _parameters$server$fe = _parameters$server.fetchStoryHtml, fetchStoryHtml = _parameters$server$fe === void 0 ? defaultFetchStoryHtml : _parameters$server$fe, params = _parameters$server.params;
-            fetchId = storyId || id;
-            storyParams = Object.assign({}, params, storyArgs);
-            _context2.next = 8;
-            return fetchStoryHtml(url, fetchId, storyParams, storyContext);
-
-          case 8:
-            element = _context2.sent;
-            showMain();
-
-            if (!(typeof element === 'string')) {
-              _context2.next = 15;
-              break;
-            }
-
-            domElement.innerHTML = element;
-            (0, _previewWeb.simulatePageLoad)(domElement);
-            _context2.next = 24;
-            break;
-
-          case 15:
-            if (!(element instanceof Node)) {
-              _context2.next = 23;
-              break;
-            }
-
-            if (!(domElement.firstChild === element && forceRemount === false)) {
-              _context2.next = 18;
-              break;
-            }
-
-            return _context2.abrupt("return");
-
-          case 18:
-            domElement.innerHTML = '';
-            domElement.appendChild(element);
-            (0, _previewWeb.simulateDOMContentLoaded)();
-            _context2.next = 24;
-            break;
-
-          case 23:
-            showError({
-              title: "Expecting an HTML snippet or DOM node from the story: \"".concat(name, "\" of \"").concat(title, "\"."),
-              description: (0, _tsDedent.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        Did you forget to return the HTML snippet from the story?\n        Use \"() => <your snippet or node>\" or when defining the story.\n      "])))
-            });
-
-          case 24:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _renderToDOM.apply(this, arguments);
+async function renderToDOM({
+  id,
+  title,
+  name,
+  showMain,
+  showError,
+  forceRemount,
+  storyFn,
+  storyContext,
+  storyContext: {
+    parameters,
+    args,
+    argTypes
+  }
+}, domElement) {
+  // Some addons wrap the storyFn so we need to call it even though Server doesn't need the answer
+  storyFn();
+  const storyArgs = buildStoryArgs(args, argTypes);
+  const {
+    server: {
+      url,
+      id: storyId,
+      fetchStoryHtml = defaultFetchStoryHtml,
+      params
+    }
+  } = parameters;
+  const fetchId = storyId || id;
+  const storyParams = Object.assign({}, params, storyArgs);
+  const element = await fetchStoryHtml(url, fetchId, storyParams, storyContext);
+  showMain();
+
+  if (typeof element === 'string') {
+    domElement.innerHTML = element;
+    (0, _previewWeb.simulatePageLoad)(domElement);
+  } else if (element instanceof Node) {
+    // Don't re-mount the element if it didn't change and neither did the story
+    if (domElement.firstChild === element && forceRemount === false) {
+      return;
+    }
+
+    domElement.innerHTML = '';
+    domElement.appendChild(element);
+    (0, _previewWeb.simulateDOMContentLoaded)();
+  } else {
+    showError({
+      title: `Expecting an HTML snippet or DOM node from the story: "${name}" of "${title}".`,
+      description: (0, _tsDedent.default)`
+        Did you forget to return the HTML snippet from the story?
+        Use "() => <your snippet or node>" or when defining the story.
+      `
+    });
+  }
 }

package/dist/types/preview/render.d.ts

@@ -2,4 +2,4 @@ import type { RenderContext } from '@storybook/store';
 import type { StoryFn } from '@storybook/csf';
 import type { ServerFramework } from './types';
 export declare const render: StoryFn<ServerFramework>;
-export declare function renderToDOM({ id, title, name, showMain, showError, forceRemount, storyFn, storyContext, storyContext: { parameters, args, argTypes }, }: RenderContext<ServerFramework>, domElement: HTMLElement): Promise<void>;
+export declare function renderToDOM({ id, title, name, showMain, showError, forceRemount, storyFn, storyContext, storyContext: { parameters, args, argTypes }, }: RenderContext<ServerFramework>, domElement: Element): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/server",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.4",
   "description": "Storybook Server renderer",
   "keywords": [
     "storybook"
@@ -32,16 +32,15 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "7.0.0-alpha.1",
-    "@storybook/core-client": "7.0.0-alpha.1",
+    "@storybook/addons": "7.0.0-alpha.4",
+    "@storybook/core-client": "7.0.0-alpha.4",
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
-    "@storybook/preview-web": "7.0.0-alpha.1",
-    "@storybook/store": "7.0.0-alpha.1",
+    "@storybook/preview-web": "7.0.0-alpha.4",
+    "@storybook/store": "7.0.0-alpha.4",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
     "react": "16.14.0",
     "react-dom": "16.14.0",
-    "regenerator-runtime": "^0.13.7",
     "ts-dedent": "^2.0.0"
   },
   "engines": {
@@ -50,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b90b85210f66da59656c2ef58b0910b156256bea"
+  "gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00"
 }