Add orgs

.babelrc

@@ -1,8 +1,14 @@
 {
-  "presets": ["react", "es2015", "stage-0"],
+  "presets": ["react"],
   "plugins": [
+    ["transform-class-properties"],
+    ["transform-export-extensions"],
+    ["transform-object-rest-spread"],
+    ["react-hot-loader/babel"],
     ["transform-decorators-legacy"],
-    ["add-module-exports"],
-    ["react-hot-loader/babel"]
+    ["transform-class-properties"],
+    ["transform-es2015-modules-commonjs"],
+    ["transform-es2015-destructuring"],
+    ["transform-es2015-classes"]
   ]
 }

.env.example

@@ -40,3 +40,10 @@ SEGMENT_WRITE_KEY="rKdQ0ZHoyoBEJ3X2kMDV2uJl46Ayby3g"
 
 SENTRY_DSN="https://x:[email protected]/z"
 SENTRY_DSN_PUBLIC="https://[email protected]/z"
+
+STRIPE_SECRET_KEY="sk_test_WUUUMuChAsCoSaS"
+STRIPE_PUBLISHABLE_KEY="pk_test_DaMeLaLlAvE"
+
+ULTRAHOOK_API_KEY="sourApplesAndSweetCarrots"
+
+INTRANET_JWT_SECRET="ZG9udHlvdWxvb2thdG1leW91d2VpcmRv"

.env.testing

@@ -0,0 +1,2 @@
+# Environment variables used when NODE_ENV=testing
+RETHINKDB_URL=rethinkdb://localhost:28015/actionTesting

.eslintrc

@@ -9,25 +9,25 @@
   "env": {
     "browser": true,
     "node": true,
-    "mocha": true
+    "jest": true
   },
   "rules": {
+    "arrow-body-style": 0,
     "babel/generator-star-spacing": 0,
-    "react/no-multi-comp": 0,
+    "global-require": 0,
     "import/default": 0,
     "import/no-duplicates": 0,
     "import/named": 0,
     "import/namespace": 0,
     "import/no-unresolved": 0,
-    "import/no-named-as-default": 2,
-    "arrow-body-style": 0,
+    "import/no-named-as-default": 0,
     "comma-dangle": 0,
     "id-length": 0,
     "indent": [
       2,
       2,
       {
-        "SwitchCase": 1
+        "SwitchCase": 1,
       }
     ],
     "no-alert": 0,
@@ -36,14 +36,16 @@
     "no-confusing-arrow": 0,
     "max-len": [
       1,
-      140
+      140,
     ],
     "object-curly-spacing": 0,
-    "react/jsx-space-before-closing": 0
+    "react/jsx-space-before-closing": 0,
+    "react/no-multi-comp": 0
   },
   "plugins": [
+    "import",
+    "jest",
     "react",
-    "import"
   ],
   "parser": "babel-eslint",
   "settings": {

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 .env
 .idea/
-.happypack/
+dll/
 build/
 dll/
 node_modules/

README.md

@@ -44,7 +44,8 @@ Action is a Node.js application based upon the
 | Client State       | [Redux](http://redux.js.org/)                             |
 | Client Data Cache  | [Cashay](https://github.com/mattkrick/cashay)             |
 | Front-end Views    | [React](https://facebook.github.io/react/)                |
-| Styling            | [aphrodite](https://github.com/khan/aphrodite) |
+| Styling            | [aphrodite](https://github.com/khan/aphrodite)            |
+| Unit Testing       | [jest](https://facebook.github.io/jest)                   |
 
 Action is programmed in ECMAscript ES6/7 (including async/await).
 Transpilation is provided by [babel](https://github.com/babel/babel).
@@ -90,6 +91,7 @@ In this mode, webpack will hot swap your updated client modules without
 needing to restarting the development server.
 
 ```bash
+$ npm run build:dll
 $ npm run dev
 ```
 [http://localhost:3000/](http://localhost:3000/)

circle.yml

@@ -1,7 +1,7 @@
 version: 2
 executorType: docker
 containerInfo:
-  - image: node:6.9.4
+  - image: node:7.6.0
   - image: rethinkdb:2.3.5
 stages:
   build:

package.json

@@ -15,47 +15,63 @@
   "main": "index.js",
   "scripts": {
     "start": "NODE_ENV=production node ./src/server/server.babel.js",
-    "dev": "NODE_ENV=development node ./src/server/server.babel.js",
+    "start:tunnel": "export $(grep ^ULTRAHOOK_API_KEY .env | tr -d '\"') && ultrahook -k $ULTRAHOOK_API_KEY dev 3000",
+    "dev": "if [ ! -f \"dll/vendors.json\" ] ; then npm run build:dll ; fi ; NODE_ENV=development node ./src/server/server.babel.js",
     "build": "rimraf build && concurrently \"npm run build:client\" \"npm run build:server\"",
     "build:deploy": "rimraf build && npm run build:server && npm run build:client-deploy",
     "build:min": "rimraf build && concurrently \"npm run build:client-min\" \"npm run build:server\"",
     "bs": "npm run build && npm start",
+    "debug:stripe": "node ./src/server/billing/debug.babel.js",
     "quickstart": "npm run db:migrate && npm run build && npm run start",
     "build:client": "NODE_ENV=production webpack --config ./webpack/prod.babel.js",
+    "build:dll": "NODE_ENV=production webpack --config ./webpack/webpack.config.dll.js",
     "build:client-min": "NODE_ENV=production WEBPACK_MIN=true webpack --config ./webpack/prod.babel.js",
     "build:client-deploy": "NODE_ENV=production WEBPACK_DEPLOY=true WEBPACK_MIN=true webpack --config ./webpack/prod.babel.js",
     "build:server": "NODE_ENV=production webpack --config ./webpack/server.babel.js",
     "db:migrate": "./src/server/database/migrate.sh up-all",
-    "test": "NODE_ENV=testing ava ./src/**/__tests__/**/*-tests.js --verbose",
+    "db:migrate-testing": "NODE_ENV=testing ./src/server/database/migrate.sh up-all",
+    "test": "NODE_ENV=testing jest",
+    "test:intranetToken": "node ./src/server/utils/getIntranetToken.babel.js",
     "db:migrate-up": "./src/server/database/migrate.sh up",
     "db:migrate-up-all": "npm run db:migrate",
     "db:migrate-down": "./src/server/database/migrate.sh down",
     "db:migrate-down-all": "./src/server/database/migrate.sh down-all",
-    "lint": "eslint 'src/**/*.js' 'tests/*.js' 'webpack/*.js'",
+    "lint": "eslint 'src/**/*.js' 'webpack/*.js'",
     "lint:fix": "eslint --fix 'src/**/*.js' 'tests/*.js' 'webpack/*.js'",
-    "profile": "webpack -p --config ./webpack/prod.babel.js --profile --json > stats.json"
+    "profile": "NODE_ENV=development webpack --config ./webpack/dev.babel.js --profile --json > stats.json"
   },
   "pre-commit": [],
   "devDependencies": {
-    "ava": "^0.17.0",
     "babel-cli": "6.18.0",
     "babel-core": "6.18.2",
     "babel-eslint": "^6.1.2",
+    "babel-jest": "^18.0.0",
     "babel-loader": "6.2.7",
     "babel-plugin-add-module-exports": "0.2.1",
     "babel-plugin-react-transform": "2.0.2",
     "babel-plugin-static-fs": "1.1.0",
+    "babel-plugin-transform-async-generator-functions": "^6.22.0",
+    "babel-plugin-transform-async-to-generator": "^6.22.0",
+    "babel-plugin-transform-class-properties": "^6.22.0",
     "babel-plugin-transform-decorators-legacy": "1.3.4",
-    "babel-preset-es2015": "6.18.0",
+    "babel-plugin-transform-es2015-classes": "^6.23.0",
+    "babel-plugin-transform-es2015-destructuring": "^6.23.0",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
+    "babel-plugin-transform-export-extensions": "^6.22.0",
+    "babel-plugin-transform-object-rest-spread": "^6.22.0",
+    "babel-preset-es2015": "^6.22.0",
     "babel-preset-react": "6.16.0",
-    "babel-preset-stage-0": "6.16.0",
     "babel-register": "6.18.0",
+    "chance": "^1.0.4",
     "concurrently": "2.2.0",
     "eslint": "^3.10.2",
     "eslint-config-airbnb": "^9.0.1",
     "eslint-plugin-import": "^1.12.0",
+    "eslint-plugin-jest": "^19.0.0",
     "eslint-plugin-react": "5.2.2",
     "file-loader": "0.9.0",
+    "jest": "^18.1.0",
+    "jest-junit-reporter": "^1.0.1",
     "json-loader": "0.5.4",
     "lockfile": "^1.0.2",
     "manifest-assets-webpack-plugin": "^4.0.0",
@@ -68,12 +84,11 @@
     "redbox-react": "1.3.3",
     "rethink-migrate": "^1.3.1",
     "rimraf": "2.5.4",
-    "sinon": "^1.17.6",
     "stats-webpack-plugin": "0.4.2",
     "transform-loader": "^0.2.3",
     "unused-files-webpack-plugin": "^3.0.0",
     "url-loader": "0.5.7",
-    "webpack": "2.1.0-beta.25",
+    "webpack": "2.2.0",
     "webpack-dev-middleware": "1.8.4",
     "webpack-hot-middleware": "^2.13.2",
     "webpack-shell-plugin": "^0.4.3",
@@ -86,11 +101,10 @@
     "auth0": "^2.5.0",
     "auth0-lock": "^9.2.2",
     "aws-sdk": "^2.7.19",
-    "babel-polyfill": "6.16.0",
     "babel-runtime": "6.18.0",
-    "bcrypt": "^0.8.7",
+    "bcrypt": "^1.0.2",
     "body-parser": "1.15.2",
-    "cashay": "^0.22.1",
+    "cashay": "^0.22.4",
     "cheerio": "^0.22.0",
     "compression": "1.6.2",
     "cors": "2.8.1",
@@ -107,54 +121,57 @@
     "isomorphic-fetch": "2.2.1",
     "jsonwebtoken": "^7.1.9",
     "jwt-decode": "^2.1.0",
-    "lodash.throttle": "^4.1.1",
     "mailcomposer": "^3.12.0",
     "mailgun-js": "^0.7.13",
     "mime-types": "^2.1.13",
     "ms": "^0.7.2",
     "node-env-flag": "0.1.0",
     "oy-vey": "^1.0.0-alpha",
     "raven": "^0.12.1",
-    "react": "15.4.0",
+    "react": "^15.4.2",
+    "react-async-hoc": "0.2.0",
     "react-copy-to-clipboard": "^4.2.3",
     "react-dnd": "^2.1.4",
     "react-dnd-html5-backend": "^2.1.2",
-    "react-dom": "15.4.0",
+    "react-dom": "^15.4.2",
     "react-fontawesome": "^1.4.0",
     "react-helmet": "^3.2.2",
     "react-hotkey-hoc": "^0.2.1",
     "react-markdown": "^2.4.4",
     "react-notification-system": "^0.2.10",
+    "react-portal-hoc": "^0.3.2",
     "react-redux": "^4.4.6",
-    "react-router": "2.8.0",
+    "react-router": "2.8.1",
     "react-textarea-autosize": "^4.0.5",
     "redux": "3.6.0",
     "redux-form": "^6.2.0",
     "redux-logger": "2.7.4",
     "redux-raven-middleware": "^1.1.0",
-    "redux-segment": "^1.5.0",
+    "redux-segment": "^1.6.0",
     "redux-socket-cluster": "^0.10.1",
     "redux-storage-engine-localstorage": "^1.1.2",
     "redux-storage-whitelist-fn": "^4.0.1",
     "redux-thunk": "2.1.0",
     "rethinkdbdash": "2.3.26",
     "serve-favicon": "^2.3.2",
     "shortid": "^2.2.6",
-    "sinon": "^1.17.6",
-    "socketcluster": "^5.0.23",
-    "socketcluster-client": "^5.0.21",
+    "socketcluster": "^5.3.0",
+    "socketcluster-client": "^5.2.5",
+    "stripe": "^4.14.0",
     "tap-xunit": "^1.7.0",
     "tinycolor2": "^1.4.1",
     "webpack-s3-plugin": "^0.9.2"
   },
-  "ava": {
-    "babel": "inherit",
-    "require": [
-      "babel-register"
-    ]
-  },
   "engines": {
-    "node": "6.2.0",
+    "node": "7.6.0",
     "npm": "3.9.3"
+  },
+  "jest": {
+    "modulePaths": [
+      "<rootDir>/src"
+    ],
+    "testRegex": "/__tests__/.*-tests\\.jsx?$",
+    "testResultsProcessor": "./node_modules/jest-junit-reporter",
+    "verbose": true
   }
 }

src/client/client.js

@@ -50,7 +50,7 @@ const initialState = {};
     if (module.hot) {
       /* eslint-disable global-require, no-shadow */
       module.hot.accept('./Root', () => {
-        const Root = require('./Root');
+        const Root = require('./Root').default;
         render(
           <AppContainer>
             <Root store={store}/>

src/client/makeStore.js

@@ -5,7 +5,7 @@ import {createMiddleware, createLoader} from 'redux-storage-whitelist-fn';
 import {createTracker} from 'redux-segment';
 import createEngine from 'redux-storage-engine-localstorage';
 import makeReducer from 'universal/redux/makeReducer';
-import {APP_REDUX_KEY, APP_VERSION, APP_VERSION_KEY} from 'universal/utils/constants';
+import {APP_REDUX_KEY, APP_VERSION_KEY} from 'universal/utils/constants';
 
 const storageWhitelist = type => {
   const whitelistPrefixes = ['@@auth', '@@cashay', '@@root'];
@@ -60,8 +60,9 @@ export default async initialState => {
     ));
   }
   const versionInStorage = window.localStorage.getItem(APP_VERSION_KEY);
-  if (APP_VERSION !== versionInStorage) {
-    window.localStorage.setItem(APP_VERSION_KEY, APP_VERSION);
+
+  if (__APP_VERSION__ !== versionInStorage) { // eslint-disable-line no-undef
+    window.localStorage.setItem(APP_VERSION_KEY, __APP_VERSION__); // eslint-disable-line no-undef
     return store;
   }
   const load = createLoader(engine);