Skip to content

Commit

Permalink
chore: update private-build-infra to v2-lite (emberjs#8509)
Browse files Browse the repository at this point in the history
* chore: update private-build-infra to v2-lite

* lint fixes

* more fixes

* Make ts types correct booleans

* ts fixes

* path cleanup

* fix docs

* fix lint

* fixup tests and build

* fixup commit

---------

Co-authored-by: Chris Thoburn <[email protected]>
  • Loading branch information
richgt and runspired authored Mar 29, 2023
1 parent e7bdc40 commit da23613
Show file tree
Hide file tree
Showing 83 changed files with 211 additions and 220 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# unconventional js
**/blueprints/*/*files/
**/vendor/
**/*.d.ts

# compiled output
**/dist/
Expand Down
4 changes: 0 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,6 @@ module.exports = {
'packages/graph/src/-private/graph/-edge-definition.ts',
'packages/graph/src/-private/coerce-id.ts',
'packages/json-api/src/-private/cache.ts',
'packages/private-build-infra/addon/index.ts',
'packages/private-build-infra/addon/deprecations.ts',
'packages/private-build-infra/addon/current-deprecations.ts',
'packages/private-build-infra/addon/available-packages.ts',
'packages/model/src/index.ts',
'packages/model/src/-private/util.ts',
'packages/model/src/-private/relationship-meta.ts',
Expand Down
3 changes: 1 addition & 2 deletions docs-generator/yuidoc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"../ember-data-types",
"../packages/-ember-data/addon",
"../packages/debug/addon",
"../packages/private-build-infra/addon",
"../packages/private-build-infra/canary-features",
"../packages/private-build-infra/virtual-packages",
"../packages/adapter/src",
"../packages/model/src",
"../packages/serializer/src",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter/addon-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module.exports = {
const DEPRECATIONS = require('@ember-data/private-build-infra/src/deprecations')(hostOptions.compatWith || null);
const FEATURES = require('@ember-data/private-build-infra/src/features')(isProd);

const ALL_PACKAGES = requireModule('@ember-data/private-build-infra/addon/available-packages.ts');
const ALL_PACKAGES = requireModule('@ember-data/private-build-infra/virtual-packages/packages.js');
const MACRO_PACKAGE_FLAGS = Object.assign({}, ALL_PACKAGES.default);
delete MACRO_PACKAGE_FLAGS['HAS_DEBUG_PACKAGE'];

Expand Down
2 changes: 1 addition & 1 deletion packages/adapter/src/error.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
import { assert, deprecate } from '@ember/debug';

import { DEPRECATE_HELPERS } from '@ember-data/private-build-infra/deprecations';
import { DEPRECATE_HELPERS } from '@ember-data/deprecations';

/**
A `AdapterError` is used by an adapter to signal that an error occurred
Expand Down
2 changes: 1 addition & 1 deletion packages/graph/addon-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module.exports = {
const DEPRECATIONS = require('@ember-data/private-build-infra/src/deprecations')(hostOptions.compatWith || null);
const FEATURES = require('@ember-data/private-build-infra/src/features')(isProd);

const ALL_PACKAGES = requireModule('@ember-data/private-build-infra/addon/available-packages.ts');
const ALL_PACKAGES = requireModule('@ember-data/private-build-infra/virtual-packages/packages.js');
const MACRO_PACKAGE_FLAGS = Object.assign({}, ALL_PACKAGES.default);
delete MACRO_PACKAGE_FLAGS['HAS_DEBUG_PACKAGE'];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { assert } from '@ember/debug';
import { DEBUG } from '@ember-data/env';

import { DEPRECATE_NON_EXPLICIT_POLYMORPHISM } from '@ember-data/private-build-infra/deprecations';
import { DEPRECATE_NON_EXPLICIT_POLYMORPHISM } from '@ember-data/deprecations';

/*
Assert that `addedRecord` has a valid type so it can be added to the
Expand Down
2 changes: 1 addition & 1 deletion packages/graph/src/-private/graph/-edge-definition.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { assert } from '@ember/debug';

import { DEPRECATE_RELATIONSHIPS_WITHOUT_INVERSE } from '@ember-data/deprecations';
import type { RelationshipDefinition } from '@ember-data/model/-private/relationship-meta';
import { DEPRECATE_RELATIONSHIPS_WITHOUT_INVERSE } from '@ember-data/private-build-infra/deprecations';
import type Store from '@ember-data/store';
import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
import type { RelationshipSchema } from '@ember-data/types/q/record-data-schemas';
Expand Down
2 changes: 1 addition & 1 deletion packages/graph/src/-private/graph/-utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { assert, inspect, warn } from '@ember/debug';

import { LOG_GRAPH } from '@ember-data/private-build-infra/debugging';
import { LOG_GRAPH } from '@ember-data/debugging';
import type { Store } from '@ember-data/store/-private';
import { peekCache } from '@ember-data/store/-private';
import type { CacheStoreWrapper } from '@ember-data/types/q/cache-store-wrapper';
Expand Down
2 changes: 1 addition & 1 deletion packages/graph/src/-private/graph/graph.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { assert } from '@ember/debug';

import { LOG_GRAPH } from '@ember-data/debugging';
import { DEBUG } from '@ember-data/env';
import { LOG_GRAPH } from '@ember-data/private-build-infra/debugging';
import { MergeOperation } from '@ember-data/types/q/cache';
import type { CacheStoreWrapper } from '@ember-data/types/q/cache-store-wrapper';
import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
Expand Down
2 changes: 1 addition & 1 deletion packages/json-api/addon-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module.exports = {
const DEPRECATIONS = require('@ember-data/private-build-infra/src/deprecations')(hostOptions.compatWith || null);
const FEATURES = require('@ember-data/private-build-infra/src/features')(isProd);

const ALL_PACKAGES = requireModule('@ember-data/private-build-infra/addon/available-packages.ts');
const ALL_PACKAGES = requireModule('@ember-data/private-build-infra/virtual-packages/packages.js');
const MACRO_PACKAGE_FLAGS = Object.assign({}, ALL_PACKAGES.default);
delete MACRO_PACKAGE_FLAGS['HAS_DEBUG_PACKAGE'];

Expand Down
2 changes: 1 addition & 1 deletion packages/json-api/src/-private/cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
import { assert } from '@ember/debug';
import { schedule } from '@ember/runloop';

import { LOG_MUTATIONS, LOG_OPERATIONS } from '@ember-data/debugging';
import { DEBUG } from '@ember-data/env';
import { graphFor, peekGraph } from '@ember-data/graph/-private';
import type { LocalRelationshipOperation } from '@ember-data/graph/-private/graph/-operations';
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 { LOG_MUTATIONS, LOG_OPERATIONS } from '@ember-data/private-build-infra/debugging';
import type { IdentifierCache } from '@ember-data/store/-private/caches/identifier-cache';
import type { ResourceBlob } from '@ember-data/types/cache/aliases';
import type { Change } from '@ember-data/types/cache/change';
Expand Down
2 changes: 1 addition & 1 deletion packages/legacy-compat/addon-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module.exports = {
const DEPRECATIONS = require('@ember-data/private-build-infra/src/deprecations')(hostOptions.compatWith || null);
const FEATURES = require('@ember-data/private-build-infra/src/features')(isProd);

const ALL_PACKAGES = requireModule('@ember-data/private-build-infra/addon/available-packages.ts');
const ALL_PACKAGES = requireModule('@ember-data/private-build-infra/virtual-packages/packages.js');
const MACRO_PACKAGE_FLAGS = Object.assign({}, ALL_PACKAGES.default);
delete MACRO_PACKAGE_FLAGS['HAS_DEBUG_PACKAGE'];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { deprecate } from '@ember/debug';

import { DEPRECATE_RSVP_PROMISE } from '@ember-data/private-build-infra/deprecations';
import { DEPRECATE_RSVP_PROMISE } from '@ember-data/deprecations';

export function _bind(fn, ...args) {
return function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { assert, deprecate, warn } from '@ember/debug';

import { importSync } from '@embroider/macros';

import { DEPRECATE_RSVP_PROMISE, DEPRECATE_V1_RECORD_DATA } from '@ember-data/deprecations';
import { DEBUG, TESTING } from '@ember-data/env';
import { HAS_GRAPH_PACKAGE } from '@ember-data/private-build-infra';
import { DEPRECATE_RSVP_PROMISE, DEPRECATE_V1_RECORD_DATA } from '@ember-data/private-build-infra/deprecations';
import { HAS_GRAPH_PACKAGE } from '@ember-data/packages';
import { createDeferred } from '@ember-data/request';
import type { Deferred } from '@ember-data/request/-private/types';
import type Store from '@ember-data/store';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { assert, deprecate } from '@ember/debug';

import { DEPRECATE_RELATIONSHIPS_WITHOUT_INVERSE, DEPRECATE_RSVP_PROMISE } from '@ember-data/deprecations';
import { DEBUG } from '@ember-data/env';
import {
DEPRECATE_RELATIONSHIPS_WITHOUT_INVERSE,
DEPRECATE_RSVP_PROMISE,
} from '@ember-data/private-build-infra/deprecations';

import { _bind, _guard, _objectIsAlive, guardDestroyedStore } from './common';
import { iterateData, payloadIsNotBlank } from './legacy-data-utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { assert } from '@ember/debug';

import { importSync } from '@embroider/macros';

import { LOG_PAYLOADS } from '@ember-data/debugging';
import { DEPRECATE_V1_RECORD_DATA } from '@ember-data/deprecations';
import { DEBUG, TESTING } from '@ember-data/env';
import { LOG_PAYLOADS } from '@ember-data/private-build-infra/debugging';
import { DEPRECATE_V1_RECORD_DATA } from '@ember-data/private-build-infra/deprecations';
import type { Handler, NextFn } from '@ember-data/request/-private/types';
import type Store from '@ember-data/store';
import type { StoreRequestContext, StoreRequestInfo } from '@ember-data/store/-private/cache-handler';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import { deprecate } from '@ember/debug';

import { DEPRECATE_SNAPSHOT_MODEL_CLASS_ACCESS } from '@ember-data/private-build-infra/deprecations';
import { DEPRECATE_SNAPSHOT_MODEL_CLASS_ACCESS } from '@ember-data/deprecations';
import type Store from '@ember-data/store';
import { SOURCE } from '@ember-data/store/-private';
import type IdentifierArray from '@ember-data/store/-private/record-arrays/identifier-array';
Expand Down
7 changes: 2 additions & 5 deletions packages/legacy-compat/src/legacy-network-handler/snapshot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@ import { assert, deprecate } from '@ember/debug';

import { importSync } from '@embroider/macros';

import { DEPRECATE_SNAPSHOT_MODEL_CLASS_ACCESS, DEPRECATE_V1_RECORD_DATA } from '@ember-data/deprecations';
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_JSON_API_PACKAGE } from '@ember-data/private-build-infra';
import {
DEPRECATE_SNAPSHOT_MODEL_CLASS_ACCESS,
DEPRECATE_V1_RECORD_DATA,
} from '@ember-data/private-build-infra/deprecations';
import { HAS_JSON_API_PACKAGE } from '@ember-data/packages';
import type Store from '@ember-data/store';
import type { ChangedAttributesHash } from '@ember-data/types/q/cache';
import { DSModelSchema } from '@ember-data/types/q/ds-model';
Expand Down
2 changes: 1 addition & 1 deletion packages/model/addon-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module.exports = {
const DEPRECATIONS = require('@ember-data/private-build-infra/src/deprecations')(hostOptions.compatWith || null);
const FEATURES = require('@ember-data/private-build-infra/src/features')(isProd);

const ALL_PACKAGES = requireModule('@ember-data/private-build-infra/addon/available-packages.ts');
const ALL_PACKAGES = requireModule('@ember-data/private-build-infra/virtual-packages/packages.js');
const MACRO_PACKAGE_FLAGS = Object.assign({}, ALL_PACKAGES.default);
delete MACRO_PACKAGE_FLAGS['HAS_DEBUG_PACKAGE'];

Expand Down
4 changes: 2 additions & 2 deletions packages/model/src/-private/belongs-to.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { assert, deprecate, warn } from '@ember/debug';
import { computed } from '@ember/object';
import { dasherize } from '@ember/string';

import { DEBUG } from '@ember-data/env';
import {
DEPRECATE_RELATIONSHIPS_WITHOUT_ASYNC,
DEPRECATE_RELATIONSHIPS_WITHOUT_INVERSE,
DEPRECATE_RELATIONSHIPS_WITHOUT_TYPE,
} from '@ember-data/private-build-infra/deprecations';
} from '@ember-data/deprecations';
import { DEBUG } from '@ember-data/env';

import { lookupLegacySupport } from './model';
import { computedMacroWithOptionalParams } from './util';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { assert } from '@ember/debug';
import { DEBUG } from '@ember-data/env';

import { DEPRECATE_NON_EXPLICIT_POLYMORPHISM } from '@ember-data/private-build-infra/deprecations';
import { DEPRECATE_NON_EXPLICIT_POLYMORPHISM } from '@ember-data/deprecations';

/*
Assert that `addedRecord` has a valid type so it can be added to the
Expand Down
4 changes: 2 additions & 2 deletions packages/model/src/-private/has-many.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import { dasherize } from '@ember/string';

import { singularize } from 'ember-inflector';

import { DEBUG } from '@ember-data/env';
import {
DEPRECATE_RELATIONSHIPS_WITHOUT_ASYNC,
DEPRECATE_RELATIONSHIPS_WITHOUT_INVERSE,
DEPRECATE_RELATIONSHIPS_WITHOUT_TYPE,
} from '@ember-data/private-build-infra/deprecations';
} from '@ember-data/deprecations';
import { DEBUG } from '@ember-data/env';

import { lookupLegacySupport } from './model';
import { computedMacroWithOptionalParams } from './util';
Expand Down
4 changes: 2 additions & 2 deletions packages/model/src/-private/legacy-relationships-support.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import { assert, deprecate } from '@ember/debug';

import { importSync } from '@embroider/macros';

import { DEPRECATE_PROMISE_PROXIES } from '@ember-data/deprecations';
import { DEBUG } from '@ember-data/env';
import type { UpgradedMeta } from '@ember-data/graph/-private/graph/-edge-definition';
import type { LocalRelationshipOperation } from '@ember-data/graph/-private/graph/-operations';
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_JSON_API_PACKAGE } from '@ember-data/private-build-infra';
import { DEPRECATE_PROMISE_PROXIES } from '@ember-data/private-build-infra/deprecations';
import { HAS_JSON_API_PACKAGE } from '@ember-data/packages';
import type Store from '@ember-data/store';
import {
fastPush,
Expand Down
2 changes: 1 addition & 1 deletion packages/model/src/-private/many-array.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
import { assert, deprecate } from '@ember/debug';

import { DEPRECATE_PROMISE_PROXIES } from '@ember-data/private-build-infra/deprecations';
import { DEPRECATE_PROMISE_PROXIES } from '@ember-data/deprecations';
import type Store from '@ember-data/store';
import {
IDENTIFIER_ARRAY_TAG,
Expand Down
6 changes: 3 additions & 3 deletions packages/model/src/-private/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import Ember from 'ember';

import { importSync } from '@embroider/macros';

import { DEBUG } from '@ember-data/env';
import { HAS_DEBUG_PACKAGE } from '@ember-data/private-build-infra';
import {
DEPRECATE_EARLY_STATIC,
DEPRECATE_MODEL_REOPEN,
DEPRECATE_NON_EXPLICIT_POLYMORPHISM,
DEPRECATE_RELATIONSHIPS_WITHOUT_INVERSE,
DEPRECATE_SAVE_PROMISE_ACCESS,
} from '@ember-data/private-build-infra/deprecations';
} from '@ember-data/deprecations';
import { DEBUG } from '@ember-data/env';
import { HAS_DEBUG_PACKAGE } from '@ember-data/packages';
import { recordIdentifierFor, storeFor } from '@ember-data/store';
import { coerceId, peekCache } from '@ember-data/store/-private';

Expand Down
2 changes: 1 addition & 1 deletion packages/model/src/-private/notify-changes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { cacheFor } from '@ember/object/internals';

import { DEPRECATE_V1_RECORD_DATA } from '@ember-data/private-build-infra/deprecations';
import { DEPRECATE_V1_RECORD_DATA } from '@ember-data/deprecations';
import type Store from '@ember-data/store';
import { peekCache } from '@ember-data/store/-private';
import type { NotificationType } from '@ember-data/store/-private/managers/notification-manager';
Expand Down
4 changes: 2 additions & 2 deletions packages/model/src/-private/promise-many-array.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import { dependentKeyCompat } from '@ember/object/compat';
import { tracked } from '@glimmer/tracking';
import Ember from 'ember';

import { DEBUG } from '@ember-data/env';
import {
DEPRECATE_A_USAGE,
DEPRECATE_COMPUTED_CHAINS,
DEPRECATE_PROMISE_MANY_ARRAY_BEHAVIORS,
} from '@ember-data/private-build-infra/deprecations';
} from '@ember-data/deprecations';
import { DEBUG } from '@ember-data/env';
import { StableRecordIdentifier } from '@ember-data/types/q/identifier';
import type { RecordInstance } from '@ember-data/types/q/record-instance';
import { FindOptions } from '@ember-data/types/q/store';
Expand Down
2 changes: 1 addition & 1 deletion packages/model/src/-private/record-state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { assert } from '@ember/debug';
import { dependentKeyCompat } from '@ember/object/compat';
import { cached, tracked } from '@glimmer/tracking';

import { DEPRECATE_V1_RECORD_DATA } from '@ember-data/deprecations';
import { DEBUG } from '@ember-data/env';
import { DEPRECATE_V1_RECORD_DATA } from '@ember-data/private-build-infra/deprecations';
import type Store from '@ember-data/store';
import { storeFor } from '@ember-data/store';
import { peekCache, recordIdentifierFor } from '@ember-data/store/-private';
Expand Down
2 changes: 1 addition & 1 deletion packages/model/src/-private/references/belongs-to.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { cached, tracked } from '@glimmer/tracking';

import type { Object as JSONObject, Value as JSONValue } from 'json-typescript';

import { DEPRECATE_PROMISE_PROXIES, DEPRECATE_V1_RECORD_DATA } from '@ember-data/deprecations';
import { DEBUG } from '@ember-data/env';
import type { Graph } from '@ember-data/graph/-private/graph/graph';
import type BelongsToRelationship from '@ember-data/graph/-private/relationships/state/belongs-to';
import { DEPRECATE_PROMISE_PROXIES, DEPRECATE_V1_RECORD_DATA } from '@ember-data/private-build-infra/deprecations';
import type Store from '@ember-data/store';
import { recordIdentifierFor } from '@ember-data/store/-private';
import type { NotificationType } from '@ember-data/store/-private/managers/notification-manager';
Expand Down
2 changes: 1 addition & 1 deletion packages/model/src/-private/references/has-many.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import type { Object as JSONObject, Value as JSONValue } from 'json-typescript';

import { ManyArray } from 'ember-data/-private';

import { DEPRECATE_PROMISE_PROXIES, DEPRECATE_V1_RECORD_DATA } from '@ember-data/deprecations';
import { DEBUG } from '@ember-data/env';
import type { Graph } from '@ember-data/graph/-private/graph/graph';
import type ManyRelationship from '@ember-data/graph/-private/relationships/state/has-many';
import { DEPRECATE_PROMISE_PROXIES, DEPRECATE_V1_RECORD_DATA } from '@ember-data/private-build-infra/deprecations';
import type Store from '@ember-data/store';
import { recordIdentifierFor } from '@ember-data/store';
import type { NotificationType } from '@ember-data/store/-private/managers/notification-manager';
Expand Down
13 changes: 0 additions & 13 deletions packages/private-build-infra/addon/available-packages.ts

This file was deleted.

Loading

0 comments on commit da23613

Please sign in to comment.