Add a feature flag

emberjs · Mar 23, 2021 · 3995cb6 · 3995cb6
1 parent 5417287
commit 3995cb6
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 105 deletions.
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -1,6 +1,7 @@
 import { getOwner, Owner } from '@ember/-internals/owner';
 import { Evented } from '@ember/-internals/runtime';
 import { symbol } from '@ember/-internals/utils';
+import { EMBER_ROUTING_ROUTER_SERVICE_REFRESH } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import { assign } from '@ember/polyfills';
@@ -394,32 +395,6 @@ export default class RouterService extends Service {
     return this._router._routerMicrolib.recognizeAndLoad(internalURL);
   }
 
-  /**
-   * Refreshes all currently active routes, doing a full transition.
-   * If a route name is provided and refers to a currently active route,
-   * it will refresh only that route and its descendents.
-   * Returns a promise that will be resolved once the refresh is complete.
-   * All resetController, beforeModel, model, afterModel, redirect, and setupController
-   * hooks will be called again. You will get new data from the model hook.
-   *
-   * @method refresh
-   * @param {String} [pivotRouteName] the route to refresh (along with all child routes)
-   * @return Transition
-   * @public
-   */
-  refresh(pivotRouteName?: string) {
-    if (!pivotRouteName) {
-      return this._router._routerMicrolib.refresh();
-    }
-
-    assert(`The route "${pivotRouteName}" was not found`, this._router.hasRoute(pivotRouteName));
-    assert(`The route "${pivotRouteName}" is currently not active`, this.isActive(pivotRouteName));
-
-    let pivotRoute = this._router._routerMicrolib.getRoute(pivotRouteName) as Route;
-
-    return this._router._routerMicrolib.refresh(pivotRoute);
-  }
-
   /**
     The `routeWillChange` event is fired at the beginning of any
     attempted transition with a `Transition` object as the sole
@@ -501,6 +476,39 @@ export default class RouterService extends Service {
   */
 }
 
+if (EMBER_ROUTING_ROUTER_SERVICE_REFRESH) {
+  RouterService.reopen({
+    /**
+     * Refreshes all currently active routes, doing a full transition.
+     * If a route name is provided and refers to a currently active route,
+     * it will refresh only that route and its descendents.
+     * Returns a promise that will be resolved once the refresh is complete.
+     * All resetController, beforeModel, model, afterModel, redirect, and setupController
+     * hooks will be called again. You will get new data from the model hook.
+     *
+     * @method refresh
+     * @param {String} [pivotRouteName] the route to refresh (along with all child routes)
+     * @return Transition
+     * @public
+     */
+    refresh(pivotRouteName?: string) {
+      if (!pivotRouteName) {
+        return this._router._routerMicrolib.refresh();
+      }
+
+      assert(`The route "${pivotRouteName}" was not found`, this._router.hasRoute(pivotRouteName));
+      assert(
+        `The route "${pivotRouteName}" is currently not active`,
+        this.isActive(pivotRouteName)
+      );
+
+      let pivotRoute = this._router._routerMicrolib.getRoute(pivotRouteName) as Route;
+
+      return this._router._routerMicrolib.refresh(pivotRoute);
+    },
+  });
+}
+
 RouterService.reopen(Evented, {
   /**
      Name of the current route.

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
@@ -21,6 +21,7 @@ export const DEFAULT_FEATURES = {
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS: true,
   EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: null,
+  EMBER_ROUTING_ROUTER_SERVICE_REFRESH: null,
 };
 
 /**
@@ -81,3 +82,6 @@ export const EMBER_STRICT_MODE = featureValue(FEATURES.EMBER_STRICT_MODE);
 export const EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = featureValue(
   FEATURES.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
 );
+export const EMBER_ROUTING_ROUTER_SERVICE_REFRESH = featureValue(
+  FEATURES.EMBER_ROUTING_ROUTER_SERVICE_REFRESH
+);
diff --git a/packages/ember/tests/routing/router_service_test/refresh_test.js b/packages/ember/tests/routing/router_service_test/refresh_test.js
@@ -1,97 +1,100 @@
 import { Route } from '@ember/-internals/routing';
+import { EMBER_ROUTING_ROUTER_SERVICE_REFRESH } from '@ember/canary-features';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 
-moduleFor(
-  'Router Service - refresh',
-  class extends RouterTestCase {
-    async ['@test RouterService#refresh can be used to re-run the model hooks of active routes'](
-      assert
-    ) {
-      let parentCounter = 0;
-      this.add(
-        'route:parent',
-        Route.extend({
-          model() {
-            ++parentCounter;
-          },
-        })
-      );
+if (EMBER_ROUTING_ROUTER_SERVICE_REFRESH) {
+  moduleFor(
+    'Router Service - refresh',
+    class extends RouterTestCase {
+      async ['@test RouterService#refresh can be used to re-run the model hooks of active routes'](
+        assert
+      ) {
+        let parentCounter = 0;
+        this.add(
+          'route:parent',
+          Route.extend({
+            model() {
+              ++parentCounter;
+            },
+          })
+        );
 
-      let childCounter = 0;
-      this.add(
-        'route:parent.child',
-        Route.extend({
-          model() {
-            ++childCounter;
-          },
-        })
-      );
+        let childCounter = 0;
+        this.add(
+          'route:parent.child',
+          Route.extend({
+            model() {
+              ++childCounter;
+            },
+          })
+        );
 
-      let sisterCounter = 0;
-      this.add(
-        'route:parent.sister',
-        Route.extend({
-          model() {
-            ++sisterCounter;
-          },
-        })
-      );
+        let sisterCounter = 0;
+        this.add(
+          'route:parent.sister',
+          Route.extend({
+            model() {
+              ++sisterCounter;
+            },
+          })
+        );
 
-      await this.visit('/');
-      assert.equal(parentCounter, 1);
-      assert.equal(childCounter, 0);
-      assert.equal(sisterCounter, 0);
+        await this.visit('/');
+        assert.equal(parentCounter, 1);
+        assert.equal(childCounter, 0);
+        assert.equal(sisterCounter, 0);
 
-      await this.routerService.refresh();
-      assert.equal(parentCounter, 2);
-      assert.equal(childCounter, 0);
-      assert.equal(sisterCounter, 0);
+        await this.routerService.refresh();
+        assert.equal(parentCounter, 2);
+        assert.equal(childCounter, 0);
+        assert.equal(sisterCounter, 0);
 
-      await this.routerService.refresh('application');
-      assert.equal(parentCounter, 3);
-      assert.equal(childCounter, 0);
-      assert.equal(sisterCounter, 0);
+        await this.routerService.refresh('application');
+        assert.equal(parentCounter, 3);
+        assert.equal(childCounter, 0);
+        assert.equal(sisterCounter, 0);
 
-      await this.routerService.transitionTo('parent.child');
-      assert.equal(parentCounter, 3);
-      assert.equal(childCounter, 1);
-      assert.equal(sisterCounter, 0);
+        await this.routerService.transitionTo('parent.child');
+        assert.equal(parentCounter, 3);
+        assert.equal(childCounter, 1);
+        assert.equal(sisterCounter, 0);
 
-      await this.routerService.refresh('parent.child');
-      assert.equal(parentCounter, 3);
-      assert.equal(childCounter, 2);
-      assert.equal(sisterCounter, 0);
+        await this.routerService.refresh('parent.child');
+        assert.equal(parentCounter, 3);
+        assert.equal(childCounter, 2);
+        assert.equal(sisterCounter, 0);
 
-      await this.routerService.refresh('parent');
-      assert.equal(parentCounter, 4);
-      assert.equal(childCounter, 3);
-      assert.equal(sisterCounter, 0);
+        await this.routerService.refresh('parent');
+        assert.equal(parentCounter, 4);
+        assert.equal(childCounter, 3);
+        assert.equal(sisterCounter, 0);
 
-      await this.routerService.transitionTo('parent.sister');
-      assert.equal(parentCounter, 4);
-      assert.equal(childCounter, 3);
-      assert.equal(sisterCounter, 1);
+        await this.routerService.transitionTo('parent.sister');
+        assert.equal(parentCounter, 4);
+        assert.equal(childCounter, 3);
+        assert.equal(sisterCounter, 1);
 
-      await this.routerService.refresh();
-      assert.equal(parentCounter, 5);
-      assert.equal(childCounter, 3);
-      assert.equal(sisterCounter, 2);
-    }
+        await this.routerService.refresh();
+        assert.equal(parentCounter, 5);
+        assert.equal(childCounter, 3);
+        assert.equal(sisterCounter, 2);
+      }
 
-    async ['@test RouterService#refresh verifies that the provided route exists']() {
-      await this.visit('/');
+      async ['@test RouterService#refresh verifies that the provided route exists']() {
+        await this.visit('/');
 
-      expectAssertion(() => {
-        this.routerService.refresh('this-route-does-not-exist');
-      }, 'The route "this-route-does-not-exist" was not found');
-    }
+        expectAssertion(() => {
+          this.routerService.refresh('this-route-does-not-exist');
+        }, 'The route "this-route-does-not-exist" was not found');
+      }
 
-    async ['@test RouterService#refresh verifies that the provided route name corresponds with an active route']() {
-      await this.visit('/');
+      async ['@test RouterService#refresh verifies that the provided route name corresponds with an active route']() {
+        await this.visit('/');
 
-      expectAssertion(() => {
-        this.routerService.refresh('parent.child');
-      }, 'The route "parent.child" is currently not active');
+        expectAssertion(() => {
+          this.routerService.refresh('parent.child');
+        }, 'The route "parent.child" is currently not active');
+      }
     }
-  }
-);
+  );
+}