Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move fix for @ember-data/debug into virtualPeerDeps #1691

Merged
merged 1 commit into from
Dec 5, 2023
Merged

Move fix for @ember-data/debug into virtualPeerDeps #1691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions packages/compat/src/compat-adapters/@ember-data/debug.ts
View file
Open in desktop

This file was deleted.

18 changes: 1 addition & 17 deletions packages/compat/src/compat-adapters/@ember-data/store.ts
View file
Open in desktop
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
View file
Open in desktop
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