Merge pull request #2110 from hypothesis/hypothesis-app-migration

Migrate HypothesisApp component and remove AngularJS

gulpfile.js

@@ -155,7 +155,6 @@ const cssBundles = [
   './src/styles/sidebar/sidebar.scss',
 
   // Vendor
-  './src/styles/vendor/angular-csp.css',
   './src/styles/vendor/icomoon.css',
   './node_modules/katex/dist/katex.min.css',
 ];

package.json

@@ -12,8 +12,6 @@
     "@babel/preset-react": "^7.0.0",
     "@octokit/rest": "^17.0.0",
     "@sentry/browser": "^5.6.2",
-    "angular": "^1.7.5",
-    "angular-mocks": "^1.7.5",
     "autoprefixer": "^9.4.7",
     "aws-sdk": "^2.345.0",
     "axe-core": "^3.4.1",

scripts/gulp/vendor-bundles.js

@@ -9,7 +9,6 @@
 module.exports = {
   bundles: {
     jquery: ['jquery'],
-    angular: ['angular'],
     katex: ['katex'],
     sentry: ['@sentry/browser'],
     showdown: ['showdown'],

src/boot/boot.js

@@ -112,14 +112,12 @@ function bootSidebarApp(doc, config) {
 
     // Vendor code required by sidebar.bundle.js
     'scripts/sentry.bundle.js',
-    'scripts/angular.bundle.js',
     'scripts/katex.bundle.js',
     'scripts/showdown.bundle.js',
 
     // The sidebar app
     'scripts/sidebar.bundle.js',
 
-    'styles/angular-csp.css',
     'styles/katex.min.css',
     'styles/sidebar.css',
   ]);

src/boot/test/boot-test.js

@@ -41,12 +41,10 @@ describe('bootstrap', function () {
 
       // Sidebar app
       'scripts/sentry.bundle.js',
-      'scripts/angular.bundle.js',
       'scripts/katex.bundle.js',
       'scripts/showdown.bundle.js',
       'scripts/sidebar.bundle.js',
 
-      'styles/angular-csp.css',
       'styles/katex.min.css',
       'styles/sidebar.css',
     ];
@@ -146,12 +144,10 @@ describe('bootstrap', function () {
     it('loads assets for the sidebar application', function () {
       runBoot();
       const expectedAssets = [
-        'scripts/angular.bundle.1234.js',
         'scripts/katex.bundle.1234.js',
         'scripts/sentry.bundle.1234.js',
         'scripts/showdown.bundle.1234.js',
         'scripts/sidebar.bundle.1234.js',
-        'styles/angular-csp.1234.css',
         'styles/katex.min.1234.css',
         'styles/sidebar.1234.css',
       ].map(assetUrl);

src/sidebar/components/hypothesis-app.js

+import { createElement } from 'preact';
+import { useEffect, useMemo } from 'preact/hooks';
+import propTypes from 'prop-types';
+
 import bridgeEvents from '../../shared/bridge-events';
-import events from '../events';
 import serviceConfig from '../service-config';
+import useStore from '../store/use-store';
 import uiConstants from '../ui-constants';
 import { parseAccountID } from '../util/account-id';
-import isSidebar from '../util/is-sidebar';
 import { shouldAutoDisplayTutorial } from '../util/session';
 import { applyTheme } from '../util/theme';
+import { withServices } from '../util/service-context';
+
+import AnnotationViewerContent from './annotation-viewer-content';
+import HelpPanel from './help-panel';
+import ShareAnnotationsPanel from './share-annotations-panel';
+import SidebarContent from './sidebar-content';
+import StreamContent from './stream-content';
+import ToastMessages from './toast-messages';
+import TopBar from './top-bar';
 
 /**
  * Return the user's authentication status from their profile.
@@ -31,102 +43,82 @@ function authStateFromProfile(profile) {
   }
 }
 
-// @ngInject
-function HypothesisAppController(
-  $document,
-  $rootScope,
-  $scope,
-  $window,
-  analytics,
-  store,
+/**
+ * The root component for the Hypothesis client.
+ *
+ * This handles login/logout actions and renders the top navigation bar
+ * and content appropriate for the current route.
+ */
+function HypothesisApp({
   auth,
   bridge,
-  features,
-  frameSync,
-  groups,
   serviceUrl,
-  session,
   settings,
-  toastMessenger
-) {
-  const self = this;
-
-  // This stores information about the current user's authentication status.
-  // When the controller instantiates we do not yet know if the user is
-  // logged-in or not, so it has an initial status of 'unknown'. This can be
-  // used by templates to show an intermediate or loading state.
-  this.auth = { status: 'unknown' };
-
-  this.backgroundStyle = applyTheme(['appBackgroundColor'], settings);
-
-  // Check to see if we're in the sidebar, or on a standalone page such as
-  // the stream page or an individual annotation page.
-  this.isSidebar = isSidebar();
-  if (this.isSidebar) {
-    frameSync.connect();
-  }
-
-  // Reload the view when the user switches accounts
-  this.onUserChange = profile => {
-    self.auth = authStateFromProfile(profile);
-    if (shouldAutoDisplayTutorial(this.isSidebar, store.profile(), settings)) {
-      // Auto-open the tutorial (help) panel
-      store.openSidebarPanel(uiConstants.PANEL_HELP);
+  session,
+  toastMessenger,
+}) {
+  const clearGroups = useStore(store => store.clearGroups);
+  const closeSidebarPanel = useStore(store => store.closeSidebarPanel);
+  const countDrafts = useStore(store => store.countDrafts);
+  const discardAllDrafts = useStore(store => store.discardAllDrafts);
+  const hasFetchedProfile = useStore(store => store.hasFetchedProfile());
+  const openSidebarPanel = useStore(store => store.openSidebarPanel);
+  const profile = useStore(store => store.profile());
+  const removeAnnotations = useStore(store => store.removeAnnotations);
+  const route = useStore(store => store.route());
+  const unsavedAnnotations = useStore(store => store.unsavedAnnotations);
+
+  const authState = useMemo(() => {
+    if (!hasFetchedProfile) {
+      return { status: 'unknown' };
     }
-  };
+    return authStateFromProfile(profile);
+  }, [hasFetchedProfile, profile]);
 
-  this.route = () => store.route();
+  const backgroundStyle = useMemo(
+    () => applyTheme(['backgroundColor'], settings),
+    [settings]
+  );
 
-  $scope.$on(events.USER_CHANGED, function (event, data) {
-    self.onUserChange(data.profile);
-  });
+  const isSidebar = route === 'sidebar';
 
-  session.load().then(profile => {
-    self.onUserChange(profile);
-  });
+  useEffect(() => {
+    if (shouldAutoDisplayTutorial(isSidebar, profile, settings)) {
+      openSidebarPanel(uiConstants.PANEL_HELP);
+    }
+  }, [isSidebar, profile, openSidebarPanel, settings]);
 
-  /**
-   * Start the login flow. This will present the user with the login dialog.
-   *
-   * @return {Promise<void>} - A Promise that resolves when the login flow
-   *   completes. For non-OAuth logins, always resolves immediately.
-   */
-  this.login = function () {
+  const login = async () => {
     if (serviceConfig(settings)) {
       // Let the host page handle the login request
       bridge.call(bridgeEvents.LOGIN_REQUESTED);
-      return Promise.resolve();
+      return;
     }
 
-    return auth
-      .login()
-      .then(() => {
-        // If the prompt-to-log-in sidebar panel is open, close it
-        store.closeSidebarPanel(uiConstants.PANEL_LOGIN_PROMPT);
-        store.clearGroups();
-        session.reload();
-      })
-      .catch(err => {
-        toastMessenger.error(err.message);
-      });
-  };
+    try {
+      await auth.login();
 
-  this.signUp = function () {
-    analytics.track(analytics.events.SIGN_UP_REQUESTED);
+      closeSidebarPanel(uiConstants.PANEL_LOGIN_PROMPT);
+      clearGroups();
+      session.reload();
+    } catch (err) {
+      toastMessenger.error(err.message);
+    }
+  };
 
+  const signUp = () => {
     if (serviceConfig(settings)) {
       // Let the host page handle the signup request
       bridge.call(bridgeEvents.SIGNUP_REQUESTED);
       return;
     }
-    $window.open(serviceUrl('signup'));
+    window.open(serviceUrl('signup'));
   };
 
-  // Prompt to discard any unsaved drafts.
-  const promptToLogout = function () {
+  const promptToLogout = () => {
     // TODO - Replace this with a UI which doesn't look terrible.
     let text = '';
-    const drafts = store.countDrafts();
+    const drafts = countDrafts();
     if (drafts === 1) {
       text =
         'You have an unsaved annotation.\n' +
@@ -138,31 +130,73 @@ function HypothesisAppController(
         ' unsaved annotations.\n' +
         'Do you really want to discard these drafts?';
     }
-    return drafts === 0 || $window.confirm(text);
+    return drafts === 0 || window.confirm(text);
   };
 
-  // Log the user out.
-  this.logout = function () {
+  const logout = () => {
     if (!promptToLogout()) {
       return;
     }
-
-    store.clearGroups();
-    store.removeAnnotations(store.unsavedAnnotations());
-    store.discardAllDrafts();
+    clearGroups();
+    removeAnnotations(unsavedAnnotations());
+    discardAllDrafts();
 
     if (serviceConfig(settings)) {
-      // Let the host page handle the signup request
       bridge.call(bridgeEvents.LOGOUT_REQUESTED);
       return;
     }
 
     session.logout();
   };
+
+  return (
+    <div
+      className="app-content-wrapper js-thread-list-scroll-root"
+      style={backgroundStyle}
+    >
+      <TopBar
+        auth={authState}
+        onLogin={login}
+        onSignUp={signUp}
+        onLogout={logout}
+        isSidebar={isSidebar}
+      />
+      <div className="content">
+        <ToastMessages />
+        <HelpPanel auth={authState} />
+        <ShareAnnotationsPanel />
+
+        {route && (
+          <main>
+            {route === 'annotation' && <AnnotationViewerContent />}
+            {route === 'stream' && <StreamContent />}
+            {route === 'sidebar' && (
+              <SidebarContent onLogin={login} onSignUp={signUp} />
+            )}
+          </main>
+        )}
+      </div>
+    </div>
+  );
 }
 
-export default {
-  controller: HypothesisAppController,
-  controllerAs: 'vm',
-  template: require('../templates/hypothesis-app.html'),
+HypothesisApp.propTypes = {
+  // Injected.
+  auth: propTypes.object,
+  bridge: propTypes.object,
+  serviceUrl: propTypes.func,
+  settings: propTypes.object,
+  session: propTypes.object,
+  toastMessenger: propTypes.object,
 };
+
+HypothesisApp.injectedProps = [
+  'auth',
+  'bridge',
+  'serviceUrl',
+  'session',
+  'settings',
+  'toastMessenger',
+];
+
+export default withServices(HypothesisApp);

src/sidebar/components/test/angular-util.js

-/* global angular */
-
-/**
- * Converts a camelCase name into hyphenated ('camel-case') form.
- *
- * This matches how Angular maps directive names to HTML tag names.
- */
-function hyphenate(name) {
-  const uppercasePattern = /([A-Z])/g;
-  return name.replace(uppercasePattern, '-$1').toLowerCase();
-}
-
-/**
- * A helper for instantiating an AngularJS directive in a unit test.
- *
- * Usage:
- *   var domElement = createDirective(document, 'myComponent', {
- *     attrA: 'initial-value'
- *   }, {
- *     scopeProperty: scopeValue
- *   },
- *   'Hello, world!');
- *
- * Will generate '<my-component attr-a="attrA">Hello, world!</my-component>' and
- * compile and link it with the scope:
- *
- *  { attrA: 'initial-value', scopeProperty: scopeValue }
- *
- * The initial value may be a callback function to invoke. eg:
- *
- * var domElement = createDirective(document, 'myComponent', {
- *  onEvent: function () {
- *    console.log('event triggered');
- *  }
- * });
- *
- * If the callback accepts named arguments, these need to be specified
- * via an object with 'args' and 'callback' properties:
- *
- * var domElement = createDirective(document, 'myComponent', {
- *   onEvent: {
- *     args: ['arg1'],
- *     callback: function (arg1) {
- *       console.log('callback called with arg', arg1);
- *     }
- *   }
- * });
- *
- * @param {Document} document - The DOM Document to create the element in
- * @param {string} name - The name of the directive to instantiate
- * @param {Object} [attrs] - A map of attribute names (in camelCase) to initial
- *                           values.
- * @param {Object} [initialScope] - A dictionary of properties to set on the
- *                                  scope when the element is linked
- * @param {string} [initialHtml] - Initial inner HTML content for the directive
- *                                 element.
- * @param {Object} [opts] - Object specifying options for creating the
- *                          directive:
- *                          'parentElement' - The parent element for the new
- *                                            directive. Defaults to document.body
- *
- * @return {DOMElement} The Angular jqLite-wrapped DOM element for the component.
- *                      The returned object has a link(scope) method which will
- *                      re-link the component with new properties.
- */
-export function createDirective(
-  document,
-  name,
-  attrs,
-  initialScope,
-  initialHtml,
-  opts
-) {
-  attrs = attrs || {};
-  initialScope = initialScope || {};
-  initialHtml = initialHtml || '';
-  opts = opts || {};
-  opts.parentElement = opts.parentElement || document.body;
-
-  // Create a template consisting of a single element, the directive
-  // we want to create and compile it.
-  let $compile;
-  let $scope;
-  angular.mock.inject(function (_$compile_, _$rootScope_) {
-    $compile = _$compile_;
-    $scope = _$rootScope_.$new();
-  });
-  const templateElement = document.createElement(hyphenate(name));
-  Object.keys(attrs).forEach(function (key) {
-    const attrName = hyphenate(key);
-    let attrKey = key;
-    if (typeof attrs[key] === 'function') {
-      // If the input property is a function, generate a function expression,
-      // eg. `<my-component on-event="onEvent()">`
-      attrKey += '()';
-    } else if (attrs[key].callback) {
-      // If the input property is a function which accepts arguments,
-      // generate the argument list.
-      // eg. `<my-component on-change="onChange(newValue)">`
-      attrKey += '(' + attrs[key].args.join(',') + ')';
-    }
-    templateElement.setAttribute(attrName, attrKey);
-  });
-  templateElement.innerHTML = initialHtml;
-
-  // Add the element to the document's body so that
-  // it responds to events, becomes visible, reports correct
-  // values for its dimensions etc.
-  opts.parentElement.appendChild(templateElement);
-
-  // setup initial scope
-  Object.keys(attrs).forEach(function (key) {
-    if (attrs[key].callback) {
-      $scope[key] = attrs[key].callback;
-    } else {
-      $scope[key] = attrs[key];
-    }
-  });
-
-  // compile the template
-  const linkFn = $compile(templateElement);
-
-  // link the component, passing in the initial
-  // scope values. The caller can then re-render/link
-  // the template passing in different properties
-  // and verify the output
-  const linkDirective = function (props) {
-    const childScope = $scope.$new();
-    angular.extend(childScope, props);
-    const element = linkFn(childScope);
-    element.scope = childScope;
-    childScope.$digest();
-    element.ctrl = element.controller(name);
-
-    if (!element.ctrl) {
-      throw new Error(
-        'Failed to create "' +
-          name +
-          '" directive in test.' +
-          'Did you forget to register it with angular.module(...).directive() ?'
-      );
-    }
-
-    return element;
-  };
-
-  return linkDirective(initialScope);
-}

src/sidebar/index.js

@@ -21,19 +21,9 @@ if (appConfig.sentry) {
   sentry.init(appConfig.sentry);
 }
 
-// Disable Angular features that are not compatible with CSP.
-//
-// See https://docs.angularjs.org/api/ng/directive/ngCsp
-//
-// The `ng-csp` attribute must be set on some HTML element in the document
-// _before_ Angular is require'd for the first time.
-document.body.setAttribute('ng-csp', '');
-
 // Prevent tab-jacking.
 disableOpenerForExternalLinks(document.body);
 
-import angular from 'angular';
-
 // Load polyfill for :focus-visible pseudo-class.
 import 'focus-visible';
 
@@ -42,8 +32,6 @@ if (process.env.NODE_ENV !== 'production') {
   require('preact/debug');
 }
 
-import wrapReactComponent from './util/wrap-react-component';
-
 if (appConfig.googleAnalytics) {
   addAnalytics(appConfig.googleAnalytics);
 }
@@ -100,29 +88,24 @@ function autosave(autosaveService) {
   autosaveService.init();
 }
 
+// @ngInject
+function setupFrameSync(frameSync) {
+  if (isSidebar) {
+    frameSync.connect();
+  }
+}
+
 // Register icons used by the sidebar app (and maybe other assets in future).
 import { registerIcons } from '../shared/components/svg-icon';
 import iconSet from './icons';
 registerIcons(iconSet);
 
-// Preact UI components that are wrapped for use within Angular templates.
-
-import AnnotationViewerContent from './components/annotation-viewer-content';
-import HelpPanel from './components/help-panel';
-import LoginPromptPanel from './components/login-prompt-panel';
-import ShareAnnotationsPanel from './components/share-annotations-panel';
-import SidebarContent from './components/sidebar-content';
-import StreamContent from './components/stream-content';
-import ThreadList from './components/thread-list';
-import ToastMessages from './components/toast-messages';
-import TopBar from './components/top-bar';
-
-// Remaining UI components that are still built with Angular.
-
-import hypothesisApp from './components/hypothesis-app';
+// The entry point component for the app.
+import { createElement, render } from 'preact';
+import HypothesisApp from './components/hypothesis-app';
+import { ServiceContext } from './util/service-context';
 
 // Services.
-
 import bridgeService from '../shared/bridge';
 
 import analyticsService from './services/analytics';
@@ -151,18 +134,13 @@ import unicodeService from './services/unicode';
 import viewFilterService from './services/view-filter';
 
 // Redux store.
-
 import store from './store';
 
 // Utilities.
-
 import { Injector } from '../shared/injector';
+import EventEmitter from 'tiny-emitter';
 
-function startAngularApp(config) {
-  // Create dependency injection container for services.
-  //
-  // This is a replacement for the use of Angular's dependency injection
-  // (including its `$injector` service) to construct services with dependencies.
+function startApp(config) {
   const container = new Injector();
 
   // Register services.
@@ -194,6 +172,15 @@ function startAngularApp(config) {
     .register('viewFilter', viewFilterService)
     .register('store', store);
 
+  // Register a dummy `$rootScope` pub-sub service for services that still
+  // use it.
+  const emitter = new EventEmitter();
+  const dummyRootScope = {
+    $on: (event, callback) => emitter.on(event, data => callback({}, data)),
+    $broadcast: (event, data) => emitter.emit(event, data),
+  };
+  container.register('$rootScope', { value: dummyRootScope });
+
   // Register utility values/classes.
   //
   // nb. In many cases these can be replaced by direct imports in the services
@@ -203,92 +190,23 @@ function startAngularApp(config) {
     .register('isSidebar', { value: isSidebar })
     .register('settings', { value: config });
 
-  // Register services which only Angular can construct, once Angular has
-  // constructed them.
-  //
-  // @ngInject
-  function registerAngularServices($rootScope) {
-    container.register('$rootScope', { value: $rootScope });
-  }
-
-  // Run initialization logic that uses constructed services.
-  //
-  // @ngInject
-  function initServices() {
-    container.run(persistDefaults);
-    container.run(autosave);
-    container.run(sendPageView);
-    container.run(setupApi);
-    container.run(setupRoute);
-    container.run(startRPCServer);
-  }
-
-  const wrapComponent = component => wrapReactComponent(component, container);
-
-  angular
-    .module('h', [])
-
-    // The root component for the application
-    .component('hypothesisApp', hypothesisApp)
-
-    // UI components
-    .component(
-      'annotationViewerContent',
-      wrapComponent(AnnotationViewerContent)
-    )
-    .component('helpPanel', wrapComponent(HelpPanel))
-    .component('loginPromptPanel', wrapComponent(LoginPromptPanel))
-    .component('sidebarContent', wrapComponent(SidebarContent))
-    .component('shareAnnotationsPanel', wrapComponent(ShareAnnotationsPanel))
-    .component('streamContent', wrapComponent(StreamContent))
-    .component('threadList', wrapComponent(ThreadList))
-    .component('toastMessages', wrapComponent(ToastMessages))
-    .component('topBar', wrapComponent(TopBar))
-
-    // Register services, the store and utilities with Angular, so that
-    // Angular components can use them.
-    .service('analytics', () => container.get('analytics'))
-    .service('api', () => container.get('api'))
-    .service('auth', () => container.get('auth'))
-    .service('bridge', () => container.get('bridge'))
-    .service('features', () => container.get('features'))
-    .service('frameSync', () => container.get('frameSync'))
-    .service('groups', () => container.get('groups'))
-    .service('loadAnnotationsService', () =>
-      container.get('loadAnnotationsService')
-    )
-    .service('rootThread', () => container.get('rootThread'))
-    .service('searchFilter', () => container.get('searchFilter'))
-    .service('serviceUrl', () => container.get('serviceUrl'))
-    .service('session', () => container.get('session'))
-    .service('streamer', () => container.get('streamer'))
-    .service('streamFilter', () => container.get('streamFilter'))
-    .service('toastMessenger', () => container.get('toastMessenger'))
-
-    // Redux store
-    .service('store', () => container.get('store'))
-
-    // Utilities
-    .value('isSidebar', container.get('isSidebar'))
-    .value('settings', container.get('settings'))
-
-    // Make Angular built-ins available to services constructed by `container`.
-    .run(registerAngularServices)
-    .run(initServices);
-
-  // Work around a check in Angular's $sniffer service that causes it to
-  // incorrectly determine that Firefox extensions are Chrome Packaged Apps which
-  // do not support the HTML 5 History API. This results Angular redirecting the
-  // browser on startup and thus the app fails to load.
-  // See https://github.com/angular/angular.js/blob/a03b75c6a812fcc2f616fc05c0f1710e03fca8e9/src/ng/sniffer.js#L30
-  if (window.chrome && !window.chrome.app) {
-    window.chrome.app = {
-      dummyAddedByHypothesisClient: true,
-    };
-  }
+  // Initialize services.
+  container.run(persistDefaults);
+  container.run(autosave);
+  container.run(sendPageView);
+  container.run(setupApi);
+  container.run(setupRoute);
+  container.run(startRPCServer);
+  container.run(setupFrameSync);
 
+  // Render the UI.
   const appEl = document.querySelector('hypothesis-app');
-  angular.bootstrap(appEl, ['h'], { strictDi: true });
+  render(
+    <ServiceContext.Provider value={container}>
+      <HypothesisApp />
+    </ServiceContext.Provider>,
+    appEl
+  );
 }
 
 // Start capturing RPC requests before we start the RPC server (startRPCServer)
@@ -296,11 +214,10 @@ preStartRPCServer();
 
 fetchConfig(appConfig)
   .then(config => {
-    startAngularApp(config);
+    startApp(config);
   })
   .catch(err => {
     // Report error. This will be the only notice that the user gets because the
-    // sidebar does not currently appear at all if the Angular app fails to
-    // start.
+    // sidebar does not currently appear at all if the app fails to start.
     console.error('Failed to start Hypothesis client: ', err);
   });

src/sidebar/store/index.js

@@ -47,31 +47,6 @@ import sidebarPanels from './modules/sidebar-panels';
 import toastMessages from './modules/toast-messages';
 import viewer from './modules/viewer';
 
-/**
- * Redux middleware which triggers an Angular change-detection cycle
- * if no cycle is currently in progress.
- *
- * This ensures that Angular UI components are updated after the UI
- * state changes in response to external inputs (eg. WebSocket messages,
- * messages arriving from other frames in the page, async network responses).
- *
- * See http://redux.js.org/docs/advanced/Middleware.html
- */
-function angularDigestMiddleware($rootScope) {
-  return function (next) {
-    return function (action) {
-      next(action);
-
-      // '$$phase' is set if Angular is in the middle of a digest cycle already
-      if (!$rootScope.$$phase) {
-        // $applyAsync() is similar to $apply() but provides debouncing.
-        // See http://stackoverflow.com/questions/30789177
-        $rootScope.$applyAsync(function () {});
-      }
-    };
-  };
-}
-
 /**
  * Factory which creates the sidebar app's state store.
  *
@@ -81,11 +56,8 @@ function angularDigestMiddleware($rootScope) {
  * passing the current state of the store.
  */
 // @ngInject
-export default function store($rootScope, settings) {
-  const middleware = [
-    debugMiddleware,
-    angularDigestMiddleware.bind(null, $rootScope),
-  ];
+export default function store(settings) {
+  const middleware = [debugMiddleware];
 
   const modules = [
     activity,

src/sidebar/store/test/index-test.js

@@ -19,7 +19,6 @@ const fixtures = immutable({
 
 describe('store', function () {
   let store;
-  let fakeRootScope;
 
   function tagForID(id) {
     const storeAnn = store.findAnnotationByID(id);
@@ -30,8 +29,7 @@ describe('store', function () {
   }
 
   beforeEach(function () {
-    fakeRootScope = { $applyAsync: sinon.stub() };
-    store = storeFactory(fakeRootScope, {});
+    store = storeFactory({});
   });
 
   describe('initialization', function () {
@@ -41,14 +39,14 @@ describe('store', function () {
     });
 
     it('sets the selection when settings.annotations is set', function () {
-      store = storeFactory(fakeRootScope, { annotations: 'testid' });
+      store = storeFactory({ annotations: 'testid' });
       assert.deepEqual(store.getSelectedAnnotationMap(), {
         testid: true,
       });
     });
 
     it('expands the selected annotations when settings.annotations is set', function () {
-      store = storeFactory(fakeRootScope, { annotations: 'testid' });
+      store = storeFactory({ annotations: 'testid' });
       assert.deepEqual(store.expandedThreads(), {
         testid: true,
       });

src/sidebar/templates/hypothesis-app.html

-<div class="app-content-wrapper js-thread-list-scroll-root" ng-style="vm.backgroundStyle">
-  <top-bar
-    auth="vm.auth"
-    on-login="vm.login()"
-    on-sign-up="vm.signUp()"
-    on-logout="vm.logout()"
-    is-sidebar="::vm.isSidebar">
-  </top-bar>
-
-  <div class="content">
-    <toast-messages></toast-messages>
-    <help-panel auth="vm.auth"></help-panel>
-    <share-annotations-panel></share-annotations-panel>
-
-    <main ng-if="vm.route()">
-      <annotation-viewer-content ng-if="vm.route() == 'annotation'"></annotation-viewer-content>
-      <stream-content ng-if="vm.route() == 'stream'"></stream-content>
-      <sidebar-content ng-if="vm.route() == 'sidebar'" on-login="vm.login()" on-signUp="vm.signUp()"></sidebar-content>
-    </main>
-  </div>
-</div>

src/sidebar/test/bootstrap.js

@@ -5,9 +5,6 @@ sinon.assert.expose(assert, { prefix: null });
 import { patch } from '../../test-util/assert-methods';
 patch(assert);
 
-import 'angular';
-import 'angular-mocks';
-
 // Configure Enzyme for UI tests.
 import 'preact/debug';
 

src/sidebar/util/test/wrap-react-component-test.js

-import angular from 'angular';
-import { Component, createElement } from 'preact';
-import { useContext } from 'preact/hooks';
-import propTypes from 'prop-types';
-
-import { Injector } from '../../../shared/injector';
-import { createDirective } from '../../components/test/angular-util';
-import { ServiceContext } from '../service-context';
-import wrapReactComponent from '../wrap-react-component';
-
-// Saved `onDblClick` prop from last render of `Button`.
-// This makes it easy to call it with different arguments.
-let lastOnDblClickCallback;
-
-// Saved service context from last render of `Button`.
-// Components in the tree can use this to get at Angular services.
-let lastServiceContext;
-
-function Button({ label, isDisabled, onClick, onDblClick }) {
-  // We don't actually use the `onDblClick` handler in this component.
-  // It exists just to test callbacks that take arguments.
-  lastOnDblClickCallback = onDblClick;
-
-  lastServiceContext = useContext(ServiceContext);
-
-  return (
-    <button disabled={isDisabled} onClick={onClick}>
-      {label}
-    </button>
-  );
-}
-Button.propTypes = {
-  // Simple input properties passed by parent component.
-  label: propTypes.string.isRequired,
-  isDisabled: propTypes.bool,
-
-  // A required callback with no arguments.
-  onClick: propTypes.func.isRequired,
-
-  // An optional callback with a `{ click }` argument.
-  onDblClick: propTypes.func,
-};
-
-describe('wrapReactComponent', () => {
-  function renderButton() {
-    const onClick = sinon.stub();
-    const onDblClick = sinon.stub();
-
-    const element = createDirective(document, 'btn', {
-      label: 'Edit',
-      isDisabled: false,
-      onClick,
-      onDblClick: {
-        args: ['count'],
-        callback: onDblClick,
-      },
-    });
-
-    return { element, onClick, onDblClick };
-  }
-
-  let servicesInjector;
-
-  beforeEach(() => {
-    const servicesInjector = new Injector();
-    servicesInjector.register('theme', { value: 'dark' });
-
-    angular
-      .module('app', [])
-      .component('btn', wrapReactComponent(Button, servicesInjector));
-    angular.mock.module('app');
-  });
-
-  afterEach(() => {
-    if (console.error.restore) {
-      console.error.restore();
-    }
-  });
-
-  it('derives Angular component "bindings" from React "propTypes"', () => {
-    const ngComponent = wrapReactComponent(Button, servicesInjector);
-    assert.deepEqual(ngComponent.bindings, {
-      label: '<',
-      isDisabled: '<',
-      onClick: '&',
-      onDblClick: '&',
-
-      // nb. Props passed via dependency injection should not appear here.
-    });
-  });
-
-  it('renders the React component when the Angular component is created', () => {
-    const { element, onClick } = renderButton();
-
-    const btnEl = element[0].querySelector('button');
-    assert.ok(btnEl);
-
-    // Check that properties are passed correctly.
-    assert.equal(btnEl.textContent, 'Edit');
-    assert.equal(btnEl.disabled, false);
-
-    // Verify that events result in callbacks being invoked.
-    btnEl.click();
-    assert.called(onClick);
-  });
-
-  it('exposes Angular services to the React component and descendants', () => {
-    lastServiceContext = null;
-    renderButton();
-    assert.ok(lastServiceContext);
-    assert.equal(lastServiceContext.get('theme'), 'dark');
-  });
-
-  it('updates the React component when the Angular component is updated', () => {
-    const { element } = renderButton();
-    const btnEl = element[0].querySelector('button');
-    assert.equal(btnEl.textContent, 'Edit');
-
-    // Change the inputs and re-render.
-    element.scope.label = 'Saving...';
-    element.scope.$digest();
-
-    // Check that the text _of the original DOM element_, was updated.
-    assert.equal(btnEl.textContent, 'Saving...');
-  });
-
-  it('removes the React component when the Angular component is destroyed', () => {
-    // Create parent Angular component which renders a React child.
-    const parentComponent = {
-      controllerAs: 'vm',
-      bindings: {
-        showChild: '<',
-      },
-      template: '<child ng-if="vm.showChild"></child>',
-    };
-
-    // Create a React child which needs to do some cleanup when destroyed.
-    const childUnmounted = sinon.stub();
-    class ChildComponent extends Component {
-      componentWillUnmount() {
-        childUnmounted();
-      }
-    }
-    ChildComponent.propTypes = {};
-
-    angular
-      .module('app', [])
-      .component('parent', parentComponent)
-      .component('child', wrapReactComponent(ChildComponent, servicesInjector));
-    angular.mock.module('app');
-
-    // Render the component with the child initially visible.
-    const element = createDirective(document, 'parent', { showChild: true });
-
-    // Re-render with the child removed and check that the React component got
-    // destroyed properly.
-    element.scope.showChild = false;
-    element.scope.$digest();
-
-    assert.called(childUnmounted);
-  });
-
-  it('throws an error if the developer forgets to set propTypes', () => {
-    function TestComponent() {
-      return <div>Hello world</div>;
-    }
-    assert.throws(
-      () => wrapReactComponent(TestComponent, servicesInjector),
-      'React component TestComponent does not specify its inputs using "propTypes"'
-    );
-  });
-
-  // Input property checking is handled by React when debug checks are enabled.
-  // This test just makes sure that these checks are working as expected.
-  it('throws an error if property types do not match when component is rendered', () => {
-    const { element } = renderButton();
-    const btnEl = element[0].querySelector('button');
-    assert.equal(btnEl.textContent, 'Edit');
-
-    // Incorrectly set label to a number, instead of a string.
-    element.scope.label = 123;
-    const consoleError = sinon.stub(console, 'error');
-    element.scope.$digest();
-
-    assert.calledWithMatch(
-      consoleError,
-      /Invalid prop `label` of type `number`/
-    );
-  });
-
-  it('throws an error if a callback is passed a non-object argument', () => {
-    renderButton();
-    assert.throws(() => {
-      lastOnDblClickCallback('not an object');
-    }, 'onDblClick callback must be invoked with an object. Was passed "not an object"');
-  });
-
-  it('supports invoking callback properties', () => {
-    const { onDblClick } = renderButton();
-    lastOnDblClickCallback({ count: 1 });
-
-    // The React component calls `onDblClick({ count: 1 })`. The template which
-    // renders the Angular wrapper contains an expression which references
-    // those variables (`<btn on-dbl-click="doSomething(count)">`) and the end
-    // result is that the callback gets passed the value of `count`.
-    assert.calledWith(onDblClick, 1);
-  });
-
-  it('supports invoking callback properties if a digest cycle is already in progress', () => {
-    const { element, onDblClick } = renderButton();
-    element.scope.$apply(() => {
-      lastOnDblClickCallback({ count: 1 });
-    });
-    assert.calledWith(onDblClick, 1);
-  });
-
-  it('triggers a digest cycle when invoking callback properties', () => {
-    // Create an Angular component which passes an `on-{event}` callback down
-    // to a child React component.
-    const parentComponent = {
-      controller() {
-        this.clicked = false;
-      },
-      controllerAs: 'vm',
-      template: `
-        <child on-click="vm.clicked = true"></child>
-        <div class="click-indicator" ng-if="vm.clicked">Clicked</div>
-      `,
-    };
-
-    function Child({ onClick }) {
-      return <button onClick={onClick}>Click me</button>;
-    }
-    Child.propTypes = { onClick: propTypes.func };
-
-    angular
-      .module('app', [])
-      .component('parent', parentComponent)
-      .component('child', wrapReactComponent(Child, servicesInjector));
-    angular.mock.module('app');
-
-    const element = createDirective(document, 'parent');
-    assert.isNull(element[0].querySelector('.click-indicator'));
-
-    const btn = element.find('button')[0];
-    btn.click();
-
-    // Check that parent component DOM has been updated to reflect new state of
-    // `vm.clicked`. This requires the `btn.click()` call to trigger a digest
-    // cycle.
-    assert.ok(element[0].querySelector('.click-indicator'));
-  });
-});

src/sidebar/util/wrap-react-component.js

-import { createElement, render } from 'preact';
-
-import { ServiceContext } from './service-context';
-
-function useExpressionBinding(propName) {
-  return propName.match(/^on[A-Z]/);
-}
-
-/**
- * @typedef {import('../../shared/injector').Injector} Injector
- */
-
-/**
- * Controller for an Angular component that wraps a React component.
- *
- * This is responsible for taking the inputs to the Angular component and
- * rendering the React component in the DOM node where the Angular component
- * has been created.
- */
-class ReactController {
-  constructor($element, services, $scope, type) {
-    /** The DOM element where the React component should be rendered. */
-    this.domElement = $element[0];
-
-    /**
-     * The services injector, used by this component and its descendants.
-     *
-     * @type {Injector}
-     */
-    this.services = services;
-
-    /** The React component function or class. */
-    this.type = type;
-
-    /** The input props to the React component. */
-    this.props = {};
-
-    // Wrap callback properties (eg. `onClick`) with `$scope.$apply` to trigger
-    // a digest cycle after the function is called. This ensures that the
-    // parent Angular component will update properly afterwards.
-    Object.keys(this.type.propTypes).forEach(propName => {
-      if (!useExpressionBinding(propName)) {
-        return;
-      }
-
-      this.props[propName] = arg => {
-        if (arg !== Object(arg)) {
-          throw new Error(
-            `${propName} callback must be invoked with an object. ` +
-              `Was passed "${arg}"`
-          );
-        }
-
-        // Test whether a digest cycle is already in progress using `$$phase`,
-        // in which case there is no need to trigger one with `$apply`.
-        //
-        // Most of the time there will be no digest cycle in progress, but this
-        // can happen if a change made by Angular code indirectly causes a
-        // component to call a function prop.
-        if ($scope.$root.$$phase) {
-          this[propName](arg);
-        } else {
-          $scope.$apply(() => {
-            this[propName](arg);
-          });
-        }
-      };
-    });
-  }
-
-  $onChanges(changes) {
-    // Copy updated property values from parent Angular component to React
-    // props. This callback is run when the component is initially created as
-    // well as subsequent updates.
-    Object.keys(changes).forEach(propName => {
-      if (!useExpressionBinding(propName)) {
-        this.props[propName] = changes[propName].currentValue;
-      }
-    });
-    this.updateReactComponent();
-  }
-
-  $onDestroy() {
-    // Unmount the rendered React component. Although Angular will remove the
-    // element itself, this is necessary to run any cleanup/unmount lifecycle
-    // hooks in the React component tree.
-    render(createElement(null), this.domElement);
-  }
-
-  updateReactComponent() {
-    // Render component, with a `ServiceContext.Provider` wrapper which
-    // provides access to services via `withServices` or `useContext`
-    // in child components.
-    render(
-      <ServiceContext.Provider value={this.services}>
-        <this.type {...this.props} />
-      </ServiceContext.Provider>,
-      this.domElement
-    );
-  }
-}
-
-/**
- * Create an AngularJS component which wraps a React component.
- *
- * The React component must specify its expected inputs using the `propTypes`
- * property on the function or class (see
- * https://reactjs.org/docs/typechecking-with-proptypes.html). Props use
- * one-way ('<') bindings except for those with names matching /^on[A-Z]/ which
- * are assumed to be callbacks that use expression ('&') bindings.
- *
- * If the React component needs access to a service, it can get at
- * them using the `withServices` wrapper from service-context.js.
- *
- * @param {Function} type - The React component class or function
- * @param {Injector} services
- *   Dependency injection container providing services that components use.
- * @return {Object} -
- *   An AngularJS component spec for use with `angular.component(...)`
- */
-export default function wrapReactComponent(type, services) {
-  if (!type.propTypes) {
-    throw new Error(
-      `React component ${type.name} does not specify its inputs using "propTypes"`
-    );
-  }
-
-  /**
-   * Create an AngularJS component controller that renders the specific React
-   * component being wrapped.
-   */
-  // @ngInject
-  function createController($element, $scope) {
-    return new ReactController($element, services, $scope, type);
-  }
-
-  const bindings = {};
-  Object.keys(type.propTypes).forEach(propName => {
-    bindings[propName] = useExpressionBinding(propName) ? '&' : '<';
-  });
-
-  return {
-    bindings,
-    controller: createController,
-  };
-}

src/styles/vendor/angular-csp.css

-/* Include this file in your html if you are using the CSP mode. */
-
-@charset "UTF-8";
-
-[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
-.ng-cloak, .x-ng-cloak,
-.ng-hide {
-  display: none !important;
-}
-
-ng\:form {
-  display: block;
-}
-
-.ng-animate-block-transitions {
-  transition:0s all!important;
-  -webkit-transition:0s all!important;
-}
-
-/* show the element during a show/hide animation when the
- * animation is ongoing, but the .ng-hide class is active */
-.ng-hide-add-active, .ng-hide-remove {
-  display: block!important;
-}

yarn.lock

@@ -1149,16 +1149,6 @@ ancestors@0.0.3:
   resolved "https://registry.yarnpkg.com/ancestors/-/ancestors-0.0.3.tgz#124eb944447d68b302057047d15d077a9da5179d"
   integrity sha1-Ek65RER9aLMCBXBH0V0Hep2lF50=
 
-angular-mocks@^1.7.5:
-  version "1.7.9"
-  resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.7.9.tgz#0a3b7e28b9a493b4e3010ed2b0f69a68e9b4f79b"
-  integrity sha512-LQRqqiV3sZ7NTHBnNmLT0bXtE5e81t97+hkJ56oU0k3dqKv1s6F+nBWRlOVzqHWPGFOiPS8ZJVdrS8DFzHyNIA==
-
-angular@^1.7.5:
-  version "1.7.9"
-  resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.9.tgz#e52616e8701c17724c3c238cfe4f9446fd570bc4"
-  integrity sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ==
-
 ansi-colors@3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"