Ember: Fix broken import

app/ember/package.json

@@ -42,6 +42,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
+    "@storybook/addons": "6.5.16",
     "@storybook/core": "6.5.16",
     "@storybook/core-common": "6.5.16",
     "@storybook/docs-tools": "6.5.16",

app/ember/src/client/docs/jsondoc.js

@@ -21,7 +21,6 @@ export const extractArgTypes = (componentName) => {
   return componentDoc.attributes.arguments.reduce((acc, prop) => {
     acc[prop.name] = {
       name: prop.name,
-      defaultValue: prop.defaultValue,
       description: prop.description,
       table: {
         defaultValue: { summary: prop.defaultValue },

app/ember/src/client/preview/docs/jsondoc.js

@@ -21,7 +21,6 @@ export const extractArgTypes = (componentName) => {
   return componentDoc.attributes.arguments.reduce((acc, prop) => {
     acc[prop.name] = {
       name: prop.name,
-      defaultValue: prop.defaultValue,
       description: prop.description,
       table: {
         defaultValue: { summary: prop.defaultValue },

app/ember/src/client/preview/index.ts

@@ -1,16 +1,37 @@
 import { start } from '@storybook/core';
+import { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';
 import { renderToDOM } from './render';
+import { EmberFramework, IStorybookSection } from './types';
 
-const { configure: coreConfigure, clientApi, forceReRender } = start(renderToDOM);
+const framework = 'ember';
 
-export const { setAddon, addDecorator, addParameters, clearDecorators, getStorybook, raw } =
-  clientApi;
+interface ClientApi extends ClientStoryApi<EmberFramework['storyResult']> {
+  setAddon(addon: any): void;
+  configure(loader: Loadable, module: NodeModule): void;
+  getStorybook(): IStorybookSection[];
+  clearDecorators(): void;
+  forceReRender(): void;
+  raw: () => any; // todo add type
+  load: (...args: any[]) => void;
+}
 
-const framework = 'ember';
-export const storiesOf = (kind: string, m: any) =>
-  clientApi.storiesOf(kind, m).addParameters({ framework });
-export const configure = (loadable: any, m: any) => coreConfigure(framework, loadable, m);
+const api = start(renderToDOM);
+
+export const storiesOf: ClientApi['storiesOf'] = (kind, m) => {
+  return (api.clientApi.storiesOf(kind, m) as ReturnType<ClientApi['storiesOf']>).addParameters({
+    framework,
+  });
+};
 
-export { forceReRender };
+export const configure: ClientApi['configure'] = (...args) => api.configure(framework, ...args);
+export const addDecorator: ClientApi['addDecorator'] = api.clientApi
+  .addDecorator as ClientApi['addDecorator'];
+export const addParameters: ClientApi['addParameters'] = api.clientApi
+  .addParameters as ClientApi['addParameters'];
+export const clearDecorators: ClientApi['clearDecorators'] = api.clientApi.clearDecorators;
+export const setAddon: ClientApi['setAddon'] = api.clientApi.setAddon;
+export const forceReRender: ClientApi['forceReRender'] = api.forceReRender;
+export const getStorybook: ClientApi['getStorybook'] = api.clientApi.getStorybook;
+export const raw: ClientApi['raw'] = api.clientApi.raw;

app/ember/src/client/preview/types.ts

@@ -15,3 +15,13 @@ export type EmberFramework = {
   component: any;
   storyResult: OptionsArgs;
 };
+
+export interface IStorybookStory {
+  name: string;
+  render: (context: any) => any;
+}
+
+export interface IStorybookSection {
+  kind: string;
+  stories: IStorybookStory[];
+}

examples/ember-cli/app/app.js

@@ -1,6 +1,6 @@
 import Application from '@ember/application';
 import loadInitializers from 'ember-load-initializers';
-import Resolver from './resolver';
+import Resolver from 'ember-resolver';
 import config from './config/environment';
 
 const App = Application.extend({

examples/ember-cli/config/ember-try.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
+
+module.exports = async function () {
+  return {
+    scenarios: [embroiderSafe(), embroiderOptimized()],
+  };
+};

examples/ember-cli/config/targets.js

@@ -1,3 +1,3 @@
 module.exports = {
-  browsers: ['ie 9', 'last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'],
+  browsers: ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'],
 };

examples/ember-cli/package.json

@@ -36,21 +36,21 @@
     "ember-cli": "~3.24.0",
     "ember-cli-app-version": "^4.0.0",
     "ember-cli-babel": "^7.23.0",
-    "ember-cli-htmlbars": "^4.4.0",
+    "ember-cli-htmlbars": "^5.3.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-uglify": "^3.0.0",
     "ember-load-initializers": "^2.1.2",
-    "ember-resolver": "^7.0.0",
+    "ember-resolver": "^8.0.2",
     "ember-source": "~3.24.0",
     "loader.js": "^4.7.0",
     "shx": "^0.3.2",
     "webpack": "4",
     "webpack-cli": "^4.2.0"
   },
   "engines": {
-    "node": "^4.5 || 6.* || >= 7.*"
+    "node": "10.* || >= 12"
   },
   "storybook": {
     "chromatic": {