Merge pull request #17843 from storybookjs/remove-ember-usage

storybookjs · Dec 12, 2022 · 6862937 · 6862937
1 parent 506e2ec
commit 6862937
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/ember/package.json b/app/ember/package.json
@@ -56,9 +56,10 @@
   },
   "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"

diff --git a/app/ember/src/client/preview/render.ts b/app/ember/src/client/preview/render.ts
@@ -1,12 +1,12 @@
 import global from 'global';
 import dedent from 'ts-dedent';
-import { RenderContext } from '@storybook/store';
+import type { RenderContext } from '@storybook/store';
+// @ts-ignore
+import Component from '@ember/component'; // eslint-disable-line import/no-unresolved
 import { OptionsArgs, EmberFramework } from './types';
 
 const { window: globalWindow, document } = global;
 
-declare let Ember: any;
-
 const rootEl = document.getElementById('root');
 
 const config = globalWindow.require(`${globalWindow.STORYBOOK_NAME}/config/environment`);
@@ -38,7 +38,7 @@ function render(options: OptionsArgs, el: HTMLElement) {
     .then((instance: any) => {
       instance.register(
         'component:story-mode',
-        Ember.Component.extend({
+        Component.extend({
           layout: template || options,
           ...context,
         })

diff --git a/yarn.lock b/yarn.lock
@@ -7863,9 +7863,10 @@ __metadata:
     ts-dedent: ^2.0.0
   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
   bin:
     build-storybook: ./bin/build.js
     start-storybook: ./bin/index.js