Skip to content

Commit 922b62f

Browse files
committed
Update app -- wow so messy
1 parent b9e3887 commit 922b62f

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

files/app/app.ts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<% if (warpDrive) { %>import '@warp-drive/ember/install';<% } %>
1+
<% if (warpDrive) { %>import '@warp-drive/ember/install';<% } %><% if (compat) { %>
22
import Application from '@ember/application';
33
import compatModules from '@embroider/virtual/compat-modules';
4-
import Resolver from 'ember-resolver';<% if (compat) { %>
5-
import loadInitializers from 'ember-load-initializers';<% } %>
4+
import Resolver from 'ember-resolver';
5+
import loadInitializers from 'ember-load-initializers';<% } else { %>
6+
import Application from 'ember-strict-application-resolver';<% } %>
67
import config from '<%= modulePrefix %>/config/environment';<% if (notMinimal) { %>
78
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';< } %>
89
import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
@@ -15,10 +16,16 @@ if (macroCondition(isDevelopingApp())) {
1516

1617

1718
export default class App extends Application {
18-
modulePrefix = config.modulePrefix;
19+
<% if (compat) {%> modulePrefix = config.modulePrefix;
1920
podModulePrefix = config.podModulePrefix;
2021
Resolver = Resolver.withModules(compatModules);
21-
inspector = setupInspector(this);
22+
<% } %> inspector = setupInspector(this);
23+
<% if (noCompat) { %>
24+
modules = {
25+
...import.meta.glob('./router', { eager: true }),
26+
...import.meta.glob('./templates/**/*', { eager: true }),
27+
}
28+
<% } %>
2229
}
2330
<% if (compat) { %>
2431
loadInitializers(App, config.modulePrefix, compatModules);

0 commit comments

Comments
 (0)