Mostly remove reopen

Author: wagenet

packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js

@@ -8,6 +8,7 @@ import {
 
 import { Component } from '@ember/-internals/glimmer';
 import Route from '@ember/routing/route';
+import EmberRouter from '@ember/routing/router';
 import { RSVP } from '@ember/-internals/runtime';
 import Controller from '@ember/controller';
 import Engine from '@ember/engine';
@@ -17,14 +18,16 @@ import { compile } from '../../utils/helpers';
 import { setComponentTemplate } from '@glimmer/manager';
 import { templateOnlyComponent } from '@glimmer/runtime';
 
+const originalSetupRouter = EmberRouter.prototype.setupRouter;
+
 moduleFor(
   'Application test: engine rendering',
   class extends ApplicationTestCase {
     get routerOptions() {
       return {
         location: 'none',
         setupRouter() {
-          this._super(...arguments);
+          originalSetupRouter.call(this, ...arguments);
           let getRoute = this._routerMicrolib.getRoute;
           this._enginePromises = Object.create(null);
           this._resolvedEngines = Object.create(null);

packages/@ember/-internals/meta/lib/meta.ts

@@ -481,7 +481,6 @@ export class Meta {
     1. A meta has been flattened (listener has been called)
     2. The meta is a prototype meta with children who have inherited its
        listeners
-    3. A new listener is subsequently added to the meta (e.g. via `.reopen()`)
 
     This is a very rare occurrence, so while the counter is global it shouldn't
     be updated very often in practice.

packages/@ember/-internals/meta/tests/listeners_test.js

@@ -140,67 +140,6 @@ moduleFor(
       }
     }
 
-    ['@test reopen after flatten'](assert) {
-      if (!DEBUG) {
-        assert.expect(0);
-        return;
-      }
-
-      // Ensure counter is zeroed
-      counters.reopensAfterFlatten = 0;
-
-      class Class1 {}
-      let class1Meta = meta(Class1.prototype);
-      class1Meta.addToListeners('hello', null, 'm', 0);
-
-      let instance1 = new Class1();
-      let m1 = meta(instance1);
-
-      class Class2 {}
-      let class2Meta = meta(Class2.prototype);
-      class2Meta.addToListeners('hello', null, 'm', 0);
-
-      let instance2 = new Class2();
-      let m2 = meta(instance2);
-
-      m1.matchingListeners('hello');
-      m2.matchingListeners('hello');
-
-      assert.equal(counters.reopensAfterFlatten, 0, 'no reopen calls yet');
-
-      m1.addToListeners('world', null, 'm', 0);
-      m2.addToListeners('world', null, 'm', 0);
-      m1.matchingListeners('world');
-      m2.matchingListeners('world');
-
-      assert.equal(counters.reopensAfterFlatten, 1, 'reopen calls after invalidating parent cache');
-
-      m1.addToListeners('world', null, 'm', 0);
-      m2.addToListeners('world', null, 'm', 0);
-      m1.matchingListeners('world');
-      m2.matchingListeners('world');
-
-      assert.equal(counters.reopensAfterFlatten, 1, 'no reopen calls after mutating leaf nodes');
-
-      class1Meta.removeFromListeners('hello', null, 'm');
-      class2Meta.removeFromListeners('hello', null, 'm');
-      m1.matchingListeners('hello');
-      m2.matchingListeners('hello');
-
-      assert.equal(counters.reopensAfterFlatten, 2, 'one reopen call after mutating parents');
-
-      class1Meta.addToListeners('hello', null, 'm', 0);
-      m1.matchingListeners('hello');
-      class2Meta.addToListeners('hello', null, 'm', 0);
-      m2.matchingListeners('hello');
-
-      assert.equal(
-        counters.reopensAfterFlatten,
-        3,
-        'one reopen call after mutating parents and flattening out of order'
-      );
-    }
-
     '@test removed listeners are removed from the underlying structure GH#1112213'(assert) {
       // this is using private API to confirm the underlying data structure is properly maintained
       // and should be changed to match the data structure as needed

packages/@ember/-internals/metal/lib/observer.ts

@@ -153,7 +153,7 @@ export function resumeObserverDeactivation() {
 }
 
 /**
- * Primarily used for cases where we are redefining a class, e.g. mixins/reopen
+ * Primarily used for cases where we are redefining a class, e.g. mixins
  * being applied later. Revalidates all the observers, resetting their tags.
  *
  * @private

packages/@ember/application/index.ts

@@ -354,10 +354,6 @@ class Application extends Engine {
       ...
     });
 
-    App.Router.reopen({
-      location: 'none'
-    });
-
     App.Router.map({
       ...
     });
@@ -388,6 +384,7 @@ class Application extends Engine {
     @default true
     @private
   */
+  // TODO: We should kill this
   declare _globalsMode: boolean;
 
   /**

packages/@ember/application/tests/readiness_test.js

@@ -34,7 +34,7 @@ moduleFor(
         _document = _document;
 
         ready() {
-          this._super();
+          super.ready();
           readyWasCalled++;
         }
       };

packages/@ember/debug/index.ts

@@ -236,19 +236,6 @@ if (DEBUG) {
     freely added for documentation and debugging purposes without worries of
     incuring any performance penalty.
 
-    ```javascript
-    import Component from '@ember/component';
-    import { runInDebug } from '@ember/debug';
-
-    runInDebug(() => {
-      Component.reopen({
-        didInsertElement() {
-          console.log("I'm happy");
-        }
-      });
-    });
-    ```
-
     @method runInDebug
     @for @ember/debug
     @static

packages/@ember/object/core.ts

@@ -96,7 +96,7 @@ function initialize(obj: CoreObject, properties?: unknown) {
 
       assert(
         'EmberObject.create no longer supports defining computed ' +
-          'properties. Define computed properties using extend() or reopen() ' +
+          'properties. Define computed properties using extend() ' +
           'before calling create().',
         !isClassicDecorator(value)
       );
@@ -307,11 +307,6 @@ class CoreObject {
     }
   }
 
-  reopen(...args: Array<Mixin | Record<string, unknown>>): this {
-    applyMixin(this, args);
-    return this;
-  }
-
   /**
     An overridable method called when objects are instantiated. By default,
     does nothing unless it is overridden during class definition.
@@ -800,60 +795,6 @@ class CoreObject {
     return instance as InstanceType<C> & MergeArray<Args>;
   }
 
-  /**
-    Augments a constructor's prototype with additional
-    properties and functions:
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const MyObject = EmberObject.extend({
-      name: 'an object'
-    });
-
-    o = MyObject.create();
-    o.get('name'); // 'an object'
-
-    MyObject.reopen({
-      say(msg) {
-        console.log(msg);
-      }
-    });
-
-    o2 = MyObject.create();
-    o2.say('hello'); // logs "hello"
-
-    o.say('goodbye'); // logs "goodbye"
-    ```
-
-    To add functions and properties to the constructor itself,
-    see `reopenClass`
-
-    @method reopen
-    @for @ember/object
-    @static
-    @public
-  */
-  static reopen<C extends typeof CoreObject>(this: C, ...args: any[]): C {
-    this.willReopen();
-    reopen.apply(this.PrototypeMixin, args);
-    return this;
-  }
-
-  static willReopen() {
-    let p = this.prototype;
-    if (wasApplied.has(p)) {
-      wasApplied.delete(p);
-
-      // If the base mixin already exists and was applied, create a new mixin to
-      // make sure that it gets properly applied. Reusing the same mixin after
-      // the first `proto` call will cause it to get skipped.
-      if (prototypeMixinMap.has(this)) {
-        prototypeMixinMap.set(this, Mixin.create(this.PrototypeMixin));
-      }
-    }
-  }
-
   /**
     Augments a constructor's own properties and functions:
 
@@ -906,10 +847,6 @@ class CoreObject {
     Note that `species` and `createPerson` are *not* valid on the `tom` and `yehuda`
     variables. They are only valid on `Person`.
 
-    To add functions and properties to instances of
-    a constructor by extending the constructor's prototype
-    see `reopen`
-
     @method reopenClass
     @for @ember/object
     @static

packages/@ember/object/tests/computed_test.js

@@ -215,10 +215,6 @@ moduleFor(
         baz: computed(function () {}),
       });
 
-      SubClass.reopen({
-        bat: computed(function () {}).meta({ iAmBat: true }),
-      });
-
       let list = [];
 
       MyClass.eachComputedProperty(function (name) {
@@ -235,17 +231,12 @@ moduleFor(
 
       SubClass.eachComputedProperty(function (name, meta) {
         list.push(name);
-
-        if (name === 'bat') {
-          assert.deepEqual(meta, { iAmBat: true });
-        } else {
-          assert.deepEqual(meta, {});
-        }
+        assert.deepEqual(meta, {});
       });
 
       assert.deepEqual(
         list.sort(),
-        ['bar', 'bat', 'baz', 'foo', 'qux'],
+        ['bar', 'baz', 'foo', 'qux'],
         'all inherited properties are included'
       );
     }
@@ -269,10 +260,6 @@ moduleFor(
 
       assert.deepEqual(list.sort(), ['bar', 'foo'].sort(), 'expected two computed properties');
 
-      MyClass.reopen({
-        baz: computed(K),
-      });
-
       MyClass.create().destroy(); // force apply mixins
 
       list = [];
@@ -281,11 +268,7 @@ moduleFor(
         list.push(name);
       });
 
-      assert.deepEqual(
-        list.sort(),
-        ['bar', 'foo', 'baz'].sort(),
-        'expected three computed properties'
-      );
+      assert.deepEqual(list.sort(), ['bar', 'foo'].sort(), 'expected two computed properties');
 
       defineProperty(MyClass.prototype, 'qux', computed(K));
 
@@ -297,8 +280,8 @@ moduleFor(
 
       assert.deepEqual(
         list.sort(),
-        ['bar', 'foo', 'baz', 'qux'].sort(),
-        'expected four computed properties'
+        ['bar', 'foo', 'qux'].sort(),
+        'expected three computed properties'
       );
     }
 

packages/@ember/object/tests/create_test.js

@@ -183,7 +183,7 @@ moduleFor(
         EmberObject.create({
           foo: computed(function () {}),
         });
-      }, 'EmberObject.create no longer supports defining computed properties. Define computed properties using extend() or reopen() before calling create().');
+      }, 'EmberObject.create no longer supports defining computed properties. Define computed properties using extend() before calling create().');
     }
 
     ['@test throws if you try to call _super in a method']() {

packages/@ember/object/tests/es-compatibility-test.js

@@ -415,14 +415,6 @@ moduleFor(
       // Only string listeners are allowed for prototypes
       addListener(B.prototype, 'someEvent', null, 'onSomeEvent');
 
-      B.reopen({
-        init() {
-          calls.push('reopen init before _super');
-          this._super(...arguments);
-          calls.push('reopen init after _super');
-        },
-      });
-
       let C = class extends B {
         init() {
           calls.push('C init before _super');
@@ -476,15 +468,13 @@ moduleFor(
       assert.deepEqual(calls, [
         'D init before super.init',
         'C init before _super',
-        'reopen init before _super',
         'B init before super.init',
         'Mixin2 init before _super',
         'Mixin1 init before _super',
         'A init',
         'Mixin1 init after _super',
         'Mixin2 init after _super',
         'B init after super.init',
-        'reopen init after _super',
         'C init after _super',
         'D init after super.init',
       ]);