@storybook/ember 6.5.9 → 7.0.0-alpha.10

package/dist/esm/client/preview/docs/jsondoc.js

@@ -1,34 +1,26 @@
-import "core-js/modules/es.array.find.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.function.name.js";
-import "core-js/modules/es.symbol.js";
-import "core-js/modules/es.symbol.description.js";
-
 /* eslint-disable no-underscore-dangle */
 
 /* global window */
-export var setJSONDoc = function setJSONDoc(jsondoc) {
+export const setJSONDoc = jsondoc => {
   window.__EMBER_GENERATED_DOC_JSON__ = jsondoc;
 };
-export var getJSONDoc = function getJSONDoc() {
+export const getJSONDoc = () => {
   return window.__EMBER_GENERATED_DOC_JSON__;
 };
-export var extractArgTypes = function extractArgTypes(componentName) {
-  var json = getJSONDoc();
+export const extractArgTypes = componentName => {
+  const json = getJSONDoc();
 
   if (!(json && json.included)) {
     return null;
   }
 
-  var componentDoc = json.included.find(function (doc) {
-    return doc.attributes.name === componentName;
-  });
+  const componentDoc = json.included.find(doc => doc.attributes.name === componentName);
 
   if (!componentDoc) {
     return null;
   }
 
-  return componentDoc.attributes.arguments.reduce(function (acc, prop) {
+  return componentDoc.attributes.arguments.reduce((acc, prop) => {
     acc[prop.name] = {
       name: prop.name,
       defaultValue: prop.defaultValue,
@@ -39,25 +31,21 @@ export var extractArgTypes = function extractArgTypes(componentName) {
         },
         type: {
           summary: prop.type,
-          required: prop.tags.length ? prop.tags.some(function (tag) {
-            return tag.name === 'required';
-          }) : false
+          required: prop.tags.length ? prop.tags.some(tag => tag.name === 'required') : false
         }
       }
     };
     return acc;
   }, {});
 };
-export var extractComponentDescription = function extractComponentDescription(componentName) {
-  var json = getJSONDoc();
+export const extractComponentDescription = componentName => {
+  const json = getJSONDoc();
 
   if (!(json && json.included)) {
     return null;
   }
 
-  var componentDoc = json.included.find(function (doc) {
-    return doc.attributes.name === componentName;
-  });
+  const componentDoc = json.included.find(doc => doc.attributes.name === componentName);
 
   if (!componentDoc) {
     return null;

package/dist/esm/client/preview/globals.js

@@ -1,4 +1,6 @@
 import global from 'global';
-var globalWindow = global.window;
+const {
+  window: globalWindow
+} = global;
 globalWindow.STORYBOOK_NAME = process.env.STORYBOOK_NAME;
 globalWindow.STORYBOOK_ENV = 'ember';

package/dist/esm/client/preview/index.js

@@ -1,26 +1,22 @@
-import { start } from '@storybook/core';
+import { start } from '@storybook/core-client';
 import './globals';
 import { renderToDOM } from './render';
-
-var _start = start(renderToDOM),
-    coreConfigure = _start.configure,
-    clientApi = _start.clientApi,
-    forceReRender = _start.forceReRender;
-
-var setAddon = clientApi.setAddon,
-    addDecorator = clientApi.addDecorator,
-    addParameters = clientApi.addParameters,
-    clearDecorators = clientApi.clearDecorators,
-    getStorybook = clientApi.getStorybook,
-    raw = clientApi.raw;
-export { setAddon, addDecorator, addParameters, clearDecorators, getStorybook, raw };
-var framework = 'ember';
-export var storiesOf = function storiesOf(kind, m) {
-  return clientApi.storiesOf(kind, m).addParameters({
-    framework: framework
-  });
-};
-export var configure = function configure(loadable, m) {
-  return coreConfigure(framework, loadable, m);
-};
+const {
+  configure: coreConfigure,
+  clientApi,
+  forceReRender
+} = start(renderToDOM);
+export const {
+  setAddon,
+  addDecorator,
+  addParameters,
+  clearDecorators,
+  getStorybook,
+  raw
+} = clientApi;
+const FRAMEWORK = 'ember';
+export const storiesOf = (kind, m) => clientApi.storiesOf(kind, m).addParameters({
+  framework: FRAMEWORK
+});
+export const configure = (loadable, m) => coreConfigure(FRAMEWORK, loadable, m);
 export { forceReRender };

package/dist/esm/client/preview/render.js

@@ -1,53 +1,43 @@
-var _templateObject;
-
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-import "core-js/modules/es.object.assign.js";
-import "core-js/modules/es.function.name.js";
-import "core-js/modules/es.array.concat.js";
-import "core-js/modules/es.array.slice.js";
-import "core-js/modules/es.object.freeze.js";
 import global from 'global';
 import dedent from 'ts-dedent';
-var globalWindow = global.window,
-    document = global.document;
-var rootEl = document.getElementById('root');
+const {
+  window: globalWindow,
+  document
+} = global;
+const rootEl = document.getElementById('root');
 
-var config = globalWindow.require("".concat(globalWindow.STORYBOOK_NAME, "/config/environment"));
+const config = globalWindow.require(`${globalWindow.STORYBOOK_NAME}/config/environment`);
 
-var app = globalWindow.require("".concat(globalWindow.STORYBOOK_NAME, "/app")).default.create(Object.assign({
+const app = globalWindow.require(`${globalWindow.STORYBOOK_NAME}/app`).default.create(Object.assign({
   autoboot: false,
   rootElement: rootEl
 }, config.APP));
 
-var lastPromise = app.boot();
-var hasRendered = false;
-var isRendering = false;
+let lastPromise = app.boot();
+let hasRendered = false;
+let isRendering = false;
 
 function render(options, el) {
   if (isRendering) return;
   isRendering = true;
-  var template = options.template,
-      _options$context = options.context,
-      context = _options$context === void 0 ? {} : _options$context,
-      element = options.element;
+  const {
+    template,
+    context = {},
+    element
+  } = options;
 
   if (hasRendered) {
-    lastPromise = lastPromise.then(function (instance) {
-      return instance.destroy();
-    });
+    lastPromise = lastPromise.then(instance => instance.destroy());
   }
 
-  lastPromise = lastPromise.then(function () {
-    var appInstancePrivate = app.buildInstance();
-    return appInstancePrivate.boot().then(function () {
-      return appInstancePrivate;
-    });
-  }).then(function (instance) {
+  lastPromise = lastPromise.then(() => {
+    const appInstancePrivate = app.buildInstance();
+    return appInstancePrivate.boot().then(() => appInstancePrivate);
+  }).then(instance => {
     instance.register('component:story-mode', Ember.Component.extend(Object.assign({
       layout: template || options
     }, context)));
-    var component = instance.lookup('component:story-mode');
+    const component = instance.lookup('component:story-mode');
 
     if (element) {
       component.appendTo(element);
@@ -62,18 +52,24 @@ function render(options, el) {
   });
 }
 
-export function renderToDOM(_ref, domElement) {
-  var storyFn = _ref.storyFn,
-      kind = _ref.kind,
-      name = _ref.name,
-      showMain = _ref.showMain,
-      showError = _ref.showError;
-  var element = storyFn();
+export function renderToDOM({
+  storyFn,
+  kind,
+  name,
+  showMain,
+  showError
+}, domElement) {
+  const element = storyFn();
 
   if (!element) {
     showError({
-      title: "Expecting a Ember element from the story: \"".concat(name, "\" of \"").concat(kind, "\"."),
-      description: dedent(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        Did you forget to return the Ember element from the story?\n        Use \"() => hbs('{{component}}')\" or \"() => { return {\n          template: hbs`{{component}}`\n        } }\" when defining the story.\n      "], ["\n        Did you forget to return the Ember element from the story?\n        Use \"() => hbs('{{component}}')\" or \"() => { return {\n          template: hbs\\`{{component}}\\`\n        } }\" when defining the story.\n      "])))
+      title: `Expecting a Ember element from the story: "${name}" of "${kind}".`,
+      description: dedent`
+        Did you forget to return the Ember element from the story?
+        Use "() => hbs('{{component}}')" or "() => { return {
+          template: hbs\`{{component}}\`
+        } }" when defining the story.
+      `
     });
     return;
   }

package/dist/esm/index.js

@@ -0,0 +1,3 @@
+export { storiesOf, setAddon, addDecorator, addParameters, configure, getStorybook, forceReRender, raw } from './client/preview'; // optimization: stop HMR propagation in webpack
+
+module?.hot?.decline();

package/dist/esm/preset.js

@@ -0,0 +1,11 @@
+import path from 'path';
+export const addons = [require.resolve('./server/framework-preset-babel-ember'), require.resolve('./server/framework-preset-ember-docs')];
+export const core = async (config, options) => {
+  const framework = await options.presets.apply('framework');
+  return Object.assign({}, config, {
+    builder: {
+      name: path.dirname(require.resolve(path.join('@storybook/builder-webpack5', 'package.json'))),
+      options: typeof framework === 'string' ? {} : framework.options.builder || {}
+    }
+  });
+};

package/dist/esm/server/framework-preset-babel-ember.js

@@ -24,9 +24,12 @@ export function babel(config, options) {
   if (options && options.presetsList) {
     options.presetsList.forEach(function (e, index) {
       if (e.preset && e.preset.emberOptions) {
-        emberOptions = e.preset.emberOptions; // eslint-disable-next-line no-param-reassign
+        emberOptions = e.preset.emberOptions;
 
-        delete options.presetsList[index].preset.emberOptions;
+        if (options.presetsList) {
+          // eslint-disable-next-line no-param-reassign
+          delete options.presetsList[index].preset.emberOptions;
+        }
       }
     });
   }
@@ -41,7 +44,7 @@ export function babel(config, options) {
     }
   }], [require.resolve('babel-plugin-ember-modules-api-polyfill')]];
   return _objectSpread(_objectSpread({}, config), {}, {
-    plugins: [].concat(babelConfigPlugins, extraPlugins)
+    plugins: [...babelConfigPlugins, ...extraPlugins]
   });
 }
 export var previewAnnotations = function (entry = []) {

package/dist/esm/types.js

@@ -0,0 +1 @@
+export {};

package/dist/{ts3.9 → types}/src/client/preview/config.d.ts

@@ -1,4 +1,4 @@
 export { renderToDOM } from './render';
 export declare const parameters: {
-    framework: string;
+    framework: "ember";
 };

package/dist/{ts3.9 → types}/src/client/preview/index.d.ts

@@ -1,9 +1,9 @@
 import './globals';
 declare const forceReRender: (() => never) | (() => void);
 export declare const setAddon: ((addon: any) => void) | (() => never), addDecorator: (() => never) | ((decorator: import("@storybook/csf").DecoratorFunction<import("./types").EmberFramework, import("@storybook/csf").Args>) => void), addParameters: (({ globals, globalTypes, ...parameters }: import("@storybook/csf").Parameters & {
-    globals?: import("@storybook/csf").Globals;
-    globalTypes?: import("@storybook/csf").GlobalTypes;
-}) => void) | (() => never), clearDecorators: (() => void) | (() => never), getStorybook: (() => never) | (() => import("@storybook/client-api/dist/ts3.9/ClientApi").GetStorybookKind<import("./types").EmberFramework>[]), raw: (() => never) | (() => import("@storybook/store").BoundStory<import("./types").EmberFramework>[]);
-export declare const storiesOf: (kind: string, m: any) => import("@storybook/addons").StoryApi<import("./types").OptionsArgs>;
+    globals?: import("@storybook/csf").Globals | undefined;
+    globalTypes?: import("@storybook/csf").GlobalTypes | undefined;
+}) => void) | (() => never), clearDecorators: (() => void) | (() => never), getStorybook: (() => never) | (() => import("lib/client-api/dist/types/ClientApi").GetStorybookKind<import("./types").EmberFramework>[]), raw: (() => never) | (() => import("lib/store/dist/types").BoundStory<import("./types").EmberFramework>[]);
+export declare const storiesOf: (kind: string, m: any) => import("lib/addons/dist/types").StoryApi<import("./types").OptionsArgs>;
 export declare const configure: (loadable: any, m: any) => void;
 export { forceReRender };

package/dist/{ts3.9 → types}/src/client/preview/render.d.ts

@@ -1,3 +1,3 @@
 import { RenderContext } from '@storybook/store';
 import { EmberFramework } from './types';
-export declare function renderToDOM({ storyFn, kind, name, showMain, showError }: RenderContext<EmberFramework>, domElement: HTMLElement): void;
+export declare function renderToDOM({ storyFn, kind, name, showMain, showError }: RenderContext<EmberFramework>, domElement: Element): void;

package/dist/{ts3.9 → types}/src/client/preview/types.d.ts

@@ -1,4 +1,4 @@
-export type { RenderContext } from '@storybook/core';
+export type { RenderContext } from '@storybook/core-client';
 export interface ShowErrorArgs {
     title: string;
     description: string;

package/dist/types/src/index.d.ts

@@ -0,0 +1 @@
+export { storiesOf, setAddon, addDecorator, addParameters, configure, getStorybook, forceReRender, raw, } from './client/preview';

package/dist/types/src/preset.d.ts

@@ -0,0 +1,4 @@
+import type { PresetProperty } from '@storybook/core-common';
+import type { StorybookConfig } from './types';
+export declare const addons: PresetProperty<'addons', StorybookConfig>;
+export declare const core: PresetProperty<'core', StorybookConfig>;

package/dist/types/src/types.d.ts

@@ -0,0 +1,25 @@
+import type { StorybookConfig as StorybookConfigBase, TypescriptOptions as TypescriptOptionsReact } from '@storybook/core-webpack';
+import type { StorybookConfigWebpack, BuilderOptions, TypescriptOptions as TypescriptOptionsBuilder } from '@storybook/builder-webpack5';
+declare type FrameworkName = '@storybook/ember-webpack5';
+declare type BuilderName = '@storybook/builder-webpack5';
+export declare type FrameworkOptions = {
+    builder?: BuilderOptions;
+};
+declare type StorybookConfigFramework = {
+    framework: FrameworkName | {
+        name: FrameworkName;
+        options: FrameworkOptions;
+    };
+    core?: StorybookConfigBase['core'] & {
+        builder?: BuilderName | {
+            name: BuilderName;
+            options: BuilderOptions;
+        };
+    };
+    typescript?: Partial<TypescriptOptionsBuilder & TypescriptOptionsReact> & StorybookConfigBase['typescript'];
+};
+/**
+ * The interface for Storybook configuration in `main.ts` files.
+ */
+export declare type StorybookConfig = Omit<StorybookConfigBase, keyof StorybookConfigWebpack | keyof StorybookConfigFramework> & StorybookConfigWebpack & StorybookConfigFramework;
+export {};

package/package.json

@@ -1,38 +1,25 @@
 {
   "name": "@storybook/ember",
-  "version": "6.5.9",
+  "version": "7.0.0-alpha.10",
   "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.",
-  "homepage": "https://github.com/storybookjs/storybook/tree/main/app/ember",
+  "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/ember",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/storybookjs/storybook.git",
-    "directory": "app/ember"
+    "directory": "frameworks/ember"
   },
   "funding": {
     "type": "opencollective",
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/cjs/client/index.js",
-  "module": "dist/esm/client/index.js",
-  "types": "dist/ts3.9/client/index.d.ts",
-  "typesVersions": {
-    "<3.8": {
-      "dist/ts3.9/*": [
-        "dist/ts3.4/*"
-      ]
-    }
-  },
-  "bin": {
-    "build-storybook": "./bin/build.js",
-    "start-storybook": "./bin/index.js",
-    "storybook-server": "./bin/index.js"
-  },
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/types/index.d.ts",
   "files": [
-    "bin/**/*",
     "dist/**/*",
     "README.md",
     "*.js",
@@ -42,16 +29,16 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/core": "6.5.9",
-    "@storybook/core-common": "6.5.9",
-    "@storybook/docs-tools": "6.5.9",
-    "@storybook/store": "6.5.9",
+    "@storybook/builder-webpack5": "7.0.0-alpha.10",
+    "@storybook/core-client": "7.0.0-alpha.10",
+    "@storybook/core-common": "7.0.0-alpha.10",
+    "@storybook/docs-tools": "7.0.0-alpha.10",
+    "@storybook/store": "7.0.0-alpha.10",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "read-pkg-up": "^7.0.1",
-    "regenerator-runtime": "^0.13.7",
     "ts-dedent": "^2.0.0"
   },
   "peerDependencies": {
@@ -66,6 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e2673f765722cbb542ef1b5cf8d533c8e746a127",
-  "sbmodern": "dist/modern/client/index.js"
+  "gitHead": "b13dd8fb52819d73d4983148af8ffc5d683e8b75"
 }

package/preset.js

@@ -1 +1 @@
-module.exports = require('./dist/cjs/server/preset');
+module.exports = require('./dist/cjs/preset');

package/bin/build.js

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-require('../dist/cjs/server/build');

package/bin/index.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require('../dist/cjs/server');

package/dist/cjs/server/build.js

@@ -1,9 +0,0 @@
-"use strict";
-
-var _server = require("@storybook/core/server");
-
-var _options = _interopRequireDefault(require("./options"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-(0, _server.buildStatic)(_options.default);

package/dist/cjs/server/index.js

@@ -1,9 +0,0 @@
-"use strict";
-
-var _server = require("@storybook/core/server");
-
-var _options = _interopRequireDefault(require("./options"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-(0, _server.buildDev)(_options.default);

package/dist/cjs/server/options.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _readPkgUp = require("read-pkg-up");
-
-var _default = {
-  packageJson: (0, _readPkgUp.sync)({
-    cwd: __dirname
-  }).packageJson,
-  framework: 'ember',
-  frameworkPresets: [require.resolve('./preset')]
-};
-exports.default = _default;

package/dist/cjs/server/preset.js

@@ -1,8 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.addons = void 0;
-var addons = [require.resolve('./framework-preset-babel-ember'), require.resolve('./framework-preset-ember-docs')];
-exports.addons = addons;

package/dist/esm/client/index.js

@@ -1,5 +0,0 @@
-export { storiesOf, setAddon, addDecorator, addParameters, configure, getStorybook, forceReRender, raw } from './preview';
-
-if (module && module.hot && module.hot.decline) {
-  module.hot.decline();
-}

package/dist/esm/server/build.js

@@ -1,3 +0,0 @@
-import { buildStatic } from '@storybook/core/server';
-import options from './options';
-buildStatic(options);

package/dist/esm/server/index.js

@@ -1,3 +0,0 @@
-import { buildDev } from '@storybook/core/server';
-import options from './options';
-buildDev(options);

package/dist/esm/server/options.js

@@ -1,8 +0,0 @@
-import { sync } from 'read-pkg-up';
-export default {
-  packageJson: sync({
-    cwd: __dirname
-  }).packageJson,
-  framework: 'ember',
-  frameworkPresets: [require.resolve('./preset')]
-};

package/dist/esm/server/preset.js

@@ -1 +0,0 @@
-export var addons = [require.resolve('./framework-preset-babel-ember'), require.resolve('./framework-preset-ember-docs')];

package/dist/modern/client/docs/config.js

@@ -1,10 +0,0 @@
-import { enhanceArgTypes } from '@storybook/docs-tools';
-import { extractArgTypes, extractComponentDescription } from './jsondoc';
-export const parameters = {
-  docs: {
-    iframeHeight: 80,
-    extractArgTypes,
-    extractComponentDescription
-  }
-};
-export const argTypesEnhancers = [enhanceArgTypes];

package/dist/modern/client/docs/index.js

@@ -1 +0,0 @@
-export { setJSONDoc } from './jsondoc';

package/dist/modern/client/docs/jsondoc.js

@@ -1,57 +0,0 @@
-import "core-js/modules/es.array.reduce.js";
-
-/* eslint-disable no-underscore-dangle */
-
-/* global window */
-export const setJSONDoc = jsondoc => {
-  window.__EMBER_GENERATED_DOC_JSON__ = jsondoc;
-};
-export const getJSONDoc = () => {
-  return window.__EMBER_GENERATED_DOC_JSON__;
-};
-export const extractArgTypes = componentName => {
-  const json = getJSONDoc();
-
-  if (!(json && json.included)) {
-    return null;
-  }
-
-  const componentDoc = json.included.find(doc => doc.attributes.name === componentName);
-
-  if (!componentDoc) {
-    return null;
-  }
-
-  return componentDoc.attributes.arguments.reduce((acc, prop) => {
-    acc[prop.name] = {
-      name: prop.name,
-      defaultValue: prop.defaultValue,
-      description: prop.description,
-      table: {
-        defaultValue: {
-          summary: prop.defaultValue
-        },
-        type: {
-          summary: prop.type,
-          required: prop.tags.length ? prop.tags.some(tag => tag.name === 'required') : false
-        }
-      }
-    };
-    return acc;
-  }, {});
-};
-export const extractComponentDescription = componentName => {
-  const json = getJSONDoc();
-
-  if (!(json && json.included)) {
-    return null;
-  }
-
-  const componentDoc = json.included.find(doc => doc.attributes.name === componentName);
-
-  if (!componentDoc) {
-    return null;
-  }
-
-  return componentDoc.attributes.description;
-};

package/dist/modern/client/index.js

@@ -1,5 +0,0 @@
-export { storiesOf, setAddon, addDecorator, addParameters, configure, getStorybook, forceReRender, raw } from './preview';
-
-if (module && module.hot && module.hot.decline) {
-  module.hot.decline();
-}

package/dist/modern/client/preview/config.js

@@ -1,4 +0,0 @@
-export { renderToDOM } from './render';
-export const parameters = {
-  framework: 'ember'
-};

package/dist/modern/client/preview/docs/config.js

@@ -1,8 +0,0 @@
-import { extractArgTypes, extractComponentDescription } from './jsondoc';
-export const parameters = {
-  docs: {
-    iframeHeight: 80,
-    extractArgTypes,
-    extractComponentDescription
-  }
-};

package/dist/modern/client/preview/docs/index.js

@@ -1 +0,0 @@
-export { setJSONDoc } from './jsondoc';