diff --git a/.changeset/lucky-pots-rest.md b/.changeset/lucky-pots-rest.md new file mode 100644 index 0000000..d80601c --- /dev/null +++ b/.changeset/lucky-pots-rest.md @@ -0,0 +1,5 @@ +--- +"ember-provide-consume-context": minor +--- + +Access @glimmer/runtime with simple import, instead of loader.require diff --git a/ember-provide-consume-context/package.json b/ember-provide-consume-context/package.json index a7d3afe..488fd41 100644 --- a/ember-provide-consume-context/package.json +++ b/ember-provide-consume-context/package.json @@ -120,6 +120,7 @@ "version": 2, "type": "addon", "main": "addon-main.cjs", + "externals": ["@glimmer/runtime"], "app-js": { "./components/context-consumer.js": "./dist/_app_/components/context-consumer.js", "./components/context-provider.js": "./dist/_app_/components/context-provider.js", diff --git a/ember-provide-consume-context/rollup.config.mjs b/ember-provide-consume-context/rollup.config.mjs index 34daa6d..05080f0 100644 --- a/ember-provide-consume-context/rollup.config.mjs +++ b/ember-provide-consume-context/rollup.config.mjs @@ -16,6 +16,8 @@ export default { // You can augment this if you need to. output: addon.output(), + external: ['@glimmer/runtime'], + plugins: [ // These are the modules that users should be able to import from your // addon. Anything not listed here may get optimized away. diff --git a/ember-provide-consume-context/src/initializers/glimmer-overrides.ts b/ember-provide-consume-context/src/initializers/glimmer-overrides.ts index 3aaa191..3336368 100644 --- a/ember-provide-consume-context/src/initializers/glimmer-overrides.ts +++ b/ember-provide-consume-context/src/initializers/glimmer-overrides.ts @@ -1,16 +1,7 @@ -import Ember from 'ember'; import { overrideGlimmerRuntime } from '../-private/override-glimmer-runtime-classes'; +import * as glimmerRuntime from '@glimmer/runtime'; export function initialize() { - if ((Ember as any).__loader?.require == null) { - return; - } - - const glimmerRuntime = (Ember as any).__loader.require('@glimmer/runtime'); - if (glimmerRuntime == null) { - return; - } - overrideGlimmerRuntime(glimmerRuntime); }