Merge branch 'master' into compressed-css

* master: Upgrade deps (notably webpack4). Include dist/ in repo so that package can be run from repo. Fix bug if annotations try to access missing `env.herman` [fixes #273] Fix bug displaying tabs in `<code>` blocks [fixes #271]
oddbird · Mar 28, 2018 · 817cf99 · 817cf99
2 parents b361c9d + c17a154
commit 817cf99
Show file tree

Hide file tree

Showing 89 changed files with 2,102 additions and 2,384 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -2,14 +2,7 @@
 
 'use strict';
 
-const env = process.env.BABEL_ENV;
-const plugins = ['./arrow-function-coverage-fix.js'];
-if (env === 'test') {
-  plugins.push(['istanbul', { include: ['assets/js/*!(init).js'] }]);
-}
-
 module.exports = {
-  plugins,
   presets: [
     [
       '@babel/preset-env',

diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,6 @@
 .nyc_output/
 .sass-cache/
 .yarn-integrity
-dist/
 docs/assets/
 docs/search-data.json
 jscov/
@@ -21,3 +20,6 @@ npm-debug.log*
 test/js/dest/
 yarn-debug.log*
 yarn-error.log*
+
+dist/webpack/app_styles.min.js
+dist/webpack/styleguide_json*
diff --git a/.npmignore b/.npmignore
@@ -34,6 +34,9 @@ yarn-debug.log*
 yarn-error.log*
 yarn.lock
 
+dist/webpack/app_styles.min.js
+dist/webpack/styleguide_json*
+
 scss/*
 !scss/utilities/
 !scss/_utilities.scss
diff --git a/.sass-lint.yml b/.sass-lint.yml
@@ -60,7 +60,7 @@ rules:
   function-name-format: 2
   hex-length: 2
   hex-notation: 2
-  indentation: 1
+  indentation: 0
   leading-zero:
     - 2
     - include: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@
 
 - 🚀 NEW: Add `sass.outputStyle` option (default: `expanded`) --
   [#263](https://github.com/oddbird/sassdoc-theme-herman/issues/263)
+- 🐛 BUGFIX: Fix bug if annotations try to access missing `env.herman` --
+  [#273](https://github.com/oddbird/sassdoc-theme-herman/issues/273)
+- 🐛 BUGFIX: Fix bug displaying tabs in `<code>` blocks --
+  [#271](https://github.com/oddbird/sassdoc-theme-herman/issues/271)
 - 🐛 BUGFIX: Fix bugs in `customCSS` URL re-writing --
   [#265](https://github.com/oddbird/sassdoc-theme-herman/issues/265),
   [#266](https://github.com/oddbird/sassdoc-theme-herman/issues/266)

diff --git a/arrow-function-coverage-fix.js b/arrow-function-coverage-fix.js
diff --git a/assets/js/init.js b/assets/js/init.js
@@ -1,3 +1,6 @@
+import 'matchmedia-polyfill';
+import 'matchmedia-polyfill/matchMedia.addListener';
+import 'srcdoc-polyfill';
 import hljs from 'vendor/highlight';
 
 import * as base from './base';

diff --git a/dist/img/favicon.ico b/dist/img/favicon.ico
diff --git a/dist/webpack/app.min.js b/dist/webpack/app.min.js
diff --git a/dist/webpack/app_styles.min.css b/dist/webpack/app_styles.min.css
diff --git a/dist/webpack/common.min.js b/dist/webpack/common.min.js
diff --git a/dist/webpack/runtime.min.js b/dist/webpack/runtime.min.js
diff --git a/dist/webpack/search.min.js b/dist/webpack/search.min.js
diff --git a/docs/CHANGELOG.html b/docs/CHANGELOG.html
@@ -299,6 +299,10 @@ <h2 id="unreleased">Unreleased</h2>
 <ul>
 <li>🚀 NEW: Add <code>sass.outputStyle</code> option (default: <code>expanded</code>) –
 <a href="https://github.com/oddbird/sassdoc-theme-herman/issues/263">#263</a></li>
+<li>🐛 BUGFIX: Fix bug if annotations try to access missing <code>env.herman</code> –
+<a href="https://github.com/oddbird/sassdoc-theme-herman/issues/273">#273</a></li>
+<li>🐛 BUGFIX: Fix bug displaying tabs in <code>&lt;code&gt;</code> blocks –
+<a href="https://github.com/oddbird/sassdoc-theme-herman/issues/271">#271</a></li>
 <li>🐛 BUGFIX: Fix bugs in <code>customCSS</code> URL re-writing –
 <a href="https://github.com/oddbird/sassdoc-theme-herman/issues/265">#265</a>,
 <a href="https://github.com/oddbird/sassdoc-theme-herman/issues/266">#266</a></li>
@@ -780,7 +784,8 @@ <h2 id="0-1-0-2015-11-25">0.1.0: 2015-11-25</h2>
     </div>
   </div>
 
-  <script type="text/javascript" src="assets/webpack/vendor.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/runtime.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/common.min.js"></script>
   <script type="text/javascript" src="assets/webpack/app.min.js"></script>
 
 </body>

diff --git a/docs/CONFIGURATION.html b/docs/CONFIGURATION.html
@@ -505,7 +505,8 @@ <h3 id="sass-outputstyle">sass.outputstyle</h3>
     </div>
   </div>
 
-  <script type="text/javascript" src="assets/webpack/vendor.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/runtime.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/common.min.js"></script>
   <script type="text/javascript" src="assets/webpack/app.min.js"></script>
 
 </body>

diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
@@ -359,7 +359,8 @@ <h2 id="code-of-conduct">Code of Conduct</h2>
     </div>
   </div>
 
-  <script type="text/javascript" src="assets/webpack/vendor.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/runtime.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/common.min.js"></script>
   <script type="text/javascript" src="assets/webpack/app.min.js"></script>
 
 </body>

diff --git a/docs/api_json-export.html b/docs/api_json-export.html
@@ -385,8 +385,6 @@ <h3 class="item-subtitle">
     <div class="example-code">
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -414,8 +412,6 @@ <h3 class="item-subtitle">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -560,8 +556,6 @@ <h2 class="item-title">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -742,8 +736,6 @@ <h3 class="item-subtitle">
     <div class="example-code">
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -1053,8 +1045,6 @@ <h3 class="item-subtitle">
     <div class="example-code">
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -1074,8 +1064,6 @@ <h3 class="item-subtitle">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -1456,8 +1444,6 @@ <h3 class="item-subtitle">
     <div class="example-code">
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -1481,8 +1467,6 @@ <h3 class="item-subtitle">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -1985,8 +1969,6 @@ <h3 class="item-subtitle">
     <div class="example-code">
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -2010,8 +1992,6 @@ <h3 class="item-subtitle">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -2120,7 +2100,8 @@ <h4 class="param-title">
     </div>
   </div>
 
-  <script type="text/javascript" src="assets/webpack/vendor.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/runtime.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/common.min.js"></script>
   <script type="text/javascript" src="assets/webpack/app.min.js"></script>
 
 </body>

diff --git a/docs/component-breadcrumb.html b/docs/component-breadcrumb.html
@@ -416,8 +416,6 @@ <h2 class="item-title">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -495,8 +493,6 @@ <h3 class="item-subtitle">
     <div class="example-code">
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -598,7 +594,8 @@ <h3 class="item-subtitle">
     </div>
   </div>
 
-  <script type="text/javascript" src="assets/webpack/vendor.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/runtime.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/common.min.js"></script>
   <script type="text/javascript" src="assets/webpack/app.min.js"></script>
 
 </body>

diff --git a/docs/component-footer.html b/docs/component-footer.html
@@ -372,8 +372,6 @@ <h3 class="item-subtitle">
     <div class="example-code">
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -409,8 +407,6 @@ <h3 class="item-subtitle">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -589,8 +585,6 @@ <h2 class="item-title">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -730,8 +724,6 @@ <h2 class="item-title">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -864,8 +856,6 @@ <h2 class="item-title">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -961,7 +951,8 @@ <h2 class="item-title">
     </div>
   </div>
 
-  <script type="text/javascript" src="assets/webpack/vendor.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/runtime.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/common.min.js"></script>
   <script type="text/javascript" src="assets/webpack/app.min.js"></script>
 
 </body>

diff --git a/docs/component-nav.html b/docs/component-nav.html
@@ -415,8 +415,6 @@ <h2 class="item-title">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -555,8 +553,6 @@ <h2 class="item-title">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -687,8 +683,6 @@ <h2 class="item-title">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -820,8 +814,6 @@ <h2 class="item-title">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -951,8 +943,6 @@ <h2 class="item-title">
 
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -1073,8 +1063,6 @@ <h3 class="item-subtitle">
     <div class="example-code">
 
 
-
-
     <div class="code-block">
 
         <div class="code-header">
@@ -1177,7 +1165,8 @@ <h3 class="item-subtitle">
     </div>
   </div>
 
-  <script type="text/javascript" src="assets/webpack/vendor.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/runtime.min.js"></script>
+  <script type="text/javascript" src="assets/webpack/common.min.js"></script>
   <script type="text/javascript" src="assets/webpack/app.min.js"></script>
 
 </body>