ember-source 6.1.0-alpha.6 → 6.1.0-beta.1

package/build-metadata.json

@@ -1,6 +1,6 @@
 {
-  "version": "6.1.0-alpha.6",
+  "version": "6.1.0-beta.1",
   "buildType": "tag",
-  "SHA": "f1ff3a47fe34d727c7907e1881148331e7f8938c",
-  "assetPath": "/tag/shas/f1ff3a47fe34d727c7907e1881148331e7f8938c.tgz"
+  "SHA": "79502846d78ce4825a2f8edcbb2de7f78702fac0",
+  "assetPath": "/tag/shas/79502846d78ce4825a2f8edcbb2de7f78702fac0.tgz"
 }

package/dist/ember-template-compiler.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   6.1.0-alpha.6
+ * @version   6.1.0-beta.1
  */
 /* eslint-disable no-var */
 /* globals global globalThis self */
@@ -12976,13 +12976,13 @@ var define, require;
               params = null,
               hash = null,
               blockParams = null;
-            return 2 === statement.length ? blocks = normalizeBlocks(statement[1]) : 3 === statement.length ? (Array.isArray(statement[1]) ? params = normalizeParams(statement[1]) : {
+            return 2 === statement.length ? blocks = normalizeBlocks(statement[1]) : 3 === statement.length ? (Array.isArray(statement[1]) ? params = normalizeParams(statement[1]) : ({
               hash: hash,
               blockParams: blockParams
-            } = normalizeBlockHash(statement[1]), blocks = normalizeBlocks(statement[2])) : 4 === statement.length && (params = normalizeParams(statement[1]), {
+            } = normalizeBlockHash(statement[1])), blocks = normalizeBlocks(statement[2])) : 4 === statement.length && (params = normalizeParams(statement[1]), ({
               hash: hash,
               blockParams: blockParams
-            } = normalizeBlockHash(statement[2]), blocks = normalizeBlocks(statement[3])), {
+            } = normalizeBlockHash(statement[2])), blocks = normalizeBlocks(statement[3])), {
               head: extractBlockHead(head),
               params: params,
               hash: hash,
@@ -15651,7 +15651,7 @@ var define, require;
           }, Symbol.toStringTag, { value: 'Module' });
 
           // this file gets replaced with the real value during the build
-          const version = '6.1.0-alpha.6';
+          const version = '6.1.0-beta.1';
 
           const emberVersion = /*#__PURE__*/Object.defineProperty({
                     __proto__: null,
@@ -16099,7 +16099,7 @@ var define, require;
             };
           }
 
-          function transformQuotedBindingsIntoJustBindings(/* env */
+          function transformQuotedBindingsIntoJustBindings( /* env */
           ) {
             return {
               name: 'transform-quoted-bindings-into-just-bindings',

package/dist/ember-testing.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   6.1.0-alpha.6
+ * @version   6.1.0-beta.1
  */
 /* eslint-disable no-var */
 /* globals global globalThis self */

package/dist/ember.debug.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   6.1.0-alpha.6
+ * @version   6.1.0-beta.1
  */
 /* eslint-disable no-var */
 /* globals global globalThis self */
@@ -3379,7 +3379,7 @@ var define, require;
           }, Symbol.toStringTag, { value: 'Module' });
 
           // this file gets replaced with the real value during the build
-          const Version = '6.1.0-alpha.6';
+          const Version = '6.1.0-beta.1';
 
           const emberVersion = /*#__PURE__*/Object.defineProperty({
                     __proto__: null,
@@ -13839,7 +13839,7 @@ var define, require;
               this._instanceConstructor = Constructor;
               this.promise = new Constructor(noop, label);
               this._abortOnReject = abortOnReject;
-              this._isUsingOwnPromise = Constructor === Promise$1;
+              this._isUsingOwnPromise = Constructor === Promise$2;
               this._isUsingOwnResolve = Constructor.resolve === resolve$4;
               this._init(...arguments);
             }
@@ -14551,6 +14551,7 @@ var define, require;
             @return {Promise}
           */
           Promise$1.prototype.then = then;
+          const Promise$2 = Promise$1;
 
           function makeObject(_, argumentNames) {
             let obj = {};
@@ -14719,13 +14720,13 @@ var define, require;
                 // TODO: this code really needs to be cleaned up
                 if (!promiseInput) {
                   if (arg !== null && typeof arg === 'object') {
-                    if (arg.constructor === Promise$1) {
+                    if (arg.constructor === Promise$2) {
                       promiseInput = true;
                     } else {
                       try {
                         promiseInput = arg.then;
                       } catch (error) {
-                        let p = new Promise$1(noop);
+                        let p = new Promise$2(noop);
                         reject$2(p, error);
                         return p;
                       }
@@ -14739,7 +14740,7 @@ var define, require;
                 }
                 args[i] = arg;
               }
-              let promise = new Promise$1(noop);
+              let promise = new Promise$2(noop);
               args[l] = function (err, val) {
                 if (err) {
                   reject$2(promise, err);
@@ -14771,7 +14772,7 @@ var define, require;
             return promise;
           }
           function handlePromiseInput(promise, args, nodeFunc, self) {
-            return Promise$1.all(args).then(args => handleValueInput(promise, args, nodeFunc, self));
+            return Promise$2.all(args).then(args => handleValueInput(promise, args, nodeFunc, self));
           }
 
           /**
@@ -14786,7 +14787,7 @@ var define, require;
             for tooling.
           */
           function all(array, label) {
-            return Promise$1.all(array, label);
+            return Promise$2.all(array, label);
           }
 
           /**
@@ -14849,9 +14850,9 @@ var define, require;
 
           function allSettled(entries, label) {
             if (!Array.isArray(entries)) {
-              return Promise$1.reject(new TypeError("Promise.allSettled must be called with an array"), label);
+              return Promise$2.reject(new TypeError("Promise.allSettled must be called with an array"), label);
             }
-            return new AllSettled(Promise$1, entries, label).promise;
+            return new AllSettled(Promise$2, entries, label).promise;
           }
 
           /**
@@ -14866,7 +14867,7 @@ var define, require;
             for tooling.
            */
           function race(array, label) {
-            return Promise$1.race(array, label);
+            return Promise$2.race(array, label);
           }
 
           class PromiseHash extends Enumerator {
@@ -14983,11 +14984,11 @@ var define, require;
             have been fulfilled, or rejected if any of them become rejected.
           */
           function hash$2(object, label) {
-            return Promise$1.resolve(object, label).then(function (object) {
+            return Promise$2.resolve(object, label).then(function (object) {
               if (object === null || typeof object !== 'object') {
                 throw new TypeError("Promise.hash must be called with an object");
               }
-              return new PromiseHash(Promise$1, object, label).promise;
+              return new PromiseHash(Promise$2, object, label).promise;
             });
           }
 
@@ -15108,11 +15109,11 @@ var define, require;
           */
 
           function hashSettled(object, label) {
-            return Promise$1.resolve(object, label).then(function (object) {
+            return Promise$2.resolve(object, label).then(function (object) {
               if (object === null || typeof object !== 'object') {
                 throw new TypeError("hashSettled must be called with an object");
               }
-              return new HashSettled(Promise$1, object, false, label).promise;
+              return new HashSettled(Promise$2, object, false, label).promise;
             });
           }
 
@@ -15205,7 +15206,7 @@ var define, require;
               resolve: undefined,
               reject: undefined
             };
-            deferred.promise = new Promise$1((resolve, reject) => {
+            deferred.promise = new Promise$2((resolve, reject) => {
               deferred.resolve = resolve;
               deferred.reject = reject;
             }, label);
@@ -15321,13 +15322,13 @@ var define, require;
           */
           function map$2(promises, mapFn, label) {
             if (typeof mapFn !== 'function') {
-              return Promise$1.reject(new TypeError("map expects a function as a second argument"), label);
+              return Promise$2.reject(new TypeError("map expects a function as a second argument"), label);
             }
-            return Promise$1.resolve(promises, label).then(function (promises) {
+            return Promise$2.resolve(promises, label).then(function (promises) {
               if (!Array.isArray(promises)) {
                 throw new TypeError("map must be called with an array");
               }
-              return new MapEnumerator(Promise$1, promises, mapFn, label).promise;
+              return new MapEnumerator(Promise$2, promises, mapFn, label).promise;
             });
           }
 
@@ -15345,7 +15346,7 @@ var define, require;
             `value`
           */
           function resolve$2(value, label) {
-            return Promise$1.resolve(value, label);
+            return Promise$2.resolve(value, label);
           }
 
           /**
@@ -15361,7 +15362,7 @@ var define, require;
             @return {Promise} a promise rejected with the given `reason`.
           */
           function reject(reason, label) {
-            return Promise$1.reject(reason, label);
+            return Promise$2.reject(reason, label);
           }
 
           const EMPTY_OBJECT = {};
@@ -15489,13 +15490,13 @@ var define, require;
 
           function filter$1(promises, filterFn, label) {
             if (typeof filterFn !== 'function') {
-              return Promise$1.reject(new TypeError("filter expects function as a second argument"), label);
+              return Promise$2.reject(new TypeError("filter expects function as a second argument"), label);
             }
-            return Promise$1.resolve(promises, label).then(function (promises) {
+            return Promise$2.resolve(promises, label).then(function (promises) {
               if (!Array.isArray(promises)) {
                 throw new TypeError("filter must be called with an array");
               }
-              return new FilterEnumerator(Promise$1, promises, filterFn, label).promise;
+              return new FilterEnumerator(Promise$2, promises, filterFn, label).promise;
             });
           }
 
@@ -15622,7 +15623,7 @@ var define, require;
           const RSVP = {
             asap,
             cast,
-            Promise: Promise$1,
+            Promise: Promise$2,
             EventTarget,
             all,
             allSettled,
@@ -15645,7 +15646,7 @@ var define, require;
           const rsvp = /*#__PURE__*/Object.defineProperty({
                     __proto__: null,
                     EventTarget,
-                    Promise: Promise$1,
+                    Promise: Promise$2,
                     all,
                     allSettled,
                     asap,
@@ -31115,7 +31116,6 @@ var define, require;
           const STATE_SYMBOL = `__STATE__-2619860001345920-3322w3`;
           const PARAMS_SYMBOL = `__PARAMS__-261986232992830203-23323`;
           const QUERY_PARAMS_SYMBOL = `__QPS__-2619863929824844-32323`;
-          const REDIRECT_DESTINATION_SYMBOL = `__RDS__-2619863929824844-32323`;
           /**
             A Transition is a thenable (a promise-like object) that represents
             an attempt to transition to another route. It can be aborted, either
@@ -31167,7 +31167,7 @@ var define, require;
                 this.debugPreviousTransition = previousTransition;
               }
               if (error) {
-                this.promise = Promise$1.reject(error);
+                this.promise = Promise$2.reject(error);
                 this.error = error;
                 return;
               }
@@ -31201,7 +31201,7 @@ var define, require;
                   throw error;
                 }, promiseLabel('Handle Abort'));
               } else {
-                this.promise = Promise$1.resolve(this[STATE_SYMBOL]);
+                this.promise = Promise$2.resolve(this[STATE_SYMBOL]);
                 this[PARAMS_SYMBOL] = {};
               }
             }
@@ -31304,7 +31304,6 @@ var define, require;
               }
             }
             redirect(newTransition) {
-              this[REDIRECT_DESTINATION_SYMBOL] = newTransition;
               this.rollback();
               this.router.routeWillChange(newTransition);
             }
@@ -31388,11 +31387,12 @@ var define, require;
               @public
              */
             followRedirects() {
-              return this.promise.catch(reason => {
-                if (this[REDIRECT_DESTINATION_SYMBOL]) {
-                  return this[REDIRECT_DESTINATION_SYMBOL].followRedirects();
+              let router = this.router;
+              return this.promise.catch(function (reason) {
+                if (router.activeTransition) {
+                  return router.activeTransition.followRedirects();
                 }
-                return Promise$1.reject(reason);
+                return Promise$2.reject(reason);
               });
             }
             toString() {
@@ -31559,13 +31559,13 @@ var define, require;
               }
             }
             getModel(_transition) {
-              return Promise$1.resolve(this.context);
+              return Promise$2.resolve(this.context);
             }
             serialize(_context) {
               return this.params || {};
             }
             resolve(transition) {
-              return Promise$1.resolve(this.routePromise).then(route => {
+              return Promise$2.resolve(this.routePromise).then(route => {
                 throwIfAborted(transition);
                 return route;
               }).then(() => this.runBeforeModelHook(transition)).then(() => throwIfAborted(transition)).then(() => this.getModel(transition)).then(resolvedModel => {
@@ -31650,7 +31650,7 @@ var define, require;
               if (isTransition(result)) {
                 result = null;
               }
-              return Promise$1.resolve(result);
+              return Promise$2.resolve(result);
             }
             runAfterModelHook(transition, resolvedModel) {
               // Stash the resolved model on the payload.
@@ -31665,7 +31665,7 @@ var define, require;
                 }
               }
               result = prepareResult(result);
-              return Promise$1.resolve(result).then(() => {
+              return Promise$2.resolve(result).then(() => {
                 // Ignore the fulfilled value returned from afterModel.
                 // Return the value stashed in resolvedModels, which
                 // might have been swapped out in afterModel.
@@ -31684,7 +31684,7 @@ var define, require;
             }
             _processRoute(route) {
               // Setup a routePromise so that we can wait for asynchronously loaded routes
-              this.routePromise = Promise$1.resolve(route);
+              this.routePromise = Promise$2.resolve(route);
               // Wait until the 'route' property has been updated when chaining to a route
               // that is a promise
               if (isPromise(route)) {
@@ -31711,7 +31711,7 @@ var define, require;
               if (transition && transition.resolvedModels) {
                 transition.resolvedModels[this.name] = this.context;
               }
-              return Promise$1.resolve(this);
+              return Promise$2.resolve(this);
             }
           }
           class UnresolvedRouteInfoByParam extends InternalRouteInfo {
@@ -31740,7 +31740,7 @@ var define, require;
               if (result && isTransition(result)) {
                 result = undefined;
               }
-              return Promise$1.resolve(result);
+              return Promise$2.resolve(result);
             }
           }
           class UnresolvedRouteInfoByObject extends InternalRouteInfo {
@@ -31897,7 +31897,7 @@ var define, require;
               let callback = resolveOneRouteInfo.bind(null, this, transition);
               let errorHandler = handleError.bind(null, this, transition);
               // The prelude RSVP.resolve() async moves us into the promise land.
-              return Promise$1.resolve(null, this.promiseLabel('Start transition')).then(callback, null, this.promiseLabel('Resolve route')).catch(errorHandler, this.promiseLabel('Handle error')).then(() => this);
+              return Promise$2.resolve(null, this.promiseLabel('Start transition')).then(callback, null, this.promiseLabel('Resolve route')).catch(errorHandler, this.promiseLabel('Handle error')).then(() => this);
             }
           }
           class TransitionError {
@@ -32228,7 +32228,7 @@ var define, require;
               let intent = new URLTransitionIntent(this, url);
               let newState = this.generateNewState(intent);
               if (newState === null) {
-                return Promise$1.reject(`URL ${url} was not recognized`);
+                return Promise$2.reject(`URL ${url} was not recognized`);
               }
               let newTransition = new Transition(this, intent, newState, undefined);
               return newTransition.then(() => {
@@ -32348,7 +32348,7 @@ var define, require;
                 if (transition.isAborted) {
                   // TODO: cleaner way? distinguish b/w targetRouteInfos?
                   this.state.routeInfos = this.currentRouteInfos;
-                  return Promise$1.reject(logAbort(transition));
+                  return Promise$2.reject(logAbort(transition));
                 }
                 this._updateURL(transition, newState);
                 transition.isActive = false;
@@ -37121,7 +37121,7 @@ var define, require;
             let qps = get$2(route, '_qp').qps;
             for (let qp of qps) {
               // Put deserialized qp on params hash.
-              let qpValueWasPassedIn = qp.prop in fullQueryParams;
+              let qpValueWasPassedIn = (qp.prop in fullQueryParams);
               params[qp.prop] = qpValueWasPassedIn ? fullQueryParams[qp.prop] : copyDefaultValue(qp.defaultValue);
             }
             return params;