ember-source 3.24.0 → 3.24.4

package/dist/header/license.js

@@ -5,5 +5,5 @@
  *            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   3.24.0
+ * @version   3.24.4
  */

package/dist/packages/@ember/-internals/glimmer/index.js

@@ -1930,7 +1930,7 @@ const LinkComponent = Component.extend({
   init() {
     this._super(...arguments);
 
-    assert('You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' + 'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' + 'See https://ember-engines.com/docs/links for more info.', !this._isEngine || this._engineMountPoint !== undefined); // Map desired event name to invoke function
+    this.assertLinkToOrigin(); // Map desired event name to invoke function
 
     let {
       eventName
@@ -1952,7 +1952,7 @@ const LinkComponent = Component.extend({
     let {
       route
     } = this;
-    return this._namespaceRoute(route === UNDEFINED ? this._currentRoute : route);
+    return route === UNDEFINED ? this._currentRoute : this._namespaceRoute(route);
   }),
   _models: computed('model', 'models', function computeLinkToComponentModels() {
     let {
@@ -2042,6 +2042,10 @@ const LinkComponent = Component.extend({
     return this._isActive(target);
   }),
 
+  assertLinkToOrigin() {
+    assert('You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' + 'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' + 'See https://ember-engines.com/docs/links for more info.', !this._isEngine || this._engineMountPoint !== undefined);
+  },
+
   _isActive(routerState) {
     if (this.loading) {
       return false;

package/dist/packages/@ember/-internals/routing/lib/services/routing.js

@@ -1,9 +1,12 @@
 /**
 @module ember
 */
+import { getOwner } from '@ember/-internals/owner';
+import { symbol } from '@ember/-internals/utils';
 import { readOnly } from '@ember/object/computed';
 import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
+const ROUTER = symbol('ROUTER');
 /**
   The Routing service is used by LinkComponent, and provides facilities for
   the component/view layer to interact with the router.
@@ -16,6 +19,19 @@ import Service from '@ember/service';
 */
 
 export default class RoutingService extends Service {
+  get router() {
+    let router = this[ROUTER];
+
+    if (router !== undefined) {
+      return router;
+    }
+
+    const owner = getOwner(this);
+    router = owner.lookup('router:main');
+    router.setupRouter();
+    return this[ROUTER] = router;
+  }
+
   hasRoute(routeName) {
     return this.router.hasRoute(routeName);
   }
@@ -34,13 +50,7 @@ export default class RoutingService extends Service {
     this.router._prepareQueryParams(routeName, models, queryParams);
   }
 
-  generateURL(routeName, models, queryParams) {
-    let router = this.router; // return early when the router microlib is not present, which is the case for {{link-to}} in integration tests
-
-    if (!router._routerMicrolib) {
-      return;
-    }
-
+  _generateURL(routeName, models, queryParams) {
     let visibleQueryParams = {};
 
     if (queryParams) {
@@ -48,11 +58,25 @@ export default class RoutingService extends Service {
       this.normalizeQueryParams(routeName, models, visibleQueryParams);
     }
 
-    return router.generate(routeName, ...models, {
+    return this.router.generate(routeName, ...models, {
       queryParams: visibleQueryParams
     });
   }
 
+  generateURL(routeName, models, queryParams) {
+    if (this.router._initialTransitionStarted) {
+      return this._generateURL(routeName, models, queryParams);
+    } else {
+      // Swallow error when transition has not started.
+      // When rendering in tests without visit(), we cannot infer the route context which <LinkTo/> needs be aware of
+      try {
+        return this._generateURL(routeName, models, queryParams);
+      } catch (_e) {
+        return;
+      }
+    }
+  }
+
   isActiveForRoute(contexts, queryParams, routeName, routerState) {
     let handlers = this.router._routerMicrolib.recognizer.handlersFor(routeName);
 

package/dist/packages/@ember/-internals/routing/lib/system/router.js

@@ -65,6 +65,7 @@ class EmberRouter extends EmberObject {
   constructor() {
     super(...arguments);
     this._didSetupRouter = false;
+    this._initialTransitionStarted = false;
     this.currentURL = null;
     this.currentRouteName = null;
     this.currentPath = null;
@@ -191,7 +192,13 @@ class EmberRouter extends EmberObject {
       }
 
       routeWillChange(transition) {
-        router.trigger('routeWillChange', transition);
+        router.trigger('routeWillChange', transition); // in case of intermediate transition we update the current route
+        // to make router.currentRoute.name consistent with router.currentRouteName
+        // see https://github.com/emberjs/ember.js/issues/19449
+
+        if (transition.isIntermediate) {
+          router.set('currentRoute', transition.to);
+        }
       }
 
       routeDidChange(transition) {
@@ -434,6 +441,8 @@ class EmberRouter extends EmberObject {
   }
 
   _doURLTransition(routerJsMethod, url) {
+    this._initialTransitionStarted = true;
+
     let transition = this._routerMicrolib[routerJsMethod](url || '/');
 
     didBeginTransition(transition, this);
@@ -549,6 +558,7 @@ class EmberRouter extends EmberObject {
 
   reset() {
     this._didSetupRouter = false;
+    this._initialTransitionStarted = false;
 
     if (this._routerMicrolib) {
       this._routerMicrolib.reset();
@@ -758,6 +768,7 @@ class EmberRouter extends EmberObject {
     let targetRouteName = _targetRouteName || getActiveTargetName(this._routerMicrolib);
 
     assert(`The route ${targetRouteName} was not found`, Boolean(targetRouteName) && this._routerMicrolib.hasRoute(targetRouteName));
+    this._initialTransitionStarted = true;
     let queryParams = {};
 
     this._processActiveTransitionQueryParams(targetRouteName, models, queryParams, _queryParams);

package/dist/packages/@ember/engine/index.js

@@ -436,9 +436,7 @@ function commonSetupRegistry(registry) {
   registry.injection('route', '_bucketCache', P`-bucket-cache:main`);
   registry.injection('route', '_router', 'router:main'); // Register the routing service...
 
-  registry.register('service:-routing', RoutingService); // Then inject the app router into it
-
-  registry.injection('service:-routing', 'router', 'router:main'); // DEBUGGING
+  registry.register('service:-routing', RoutingService); // DEBUGGING
 
   registry.register('resolver-for-debugging:main', registry.resolver, {
     instantiate: false

package/dist/packages/ember/version.js

@@ -1 +1 @@
-export default "3.24.0";
+export default "3.24.4";

package/docs/data.json

@@ -3,7 +3,7 @@
     "name": "The Ember API",
     "description": "The Ember API: a framework for building ambitious web applications",
     "url": "https://emberjs.com/",
-    "version": "3.24.0"
+    "version": "3.24.4"
   },
   "files": {
     "node_modules/rsvp/lib/rsvp/promise/all.js": {
@@ -3065,7 +3065,7 @@
       "module": "ember",
       "namespace": "",
       "file": "packages/@ember/-internals/routing/lib/services/routing.ts",
-      "line": 11,
+      "line": 15,
       "description": "The Routing service is used by LinkComponent, and provides facilities for\nthe component/view layer to interact with the router.\n\nThis is a private service for internal usage only. For public usage,\nrefer to the `Router` service.",
       "access": "private",
       "tagname": ""
@@ -6389,7 +6389,7 @@
     },
     {
       "file": "packages/@ember/-internals/glimmer/lib/components/link-to.ts",
-      "line": 551,
+      "line": 547,
       "description": "Accessed as a classname binding to apply the component's `disabledClass`\nCSS `class` to the element when the link is disabled.\n\nWhen `true`, interactions with the element will not trigger route changes.",
       "itemtype": "property",
       "name": "disabled",
@@ -6400,7 +6400,7 @@
     },
     {
       "file": "packages/@ember/-internals/glimmer/lib/components/link-to.ts",
-      "line": 574,
+      "line": 570,
       "description": "Accessed as a classname binding to apply the component's `activeClass`\nCSS `class` to the element when the link is active.\n\nThis component is considered active when its `currentWhen` property is `true`\nor the application's current route is the route this component would trigger\ntransitions into.\n\nThe `currentWhen` property can match against multiple routes by separating\nroute names using the ` ` (space) character.",
       "itemtype": "property",
       "name": "active",
@@ -6411,7 +6411,7 @@
     },
     {
       "file": "packages/@ember/-internals/glimmer/lib/components/link-to.ts",
-      "line": 689,
+      "line": 694,
       "description": "Event handler that invokes the link, activating the associated route.",
       "itemtype": "method",
       "name": "_invoke",
@@ -6429,7 +6429,7 @@
     },
     {
       "file": "packages/@ember/-internals/glimmer/lib/components/link-to.ts",
-      "line": 768,
+      "line": 773,
       "description": "Sets the element's `href` attribute to the url for\nthe `LinkComponent`'s targeted route.\n\nIf the `LinkComponent`'s `tagName` is changed to a value other\nthan `a`, this property will be ignored.",
       "itemtype": "property",
       "name": "href",
@@ -6440,7 +6440,7 @@
     },
     {
       "file": "packages/@ember/-internals/glimmer/lib/components/link-to.ts",
-      "line": 851,
+      "line": 856,
       "description": "The default href value to use while a link-to is loading.\nOnly applies when tagName is 'a'",
       "itemtype": "property",
       "name": "loadingHref",
@@ -11021,7 +11021,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 390,
+      "line": 397,
       "description": "Initializes the current router instance and sets up the change handling\nevent listeners used by the instances `location` implementation.\n\nA property named `initialURL` will be used to determine the initial URL.\nIf no value is found `/` will be used.",
       "itemtype": "method",
       "name": "startRouting",
@@ -11032,7 +11032,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 508,
+      "line": 516,
       "description": "Transition the application into another route. The route may\nbe either a single route or route path:\n\nSee [transitionTo](/ember/release/classes/Route/methods/transitionTo?anchor=transitionTo) for more info.",
       "itemtype": "method",
       "name": "transitionTo",
@@ -11065,7 +11065,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 563,
+      "line": 571,
       "description": "Determines if the supplied route is currently active.",
       "itemtype": "method",
       "name": "isActive",
@@ -11086,7 +11086,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 575,
+      "line": 583,
       "description": "An alternative form of `isActive` that doesn't require\nmanual concatenation of the arguments into a single\narray.",
       "itemtype": "method",
       "name": "isActiveIntent",
@@ -11116,7 +11116,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 597,
+      "line": 605,
       "description": "Does this router instance have the given route.",
       "itemtype": "method",
       "name": "hasRoute",
@@ -11131,7 +11131,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 608,
+      "line": 616,
       "description": "Resets the state of the router by clearing the current route\nhandlers and deactivating them.",
       "access": "private",
       "tagname": "",
@@ -11142,7 +11142,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 715,
+      "line": 724,
       "description": "Serializes the given query params according to their QP meta information.",
       "access": "private",
       "tagname": "",
@@ -11169,7 +11169,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 742,
+      "line": 751,
       "description": "Serializes the value of a query parameter based on a type",
       "access": "private",
       "tagname": "",
@@ -11192,7 +11192,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 760,
+      "line": 769,
       "description": "Deserializes the given query params according to their QP meta information.",
       "access": "private",
       "tagname": "",
@@ -11219,7 +11219,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 785,
+      "line": 794,
       "description": "Deserializes the value of a query parameter based on a default type",
       "access": "private",
       "tagname": "",
@@ -11242,7 +11242,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 806,
+      "line": 815,
       "description": "Removes (prunes) any query params with default values from the given QP\nobject. Default values are determined from the QP meta information per key.",
       "access": "private",
       "tagname": "",
@@ -11269,7 +11269,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 886,
+      "line": 897,
       "description": "Prepares the query params for a URL or Transition. Restores any undefined QP\nkeys/values, serializes all values, and then prunes any default values.",
       "access": "private",
       "tagname": "",
@@ -11306,7 +11306,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 913,
+      "line": 924,
       "description": "Returns the meta information for the query params of a given route. This\nwill be overridden to allow support for lazy routes.",
       "access": "private",
       "tagname": "",
@@ -11328,7 +11328,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 927,
+      "line": 938,
       "description": "Returns a merged query params meta object for a given set of routeInfos.\nUseful for knowing what query params are available for a given route hierarchy.",
       "access": "private",
       "tagname": "",
@@ -11350,7 +11350,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 992,
+      "line": 1003,
       "description": "Maps all query param keys to their fully scoped property name of the form\n`controllerName:propName`.",
       "access": "private",
       "tagname": "",
@@ -11382,7 +11382,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1034,
+      "line": 1045,
       "description": "Hydrates (adds/restores) any query params that have pre-existing values into\nthe given queryParams hash. This is what allows query params to be \"sticky\"\nand restore their last known values for their scope.",
       "access": "private",
       "tagname": "",
@@ -11409,7 +11409,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1337,
+      "line": 1348,
       "description": "Finds the name of the substate route if it exists for the given route. A\nsubstate route is of the form `route_state`, such as `foo_loading`.",
       "access": "private",
       "tagname": "",
@@ -11434,7 +11434,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1356,
+      "line": 1367,
       "description": "Finds the name of the state route if it exists for the given route. A state\nroute is of the form `route.state`, such as `foo.loading`. Properly Handles\n`application` named routes.",
       "access": "private",
       "tagname": "",
@@ -11459,7 +11459,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1376,
+      "line": 1387,
       "description": "Determines whether or not a route has been defined by checking that the route\nis in the Router's map and the owner has a registration for that route.",
       "access": "private",
       "tagname": "",
@@ -11494,7 +11494,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1542,
+      "line": 1553,
       "description": "The `Router.map` function allows you to define mappings from URLs to routes\nin your application. These mappings are defined within the\nsupplied callback function using `this.route`.\n\nThe first parameter is the name of the route which is used by default as the\npath name as well.\n\nThe second parameter is the optional options hash. Available options are:\n\n  * `path`: allows you to provide your own path as well as mark dynamic\n    segments.\n  * `resetNamespace`: false by default; when nesting routes, ember will\n    combine the route names to form the fully-qualified route name, which is\n    used with `{{link-to}}` or manually transitioning to routes. Setting\n    `resetNamespace: true` will cause the route not to inherit from its\n    parent route's names. This is handy for preventing extremely long route names.\n    Keep in mind that the actual URL path behavior is still retained.\n\nThe third parameter is a function, which can be used to nest routes.\nNested routes, by default, will have the parent route tree's route name and\npath prepended to it's own.\n\n```app/router.js\nRouter.map(function(){\n  this.route('post', { path: '/post/:post_id' }, function() {\n    this.route('edit');\n    this.route('comments', { resetNamespace: true }, function() {\n      this.route('new');\n    });\n  });\n});\n```",
       "itemtype": "method",
       "name": "map",
@@ -11511,7 +11511,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1738,
+      "line": 1749,
       "description": "Handles updating the paths and notifying any listeners of the URL\nchange.\n\nTriggers the router level `didTransition` hook.\n\nFor example, to notify google analytics when the route changes,\nyou could use this hook.  (Note: requires also including GA scripts, etc.)\n\n```javascript\nimport config from './config/environment';\nimport EmberRouter from '@ember/routing/router';\nimport { inject as service } from '@ember/service';\n\nlet Router = EmberRouter.extend({\n  location: config.locationType,\n\n  router: service(),\n\n  didTransition: function() {\n    this._super(...arguments);\n\n    ga('send', 'pageview', {\n      page: this.router.currentURL,\n      title: this.router.currentRouteName,\n    });\n  }\n});\n```",
       "itemtype": "method",
       "name": "didTransition",
@@ -11523,7 +11523,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1774,
+      "line": 1785,
       "description": "Handles notifying any listeners of an impending URL\nchange.\n\nTriggers the router level `willTransition` hook.",
       "itemtype": "method",
       "name": "willTransition",
@@ -11535,7 +11535,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1785,
+      "line": 1796,
       "description": "Represents the URL of the root of the application, often '/'. This prefix is\nassumed on all routes defined on this router.",
       "itemtype": "property",
       "name": "rootURL",
@@ -11547,7 +11547,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1795,
+      "line": 1806,
       "description": "The `location` property determines the type of URL's that your\napplication will use.\n\nThe following location types are currently available:\n\n* `history` - use the browser's history API to make the URLs look just like any standard URL\n* `hash` - use `#` to separate the server part of the URL from the Ember part: `/blog/#/posts/new`\n* `none` - do not store the Ember URL in the actual browser URL (mainly used for testing)\n* `auto` - use the best option based on browser capabilities: `history` if possible, then `hash` if possible, otherwise `none`\n\nThis value is defaulted to `auto` by the `locationType` setting of `/config/environment.js`",
       "itemtype": "property",
       "name": "location",
@@ -11562,7 +11562,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1815,
+      "line": 1826,
       "description": "Represents the current URL.",
       "itemtype": "property",
       "name": "url",
@@ -20172,15 +20172,15 @@
     },
     {
       "message": "Missing item type\nFinds the name of the substate route if it exists for the given route. A\nsubstate route is of the form `route_state`, such as `foo_loading`.",
-      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1337"
+      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1348"
     },
     {
       "message": "Missing item type\nFinds the name of the state route if it exists for the given route. A state\nroute is of the form `route.state`, such as `foo.loading`. Properly Handles\n`application` named routes.",
-      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1356"
+      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1367"
     },
     {
       "message": "Missing item type\nDetermines whether or not a route has been defined by checking that the route\nis in the Router's map and the owner has a registration for that route.",
-      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1376"
+      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1387"
     },
     {
       "message": "Missing item type\nPreviously we used `Ember.$.uuid`, however `$.uuid` has been removed from\njQuery master. We'll just bootstrap our own uuid now.",

package/lib/index.js

@@ -245,13 +245,16 @@ module.exports = {
 
     let ember;
     let targets = (this.project && this.project.targets && this.project.targets.browsers) || [];
+    let targetNode = (this.project && this.project.targets && this.project.targets.node) || false;
 
     const isProduction = process.env.EMBER_ENV === 'production';
 
     if (
       !isProduction &&
       PRE_BUILT_TARGETS.every((target) => targets.includes(target)) &&
-      targets.length === PRE_BUILT_TARGETS.length
+      targets.length === PRE_BUILT_TARGETS.length &&
+      // if node is defined in targets we can't reliably use the prebuilt bundles
+      !targetNode
     ) {
       ember = new Funnel(tree, {
         destDir: 'ember',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "3.24.0",
+  "version": "3.24.4",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.65.1",
+    "@glimmer/compiler": "0.65.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.65.1",
-    "@glimmer/interfaces": "0.65.1",
-    "@glimmer/node": "0.65.1",
-    "@glimmer/opcode-compiler": "0.65.1",
-    "@glimmer/program": "0.65.1",
-    "@glimmer/reference": "0.65.1",
-    "@glimmer/runtime": "0.65.1",
-    "@glimmer/validator": "0.65.1",
+    "@glimmer/global-context": "0.65.3",
+    "@glimmer/interfaces": "0.65.3",
+    "@glimmer/node": "0.65.3",
+    "@glimmer/opcode-compiler": "0.65.3",
+    "@glimmer/program": "0.65.3",
+    "@glimmer/reference": "0.65.3",
+    "@glimmer/runtime": "0.65.3",
+    "@glimmer/validator": "0.65.3",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
@@ -137,7 +137,7 @@
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
-    "router_js": "^7.1.1",
+    "router_js": "^7.3.0",
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
@@ -151,6 +151,9 @@
   "ember-addon": {
     "after": "ember-cli-legacy-blueprints"
   },
-  "_originalVersion": "3.24.0",
-  "_versionPreviouslyCalculated": true
-}
+  "_originalVersion": "3.24.4",
+  "_versionPreviouslyCalculated": true,
+  "publishConfig": {
+    "tag": "old"
+  }
+}