Merge branch 'master' into feature/add-password-strength-indicator

.babelrc

@@ -13,6 +13,7 @@
   "plugins": [
     "transform-class-properties",
     "transform-object-rest-spread",
+    "lodash",
     [
       "babel-plugin-transform-builtin-extend",
       {

.eslintignore

@@ -1,4 +1,5 @@
 **/dist/**/*
 **/vendor/**/*
 **/tests/sentry/lang/javascript/fixtures/**/*
+**/tests/sentry/lang/javascript/example-project/**/*
 /examples/

.eslintrc

@@ -7,7 +7,7 @@
   "env": {
     "browser": true,
     "es6": true,
-    "mocha": true, // we use Chai, but close enough,
+    "jest": true,
     "jquery": true // hard-loaded into vendor.js
   },
   "globals": {

.gitignore

@@ -19,6 +19,7 @@ sentry-package.json
 /env
 /tmp
 /node_modules/
+/docs-ui/node_modules/
 /docs/_build
 example/db.sqlite
 /src/sentry/assets.json
@@ -33,4 +34,4 @@ example/db.sqlite
 /test_cli/
 Gemfile.lock
 .idea/
-.vscode/tags
+.vscode/tags

.storybook/addons.js

@@ -0,0 +1 @@
+import '@storybook/addon-actions/register';

.storybook/config.js

@@ -0,0 +1,23 @@
+import {configure, setAddon} from '@storybook/react';
+import infoAddon, {setDefaults} from '@storybook/addon-info';
+import './storybook.less';
+
+setDefaults({
+  inline: true,
+  header: false,
+  source: true
+});
+setAddon(infoAddon);
+
+// Use webpack's require.context to load modules dynamically
+// From https://storybook.js.org/basics/writing-stories/
+const req = require.context('../docs-ui/components', true, /\.stories\.js$/);
+
+configure(function() {
+  require('../docs-ui/index.js');
+  req.keys().forEach(filename => req(filename));
+}, module);
+
+// For percy integration
+if (typeof window === 'object')
+  window.__storybook_stories__ = require('@storybook/react').getStorybook();

.storybook/storybook.less

@@ -0,0 +1,15 @@
+html > body {
+  background-color: rgba(0, 0, 0, 0.05);
+  background-image: repeating-linear-gradient(0deg, transparent, transparent 7px, rgba(0, 0, 0, 0.1) 1px, transparent 8px), repeating-linear-gradient(90deg, transparent, transparent 7px, rgba(0, 0, 0, 0.1) 1px, transparent 8px);
+  background-size: 8px 8px;
+}
+
+html {
+  box-sizing: border-box;
+  font-size: 14px;
+}
+
+*, *:before, *:after {
+  box-sizing: inherit;
+}
+

.storybook/webpack.config.js

@@ -0,0 +1,62 @@
+const path = require('path');
+const webpack = require('webpack');
+
+const staticPath = path.resolve(__dirname, '..', 'src', 'sentry', 'static', 'sentry');
+const componentPath = path.resolve(staticPath, 'app', 'components');
+
+const sentryConfig = require('../webpack.config');
+const appConfig = sentryConfig[0];
+const legacyCssConfig = sentryConfig[1];
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.po$/,
+        loader: 'po-catalog-loader',
+        query: {
+          referenceExtensions: ['.js', '.jsx'],
+          domain: 'sentry'
+        }
+      },
+      {
+        test: /\.css$/,
+        use: ['style-loader', 'css-loader']
+      },
+      {
+        test: /\.less$/,
+        use: [
+          {
+            loader: 'style-loader'
+          },
+          {
+            loader: 'css-loader'
+          },
+          {
+            loader: 'less-loader'
+          }
+        ]
+      },
+      {
+        test: /\.(woff|woff2|ttf|eot|svg|png|gif|ico|jpg)($|\?)/,
+        loader: 'file-loader?name=' + '[name].[ext]'
+      }
+    ]
+  },
+  plugins: [
+    new webpack.ProvidePlugin({
+      $: 'jquery',
+      jQuery: 'jquery',
+      'window.jQuery': 'jquery',
+      'root.jQuery': 'jquery',
+      Raven: 'raven-js',
+      underscore: 'underscore',
+      _: 'underscore'
+    })
+  ],
+  resolve: {
+    alias: Object.assign({}, appConfig.resolve.alias, {
+      'sentry-ui': componentPath
+    })
+  }
+};

.travis.yml

@@ -1,5 +1,6 @@
 filter_secrets: false
 sudo: false
+dist: precise
 language: python
 rvm:
   - 2.2
@@ -17,6 +18,7 @@ addons:
       - ubuntu-toolchain-r-test
     packages:
       - g++-4.8
+      - libxmlsec1-dev
 env:
   global:
     - NODE_ENV=production
@@ -27,6 +29,7 @@ env:
     - CXX=g++-4.8
 install:
   - nvm install $TRAVIS_NODE_VERSION
+  - npm install -g yarn@0.27.5
   - make travis-install-$TEST_SUITE
 before_script:
   - pip freeze
@@ -64,6 +67,12 @@ matrix:
         - memcached
         - redis-server
         - postgresql
+    - python: 2.7
+      env: TEST_SUITE=network DB=postgres
+      services:
+        - memcached
+        - redis-server
+        - postgresql
     - python: 2.7
       env: TEST_SUITE=mysql DB=mysql
       services:

.vscode/settings.json

@@ -34,8 +34,9 @@
 
     "python.linting.pylintEnabled": false,
     "python.linting.flake8Enabled": true,
-
     "python.formatting.provider": "autopep8",
+    // https://github.com/DonJayamanne/pythonVSCode/issues/992
+    "python.formatting.yapfArgs": ["--style", "${workspaceRoot}/setup.cfg"],
     "python.pythonPath": "${env.WORKON_HOME}/sentry/bin/python",
     // test discovery is sluggish and the UI around running
     // tests is often in your way and misclicked