RecordData errors

bin/publish.js

@@ -66,7 +66,9 @@ function getConfig() {
   }
   if (!['release', 'beta', 'canary', 'lts'].includes(mainOptions.channel)) {
     throw new Error(
-      `Incorrect usage of publish:\n\tpublish <channel>\n\nChannel must be one of release|beta|canary|lts. Received ${mainOptions.channel}`
+      `Incorrect usage of publish:\n\tpublish <channel>\n\nChannel must be one of release|beta|canary|lts. Received ${
+        mainOptions.channel
+      }`
     );
   }
 
@@ -162,7 +164,9 @@ function assertGitIsClean() {
     if (options.force) {
       console.log(
         chalk.white(
-          `⚠️ ⚠️ ⚠️  Expected to publish npm tag ${options.distTag} from the git branch ${expectedChannelBranch}, but found ${foundBranch}`
+          `⚠️ ⚠️ ⚠️  Expected to publish npm tag ${
+            options.distTag
+          } from the git branch ${expectedChannelBranch}, but found ${foundBranch}`
         ) +
           chalk.yellow('\n\tPassed option: ') +
           chalk.white('--force') +
@@ -171,7 +175,9 @@ function assertGitIsClean() {
     } else {
       console.log(
         chalk.red(
-          `💥 Expected to publish npm tag ${options.distTag} from the git branch ${expectedChannelBranch}, but found ${foundBranch} 💥 \n\t`
+          `💥 Expected to publish npm tag ${
+            options.distTag
+          } from the git branch ${expectedChannelBranch}, but found ${foundBranch} 💥 \n\t`
         ) +
           chalk.grey('Use ') +
           chalk.white('--force') +

package.json

@@ -19,7 +19,7 @@
     "test:node": "lerna run test:node",
     "test:production": "yarn workspace ember-data test:production",
     "test:try-one": "yarn workspace ember-data test:try-one",
-    "test:enabled-in-progress-features": "yarn workspace ember-data test --enable-in-progress",
+    "test:enabled-in-progress-features": "yarn workspace ember-data test:optional-features",
     "test-external:ember-m3": "./bin/test-external-partner-project.js ember-m3 https://github.com/hjdivad/ember-m3.git",
     "test-external:ember-data-change-tracker": "./bin/test-external-partner-project.js ember-data-change-tracker https://github.com/danielspaniel/ember-data-change-tracker.git",
     "test-external:model-fragments": "./bin/test-external-partner-project.js ember-data-model-fragments https://github.com/lytics/ember-data-model-fragments.git",

packages/-build-infra/src/debug-macros.js

@@ -10,17 +10,7 @@ module.exports = function debugMacros(environment) {
         flags: [
           {
             source: '@ember-data/canary-features',
-            flags: Object.assign(
-              // explicit list of additional exports within @ember-data/canary-features
-              // without adding this (with a null value) an error is thrown during
-              // the feature replacement process (e.g. XYZ is not a supported flag)
-              {
-                FEATURES: null,
-                DEFAULT_FEATURES: null,
-                isEnabled: null,
-              },
-              FEATURES
-            ),
+            flags: FEATURES,
           },
         ],
       },

packages/-build-infra/src/features.js

@@ -1,12 +1,29 @@
 'use strict';
 
 function getFeatures() {
-  const features = { SAMPLE_FEATURE_FLAG: null };
-  let enableFeatures = process.env.EMBER_DATA_FEATURES;
-  // turn on all features when given the above environment variable
-  if (enableFeatures) {
-    for (let key in features) {
-      features[key] = true;
+  const features = {
+    SAMPLE_FEATURE_FLAG: null,
+    RECORD_DATA_ERRORS: null,
+  };
+
+  const FEATURE_OVERRIDES = process.env.EMBER_DATA_FEATURE_OVERRIDE;
+  if (FEATURE_OVERRIDES === 'ENABLE_ALL_OPTIONAL') {
+    // enable all features with a current value of `null`
+    for (let feature in features) {
+      let featureValue = features[feature];
+
+      if (featureValue === null) {
+        features[feature] = true;
+      }
+    }
+  } else if (FEATURE_OVERRIDES) {
+    // enable only the specific features listed in the environment
+    // variable (comma separated)
+    const forcedFeatures = FEATURE_OVERRIDES.split(',');
+    for (var i = 0; i < forcedFeatures.length; i++) {
+      let featureName = forcedFeatures[i];
+
+      features[featureName] = true;
     }
   }
 

packages/-ember-data/ember-cli-build.js

@@ -4,6 +4,11 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
   let app = new EmberAddon(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')()],
+    },
     'ember-cli-babel': {
       throwUnlessParallelizable: true,
     },

packages/-ember-data/package.json

@@ -14,7 +14,7 @@
     "test": "ember test",
     "test:all": "ember try:each",
     "test:production": "ember test -e production",
-    "test:optional-features": "ember test -e test-optional-features",
+    "test:optional-features": "EMBER_DATA_FEATURE_OVERRIDE=ENABLE_ALL_OPTIONAL ember test",
     "test:try-one": "ember try:one",
     "prepublishOnly": "ember build --environment=production && ember ts:precompile",
     "postpublish": "ember ts:clean"

packages/-ember-data/tests/helpers/watch-property.js

@@ -98,7 +98,9 @@ QUnit.assert.watchedPropertyCounts = function assertWatchedPropertyCount(
       expectedCount = expectedCount[0];
     }
 
-    assertionText += ` | Expected ${expectedCount} change notifications for ${propertyName} but recieved ${counter.count}`;
+    assertionText += ` | Expected ${expectedCount} change notifications for ${propertyName} but recieved ${
+      counter.count
+    }`;
 
     if (counter === undefined) {
       throw new Error(

packages/-ember-data/tests/index.html

@@ -24,6 +24,14 @@
     <script src="/testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>
+
+    <script>
+      // Handle testing feature flags
+      if (QUnit.urlParams.enableoptionalfeatures) {
+        window.EmberDataENV = { ENABLE_OPTIONAL_FEATURES: true };
+      }
+    </script>
+
     <script src="{{rootURL}}assets/dummy.js"></script>
     <script src="{{rootURL}}assets/tests.js"></script>