@storybook/ember 7.0.0-alpha.3 → 7.0.0-alpha.30

package/README.md

@@ -12,7 +12,7 @@ So you can develop UI components in isolation without worrying about app specifi
 
 ```sh
 cd my-ember-app
-npx sb init
+npx storybook init
 ```
 
 For more information visit: [storybook.js.org](https://storybook.js.org)

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

@@ -31,14 +31,14 @@ exports.clearDecorators = clearDecorators;
 exports.addParameters = addParameters;
 exports.addDecorator = addDecorator;
 exports.setAddon = setAddon;
-const framework = 'ember';
+const FRAMEWORK = 'ember';
 
 const storiesOf = (kind, m) => clientApi.storiesOf(kind, m).addParameters({
-  framework
+  framework: FRAMEWORK
 });
 
 exports.storiesOf = storiesOf;
 
-const configure = (loadable, m) => coreConfigure(framework, loadable, m);
+const configure = (loadable, m) => coreConfigure(FRAMEWORK, loadable, m);
 
 exports.configure = configure;

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

@@ -7,15 +7,18 @@ exports.renderToDOM = renderToDOM;
 
 var _global = _interopRequireDefault(require("global"));
 
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+var _tsDedent = require("ts-dedent");
+
+var _component = _interopRequireDefault(require("@ember/component"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// @ts-ignore
 const {
   window: globalWindow,
   document
 } = _global.default;
-const rootEl = document.getElementById('root');
+const rootEl = document.getElementById('storybook-root');
 
 const config = globalWindow.require(`${globalWindow.STORYBOOK_NAME}/config/environment`);
 
@@ -45,7 +48,7 @@ function render(options, el) {
     const appInstancePrivate = app.buildInstance();
     return appInstancePrivate.boot().then(() => appInstancePrivate);
   }).then(instance => {
-    instance.register('component:story-mode', Ember.Component.extend(Object.assign({
+    instance.register('component:story-mode', _component.default.extend(Object.assign({
       layout: template || options
     }, context)));
     const component = instance.lookup('component:story-mode');
@@ -75,7 +78,7 @@ function renderToDOM({
   if (!element) {
     showError({
       title: `Expecting a Ember element from the story: "${name}" of "${kind}".`,
-      description: (0, _tsDedent.default)`
+      description: (0, _tsDedent.dedent)`
         Did you forget to return the Ember element from the story?
         Use "() => hbs('{{component}}')" or "() => { return {
           template: hbs\`{{component}}\`

package/dist/cjs/preset.js

@@ -4,12 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.core = exports.addons = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 const addons = [require.resolve('./server/framework-preset-babel-ember'), require.resolve('./server/framework-preset-ember-docs')];
 exports.addons = addons;
 
-const core = async config => {
+const core = async (config, options) => {
+  const framework = await options.presets.apply('framework');
   return Object.assign({}, config, {
-    builder: require.resolve('@storybook/builder-webpack5')
+    builder: {
+      name: _path.default.dirname(require.resolve(_path.default.join('@storybook/builder-webpack5', 'package.json'))),
+      options: typeof framework === 'string' ? {} : framework.options.builder || {}
+    }
   });
 };
 

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

@@ -34,9 +34,12 @@ 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;
+        }
       }
     });
   }
@@ -51,7 +54,7 @@ function babel(config, options) {
     }
   }], [require.resolve('babel-plugin-ember-modules-api-polyfill')]];
   return _objectSpread(_objectSpread({}, config), {}, {
-    plugins: [].concat(babelConfigPlugins, extraPlugins)
+    plugins: [...babelConfigPlugins, ...extraPlugins]
   });
 }
 

package/dist/cjs/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -14,9 +14,9 @@ export const {
   getStorybook,
   raw
 } = clientApi;
-const framework = 'ember';
+const FRAMEWORK = 'ember';
 export const storiesOf = (kind, m) => clientApi.storiesOf(kind, m).addParameters({
-  framework
+  framework: FRAMEWORK
 });
-export const configure = (loadable, m) => coreConfigure(framework, loadable, m);
+export const configure = (loadable, m) => coreConfigure(FRAMEWORK, loadable, m);
 export { forceReRender };

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

@@ -1,10 +1,13 @@
 import global from 'global';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
+// @ts-ignore
+import Component from '@ember/component'; // eslint-disable-line import/no-unresolved
+
 const {
   window: globalWindow,
   document
 } = global;
-const rootEl = document.getElementById('root');
+const rootEl = document.getElementById('storybook-root');
 
 const config = globalWindow.require(`${globalWindow.STORYBOOK_NAME}/config/environment`);
 
@@ -34,7 +37,7 @@ function render(options, el) {
     const appInstancePrivate = app.buildInstance();
     return appInstancePrivate.boot().then(() => appInstancePrivate);
   }).then(instance => {
-    instance.register('component:story-mode', Ember.Component.extend(Object.assign({
+    instance.register('component:story-mode', Component.extend(Object.assign({
       layout: template || options
     }, context)));
     const component = instance.lookup('component:story-mode');

package/dist/esm/preset.js

@@ -1,6 +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 => {
+export const core = async (config, options) => {
+  const framework = await options.presets.apply('framework');
   return Object.assign({}, config, {
-    builder: require.resolve('@storybook/builder-webpack5')
+    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/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/types/src/client/preview/index.d.ts

@@ -1,8 +1,8 @@
 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;
+    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;

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

@@ -1,3 +1,3 @@
-import { RenderContext } from '@storybook/store';
+import type { 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/types/src/preset.d.ts

@@ -1,11 +1,4 @@
-import type { StorybookConfig } from '@storybook/core-common';
-export declare const addons: StorybookConfig['addons'];
-export declare const core: (config: StorybookConfig['core']) => Promise<{
-    builder: string;
-    disableWebpackDefaults?: boolean;
-    channelOptions?: Partial<import("telejson").Options>;
-    disableProjectJson?: boolean;
-    disableTelemetry?: boolean;
-    enableCrashReports?: boolean;
-    crossOriginIsolated?: boolean;
-}>;
+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,6 +1,6 @@
 {
   "name": "@storybook/ember",
-  "version": "7.0.0-alpha.3",
+  "version": "7.0.0-alpha.30",
   "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/ember",
   "bugs": {
@@ -26,28 +26,30 @@
     "*.d.ts"
   ],
   "scripts": {
-    "prepare": "node ../../scripts/prepare.js"
+    "check": "tsc --noEmit",
+    "prepare": "node ../../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/builder-webpack5": "7.0.0-alpha.3",
-    "@storybook/core-client": "7.0.0-alpha.3",
-    "@storybook/core-common": "7.0.0-alpha.3",
-    "@storybook/core-server": "7.0.0-alpha.3",
-    "@storybook/docs-tools": "7.0.0-alpha.3",
-    "@storybook/store": "7.0.0-alpha.3",
-    "core-js": "^3.8.2",
+    "@storybook/builder-webpack5": "7.0.0-alpha.30",
+    "@storybook/core-client": "7.0.0-alpha.30",
+    "@storybook/core-common": "7.0.0-alpha.30",
+    "@storybook/docs-tools": "7.0.0-alpha.30",
+    "@storybook/store": "7.0.0-alpha.30",
     "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"
   },
+  "devDependencies": {
+    "typescript": "~4.6.3"
+  },
   "peerDependencies": {
     "@babel/core": "*",
+    "@types/ember__component": "4.0.8",
     "babel-plugin-ember-modules-api-polyfill": "^2.12.0",
     "babel-plugin-htmlbars-inline-precompile": "2 || 3",
-    "ember-source": "^3.16.0"
+    "ember-source": "~3.28.1"
   },
   "engines": {
     "node": ">=10.13.0"
@@ -55,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "629b056190993bcee6445471b8cb27208eb401a9"
+  "gitHead": "aabf7b595cb13d8a86dca27ad3d6039205bd55d6"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 Kadira Inc. <hello@kadira.io>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

package/standalone.js

@@ -1,7 +0,0 @@
-const build = require('@storybook/core-server/standalone');
-
-async function buildStandalone(options) {
-  return build(options);
-}
-
-module.exports = buildStandalone;