Use conditional-files to clean up the no-compat variance

Author: NullVoxPopuli

conditional-files/no-compat/app/app.ts

@@ -0,0 +1,20 @@
+<% if (warpDrive) { %>import '@warp-drive/ember/install';
+import Application from 'ember-strict-application-resolver';
+import config from '<%= modulePrefix %>/config/environment';<% if (notMinimal) { %>
+import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';< } %>
+import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
+
+<% if (notMinimal) { %>
+if (macroCondition(isDevelopingApp())) {
+  importSync('./deprecation-workflow');
+}
+<% } %>
+
+
+export default class App extends Application {
+  modules = {
+    ...import.meta.glob('./router.*', { eager: true }),
+    ...import.meta.glob('./templates/**/*', { eager: true }),
+    ...import.meta.glob('./services/**/*', { eager: true }),
+  }
+}

files/app/app.ts

@@ -1,32 +1,21 @@
-<% if (warpDrive) { %>import '@warp-drive/ember/install';<% } %><% if (compat) { %>
+<% if (warpDrive) { %>import '@warp-drive/ember/install';<% } %>
 import Application from '@ember/application';
 import compatModules from '@embroider/virtual/compat-modules';
 import Resolver from 'ember-resolver';
-import loadInitializers from 'ember-load-initializers';<% } else { %>
-  import Application from 'ember-strict-application-resolver';<% } %>
-import config from '<%= modulePrefix %>/config/environment';<% if (notMinimal) { %>
-import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';< } %>
+import loadInitializers from 'ember-load-initializers';
+import config from '<%= modulePrefix %>/config/environment';
+import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
 import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
 
-<% if (notMinimal) { %>
 if (macroCondition(isDevelopingApp())) {
   importSync('./deprecation-workflow');
 }
-<% } %>
-
 
 export default class App extends Application {
-<% if (compat) {%>  modulePrefix = config.modulePrefix;
+  modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;
   Resolver = Resolver.withModules(compatModules);
-<% } %>  inspector = setupInspector(this);
-<% if (noCompat) { %>
-  modules = {
-    ...import.meta.glob('./router', { eager: true }),
-    ...import.meta.glob('./templates/**/*', { eager: true }),
-  }
-<% } %>
+  inspector = setupInspector(this);
 }
-<% if (compat) { %>
+
 loadInitializers(App, config.modulePrefix, compatModules);
-<% } %>

index.js

@@ -24,6 +24,15 @@ function stringifyAndNormalize(contents) {
  * (see `conditional-files`)
  */
 const replacers = {
+  'app/app.ts'(locals, contents) {
+    if (locals.noCompat) {
+      let filePath = join(CONDITIONAL_FILES, 'no-compat', 'app/app.ts');
+      let raw = readFileSync(filePath).toString();
+      return ejs.render(raw, locals);
+    }
+
+    return contents;
+  },
   'app/config/environment.ts'(locals, contents) {
     if (locals.noCompat) {
       let filePath = join(