remove deprecated Location.create

emberjs · Jun 20, 2019 · 8005411 · 8005411
1 parent 68ef63c
commit 8005411
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 138 deletions.
diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
@@ -1,7 +1,6 @@
 // ES6TODO: Cleanup modules with side-effects below
 import './lib/ext/controller';
 
-export { default as Location } from './lib/location/api';
 export { default as NoneLocation } from './lib/location/none_location';
 export { default as HashLocation } from './lib/location/hash_location';
 export { default as HistoryLocation } from './lib/location/history_location';

diff --git a/packages/@ember/-internals/routing/lib/location/api.ts b/packages/@ember/-internals/routing/lib/location/api.ts
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -4,7 +4,6 @@ import { getOwner } from '@ember/-internals/owner';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { tryInvoke } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import { EmberLocation, UpdateCallback } from './api';
 import {
   getFullPath,
   getHash,
@@ -13,8 +12,9 @@ import {
   replacePath,
   supportsHashChange,
   supportsHistory,
+  EmberLocation,
+  UpdateCallback
 } from './util';
-
 /**
 @module @ember/routing
 */

diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts
@@ -1,9 +1,7 @@
 import { set } from '@ember/-internals/metal';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { bind } from '@ember/runloop';
-import { EmberLocation, UpdateCallback } from './api';
-import { getHash } from './util';
-
+import { getHash, EmberLocation, UpdateCallback } from './util';
 /**
 @module @ember/routing
 */

diff --git a/packages/@ember/-internals/routing/lib/location/history_location.ts b/packages/@ember/-internals/routing/lib/location/history_location.ts
@@ -1,7 +1,6 @@
 import { set } from '@ember/-internals/metal';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { EmberLocation, UpdateCallback } from './api';
-import { getHash } from './util';
+import { getHash, EmberLocation, UpdateCallback } from './util';
 
 /**
 @module @ember/routing

diff --git a/packages/@ember/-internals/routing/lib/location/none_location.ts b/packages/@ember/-internals/routing/lib/location/none_location.ts
@@ -1,7 +1,7 @@
 import { set } from '@ember/-internals/metal';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { assert } from '@ember/debug';
-import { EmberLocation, UpdateCallback } from './api';
+import { EmberLocation, UpdateCallback } from './util';
 
 /**
 @module @ember/routing

diff --git a/packages/@ember/-internals/routing/lib/location/util.ts b/packages/@ember/-internals/routing/lib/location/util.ts
@@ -1,3 +1,17 @@
+export interface EmberLocation {
+  implementation: string;
+  cancelRouterSetup?: boolean;
+  getURL(): string;
+  setURL(url: string): void;
+  replaceURL?(url: string): void;
+  onUpdateURL(callback: UpdateCallback): void;
+  formatURL(url: string): string;
+  detect?(): void;
+  initState?(): void;
+}
+
+export type UpdateCallback = (url: string) => void;
+
 /**
   @private
 

diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -7,7 +7,7 @@ import EmberError from '@ember/error';
 import { assign } from '@ember/polyfills';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import EmberLocation, { EmberLocation as IEmberLocation } from '../location/api';
+import { EmberLocation } from '../location/utils';
 import { calculateCacheKey, extractRouteArgs, getActiveTargetName, resemblesURL } from '../utils';
 import DSL from './dsl';
 import Route, {
@@ -121,7 +121,7 @@ const { slice } = Array.prototype;
   @public
 */
 class EmberRouter extends EmberObject {
-  location!: string | IEmberLocation;
+  location!: string | EmberLocation;
   rootURL!: string;
   _routerMicrolib!: Router<Route>;
 
@@ -546,7 +546,7 @@ class EmberRouter extends EmberObject {
 
   generate(name: string, ...args: any[]) {
     let url = this._routerMicrolib.generate(name, ...args);
-    return (this.location as IEmberLocation).formatURL(url);
+    return (this.location as EmberLocation).formatURL(url);
   }
 
   /**
@@ -667,17 +667,8 @@ class EmberRouter extends EmberObject {
 
     if ('string' === typeof location && owner) {
       let resolvedLocation = owner.lookup(`location:${location}`);
-
-      if (resolvedLocation !== undefined) {
-        location = set(this, 'location', resolvedLocation);
-      } else {
-        // Allow for deprecated registration of custom location API's
-        let options = {
-          implementation: location,
-        };
-
-        location = set(this, 'location', EmberLocation.create(options));
-      }
+      assert(`Location factory with ${location} name is not found`, resolvedLocation !== undefined);
+      location = set(this, 'location', resolvedLocation);
     }
 
     if (location !== null && typeof location === 'object') {

diff --git a/packages/ember/index.js b/packages/ember/index.js
@@ -624,7 +624,6 @@ Ember.ComponentLookup = views.ComponentLookup;
 Ember.EventDispatcher = views.EventDispatcher;
 
 // ****@ember/-internals/routing****
-Ember.Location = routing.Location;
 Ember.AutoLocation = routing.AutoLocation;
 Ember.HashLocation = routing.HashLocation;
 Ember.HistoryLocation = routing.HistoryLocation;

diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
@@ -319,7 +319,6 @@ let allExports = [
   ['computed.collect', '@ember/object/computed', 'collect'],
 
   // @ember/-internals/routing
-  ['Location', '@ember/-internals/routing'],
   ['AutoLocation', '@ember/-internals/routing'],
   ['HashLocation', '@ember/-internals/routing'],
   ['HistoryLocation', '@ember/-internals/routing'],