feat (new app-boot): the entry point exports the amdModules, which ar…

…e then define in app.js
embroider-build · Jun 25, 2024 · a49d44c · a49d44c
1 parent 9993260
commit a49d44c
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/packages/core/src/virtual-entrypoint.ts b/packages/core/src/virtual-entrypoint.ts
@@ -181,7 +181,6 @@ import environment from './config/environment';
 
 {{#each amdModules as |amdModule index| ~}}
   import * as amdModule{{index}} from "{{js-string-escape amdModule.buildtime}}"
-  d("{{js-string-escape amdModule.runtime}}", function(){ return amdModule{{index}}; });
 {{/each}}
 
 {{#if fastbootOnlyAmdModules}}
@@ -226,6 +225,12 @@ w._embroiderEngineBundles_ = [
   {{/each}}
 ]
 {{/if}}
+
+export default {
+  {{#each amdModules as |amdModule index| ~}}
+    "{{js-string-escape amdModule.runtime}}": amdModule{{index}},
+  {{/each}}
+};
 `) as (params: {
   amdModules: { runtime: string; buildtime: string }[];
   fastbootOnlyAmdModules?: { runtime: string; buildtime: string }[];

diff --git a/tests/addon-template/tests/dummy/app/app.js b/tests/addon-template/tests/dummy/app/app.js
@@ -1,9 +1,17 @@
 import Application from '@ember/application';
+import '@embroider/core/entrypoint';
+import coreModules from '@embroider/core/entrypoint';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'dummy/config/environment';
 
-import '@embroider/core/entrypoint';
+let d = window.define;
+
+for (const [name, module] of Object.entries(coreModules)) {
+  d(name, function () {
+    return module;
+  });
+}
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;

diff --git a/tests/app-template/app/app.js b/tests/app-template/app/app.js
@@ -1,9 +1,17 @@
 import Application from '@ember/application';
+import '@embroider/core/entrypoint';
+import coreModules from '@embroider/core/entrypoint';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-import '@embroider/core/entrypoint';
+let d = window.define;
+
+for (const [name, module] of Object.entries(coreModules)) {
+  d(name, function () {
+    return module;
+  });
+}
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;

diff --git a/tests/ts-app-template/app/app.ts b/tests/ts-app-template/app/app.ts
@@ -1,9 +1,19 @@
 import Application from '@ember/application';
+import '@embroider/core/entrypoint';
+// @ts-ignore
+import coreModules from '@embroider/core/entrypoint';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'ts-app-template/config/environment';
 
-import '@embroider/core/entrypoint';
+// @ts-ignore
+let d = window.define;
+
+for (const [name, module] of Object.entries(coreModules)) {
+  d(name, function () {
+    return module;
+  });
+}
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;