chore: update package flags (emberjs#8357)

* chore: update package flags

* chore: update pnpm version

* fix lint

* update deps

* add missing peer-dep

* update embroider-macros patch

Author: runspired

package.json

@@ -164,7 +164,8 @@
   },
   "pnpm": {
     "patchedDependencies": {
-      "@embroider/[email protected]": "patches/@[email protected]"
+      "@embroider/[email protected]": "patches/@[email protected]",
+      "@embroider/[email protected]": "patches/@[email protected]"
     }
   }
 }

packages/model/package.json

@@ -30,6 +30,7 @@
   ],
   "peerDependencies": {
     "@ember-data/json-api": "workspace:4.10.0-alpha.4",
+    "@ember-data/graph": "workspace:4.10.0-alpha.4",
     "@ember-data/store": "workspace:4.10.0-alpha.4",
     "@ember-data/tracking": "workspace:4.10.0-alpha.4",
     "@ember/string": "^3.0.0",
@@ -38,6 +39,9 @@
   "peerDependenciesMeta": {
     "@ember-data/json-api": {
       "optional": true
+    },
+    "@ember-data/graph": {
+      "optional": true
     }
   },
   "dependenciesMeta": {

packages/model/src/-private/legacy-relationships-support.ts

@@ -9,7 +9,7 @@ import type { LocalRelationshipOperation } from '@ember-data/graph/-private/grap
 import type { ImplicitRelationship } from '@ember-data/graph/-private/graph/index';
 import type BelongsToRelationship from '@ember-data/graph/-private/relationships/state/belongs-to';
 import type ManyRelationship from '@ember-data/graph/-private/relationships/state/has-many';
-import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
+import { HAS_JSON_API_PACKAGE } from '@ember-data/private-build-infra';
 import { DEPRECATE_PROMISE_PROXIES } from '@ember-data/private-build-infra/deprecations';
 import type Store from '@ember-data/store';
 import { fastPush, isStableIdentifier, recordIdentifierFor, SOURCE, storeFor } from '@ember-data/store/-private';
@@ -207,7 +207,7 @@ export class LegacySupport {
   }
 
   getManyArray(key: string, definition?: UpgradedMeta): RelatedCollection {
-    if (HAS_RECORD_DATA_PACKAGE) {
+    if (HAS_JSON_API_PACKAGE) {
       let manyArray: RelatedCollection | undefined = this._manyArrayCache[key];
       if (!definition) {
         const graphFor = (importSync('@ember-data/graph/-private') as typeof import('@ember-data/graph/-private'))
@@ -248,7 +248,7 @@ export class LegacySupport {
     manyArray: RelatedCollection,
     options?: FindOptions
   ): Promise<RelatedCollection> {
-    if (HAS_RECORD_DATA_PACKAGE) {
+    if (HAS_JSON_API_PACKAGE) {
       let loadingPromise = this._relationshipPromisesCache[key] as Promise<RelatedCollection> | undefined;
       if (loadingPromise) {
         return loadingPromise;
@@ -273,7 +273,7 @@ export class LegacySupport {
   }
 
   reloadHasMany(key: string, options?: FindOptions) {
-    if (HAS_RECORD_DATA_PACKAGE) {
+    if (HAS_JSON_API_PACKAGE) {
       let loadingPromise = this._relationshipPromisesCache[key];
       if (loadingPromise) {
         return loadingPromise;
@@ -298,7 +298,7 @@ export class LegacySupport {
   }
 
   getHasMany(key: string, options?: FindOptions): PromiseManyArray | RelatedCollection {
-    if (HAS_RECORD_DATA_PACKAGE) {
+    if (HAS_JSON_API_PACKAGE) {
       const graphFor = (importSync('@ember-data/graph/-private') as typeof import('@ember-data/graph/-private'))
         .graphFor;
       const relationship = graphFor(this.store).get(this.identifier, key) as ManyRelationship;
@@ -370,7 +370,7 @@ export class LegacySupport {
     let reference = this.references[name];
 
     if (!reference) {
-      if (!HAS_RECORD_DATA_PACKAGE) {
+      if (!HAS_JSON_API_PACKAGE) {
         // TODO @runspired while this feels odd, it is not a regression in capability because we do
         // not today support references pulling from RecordDatas other than our own
         // because of the intimate API access involved. This is something we will need to redesign.
@@ -418,7 +418,7 @@ export class LegacySupport {
     relationship: ManyRelationship,
     options: FindOptions = {}
   ): Promise<void | unknown[]> | void {
-    if (HAS_RECORD_DATA_PACKAGE) {
+    if (HAS_JSON_API_PACKAGE) {
       if (!resource) {
         return;
       }

packages/private-build-infra/addon/available-packages.ts

@@ -2,7 +2,10 @@ export default {
   HAS_EMBER_DATA_PACKAGE: 'ember-data',
   HAS_STORE_PACKAGE: '@ember-data/store',
   HAS_MODEL_PACKAGE: '@ember-data/model',
-  HAS_RECORD_DATA_PACKAGE: '@ember-data/json-api',
+  HAS_JSON_API_PACKAGE: '@ember-data/json-api',
+  HAS_GRAPH_PACKAGE: '@ember-data/graph',
+  HAS_REQUEST_PACKAGE: '@ember-data/request',
+  HAS_TRACKING_PACKAGE: '@ember-data/tracking',
   HAS_ADAPTER_PACKAGE: '@ember-data/adapter',
   HAS_SERIALIZER_PACKAGE: '@ember-data/serializer',
   HAS_DEBUG_PACKAGE: '@ember-data/debug',

packages/private-build-infra/addon/index.ts

@@ -13,4 +13,7 @@ export const HAS_MODEL_PACKAGE = flagState('HAS_MODEL_PACKAGE');
 export const HAS_ADAPTER_PACKAGE = flagState('HAS_ADAPTER_PACKAGE');
 export const HAS_SERIALIZER_PACKAGE = flagState('HAS_SERIALIZER_PACKAGE');
 export const HAS_DEBUG_PACKAGE = flagState('HAS_DEBUG_PACKAGE');
-export const HAS_RECORD_DATA_PACKAGE = flagState('HAS_RECORD_DATA_PACKAGE');
+export const HAS_JSON_API_PACKAGE = flagState('HAS_JSON_API_PACKAGE');
+export const HAS_GRAPH_PACKAGE = flagState('HAS_GRAPH_PACKAGE');
+export const HAS_REQUEST_PACKAGE = flagState('HAS_REQUEST_PACKAGE');
+export const HAS_TRACKING_PACKAGE = flagState('HAS_TRACKING_PACKAGE');

packages/store/package.json

@@ -31,6 +31,7 @@
   "peerDependencies": {
     "@ember-data/model": "workspace:4.10.0-alpha.4",
     "@ember-data/json-api": "workspace:4.10.0-alpha.4",
+    "@ember-data/graph": "workspace:4.10.0-alpha.4",
     "@ember-data/tracking": "workspace:4.10.0-alpha.4",
     "@ember/string": "^3.0.0",
     "@glimmer/tracking": "^1.1.2"
@@ -39,6 +40,9 @@
     "@ember-data/json-api": {
       "optional": true
     },
+    "@ember-data/graph": {
+      "optional": true
+    },
     "@ember-data/model": {
       "optional": true
     }

packages/store/src/-private/caches/instance-cache.ts

@@ -6,7 +6,7 @@ import { resolve } from 'rsvp';
 
 import type { Graph } from '@ember-data/graph/-private/graph/graph';
 import type { peekGraph } from '@ember-data/graph/-private/graph/index';
-import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
+import { HAS_GRAPH_PACKAGE, HAS_JSON_API_PACKAGE } from '@ember-data/private-build-infra';
 import { LOG_INSTANCE_CACHE } from '@ember-data/private-build-infra/debugging';
 import { DEPRECATE_V1_RECORD_DATA, DEPRECATE_V1CACHE_STORE_APIS } from '@ember-data/private-build-infra/deprecations';
 import type {
@@ -40,7 +40,7 @@ import normalizeModelName from '../utils/normalize-model-name';
 import { removeRecordDataFor, setRecordDataFor } from './record-data-for';
 
 let _peekGraph: peekGraph;
-if (HAS_RECORD_DATA_PACKAGE) {
+if (HAS_GRAPH_PACKAGE) {
   let __peekGraph: peekGraph;
   _peekGraph = (wrapper: Store | StoreWrapper): Graph | undefined => {
     let a = (importSync('@ember-data/graph/-private') as { peekGraph: peekGraph }).peekGraph;
@@ -192,7 +192,7 @@ export class InstanceCache {
             record: staleIdentifier,
             value: keptIdentifier,
           });
-        } else if (HAS_RECORD_DATA_PACKAGE) {
+        } else if (HAS_JSON_API_PACKAGE) {
           // TODO notify cache always, this requires it always being a singleton
           // and not ever specific to one record-data
           this.store.__private_singleton_recordData?.sync({
@@ -208,7 +208,7 @@ export class InstanceCache {
 
         /*
       TODO @runspired consider adding this to make polymorphism even nicer
-      if (HAS_RECORD_DATA_PACKAGE) {
+      if (HAS_GRAPH_PACKAGE) {
         if (identifier.type !== matchedIdentifier.type) {
           const graphFor = importSync('@ember-data/graph/-private').graphFor;
           graphFor(this).registerPolymorphicType(identifier.type, matchedIdentifier.type);
@@ -375,7 +375,7 @@ export class InstanceCache {
       !record || record.isDestroyed || record.isDestroying
     );
 
-    if (HAS_RECORD_DATA_PACKAGE) {
+    if (HAS_GRAPH_PACKAGE) {
       let graph = _peekGraph(this.store);
       if (graph) {
         graph.remove(identifier);

packages/store/src/-private/network/fetch-manager.ts

@@ -8,7 +8,7 @@ import { DEBUG } from '@glimmer/env';
 import { importSync, isDevelopingApp } from '@embroider/macros';
 import { default as RSVP, resolve } from 'rsvp';
 
-import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
+import { HAS_GRAPH_PACKAGE } from '@ember-data/private-build-infra';
 import { DEPRECATE_RSVP_PROMISE } from '@ember-data/private-build-infra/deprecations';
 import type { CollectionResourceDocument, SingleResourceDocument } from '@ember-data/types/q/ember-data-json-api';
 import type { FindRecordQuery, Request, SaveRecordMutation } from '@ember-data/types/q/fetch-manager';
@@ -217,7 +217,7 @@ export default class FetchManager {
         const recordData = store._instanceCache.peek({ identifier, bucket: 'recordData' });
         if (!recordData || recordData.isEmpty(identifier) || isLoading) {
           let isReleasable = true;
-          if (!recordData && HAS_RECORD_DATA_PACKAGE) {
+          if (!recordData && HAS_GRAPH_PACKAGE) {
             const graphFor = (importSync('@ember-data/graph/-private') as typeof import('@ember-data/graph/-private'))
               .graphFor;
             const graph = graphFor(store);

packages/store/src/-private/network/snapshot.ts

@@ -7,7 +7,7 @@ import { importSync } from '@embroider/macros';
 
 import type BelongsToRelationship from '@ember-data/graph/-private/relationships/state/belongs-to';
 import type ManyRelationship from '@ember-data/graph/-private/relationships/state/has-many';
-import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
+import { HAS_JSON_API_PACKAGE } from '@ember-data/private-build-infra';
 import { DEPRECATE_SNAPSHOT_MODEL_CLASS_ACCESS } from '@ember-data/private-build-infra/deprecations';
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { OptionsHash } from '@ember-data/types/q/minimum-serializer-interface';
@@ -315,7 +315,7 @@ export default class Snapshot implements Snapshot {
     // function without access to intimate API contracts between RecordData and Model.
     // This is a requirement we should fix as soon as the relationship layer does not require
     // this intimate API usage.
-    if (!HAS_RECORD_DATA_PACKAGE) {
+    if (!HAS_JSON_API_PACKAGE) {
       assert(`snapshot.belongsTo only supported when using the package @ember-data/json-api`);
     }
 
@@ -416,7 +416,7 @@ export default class Snapshot implements Snapshot {
     // function without access to intimate API contracts between RecordData and Model.
     // This is a requirement we should fix as soon as the relationship layer does not require
     // this intimate API usage.
-    if (!HAS_RECORD_DATA_PACKAGE) {
+    if (!HAS_JSON_API_PACKAGE) {
       assert(`snapshot.hasMany only supported when using the package @ember-data/json-api`);
     }
 

packages/store/src/-private/store-service.ts

@@ -12,7 +12,7 @@ import { reject, resolve } from 'rsvp';
 
 import type { RecordData as RecordDataClass } from '@ember-data/json-api/-private';
 import type DSModelClass from '@ember-data/model';
-import { HAS_MODEL_PACKAGE, HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra';
+import { HAS_GRAPH_PACKAGE, HAS_JSON_API_PACKAGE, HAS_MODEL_PACKAGE } from '@ember-data/private-build-infra';
 import { LOG_PAYLOADS } from '@ember-data/private-build-infra/debugging';
 import {
   DEPRECATE_HAS_RECORD,
@@ -1928,7 +1928,7 @@ class Store {
         // destroy the graph before unloadAll
         // since then we avoid churning relationships
         // during unload
-        if (HAS_RECORD_DATA_PACKAGE) {
+        if (HAS_GRAPH_PACKAGE) {
           const peekGraph = (importSync('@ember-data/graph/-private') as typeof import('@ember-data/graph/-private'))
             .peekGraph;
           let graph = peekGraph(this);
@@ -2403,7 +2403,7 @@ class Store {
     identifier: StableRecordIdentifier,
     storeWrapper: RecordDataStoreWrapper
   ): RecordData | RecordDataV1 {
-    if (HAS_RECORD_DATA_PACKAGE) {
+    if (HAS_JSON_API_PACKAGE) {
       // we can't greedily use require as this causes
       // a cycle we can't easily fix (or clearly pin point) at present.
       //
@@ -2633,7 +2633,7 @@ class Store {
       }
     }
 
-    if (HAS_RECORD_DATA_PACKAGE) {
+    if (HAS_GRAPH_PACKAGE) {
       const peekGraph = (importSync('@ember-data/graph/-private') as typeof import('@ember-data/graph/-private'))
         .peekGraph;
       let graph = peekGraph(this);

patches/@[email protected]

@@ -0,0 +1,21 @@
+diff --git a/src/babel/module-exists.js b/src/babel/module-exists.js
+index 4737d6ebd58e55fd22257a66bef08805be792eba..1774eb28c9407169b0859debf6e02457bde8f83a 100644
+--- a/src/babel/module-exists.js
++++ b/src/babel/module-exists.js
+@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
+ Object.defineProperty(exports, "__esModule", { value: true });
+ const error_1 = __importDefault(require("./error"));
+ const evaluate_json_1 = require("./evaluate-json");
+-const resolve_1 = __importDefault(require("resolve"));
+ const path_1 = require("path");
+ function moduleExists(path, state) {
+     if (path.node.arguments.length !== 1) {
+@@ -16,7 +15,7 @@ function moduleExists(path, state) {
+         throw (0, error_1.default)((0, evaluate_json_1.assertArray)(path.get('arguments'))[0], `the first argument to moduleExists must be a string literal`);
+     }
+     try {
+-        resolve_1.default.sync(moduleSpecifier.value, { basedir: (0, path_1.dirname)(state.sourceFile) });
++        require.resolve(moduleSpecifier.value, { paths: [process.cwd(), state.sourceFile, (0, path_1.dirname)(state.sourceFile)] });
+         return true;
+     }
+     catch (err) {