Fix content while creating a "js only" component (#718)

* Fix component-js content * Test case fix
ember-cli · Apr 21, 2020 · 3aa3002 · 3aa3002
1 parent 833cc4c
commit 3aa3002
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/app/mixins/files.js b/app/mixins/files.js
@@ -65,8 +65,19 @@ export default Mixin.create({
     run.scheduleOnce('afterRender', this, this.updateOpenFiles);
   },
 
-  addFile(type) {
-    let fileProperties = type ? this.emberCli.buildProperties(type) : {filePath:'file.js'};
+  async addFile(type) {
+    let replacements = {};
+    let isGlimmer = await this.emberCli.twiddleJson.hasAddon(this.model, '@glimmer/component');
+
+    if (type === 'component-js') {
+      replacements.importComponent = isGlimmer ?
+        `import Component from '@glimmer/component';` :
+        `import Component from '@ember/component';`;
+      replacements.importTemplate = '';
+      replacements.defaultExport = "class extends Component {\n}";
+    }
+
+    let fileProperties = type ? this.emberCli.buildProperties(type, replacements) : {filePath:'file.js'};
     let filePath = fileProperties.filePath;
 
     if (['twiddle.json','router', 'css'].indexOf(type)===-1) {

diff --git a/app/services/twiddle-json.js b/app/services/twiddle-json.js
@@ -131,8 +131,8 @@ export default Service.extend({
   },
 
   async hasAddon(gist, addonName) {
-    let json = await this._getTwiddleJson(gist);
-    return addonName in json.addons;
+    let { addons = {} } = await this._getTwiddleJson(gist);
+    return addonName in addons;
   },
 
   _dedupEmberData(json) {