From 55432ac564a69512a495fe623269cf3a63a96183 Mon Sep 17 00:00:00 2001 From: sly7-7 Date: Fri, 21 May 2021 10:47:35 +0200 Subject: [PATCH] import DebugAdapter only if @ember-data/debug package is present Fix #7053 --- packages/-ember-data/addon/index.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/-ember-data/addon/index.js b/packages/-ember-data/addon/index.js index 6049c414fb4..c39ea0b8c0d 100644 --- a/packages/-ember-data/addon/index.js +++ b/packages/-ember-data/addon/index.js @@ -3,6 +3,8 @@ import 'ember-inflector'; import EmberError from '@ember/error'; import { VERSION } from '@ember/version'; +import require, { has } from 'require'; + import Adapter, { BuildURLMixin } from '@ember-data/adapter'; import AdapterError, { AbortError, @@ -18,7 +20,6 @@ import AdapterError, { } from '@ember-data/adapter/error'; import JSONAPIAdapter from '@ember-data/adapter/json-api'; import RESTAdapter from '@ember-data/adapter/rest'; -import DebugAdapter from '@ember-data/debug'; import Model, { attr, belongsTo, hasMany } from '@ember-data/model'; import Serializer from '@ember-data/serializer'; import { BooleanTransform, DateTransform, NumberTransform, StringTransform } from '@ember-data/serializer/-private'; @@ -45,6 +46,8 @@ import { } from './-private'; import setupContainer from './setup-container'; +const HAS_DEBUG_PACKAGE = has('@ember-data/debug') || false; + if (VERSION.match(/^1\.([0-9]|1[0-2])\./)) { throw new EmberError( 'Ember Data requires at least Ember 1.13.0, but you have ' + @@ -85,7 +88,9 @@ DS.errorsArrayToHash = errorsArrayToHash; DS.Serializer = Serializer; -DS.DebugAdapter = DebugAdapter; +if (HAS_DEBUG_PACKAGE) { + DS.DebugAdapter = require('@ember/debug').default; +} DS.RecordArray = RecordArray; DS.AdapterPopulatedRecordArray = AdapterPopulatedRecordArray;