Skip to content

fix: resolves #7053 issue preventing debug adapter removal from prod builds using the ember-data package #7531

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

Merged
merged 2 commits into from
May 25, 2021
Merged

fix: resolves #7053 issue preventing debug adapter removal from prod builds using the ember-data package #7531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55432ac
import DebugAdapter only if @ember-data/debug package is present Fix …
sly7-7 May 21, 2021
8dda545
fix stripping and enable tests to work when stripped
runspired May 24, 2021
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
9 changes: 7 additions & 2 deletions packages/-ember-data/addon/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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';
Expand All @@ -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 ' +
Expand Down Expand Up @@ -85,7 +88,9 @@ DS.errorsArrayToHash = errorsArrayToHash;

DS.Serializer = Serializer;

DS.DebugAdapter = DebugAdapter;
if (HAS_DEBUG_PACKAGE) {
DS.DebugAdapter = require('@ember-data/debug').default;
}

DS.RecordArray = RecordArray;
DS.AdapterPopulatedRecordArray = AdapterPopulatedRecordArray;
Expand Down
Loading