Make the npm run start:prod pass.

also
- add react version to .eslintrc
- make dependency versioning in package.json consistent (^ => ~)

.eslintrc.js

@@ -6,6 +6,11 @@ module.exports = {
   extends: [
     'plugin:react/recommended'
   ],
+  settings: {
+    react: {
+      version: '16.6'
+    }
+  },
   rules: {
     camelcase: 0,
     'comma-dangle': [2, 'never'],

config/webpack/entries/main.js

@@ -34,7 +34,7 @@ function importComponents(r) {
   r.keys().forEach(path => {
     const Component = r(path).default;
     const name = extractComponentNameFromPath(path);
-    if (name !== Component.name) {
+    if (name !== Component.name && process.env.NODE_ENV !== 'production') {
       throw new Error(`Component filename and component name do not match: ${name || '<empty>'} vs ${Component.name || '<empty>'}`);
     }
     if (!Component.propTypes) {
@@ -44,7 +44,7 @@ function importComponents(r) {
 
     angular
       .module('trustroots')
-      .directive(lowercaseFirstLetter(Component.name), createDirective);
+      .directive(lowercaseFirstLetter(name), createDirective);
 
     /* @ngInject */
     function createDirective(reactDirective) {

config/webpack/webpack.config.js

@@ -26,7 +26,7 @@ module.exports = merge(shims, {
       {
         test: /\.js$/,
         exclude: /node_modules/,
-        use: {
+        use: [{
           loader: 'babel-loader',
           options: {
             presets: [
@@ -37,18 +37,12 @@ module.exports = merge(shims, {
               ['@babel/preset-react']
             ],
             plugins: [
-              '@babel/plugin-proposal-object-rest-spread'
+              '@babel/plugin-proposal-object-rest-spread',
+              'angularjs-annotate'
             ]
           }
-        }
-      },
-      ...(isProduction ? [
-        {
-          test: /\.js$/,
-          exclude: /node_modules/,
-          loader: 'ng-annotate-loader?ngAnnotate=ng-annotate-patched'
-        }
-      ] : [])
+        }]
+      }
     ]
   },
   plugins: [

modules/core/client/services/photos.service.js

@@ -1,7 +1,5 @@
 /* eslint-disable angular/document-service,angular/window-service */
 
-import angular from 'angular';
-
 const photos = {
   'bokeh': {
     'name': 'Sandra', // "pinkorchid_too"
@@ -158,15 +156,11 @@ const photos = {
   }
 };
 
-function getApplicationScope() {
-  return angular.element(document.querySelector('html')).scope();
-}
-
 export function selectPhoto(name) {
   const photo = photos[name];
   const file = (window.innerWidth <= 480 && photo.file_mobile) ? photo.file_mobile : photo.file;
   const imageUrl = `/img/board/${file}`;
-  getApplicationScope().$emit('photoCreditsUpdated', { [name]: photo });
+
   return {
     imageUrl,
     ...photo