Skip to content

Commit

Permalink
Merge pull request #1691 from embroider-build/fix-ember-data
Browse files Browse the repository at this point in the history
Move fix for @ember-data/debug into virtualPeerDeps
  • Loading branch information
ef4 authored Dec 5, 2023
2 parents ba9fd29 + b5aea52 commit 6c8efe8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 36 deletions.
19 changes: 0 additions & 19 deletions packages/compat/src/compat-adapters/@ember-data/debug.ts

This file was deleted.

18 changes: 1 addition & 17 deletions packages/compat/src/compat-adapters/@ember-data/store.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1 @@
import type { AddonMeta } from '@embroider/core';
import { EmberDataBase } from '../ember-data';

export default class EmberDataStore extends EmberDataBase {
get packageMeta(): Partial<AddonMeta> {
let meta = super.packageMeta;

// this is here because the compat-adapter for @ember-data/debug adds this
// to externals because it has an undeclared peerDep on us, and thus might
// resolve totally incorrect copies. By making it external we leave it up to
// runtime, where we will find this implicit-module for the actual copy of
// @ember-data/store that is active in app.
meta['implicit-modules'] = [...(meta['implicit-modules'] ?? []), './index.js'];

return meta;
}
}
export { EmberDataBase as default } from '../ember-data';
3 changes: 3 additions & 0 deletions packages/shared-internals/src/ember-standard-modules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ emberVirtualPackages.add('@glimmer/validator');
emberVirtualPackages.add('@glimmer/reference');
emberVirtualPackages.add('@glimmer/manager');

// ember-data pre 4.12 failed to declare this as a peer dependency of @ember-data/debug
emberVirtualPeerDeps.add('@ember-data/store');

// These are the known names that people use to import template precomiplation
// macros from.
export const templateCompilationModules = Object.freeze([
Expand Down

0 comments on commit 6c8efe8

Please sign in to comment.