# This is a combination of 64 commits.

# This is the 1st commit message: WIP Tracerbench Travis setup # This is the commit message #2: dont checkin results # This is the commit message #3: configure azure job, make first thing for testing # This is the commit message #4: config updates # This is the commit message #5: Able to get results from Tracerbench # This is the commit message #6: redirect for tracerbench # This is the commit message #7: Update URLs to include ?tracerbench=true # This is the commit message #8: wip # This is the commit message #9: moves .server-replay.json to root # This is the commit message #10: wip # This is the commit message #11: cleanup # This is the commit message #12: cleanup # This is the commit message #13: cleanup # This is the commit message #14: cleanup # This is the commit message #15: change command # This is the commit message #16: Make process terminate with exit code 0 # This is the commit message #17: Ignore tracerbench-results files # This is the commit message #18: Delete generated JSON file # This is the commit message #19: rename directory # This is the commit message #20: Bump ember-decorators-polyfill from 1.0.6 to 1.1.0 Bumps [ember-decorators-polyfill](https://github.com/pzuraq/ember-decorators-polyfill) from 1.0.6 to 1.1.0. - [Release notes](https://github.com/pzuraq/ember-decorators-polyfill/releases) - [Commits](ember-polyfills/ember-decorators-polyfill@1.0.6...1.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #21: Bump @ember/optional-features from 1.0.0 to 1.1.0 Bumps [@ember/optional-features](https://github.com/emberjs/ember-optional-features) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/emberjs/ember-optional-features/releases) - [Changelog](https://github.com/emberjs/ember-optional-features/blob/master/CHANGELOG.md) - [Commits](emberjs/ember-optional-features@v1.0.0...v1.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #22: [CHORE] fix Typo (emberjs#6635) Happen to run into this typo. Been using Ember for years, love your work! Good luck! Co-authored-by: igorT <terzicigor@gmail.com> # This is the commit message #23: Update Changelog for v3.13.0 # This is the commit message #24: update changelog for v3.13.1 # This is the commit message #25: [CHORE] adds infra for testing calls to Ember warn|deprecate|assert (emberjs#6626) * [CHORE] adds infra for testing calls to Ember warn|deprecate|assert * fix production tests * address feedback * feedback on labels * remove id checks # This is the commit message #26: [CHORE] Refactor integration/multiple-stores-test.js in order to remove run loop usage (emberjs#6632) # This is the commit message #27: Bump ember-simple-tree from 0.7.0 to 0.7.1 Bumps [ember-simple-tree](https://github.com/btecu/ember-simple-tree) from 0.7.0 to 0.7.1. - [Release notes](https://github.com/btecu/ember-simple-tree/releases) - [Commits](btecu/ember-simple-tree@0.7.0...0.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #28: Bump ember-decorators-polyfill from 1.1.0 to 1.1.1 Bumps [ember-decorators-polyfill](https://github.com/pzuraq/ember-decorators-polyfill) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/pzuraq/ember-decorators-polyfill/releases) - [Commits](ember-polyfills/ember-decorators-polyfill@1.1.0...1.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #29: cleanup serializer documentation (emberjs#6575) # This is the commit message #30: ISSUE-6012: test: added test for meta property and bug fix. (emberjs#6640) # This is the commit message #31: [FEAT links] ensures full links object support for relationships (emberjs#6606) * [FEAT links] ensures full links object support for relationships * fix lint * add feature flags # This is the commit message #32: [BUGFIX release] Enable `store.createRecord` in FastBoot (emberjs#6568) * Add FastBoot test for store.createRecord Fails at the moment. * Enable store.createRecord in FastBoot Changes the V4 UUID generation to leverage `FastBoot.require` when possible. This currently requires that the host application add the following to their `package.json`: ``` "fastbootDependencies": [ "crypto" ] ``` * fix types # This is the commit message #33: [CHORE] rename and restructure packages to clarify unpublished/private status move unpublished packages into directories marked private move published but private into better naming convention move unpublished into better naming convention change -build-infra imports to private-build-infra larger re-org # This is the commit message #34: Bump eslint-config-prettier from 6.4.0 to 6.5.0 Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/prettier/eslint-config-prettier/releases) - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md) - [Commits](prettier/eslint-config-prettier@v6.4.0...v6.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #35: Bump eslint from 6.5.1 to 6.6.0 Bumps [eslint](https://github.com/eslint/eslint) from 6.5.1 to 6.6.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](eslint/eslint@v6.5.1...v6.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #36: [CHORE] refactor: Remove runloop usage in destroy module of integration/store… (emberjs#6646) * refactor: Remove runloop usage in destroy module of integration/store-test * fix linter errors # This is the commit message #37: Bump @types/ember__debug from 3.0.5 to 3.0.6 (emberjs#6647) Bumps [@types/ember__debug](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/ember__debug) from 3.0.5 to 3.0.6. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/ember__debug) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #38: Bump eslint-plugin-mocha from 6.2.0 to 6.2.1 Bumps [eslint-plugin-mocha](https://github.com/lo1tuma/eslint-plugin-mocha) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/lo1tuma/eslint-plugin-mocha/releases) - [Changelog](https://github.com/lo1tuma/eslint-plugin-mocha/blob/master/CHANGELOG.md) - [Commits](lo1tuma/eslint-plugin-mocha@6.2.0...6.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #39: Bump qunit-dom from 0.9.0 to 0.9.1 Bumps [qunit-dom](https://github.com/simplabs/qunit-dom) from 0.9.0 to 0.9.1. - [Release notes](https://github.com/simplabs/qunit-dom/releases) - [Changelog](https://github.com/simplabs/qunit-dom/blob/master/CHANGELOG.md) - [Commits](mainmatter/qunit-dom@v0.9.0...v0.9.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #40: Bump @typescript-eslint/parser from 2.5.0 to 2.6.0 Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v2.6.0/packages/parser) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #41: Bump @typescript-eslint/eslint-plugin from 2.5.0 to 2.6.0 Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v2.6.0/packages/eslint-plugin) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #42: fix tracerbench command for renamed test app folder # This is the commit message #43: Setup har-remix # This is the commit message #44: replace server-replay with har-remix # This is the commit message #45: Use concurrently from node_modules instead of global installation # This is the commit message #46: wip # This is the commit message #47: Update bash script to use ember-data workspace for experiment # This is the commit message #48: relationship performance bash script updates # This is the commit message #49: removes line breaks # This is the commit message #50: removes .travis.yml from test app # This is the commit message #51: cleanup linting # This is the commit message #52: change eslint config # This is the commit message #53: cleanup # This is the commit message #54: remove comments # This is the commit message #55: updates azure-pipelines.yml # This is the commit message #56: adds tracerbench to github action workflow # This is the commit message #57: Update CI to install PM2 globally # This is the commit message #58: [CHORE] allow asserting all tests for deprecations (emberjs#6627) * [CHORE] configure the ability to filter deprecations from assertNoDeprecations * turn off helpers until tests are fixed # This is the commit message #59: [DOC] Close code block in the description # This is the commit message #60: Bump ember-qunit from 4.5.1 to 4.6.0 Bumps [ember-qunit](https://github.com/emberjs/ember-qunit) from 4.5.1 to 4.6.0. - [Release notes](https://github.com/emberjs/ember-qunit/releases) - [Changelog](https://github.com/emberjs/ember-qunit/blob/master/CHANGELOG.md) - [Commits](emberjs/ember-qunit@v4.5.1...v4.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #61: Bump ember-fetch from 6.7.1 to 6.7.2 Bumps [ember-fetch](https://github.com/ember-cli/ember-fetch) from 6.7.1 to 6.7.2. - [Release notes](https://github.com/ember-cli/ember-fetch/releases) - [Changelog](https://github.com/ember-cli/ember-fetch/blob/v6.7.2/CHANGELOG.md) - [Commits](ember-cli/ember-fetch@v6.7.1...v6.7.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #62: Bump ember-load-initializers from 2.1.0 to 2.1.1 Bumps [ember-load-initializers](https://github.com/ember-cli/ember-load-initializers) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/ember-cli/ember-load-initializers/releases) - [Changelog](https://github.com/ember-cli/ember-load-initializers/blob/master/CHANGELOG.md) - [Commits](ember-cli/ember-load-initializers@v2.1.0...v2.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #63: Bump ember-source from 3.13.3 to 3.14.1 Bumps [ember-source](https://github.com/emberjs/ember.js) from 3.13.3 to 3.14.1. - [Release notes](https://github.com/emberjs/ember.js/releases) - [Changelog](https://github.com/emberjs/ember.js/blob/master/CHANGELOG.md) - [Commits](emberjs/ember.js@v3.13.3...v3.14.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> # This is the commit message #64: Bump eslint-plugin-ember from 7.2.0 to 7.3.0 Bumps [eslint-plugin-ember](https://github.com/ember-cli/eslint-plugin-ember) from 7.2.0 to 7.3.0. - [Release notes](https://github.com/ember-cli/eslint-plugin-ember/releases) - [Changelog](https://github.com/ember-cli/eslint-plugin-ember/blob/master/CHANGELOG.md) - [Commits](ember-cli/eslint-plugin-ember@v7.2.0...v7.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
iamdtang · Nov 6, 2019 · 45b7e91 · 45b7e91
1 parent deedab2
commit 45b7e91
Show file tree

Hide file tree

Showing 324 changed files with 2,461 additions and 810 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -57,8 +57,9 @@ module.exports = {
         '.eslintrc.js',
         '.prettierrc.js',
         'bin/*',
-        'packages/-build-infra/src/**/*.js',
-        'packages/-test-infra/src/**/*.js',
+        'packages/private-build-infra/src/**/*.js',
+        'packages/unpublished-relationship-performance-test-app/bin/*.js',
+        'packages/unpublished-test-infra/src/**/*.js',
         'packages/*/.ember-cli.js',
         'packages/*/.eslintrc.js',
         'packages/*/.template-lintrc.js',
@@ -91,7 +92,7 @@ module.exports = {
 
     // node tests
     {
-      files: ['packages/*/node-tests/**', 'packages/-test-infra/src/node-test-helpers/**/*'],
+      files: ['packages/*/node-tests/**', 'packages/unpublished-test-infra/src/node-test-helpers/**/*'],
       env: {
         mocha: true,
       },
@@ -108,7 +109,7 @@ module.exports = {
 
     // bin files
     {
-      files: ['bin/*'],
+      files: ['bin/*', 'packages/unpublished-relationship-performance-test-app/bin/*'],
       // eslint-disable-next-line node/no-unpublished-require
       rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
         'no-console': 'off',

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -185,3 +185,17 @@ jobs:
           CI: true
         run: yarn test-external:${{ matrix.partner }}
         continue-on-error: ${{ matrix['continue-on-error'] == true }}
+
+  performance:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - name: TracerBench CLI Install
+        run: yarn global add tracerbench
+      - name: PM2 CLI Install
+        run: yarn global add pm2
+      - name: TracerBench Compare
+        run: ./bin/relationship-performance-check
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 ### Master
 
+## Release 3.13.1 (September 24, 2019)
+
+- [0ff38fb1](https://github.com/emberjs/data/commit/0ff38fb1c0a8d75c7ad03f5dc8eaf8193d7f6e80) [DOC serializer] implements MinimumSerializerInterface (#6451) (#6499)
+
+## Release 3.13.0 (September 20, 2019)
+
+- [b29baa17](https://github.com/emberjs/data/commit/b29baa176f91b87ffc28a0c11c2fdd1c079e5ad9) [DOCS BETA RELEASE] Fix @ember-data/model package is blank (#6444) (#6445)
+- [8320ff4c](https://github.com/emberjs/data/commit/8320ff4c51012631af3af2ff50aa0ca679402b3f) [BUGFIX BETA RELEASE] Fix missing @babel/plugin-transform-block-scoping dependency (#6432)
+- [d7454364](https://github.com/emberjs/data/commit/d7454364e262743206d86a9b88607d03fe4ae46f) [BUGFIX BETA] ensure produced artifacts correctly lock with each other (#6309)
+- [a029725f](https://github.com/emberjs/data/commit/a029725f7372bae73b8cfbda307c3d2569b45b07) [BUGFIX beta] Fix Rollup warning about unresolved dependency
+- [69749b86](https://github.com/emberjs/data/commit/69749b86fe7d3effea974edf0b12fc4316e02ebf) [BUGFIX release beta canary] Fix Model lifecycle event deprecations
+- [#6312](https://github.com/emberjs/data/pull/6312) [BETA] Add environment variable to opt-out of rolling up `-private` (#6312)
+- [#6292](https://github.com/emberjs/data/pull/6292) chore: ensure * deps are hoisted (#6292)
+- [#6337](https://github.com/emberjs/data/pull/6337) [CHORE] fix test observers to match ember canary changes (#6337)
+- [#6411](https://github.com/emberjs/data/pull/6411) [BUGFIX beta] Adds support for parenless attr, belongsTo, and hasMany (#6339)
+- [#6434](https://github.com/emberjs/data/pull/6434) [BUGFIX BETA RELEASE] make fetch function JIT (#6430) (#6434)
+- [#6436](https://github.com/emberjs/data/pull/6436) fix: Strip Symbol from production builds (#6389) (#6436)
+- [#6452](https://github.com/emberjs/data/pull/6452) [BUGFIX beta] Update edition detection logic.
+- [#6334](https://github.com/emberjs/data/pull/6334) [BUGFIX BETA CANARY] usage of recordDataFor for client side create needs to be in correct cache
+- [#6430](https://github.com/emberjs/data/pull/6430) [BUGFIX BETA RELEASE] make fetch function JIT
+
 ## Release 3.12.3 (LTS) (September 20, 2019)
 
 - [#6441](https://github.com/emberjs/data/pull/6441) [BUGFIX] Await potentially async operations (#6441)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,10 +26,13 @@ jobs:
           versionSpec: '12.x' # The version we're installing
       - script: |
           yarn global add tracerbench
-        displayName: Tracerbench CLI Install
+        displayName: TracerBench CLI Install
       - script: |
-          yarn run tracerbench:compare
-        displayName: Tracerbench Compare
+          yarn global add pm2
+        displayName: PM2 CLI Install
+      - script: |
+          ./bin/relationship-performance-check
+        displayName: TracerBench Compare
 
   - job: Lint
     dependsOn: Performance

diff --git a/bin/lint-features b/bin/lint-features
@@ -2,10 +2,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const configPath = path.join(
-  __dirname,
-  '../packages/-build-infra/config/in-progress-features.json'
-);
+const configPath = path.join(__dirname, '../packages/private-build-infra/config/in-progress-features.json');
 const beginsWithDS = /^ds-/;
 const violations = [];
 

diff --git a/bin/packages-for-commit.js b/bin/packages-for-commit.js
@@ -8,9 +8,9 @@
   project without publishing the commit to a registry.
 
   The tarballs produced will reference each other appropriately. For instance
-  if `@ember-data/store` has a dependency on `@ember-data/-build-infra` the
+  if `@ember-data/store` has a dependency on `@ember-data/private-build-infra` the
   tarball for `@ember-data/store` will have a package.json file whose version
-  of `@ember-data/-build-infra` is the tarball for the commit for that package.
+  of `@ember-data/private-build-infra` is the tarball for the commit for that package.
 */
 
 'use strict';

diff --git a/bin/relationship-performance-check b/bin/relationship-performance-check
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+APP_PATH=packages/unpublished-relationship-performance-test-app
+HAR_REMIX_SCRIPT="$APP_PATH/bin/har-remix.js"
+WORKSPACE=relationship-performance-test-app
+CONTROl_BRANCH=master
+EXPERIMENT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
+
+git checkout $CONTROl_BRANCH
+
+if test -f $HAR_REMIX_SCRIPT; then
+  yarn install
+  yarn workspace $WORKSPACE ember build -e production --output-path dist-control
+  git checkout $EXPERIMENT_BRANCH
+  yarn install
+  yarn workspace $WORKSPACE ember build -e production --output-path dist-experiment
+  HR_PORT=4200 HR_GROUP=control pm2 start $HAR_REMIX_SCRIPT --name control
+  HR_PORT=4201 HR_GROUP=experiment pm2 start $HAR_REMIX_SCRIPT --name experiment
+  yarn workspace $WORKSPACE tracerbench:compare
+  pm2 kill
+else
+  echo "har-remix.js does not exist on the $CONTROl_BRANCH branch"
+  git checkout $EXPERIMENT_BRANCH
+fi
diff --git a/package.json b/package.json
@@ -35,23 +35,21 @@
     "test-external:factory-guy": "./bin/test-external-partner-project.js factory-guy https://github.com/danielspaniel/ember-data-factory-guy.git",
     "test-external:ilios-frontend": "./bin/test-external-partner-project.js ilios-frontend https://github.com/ilios/frontend.git --skip-smoke-test",
     "test-external:ember-resource-metadata": "./bin/test-external-partner-project.js ember-resource-metadata https://github.com/ef4/ember-resource-metadata.git",
-    "test-external:ember-data-relationship-tracker": "./bin/test-external-partner-project.js ember-data-relationship-tracker https://github.com/ef4/ember-data-relationship-tracker.git",
-    "tracerbench": "concurrently 'server-replay ./packages/-$APP/bin/localhost.har --port 4200' 'yarn workspace $APP tracerbench:compare' --kill-others --success first"
+    "test-external:ember-data-relationship-tracker": "./bin/test-external-partner-project.js ember-data-relationship-tracker https://github.com/ef4/ember-data-relationship-tracker.git"
   },
   "devDependencies": {
     "@babel/plugin-transform-typescript": "^7.6.3",
-    "@ember/optional-features": "^1.0.0",
-    "@tracerbench/core": "^2.3.0",
+    "@ember/optional-features": "^1.1.0",
     "@types/ember": "^3.1.1",
     "@types/ember-qunit": "^3.4.7",
     "@types/ember-test-helpers": "~1.0.6",
     "@types/ember-testing-helpers": "~0.0.3",
-    "@types/ember__debug": "3.0.5",
+    "@types/ember__debug": "3.0.6",
     "@types/ember__test-helpers": "~0.7.9",
     "@types/qunit": "^2.5.3",
     "@types/rsvp": "^4.0.3",
-    "@typescript-eslint/eslint-plugin": "^2.5.0",
-    "@typescript-eslint/parser": "^2.5.0",
+    "@typescript-eslint/eslint-plugin": "^2.6.0",
+    "@typescript-eslint/parser": "^2.6.0",
     "babel-eslint": "^10.0.3",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-feature-flags": "^0.3.1",
@@ -94,29 +92,27 @@
     "ember-cli-version-checker": "^3.1.2",
     "ember-cli-yuidoc": "^0.8.8",
     "ember-compatibility-helpers": "^1.2.0",
-    "ember-decorators-polyfill": "^1.1.0",
+    "ember-decorators-polyfill": "^1.1.1",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
-    "ember-fetch": "^6.7.1",
-    "ember-load-initializers": "^2.1.0",
+    "ember-fetch": "^6.7.2",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.5.1",
-    "ember-qunit-assert-helpers": "^0.2.2",
+    "ember-qunit": "^4.6.0",
     "ember-resolver": "^5.3.0",
-    "ember-simple-tree": "^0.7.0",
-    "ember-source": "^3.13.3",
+    "ember-simple-tree": "^0.7.1",
+    "ember-source": "^3.14.1",
     "ember-source-channel-url": "^2.0.1",
     "ember-try": "^1.2.1",
-    "eslint": "^6.5.1",
-    "eslint-config-prettier": "^6.4.0",
-    "eslint-plugin-ember": "^7.2.0",
-    "eslint-plugin-mocha": "^6.2.0",
+    "eslint": "^6.6.0",
+    "eslint-config-prettier": "^6.5.0",
+    "eslint-plugin-ember": "^7.3.0",
+    "eslint-plugin-mocha": "^6.2.1",
     "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-qunit": "^4.0.0",
     "execa": "^3.2.0",
     "fromentries": "^1.2.0",
-    "fs-extra": "^8.1.0",
     "git-repo-info": "^2.1.1",
     "github": "^1.1.1",
     "glob": "^7.1.5",
@@ -128,7 +124,7 @@
     "pre-commit": "^1.2.2",
     "prettier": "~1.18.2",
     "qunit": "^2.9.3",
-    "qunit-dom": "^0.9.0",
+    "qunit-dom": "^0.9.1",
     "rimraf": "^3.0.0",
     "rsvp": "^4.8.5",
     "semver": "^6.2.0",

diff --git a/packages/-ember-data/ember-cli-build.js b/packages/-ember-data/ember-cli-build.js
@@ -7,7 +7,7 @@ module.exports = function(defaults) {
     babel: {
       // this ensures that the same `@ember-data/canary-features` processing that the various
       // ember-data addons do is done in the dummy app
-      plugins: [...require('@ember-data/-build-infra/src/debug-macros')()],
+      plugins: [...require('@ember-data/private-build-infra/src/debug-macros')()],
     },
     'ember-cli-babel': {
       throwUnlessParallelizable: true,

diff --git a/packages/-ember-data/index.js b/packages/-ember-data/index.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const addonBuildConfigForDataPackage = require('@ember-data/-build-infra/src/addon-build-config-for-data-package');
+const addonBuildConfigForDataPackage = require('@ember-data/private-build-infra/src/addon-build-config-for-data-package');
 const addonBaseConfig = addonBuildConfigForDataPackage('ember-data');
-const version = require('@ember-data/-build-infra/src/create-version-module');
+const version = require('@ember-data/private-build-infra/src/create-version-module');
 const merge = require('broccoli-merge-trees');
 
 module.exports = Object.assign({}, addonBaseConfig, {

diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json
@@ -23,7 +23,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@ember-data/-build-infra": "3.15.0-alpha.1",
+    "@ember-data/private-build-infra": "3.15.0-alpha.1",
     "@ember-data/adapter": "3.15.0-alpha.1",
     "@ember-data/debug": "3.15.0-alpha.1",
     "@ember-data/model": "3.15.0-alpha.1",
@@ -39,12 +39,12 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-typescript": "^7.6.3",
-    "@ember/optional-features": "^1.0.0",
+    "@ember/optional-features": "^1.1.0",
     "@types/ember": "^3.1.1",
     "@types/ember-qunit": "^3.4.7",
     "@types/ember-test-helpers": "~1.0.6",
     "@types/ember-testing-helpers": "~0.0.3",
-    "@types/ember__debug": "3.0.5",
+    "@types/ember__debug": "3.0.6",
     "@types/ember__test-helpers": "~0.7.9",
     "@types/qunit": "^2.5.3",
     "@types/rsvp": "^4.0.3",
@@ -68,15 +68,14 @@
     "ember-cli-uglify": "3.0.0",
     "ember-cli-yuidoc": "^0.8.8",
     "ember-compatibility-helpers": "^1.2.0",
-    "ember-decorators-polyfill": "^1.1.0",
+    "ember-decorators-polyfill": "^1.1.1",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^2.1.0",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.5.1",
-    "ember-qunit-assert-helpers": "^0.2.2",
+    "ember-qunit": "^4.6.0",
     "ember-resolver": "^5.3.0",
-    "ember-source": "^3.13.3",
+    "ember-source": "^3.14.1",
     "ember-source-channel-url": "^2.0.1",
     "ember-try": "^1.2.1",
     "github": "^1.1.1",

diff --git a/packages/-ember-data/tests/acceptance/relationships/has-many-test.js b/packages/-ember-data/tests/acceptance/relationships/has-many-test.js
@@ -457,7 +457,7 @@ module('async has-many rendering tests', function(hooks) {
       assert.equal(!!RelationshipPromiseCache['children'], false, 'The relationship has no fetch promise');
       assert.equal(!!RelationshipProxyCache['children'], true, 'The relationship has a promise proxy');
       assert.equal(relationshipState.hasFailedLoadAttempt === true, true, 'The relationship has attempted a load');
-      assert.equal(!!relationshipState.link, true, 'The relationship has a link');
+      assert.equal(!!(relationshipState.links && relationshipState.links.related), true, 'The relationship has a link');
 
       Ember.onerror = originalOnError;
     });

diff --git a/packages/-ember-data/tests/helpers/deprecated-test.js b/packages/-ember-data/tests/helpers/deprecated-test.js
@@ -1,5 +1,11 @@
 import { test } from 'qunit';
 import VERSION from 'ember-data/version';
+import { DEBUG } from '@glimmer/env';
+
+// temporary so that we can split out test fixes
+// from landing this. If working locally turn this
+// on to have tests fail that require being fixed.
+export const SHOULD_ASSERT_ALL = false;
 
 // small comparison function for major and minor semver values
 function gte(EDVersion, DeprecationVersion) {
@@ -22,8 +28,20 @@ export function deprecatedTest(testName, deprecation, testCallback) {
     throw new Error(`deprecatedTest expects { id } to be a meaningful string`);
   }
 
+  async function interceptor(assert) {
+    await testCallback.call(this, assert);
+    if (DEBUG) {
+      if (SHOULD_ASSERT_ALL) {
+        if (typeof assert.test.expected === 'number') {
+          assert.test.expected += 1;
+        }
+        assert.expectDeprecation(deprecation);
+      }
+    }
+  }
+
   if (gte(VERSION, deprecation.until)) {
-    test(`DEPRECATION ${deprecation.id} until ${deprecation.until} | ${testName}`, testCallback);
+    test(`DEPRECATION ${deprecation.id} until ${deprecation.until} | ${testName}`, interceptor);
   } else {
     test(`DEPRECATION ${deprecation.id} until ${deprecation.until} | ${testName}`, function(assert) {
       if (deprecation.refactor === true) {