Merge branch 'master' into algolia

.snyk

@@ -12,3 +12,9 @@ patch:
         patched: '2018-10-10T17:48:01.398Z'
     - webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > cryptiles > boom > hoek:
         patched: '2018-10-10T17:48:01.398Z'
+  'npm:debug:20170905':
+    - amplitude-js > @segment/top-domain > component-cookie > debug:
+        patched: '2018-11-02T17:08:02.760Z'
+  'npm:ms:20170412':
+    - amplitude-js > @segment/top-domain > component-cookie > debug > ms:
+        patched: '2018-11-02T17:08:02.760Z'

Gemfile

@@ -12,6 +12,7 @@ group :jekyll_plugins do
   }
   gem 'jekyll-assets', '3.0.11'
   gem 'jekyll-algolia', '~> 1.0'
+  gem 'jekyll-toc', '0.9.0'
   gem 'autoprefixer-rails'
   gem 'jekyll-extlinks'
   gem 'liquid-md5'

Gemfile.lock

@@ -91,6 +91,8 @@ GEM
       jekyll (~> 3.1)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
+    jekyll-toc (0.9.0)
+      nokogiri (~> 1.8)
     jekyll-watch (2.0.0)
       listen (~> 3.0)
     json (2.1.0)
@@ -148,10 +150,11 @@ DEPENDENCIES
   jekyll-algolia (~> 1.0)
   jekyll-assets (= 3.0.11)
   jekyll-extlinks
+  jekyll-toc (= 0.9.0)
   liquid-md5
   nokogiri (= 1.8.3)
   sprockets (~> 4.0.beta)
   tzinfo-data
 
 BUNDLED WITH
-   1.16.3
+   1.16.5

__tests__/documentation.js

@@ -1,6 +1,7 @@
 import { getJekyllData, printOnFail } from '../lib/helpers';
 import { existsSync } from 'fs';
 import path from 'path';
+import glob from 'glob-promise';
 
 describe('Documentation', function() {
   beforeAll(() => {
@@ -17,4 +18,14 @@ describe('Documentation', function() {
       });
     });
   });
+
+  test('urls should not change unexpectedly', () => {
+    expect.assertions(1);
+    return glob(path.join(process.cwd(), '_site/**/*.{html,json,xml}')).then(
+      paths => {
+        const relativePaths = paths.sort().map(p => p.split('_site/')[1]);
+        expect(relativePaths).toMatchSnapshot();
+      }
+    );
+  });
 });

_config.yml

@@ -41,14 +41,15 @@ defaults:
       type: documentation
     values:
       layout: doc
+      toc: true
       permalink: /:path/
   - scope:
       path: collections/_documentation/clients/*
       type: documentation
     values:
       layout: legacy-client
   - scope:
-      path: collections/_documentation/relay/*
+      path: collections/_documentation/data-management/relay/*
       type: documentation
     values:
       layout: relay

cloudbuild.yaml

@@ -34,3 +34,4 @@ images: [
   'us.gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA',
 ]
 timeout: 20m
+logsBucket: 'gs://sentryio-cloudbuild-logs/sentry-docs/'

nginx.conf

@@ -13,58 +13,165 @@ server {
   add_header X-Content-Type-Options nosniff always;
   add_header X-XSS-Protection "1; mode=block" always;
 
-  add_header Content-Security-Policy-Report-Only "upgrade-insecure-requests; default-src 'none'; script-src 'self' 'unsafe-inline' cdn.ravenjs.com www.googletagmanager.com www.google-analytics.com js.hs-scripts.com js.hs-analytics.net; connect-src 'self' sentry.io reload.getsentry.net api.amplitude.com; img-src 'self' www.google-analytics.com www.facebook.com track.hubspot.com; style-src 'self' 'unsafe-inline' fonts.googleapis.com; font-src 'self' fonts.gstatic.com; report-uri https://sentry.io/api/1297620/security/?sentry_key=b3cfba5788cb4c138f855c8120f70eab" always;
+  add_header Content-Security-Policy-Report-Only "upgrade-insecure-requests; default-src 'none'; script-src 'self' 'unsafe-inline' cdn.ravenjs.com www.googletagmanager.com www.google-analytics.com js.hs-scripts.com js.hs-analytics.net; connect-src 'self' sentry.io reload.getsentry.net api.amplitude.com; img-src 'self' www.google-analytics.com www.facebook.com track.hubspot.com saucelabs.com; style-src 'self' 'unsafe-inline'; font-src 'self'; report-uri https://sentry.io/api/1297620/security/?sentry_key=b3cfba5788cb4c138f855c8120f70eab" always;
 
   rewrite ^/(?:hosted|on-premise)/(.*)$ /$1$is_args$args redirect;
-  rewrite ^/learn/(data-forwarding|issue-owners|membership|notifications|pricing|sso|search|quotas)/$ /product/$1$is_args$args redirect;
-
+
+  rewrite ^/clientdev/(.*)$ /development/sdk-dev/$1$is_args$args redirect;
+  rewrite ^/integrations/(.*)$ /workflow/integrations/$1$is_args$args redirect;
+  rewrite ^/internal/(api|docs|contributing|environment)/$ /development/contribute/$1/$is_args$args redirect;
+
+  rewrite ^/learn/(capturing|configuration|security-policy-reporting)/$ /error-reporting/$1/$is_args$args redirect;
+  rewrite ^/learn/(draining|filtering)/$ /error-reporting/configuration/$1/$is_args$args redirect;
+  rewrite ^/learn/(breadcrumbs|context|environments|scopes|user-feedback)/$ /enriching-error-data/$1/$is_args$args redirect;
+  rewrite ^/learn/(issue-owners|notifications|releases|search)/$ /workflow/$1/$is_args$args redirect;
+  rewrite ^/learn/(data-forwarding|rollups|sensitive-data)/$ /data-management/$1/$is_args$args redirect;
+  rewrite ^/learn/(membership|pricing|quotas|sso)/$ /accounts/$1/$is_args$args redirect;
+
+  rewrite ^/learn/cli/(configuration|dif|installation|releases|send-event)/$ /cli/$1/$is_args$args redirect;
+  rewrite ^/learn/cli/(breakpad|dsym|elf|pdb|proguard)/$ /cli/dif/$1/$is_args$args redirect;
+
+  rewrite ^/product/(membership|pricing|quotas|sso)/$ /accounts/$1/$is_args$args redirect;
+  rewrite ^/product/(discover|issue-owners|notifications|search)/$ /workflow/$1/$is_args$args redirect;
+
+  rewrite ^/relay/(.*)$ /data-management/relay/$1$is_args$args redirect;
+
+
+  location = /quickstart/ {
+    return 302 /error-reporting/quickstart/$is_args$args;
+  }
+
+  location = /quickstart {
+    return 302 /error-reporting/quickstart/$is_args$args;
+  }
+
+  location = /pricing/ {
+    return 302 /accounts/pricing/$is_args$args;
+  }
+
+  location = /pricing {
+    return 302 /accounts/pricing/$is_args$args;
+  }
+
+  location = /internal/ {
+    return 302 /development/$is_args$args;
+  }
+
+  location = /internal {
+    return 302 /development/$is_args$args;
+  }
+
+  location = /learn/cli/ {
+    return 302 /cli/$is_args$args;
+  }
+
+  location = /learn/cli {
+    return 302 /cli/$is_args$args;
+  }
+
+  location = /product/data-forwarding/ {
+    return 302 /data-management/data-forwarding/$is_args$args;
+  }
+
+  location = /product/data-forwarding {
+    return 302 /data-management/data-forwarding/$is_args$args;
+  }
+
   location = /clients/electron/ {
     return 302 /platforms/javascript/electron/$is_args$args;
   }
+
+  location = /clients/electron {
+    return 302 /platforms/javascript/electron/$is_args$args;
+  }
 
   location = /clients/rust/ {
     return 302 /platforms/rust/$is_args$args;
   }
+
+  location = /clients/rust {
+    return 302 /platforms/rust/$is_args$args;
+  }
 
   location = /clients/cordova/ {
     return 302 /platforms/javascript/cordova/$is_args$args;
   }
+
+  location = /clients/cordova {
+    return 302 /platforms/javascript/cordova/$is_args$args;
+  }
 
   location = /clients/cordova/ionic/ {
     return 302 /platforms/javascript/ionic/$is_args$args;
   }
+
+  location = /clients/cordova/ionic {
+    return 302 /platforms/javascript/ionic/$is_args$args;
+  }
 
   location = /clients/minidump/ {
     return 302 /platforms/minidump/$is_args$args;
   }
+
+  location = /clients/minidump {
+    return 302 /platforms/minidump/$is_args$args;
+  }
 
   location = /clients/javascript/integrations/angular2/ {
     return 302 /clients/javascript/integrations/angular/$is_args$args;
   }
+
+  location = /clients/javascript/integrations/angular2 {
+    return 302 /clients/javascript/integrations/angular/$is_args$args;
+  }
 
   location = /api/releases/post-project-releases/ {
     return 302 /api/releases/post-organization-releases/$is_args$args;
   }
+
+  location = /api/releases/post-project-releases {
+    return 302 /api/releases/post-organization-releases/$is_args$args;
+  }
 
   location = /api/releases/delete-project-release-details/ {
     return 302 /api/releases/delete-organization-release-details/$is_args$args;
   }
+
+  location = /api/releases/delete-project-release-details {
+    return 302 /api/releases/delete-organization-release-details/$is_args$args;
+  }
 
   location = /api/releases/put-project-release-details/ {
     return 302 /api/releases/put-organization-release-details/$is_args$args;
   }
+
+  location = /api/releases/put-project-release-details {
+    return 302 /api/releases/put-organization-release-details/$is_args$args;
+  }
 
   location = /api/releases/get-project-releases/ {
     return 302 /api/releases/get-organization-releases/$is_args$args;
   }
+
+  location = /api/releases/get-project-releases {
+    return 302 /api/releases/get-organization-releases/$is_args$args;
+  }
 
   location = /learn/hints/ {
-    return 302 /learn/filtering/$is_args$args;
+    return 302 /error-reporting/configuration/filtering/$is_args$args;
+  }
+
+  location = /learn/hints {
+    return 302 /error-reporting/configuration/filtering/$is_args$args;
   }
 
   location = /sitemap/ {
     return 301 /sitemap.xml$is_args$args;
   }
+
+  location = /sitemap {
+    return 301 /sitemap.xml$is_args$args;
+  }
 
   location / {
     try_files $uri $uri.html $uri/ $uri/index.html =404;

package.json

@@ -29,19 +29,20 @@
     "bootstrap": "4.1.1",
     "fs-extra": "5.0.0",
     "instantsearch.js": "^2.10.4",
+    "glob-promise": "^3.4.0",
     "jquery": "3.2.1",
     "popper.js": "1.12.9",
     "query-string": "^6.1.0",
-    "snyk": "^1.103.0",
+    "snyk": "^1.106.0",
     "url-parse": "^1.4.3",
     "webpack": "^4.5.0",
-    "webpack-cli": "^2.0.14",
+    "webpack-cli": "^3.1.2",
     "yarn": "^1.10.1"
   },
   "devDependencies": {
-    "jest": "22.3.0",
-    "jest-cli": "22.3.0",
-    "jest-localstorage-mock": "^2.2.0",
+    "jest": "^23.6.0",
+    "jest-cli": "^23.6.0",
+    "jest-localstorage-mock": "^2.3.0",
     "prettier": "1.14.2",
     "pretty": "^2.0.0"
   },

src/_assets/css/_includes/grid.scss

@@ -49,3 +49,8 @@ body {
     flex-shrink: 0;
   }
 }
+
+.doc-toc {
+  position: sticky;
+  top: $spacer;
+}

src/_assets/css/_includes/sidebar.scss

@@ -17,11 +17,11 @@
     }
   }
 
-  .toc-item .toc-item {
-    padding-left: $spacer;
+  .toc-item {
+    padding-left: $spacer * 0.5;
   }
 
-  ul a {
+  [data-sidebar-link] {
     position: relative;
     line-height: 1.5;
     display: block;
@@ -34,30 +34,35 @@
 
     &:hover {
       opacity: 1;
-      color: $highlightPurple;
       text-decoration: none;
 
-      &:after {
+      &:before {
         width: 4px;
       }
     }
 
-    &:after {
+    &:before {
       position: absolute;
       content: '';
-      right: -1.5rem;
+      left: -0.7rem;
       width: 0px;
       background-color: $satPurple0;
       height: 1.5em;
-      transition: width $transition-time ease-out;
     }
 
     &.active {
-      color: $white;
       opacity: 1;
 
       &:after {
-        width: 4px;
+        position: absolute;
+        content: '';
+        right: -1.5rem;
+        width: 0px;
+        height: 0px;
+        transition: all $transition-time ease-out;
+        border-top: 0.75rem solid transparent;
+        border-bottom: 0.75rem solid transparent;
+        border-right: 0.75rem solid $white;
       }
     }
   }
@@ -85,3 +90,13 @@
     }
   }
 }
+
+.section-nav {
+  list-style-type: none;
+  padding-left: 0;
+
+  ul {
+    list-style-type: none;
+    padding-left: $spacer * 0.5;
+  }
+}

src/_assets/css/_includes/type.scss

@@ -1,3 +1,30 @@
+@font-face {
+  font-family: 'Karla';
+  src: asset-url('karla-bold.woff2') format('woff2'),
+    asset-url('karla-bold.woff') format('woff'),
+    asset-url('karla-bold.ttf') format('truetype');
+  font-weight: 700;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Karla';
+  src: asset-url('karla-italic.woff2') format('woff2'),
+    asset-url('karla-italic.woff') format('woff'),
+    asset-url('karla-italic.ttf') format('truetype');
+  font-weight: 400;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'Karla';
+  src: asset-url('karla-regular.woff2') format('woff2'),
+    asset-url('karla-regular.woff') format('woff'),
+    asset-url('karla-regular.ttf') format('truetype');
+  font-weight: 400;
+  font-style: normal;
+}
+
 .prose {
   h1,
   h2,

src/_assets/css/_includes/user-content-ui.scss

@@ -0,0 +1,4 @@
+.user-content-menu {
+  max-height: 300px;
+  overflow: scroll;
+}