chore: update core to 7.0.0-beta.1

Author: christopherthielen

package.json

@@ -75,7 +75,7 @@
   "module": "lib-esm/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "@uirouter/core": "6.0.6"
+    "@uirouter/core": "v7beta"
   },
   "peerDependencies": {
     "angular": ">=1.2.0"

src/directives/viewDirective.ts

@@ -21,6 +21,7 @@ import {
   Transition,
   TransitionService,
   TypedMap,
+  UIViewPortalRenderCommand,
   unnestR,
   ViewService,
 } from '@uirouter/core';
@@ -213,7 +214,6 @@ uiView = [
     };
 
     const directive = {
-      count: 0,
       restrict: 'ECA',
       terminal: true,
       priority: 400,
@@ -228,44 +228,49 @@ uiView = [
 
           let previousEl: JQuery, currentEl: JQuery, currentScope: IScope, viewConfig: Ng1ViewConfig;
 
+          const uiViewId = $view.registerView('ng1', inherited.$uiView.id, name, renderContentIntoUIViewPortal);
+
+          scope.$on('$destroy', function () {
+            trace.traceUIViewEvent('Destroying/Unregistering', activeUIView);
+            $view.deregisterView(uiViewId);
+          });
+
           const activeUIView: ActiveUIView = {
             $type: 'ng1',
-            id: directive.count++, // Global sequential ID for ui-view tags added to DOM
+            id: uiViewId, // filled in later
             name: name, // ui-view name (<div ui-view="name"></div>
             fqn: inherited.$uiView.fqn ? inherited.$uiView.fqn + '.' + name : name, // fully qualified name, describes location in DOM
             config: null, // The ViewConfig loaded (from a state.views definition)
-            configUpdated: configUpdatedCallback, // Called when the matching ViewConfig changes
-            get creationContext() {
-              // The context in which this ui-view "tag" was created
-              const fromParentTagConfig = parse('$cfg.viewDecl.$context')(inherited);
-              // Allow <ui-view name="foo"><ui-view name="bar"></ui-view></ui-view>
-              // See https://github.com/angular-ui/ui-router/issues/3355
-              const fromParentTag = parse('$uiView.creationContext')(inherited);
-              return fromParentTagConfig || fromParentTag;
-            },
+            configUpdated: undefined, // unused in core
+            creationContext: undefined, // unused in core
+            // configUpdated: configUpdatedCallback, // Called when the matching ViewConfig changes
+            // get creationContext() {
+            // The context in which this ui-view "tag" was created
+            // const fromParentTagConfig = parse('$cfg.viewDecl.$context')(inherited);
+            // Allow <ui-view name="foo"><ui-view name="bar"></ui-view></ui-view>
+            // See https://github.com/angular-ui/ui-router/issues/3355
+            // const fromParentTag = parse('$uiView.creationContext')(inherited);
+            // return fromParentTagConfig || fromParentTag;
+            // },
           };
 
           trace.traceUIViewEvent('Linking', activeUIView);
 
-          function configUpdatedCallback(config?: Ng1ViewConfig) {
-            if (config && !(config instanceof Ng1ViewConfig)) return;
-            if (configsEqual(viewConfig, config)) return;
-            trace.traceUIViewConfigUpdated(activeUIView, config && config.viewDecl && config.viewDecl.$context);
+          function renderContentIntoUIViewPortal(renderCommand: UIViewPortalRenderCommand) {
+            if (renderCommand.command === 'RENDER_DEFAULT_CONTENT') {
+              viewConfig = undefined;
+            } else if (renderCommand.command === 'RENDER_ROUTED_VIEW') {
+              viewConfig = renderCommand.routedViewConfig as Ng1ViewConfig;
+            } else if (renderCommand.command === 'RENDER_INTEROP_DIV') {
+            }
 
-            viewConfig = config;
-            updateView(config);
+            updateView(viewConfig);
           }
 
           $element.data('$uiView', { $uiView: activeUIView });
 
           updateView();
 
-          const unregister = $view.registerUIView(activeUIView);
-          scope.$on('$destroy', function () {
-            trace.traceUIViewEvent('Destroying/Unregistering', activeUIView);
-            unregister();
-          });
-
           function cleanupLastView() {
             if (previousEl) {
               trace.traceUIViewEvent('Removing (previous) el', previousEl.data('$uiView'));

yarn.lock

@@ -735,10 +735,10 @@
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-"@uirouter/core@6.0.6":
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/@uirouter/core/-/core-6.0.6.tgz#4bea0ca88790a939d8e84ba05a31b96f50d9abe8"
-  integrity sha512-+i1iNaPQRp1JoEnxi4EsTX30bSvkWtPEenENWdvdIzX615Q3WCWwnbW9DtrwX9gSD5qmWEaQEtGMU0uF3qJ+1g==
+"@uirouter/core@v7beta":
+  version "7.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@uirouter/core/-/core-7.0.0-beta.1.tgz#294c9a9f82f203ca396763b470093daeef3a8d52"
+  integrity sha512-jdRQscId7iHWnuSw9xvWNnTDM8QORqP1J5ovtDPtKEW3m0+SfCcKJqQWV6AyXXBFhUIzF+0JmQ8YOoVxDFSBPw==
 
 "@uirouter/publish-scripts@2.5.3":
   version "2.5.3"