diff --git a/packages/-ember-data/index.js b/packages/-ember-data/index.js index b345d64ee0a..c350037a509 100644 --- a/packages/-ember-data/index.js +++ b/packages/-ember-data/index.js @@ -12,6 +12,7 @@ module.exports = Object.assign({}, addonBaseConfig, { 'ember', '@ember/application/namespace', '@ember-data/json-api/-private', + '@ember-data/json-api', 'ember-data/version', '@ember-data/store/-private', '@ember-data/store', diff --git a/packages/json-api/src/.gitkeep b/packages/json-api/src/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/packages/json-api/src/index.ts b/packages/json-api/src/index.ts new file mode 100644 index 00000000000..8f9cc570932 --- /dev/null +++ b/packages/json-api/src/index.ts @@ -0,0 +1,5 @@ +/** + @module @ember-data/json-api +*/ + +export { Cache } from './-private'; diff --git a/packages/store/src/-private/store-service.ts b/packages/store/src/-private/store-service.ts index b1e6328b90f..bfa89f9719f 100644 --- a/packages/store/src/-private/store-service.ts +++ b/packages/store/src/-private/store-service.ts @@ -10,7 +10,7 @@ import { DEBUG } from '@glimmer/env'; import { importSync } from '@embroider/macros'; import { reject, resolve } from 'rsvp'; -import type { Cache as CacheClass } from '@ember-data/json-api/-private'; +import type { Cache as CacheClass } from '@ember-data/json-api'; import type DSModelClass from '@ember-data/model'; 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'; @@ -2416,7 +2416,7 @@ class Store { // it can be reproduced in partner tests by running // node ./scripts/packages-for-commit.js && pnpm test-external:ember-observer if (_Cache === undefined) { - _Cache = (importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private')).Cache; + _Cache = (importSync('@ember-data/json-api') as typeof import('@ember-data/json-api')).Cache; } if (DEPRECATE_V1CACHE_STORE_APIS) { diff --git a/tests/adapter-encapsulation/app/services/store.js b/tests/adapter-encapsulation/app/services/store.js index 5b4733b1744..1b58fda858b 100644 --- a/tests/adapter-encapsulation/app/services/store.js +++ b/tests/adapter-encapsulation/app/services/store.js @@ -1,4 +1,4 @@ -import { Cache } from '@ember-data/json-api/-private'; +import { Cache } from '@ember-data/json-api'; import Store from '@ember-data/store'; export default class DefaultStore extends Store { diff --git a/tests/embroider-basic-compat/ember-cli-build.js b/tests/embroider-basic-compat/ember-cli-build.js index b8c2a8e1c01..28041f353c9 100644 --- a/tests/embroider-basic-compat/ember-cli-build.js +++ b/tests/embroider-basic-compat/ember-cli-build.js @@ -50,7 +50,7 @@ module.exports = function (defaults) { package: '@ember-data/store', addonModules: { '-private.js': { - dependsOnModules: ['@ember-data/json-api/-private'], + dependsOnModules: ['@ember-data/json-api'], }, }, }, diff --git a/tests/serializer-encapsulation/app/services/store.js b/tests/serializer-encapsulation/app/services/store.js index 5b4733b1744..1b58fda858b 100644 --- a/tests/serializer-encapsulation/app/services/store.js +++ b/tests/serializer-encapsulation/app/services/store.js @@ -1,4 +1,4 @@ -import { Cache } from '@ember-data/json-api/-private'; +import { Cache } from '@ember-data/json-api'; import Store from '@ember-data/store'; export default class DefaultStore extends Store {