fixup! address TV's review

Author: bajtos

packages/cli/generators/app/index.js

@@ -86,6 +86,22 @@ module.exports = class AppGenerator extends ProjectGenerator {
     return super.promptOptions();
   }
 
+  buildAppClassMixins() {
+    if (this.shouldExit()) return false;
+    const {enableRepository, enableServices} = this.projectInfo || {};
+    if (!enableRepository && !enableServices) return;
+
+    let appClassWithMixins = 'RestApplication';
+    if (enableRepository) {
+      appClassWithMixins = `RepositoryMixin(${appClassWithMixins})`;
+    }
+    if (enableServices) {
+      appClassWithMixins = `ServiceMixin(${appClassWithMixins})`;
+    }
+
+    this.projectInfo.appClassWithMixins = appClassWithMixins;
+  }
+
   scaffold() {
     return super.scaffold();
   }

packages/cli/generators/app/templates/src/application.ts.ejs

@@ -9,17 +9,9 @@ import {ServiceMixin} from '@loopback/service-proxy';
 <% } -%>
 import {MySequence} from './sequence';
 
-<% if (project.enableRepository || project.enableServices) {
-  let classWithOptionalMixins = 'RestApplication';
-  if (project.enableRepository) {
-    classWithOptionalMixins = `RepositoryMixin(${classWithOptionalMixins})`;
-  }
-  if (project.enableServices) {
-    classWithOptionalMixins = `ServiceMixin(${classWithOptionalMixins})`;
-  }
--%>
+<% if (project.appClassWithMixins) { -%>
 export class <%= project.applicationName %> extends BootMixin(
-  <%= classWithOptionalMixins %>,
+  <%= project.appClassWithMixins %>,
 ) {
 <%
 } else { // no optional mixins

packages/cli/generators/project/templates/package.json.ejs

@@ -78,10 +78,16 @@
     "@loopback/core": "<%= project.dependencies['@loopback/core'] -%>",
     "@loopback/dist-util": "<%= project.dependencies['@loopback/dist-util'] -%>",
     "@loopback/openapi-v3": "<%= project.dependencies['@loopback/openapi-v3'] -%>",
+<% if (project.enableRepository) { -%>
     "@loopback/repository": "<%= project.dependencies['@loopback/repository'] -%>",
+<% } -%>
+<% if (project.enableServices) { -%>
     "@loopback/rest": "<%= project.dependencies['@loopback/rest'] -%>",
     "@loopback/service-proxy": "<%= project.dependencies['@loopback/service-proxy'] -%>"
 <% } else { -%>
+    "@loopback/rest": "<%= project.dependencies['@loopback/rest'] -%>"
+<% } -%>
+<% } else { /* NOT AN APPLICATION */-%>
     "@loopback/core": "<%= project.dependencies['@loopback/core'] -%>",
     "@loopback/dist-util": "<%= project.dependencies['@loopback/dist-util'] -%>"
 <% } -%>