Update to v4 API

marionettejs · Jul 23, 2018 · 7c6957c · 7c6957c
1 parent f91aabf
commit 7c6957c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -36,6 +36,6 @@
     "upgradeGuide.md"
   ],
   "dependencies": {
-    "backbone.marionette": "^3.0.0"
+    "backbone.marionette": "^4.0.0"
   }
 }
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
   },
   "github": "https://github.com/marionettejs/marionette.approuter",
   "dependencies": {
-    "backbone.marionette": "^3.0.0"
+    "backbone.marionette": "^4.0.0, 4.0.0-beta.1"
   },
   "peerDependencies": {
     "backbone": "~1.3.3",

diff --git a/src/marionette.approuter.js b/src/marionette.approuter.js
@@ -19,7 +19,7 @@
 
 import Backbone from 'backbone';
 import _ from 'underscore';
-import Marionette from 'backbone.marionette';
+import Marionette, { MnObject } from 'backbone.marionette';
 
 // API borrowed from Marionette.Object
 const ObjectAPI = [
@@ -101,8 +101,9 @@ const AppRouter = Backbone.Router.extend({
   }
 });
 
-_.extend(AppRouter.prototype, _.pick(Marionette.Object.prototype, ObjectAPI));
+_.extend(AppRouter.prototype, _.pick(MnObject.prototype, ObjectAPI));
 
+// For Backwards compatibility
 Marionette.AppRouter = AppRouter;
 
 export default AppRouter;
diff --git a/yarn.lock b/yarn.lock
@@ -598,9 +598,9 @@ babylon@^6.11.2, babylon@^6.17.2:
   version "6.17.4"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
 
-backbone.marionette@^3.0.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/backbone.marionette/-/backbone.marionette-3.4.2.tgz#42b61cd1f760b1148063a0ea6aeb98be5a6252c6"
+"backbone.marionette@^4.0.0, 4.0.0-beta.1":
+  version "4.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/backbone.marionette/-/backbone.marionette-4.0.0-beta.1.tgz#793528fc5c60620200e2440e6dcd04ba16c3aab3"
   dependencies:
     backbone.radio "^2.0.0"