chore(extension): compile pug files using Webpack (#672)

* chore(extension): compile pug files using Webpack

* prettier

extension/gulpfile.babel.js

@@ -1,7 +1,6 @@
 import fs from 'fs';
 import gulp from 'gulp';
 import gutil from 'gulp-util';
-import jade from 'gulp-pug';
 import rename from 'gulp-rename';
 import zip from 'gulp-zip';
 import webpack from 'webpack';
@@ -29,18 +28,6 @@ gulp.task('webpack:dev', (callback) => {
   callback();
 });
 
-gulp.task('views:dev', (done) => {
-  gulp
-    .src('./src/browser/views/*.pug')
-    .pipe(
-      jade({
-        locals: { env: 'dev' },
-      })
-    )
-    .pipe(gulp.dest('./dev'));
-  done();
-});
-
 gulp.task('copy:dev', (done) => {
   gulp
     .src('./src/browser/extension/manifest.json')
@@ -71,25 +58,13 @@ gulp.task('webpack:build:extension', (callback) => {
     .then(() => {
       const dest = './build/extension';
       fs.rename(
-        `${dest}/js/redux-devtools-extension.bundle.js`,
+        `${dest}/redux-devtools-extension.bundle.js`,
-        `${dest}/js/redux-devtools-extension.js`,
+        `${dest}/redux-devtools-extension.js`,
         callback
       );
     });
 });
 
-gulp.task('views:build:extension', (done) => {
-  gulp
-    .src(['./src/browser/views/*.pug'])
-    .pipe(
-      jade({
-        locals: { env: 'prod' },
-      })
-    )
-    .pipe(gulp.dest('./build/extension'));
-  done();
-});
-
 gulp.task('copy:build:extension', (done) => {
   gulp
     .src('./src/browser/extension/manifest.json')
@@ -123,10 +98,6 @@ gulp.task('compress:firefox', (done) => {
  * watch tasks
  */
 
-gulp.task('views:watch', () => {
-  gulp.watch('./src/browser/views/*.pug', gulp.series('views:dev'));
-});
-
 gulp.task('copy:watch', () => {
   gulp.watch(
     ['./src/browser/extension/manifest.json', './src/assets/**/*'],
@@ -150,23 +121,10 @@ gulp.task('test:electron', () => {
     .on('end', () => crdv.stop());
 });
 
-gulp.task(
+gulp.task('default', gulp.parallel('webpack:dev', 'copy:dev', 'copy:watch'));
-  'default',
-  gulp.parallel(
-    'webpack:dev',
-    'views:dev',
-    'copy:dev',
-    'views:watch',
-    'copy:watch'
-  )
-);
 gulp.task(
   'build:extension',
-  gulp.parallel(
+  gulp.parallel('webpack:build:extension', 'copy:build:extension')
-    'webpack:build:extension',
-    'views:build:extension',
-    'copy:build:extension'
-  )
 );
 gulp.task(
   'copy:build:firefox',
@@ -174,7 +132,7 @@ gulp.task(
     gulp
       .src([
         './build/extension/**',
-        '!./build/extension/js/redux-devtools-extension.js',
+        '!./build/extension/redux-devtools-extension.js',
       ])
       .pipe(gulp.dest('./build/firefox'))
       .on('finish', function () {

extension/package.json

@@ -50,15 +50,16 @@
     "eslint-config-airbnb": "^0.1.0",
     "eslint-plugin-react": "^3.2.3",
     "expect": "^1.20.1",
+    "file-loader": "^6.2.0",
     "gitbook-cli": "^2.3.0",
     "gulp": "^4.0.2",
     "gulp-mocha": "^3.0.1",
-    "gulp-pug": "^3.1.0",
     "gulp-rename": "^1.2.2",
     "gulp-util": "^3.0.7",
     "gulp-zip": "^3.0.2",
     "jsdom": "^9.8.3",
     "mocha": "^3.1.2",
+    "pug-html-loader": "^1.1.5",
     "raw-loader": "^0.5.1",
     "react-addons-test-utils": "^15.4.1",
     "react-transform-catch-errors": "^1.0.0",

extension/src/browser/extension/devpanel/index.js

@@ -7,6 +7,8 @@ import App from '../../../app/containers/App';
 import configureStore from '../../../app/stores/panelStore';
 import getPreloadedState from '../background/getPreloadedState';
 
+import '../../views/devpanel.pug';
+
 const position = location.hash;
 const messageStyle = { padding: '20px', width: '100%', textAlign: 'center' };
 

extension/src/browser/extension/devtools/index.js

@@ -1,3 +1,5 @@
+import '../../views/devtools.pug';
+
 function createPanel(url) {
   chrome.devtools.panels.create(
     'Redux',

extension/src/browser/extension/manifest.json

@@ -39,23 +39,23 @@
     "chrome_style": true
   },
   "background": {
-    "scripts": ["js/background.bundle.js"],
+    "scripts": ["background.bundle.js"],
     "persistent": false
   },
   "content_scripts": [
     {
       "matches": ["<all_urls>"],
       "exclude_globs": ["https://www.google*"],
-      "js": ["js/content.bundle.js", "js/pagewrap.bundle.js"],
+      "js": ["content.bundle.js", "pagewrap.bundle.js"],
       "run_at": "document_start",
       "all_frames": true
     }
   ],
   "devtools_page": "devtools.html",
   "web_accessible_resources": [
-    "js/page.bundle.js",
+    "page.bundle.js",
-    "js/inject.bundle.js",
+    "inject.bundle.js",
-    "js/redux-devtools-extension.js"
+    "redux-devtools-extension.js"
   ],
   "externally_connectable": {
     "ids": ["*"]

extension/src/browser/extension/options/index.js

@@ -2,6 +2,8 @@ import React from 'react';
 import { render } from 'react-dom';
 import Options from './Options';
 
+import '../../views/options.pug';
+
 chrome.runtime.getBackgroundPage((background) => {
   const syncOptions = background.syncOptions;
 

extension/src/browser/extension/window/index.js

@@ -7,6 +7,8 @@ import App from '../../../app/containers/App';
 import configureStore from '../../../app/stores/windowStore';
 import getPreloadedState from '../background/getPreloadedState';
 
+import '../../views/window.pug';
+
 const position = location.hash;
 let preloadedState;
 getPreloadedState(position, (state) => {

extension/src/browser/extension/window/remote.js

@@ -2,6 +2,8 @@ import React from 'react';
 import { render } from 'react-dom';
 import App from 'remotedev-app';
 
+import '../../views/remote.pug';
+
 chrome.storage.local.get(
   {
     'select-monitor': 'InspectorMonitor',

extension/src/browser/firefox/manifest.json

@@ -38,21 +38,21 @@
     "page": "options.html"
   },
   "background": {
-    "scripts": ["js/background.bundle.js"]
+    "scripts": ["background.bundle.js"]
   },
   "content_scripts": [
     {
       "matches": ["<all_urls>"],
-      "js": ["js/content.bundle.js", "js/pagewrap.bundle.js"],
+      "js": ["content.bundle.js", "pagewrap.bundle.js"],
       "run_at": "document_start",
       "all_frames": true
     }
   ],
   "devtools_page": "devtools.html",
   "web_accessible_resources": [
-    "js/page.bundle.js",
+    "page.bundle.js",
-    "js/inject.bundle.js",
+    "inject.bundle.js",
-    "js/redux-devtools-extension.js"
+    "redux-devtools-extension.js"
   ],
   "permissions": [
     "notifications",

extension/src/browser/views/devpanel.pug

@@ -12,4 +12,4 @@ html
 
   body
     #root
-    script(src='/js/devpanel.bundle.js')
+    script(src='/devpanel.bundle.js')

extension/src/browser/views/devtools.pug

@@ -7,4 +7,4 @@ html
 
     body
         #root
-        script(src='/js/devtools.bundle.js')
+        script(src='/devtools.bundle.js')

extension/src/browser/views/options.pug

@@ -90,4 +90,4 @@ html
 
   body
     #root
-    script(src='/js/options.bundle.js')
+    script(src='/options.bundle.js')

extension/src/browser/views/remote.pug

@@ -8,4 +8,4 @@ html
 
   body
     #root
-    script(src='/js/remote.bundle.js')
+    script(src='/remote.bundle.js')

extension/src/browser/views/window.pug

@@ -14,4 +14,4 @@ html
           height=300, width=350,
           style='position: absolute; top: 50%; left: 50%; margin-top: -175px; margin-left: -175px;'
         )
-    script(src='/js/window.bundle.js')
+    script(src='/window.bundle.js')

extension/webpack/base.config.js

@@ -77,6 +77,10 @@ const baseConfig = (params) => ({
         test: /\.css?$/,
         use: ['style-loader', 'raw-loader'],
       },
+      {
+        test: /\.pug$/,
+        use: ['file-loader?name=[name].html', 'pug-html-loader'],
+      },
     ],
   },
 });

extension/webpack/dev.config.js

@@ -6,7 +6,7 @@ let config = baseConfig({
   inputExtra: {
     page: [path.join(__dirname, '../src/browser/extension/inject/pageScript')],
   },
-  output: { path: path.join(__dirname, '../dev/js') },
+  output: { path: path.join(__dirname, '../dev') },
   globals: {
     'process.env': {
       NODE_ENV: '"development"',

extension/webpack/prod.config.js

@@ -2,7 +2,7 @@ import path from 'path';
 import baseConfig from './base.config';
 
 export default baseConfig({
-  output: { path: path.join(__dirname, '../build/extension/js') },
+  output: { path: path.join(__dirname, '../build/extension') },
   globals: {
     'process.env': {
       NODE_ENV: '"production"',

extension/yarn.lock

@@ -1000,7 +1000,19 @@
   dependencies:
     chokidar "2.1.8"
 
-"@types/json-schema@^7.0.5":
+"@types/babel-types@*", "@types/babel-types@^7.0.0":
+  version "7.0.9"
+  resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.9.tgz#01d7b86949f455402a94c788883fe4ba574cad41"
+  integrity sha512-qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA==
+
+"@types/babylon@^6.16.2":
+  version "6.16.5"
+  resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.5.tgz#1c5641db69eb8cdf378edd25b4be7754beeb48b4"
+  integrity sha512-xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w==
+  dependencies:
+    "@types/babel-types" "*"
+
+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
   integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
@@ -1268,7 +1280,7 @@ ajv@^6.1.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4:
+ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1701,6 +1713,29 @@ babel-runtime@6.20.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtim
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
+babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
+
 bach@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880"
@@ -2326,13 +2361,12 @@ classnames@^2.2.3:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
   integrity sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0=
 
-clean-css@^3.3.0:
+clean-css@^4.1.11:
-  version "3.4.23"
+  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.23.tgz#604fbbca24c12feb59b02f00b84f1fb7ded6d001"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
-  integrity sha1-YE+7yiTBL+tZsC8AuE8ft97W0AE=
+  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
   dependencies:
-    commander "2.8.x"
+    source-map "~0.6.0"
-    source-map "0.4.x"
 
 cliui@^2.1.0:
   version "2.1.0"
@@ -2508,13 +2542,6 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.8.x:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
 commander@2.9.0, commander@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
@@ -2599,6 +2626,16 @@ constantinople@^3.0.1:
     acorn "^3.1.0"
     is-expression "^2.0.1"
 
+constantinople@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647"
+  integrity sha512-yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw==
+  dependencies:
+    "@types/babel-types" "^7.0.0"
+    "@types/babylon" "^6.16.2"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -3837,6 +3874,14 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
+file-loader@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
+  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
+  dependencies:
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
@@ -4518,22 +4563,12 @@ gulp-mocha@^3.0.1:
     temp "^0.8.3"
     through "^2.3.4"
 
-gulp-pug@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/gulp-pug/-/gulp-pug-3.2.0.tgz#0d890ffab15410ed0c909821ebf76c4c3270ada6"
-  integrity sha1-DYkP+rFUEO0MkJgh6/dsTDJwraY=
-  dependencies:
-    gulp-util "^3.0.2"
-    object-assign "^4.1.0"
-    pug ">=2.0.0-alpha <3"
-    through2 "^2.0.0"
-
 gulp-rename@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817"
   integrity sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc=
 
-gulp-util@^3.0.0, gulp-util@^3.0.2, gulp-util@^3.0.7:
+gulp-util@^3.0.0, gulp-util@^3.0.7:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
   integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
@@ -5812,6 +5847,16 @@ loader-runner@^2.3.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
   integrity sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=
 
+loader-utils@^0.2.17:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
+
 loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
@@ -5830,6 +5875,15 @@ loader-utils@^1.4.0:
     emojis-list "^3.0.0"
     json5 "^1.0.1"
 
+loader-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
+  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
+
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
@@ -6221,7 +6275,7 @@ lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.2.1, lod
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
   integrity sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=
 
-lodash@^4.17.14, lodash@^4.17.19:
+lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.4:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -7718,110 +7772,118 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-pug-attrs@^2.0.1:
+pug-attrs@^2.0.4:
-  version "2.0.1"
+  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.1.tgz#8b5dd7c330730c09f62299e06b58fd0ebc4ebfd5"
+  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.4.tgz#b2f44c439e4eb4ad5d4ef25cac20d18ad28cc336"
-  integrity sha1-i13XwzBzDAn2Ipnga1j9DrxOv9U=
+  integrity sha512-TaZ4Z2TWUPDJcV3wjU3RtUXMrd3kM4Wzjbe3EWnSsZPsJ3LDI0F3yCnf2/W7PPFF+edUFQ0HgDL1IoxSz5K8EQ==
   dependencies:
     constantinople "^3.0.1"
     js-stringify "^1.0.1"
-    pug-runtime "^2.0.0"
+    pug-runtime "^2.0.5"
 
-pug-code-gen@^1.1.0:
+pug-code-gen@^2.0.2:
-  version "1.1.0"
+  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-1.1.0.tgz#f638a6d5792185536a4a2bb3cb73b8f458bdc01f"
+  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.2.tgz#ad0967162aea077dcf787838d94ed14acb0217c2"
-  integrity sha1-9jim1XkhhVNqSiuzy3O49Fi9wB8=
+  integrity sha512-kROFWv/AHx/9CRgoGJeRSm+4mLWchbgpRzTEn8XCiwwOy6Vh0gAClS8Vh5TEJ9DBjaP8wCjS3J6HKsEsYdvaCw==
   dependencies:
-    constantinople "^3.0.1"
+    constantinople "^3.1.2"
     doctypes "^1.1.0"
     js-stringify "^1.0.1"
-    pug-attrs "^2.0.1"
+    pug-attrs "^2.0.4"
-    pug-error "^1.3.0"
+    pug-error "^1.3.3"
-    pug-runtime "^2.0.0"
+    pug-runtime "^2.0.5"
     void-elements "^2.0.1"
     with "^5.0.0"
 
-pug-error@^1.0.0, pug-error@^1.3.0:
+pug-error@^1.3.3:
-  version "1.3.1"
+  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.1.tgz#61627425c3f8b307b1c38b10a0b6d5c8e1a3581f"
+  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.3.tgz#f342fb008752d58034c185de03602dd9ffe15fa6"
-  integrity sha1-YWJ0JcP4swexw4sQoLbVyOGjWB8=
+  integrity sha512-qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ==
 
-pug-filters@^1.2.4:
+pug-filters@^3.1.1:
-  version "1.2.4"
+  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-1.2.4.tgz#92d852472c74508572a0d9b0c91f9dcb9ae05839"
+  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-3.1.1.tgz#ab2cc82db9eeccf578bda89130e252a0db026aa7"
-  integrity sha1-kthSRyx0UIVyoNmwyR+dy5rgWDk=
+  integrity sha512-lFfjNyGEyVWC4BwX0WyvkoWLapI5xHSM3xZJFUhx4JM4XyyRdO8Aucc6pCygnqV2uSgJFaJWW3Ft1wCWSoQkQg==
   dependencies:
-    clean-css "^3.3.0"
+    clean-css "^4.1.11"
     constantinople "^3.0.1"
     jstransformer "1.0.0"
-    pug-error "^1.3.0"
+    pug-error "^1.3.3"
-    pug-walk "^1.0.0"
+    pug-walk "^1.1.8"
     resolve "^1.1.6"
     uglify-js "^2.6.1"
 
-pug-lexer@^2.2.0:
+pug-html-loader@^1.1.5:
-  version "2.3.0"
+  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-2.3.0.tgz#b841ac4cd8d27501281e0f9c88fb4243297aff3a"
+  resolved "https://registry.yarnpkg.com/pug-html-loader/-/pug-html-loader-1.1.5.tgz#b46855a7790a306e43ec5db297dbdbb7995f4b5a"
-  integrity sha1-uEGsTNjSdQEoHg+ciPtCQyl6/zo=
+  integrity sha512-EOcLK0z0vJ1fSXsDypqL8SsPXVaevS9Oy8JA1RpYYkgAOV9qJXCSedvMYw499hSXxmoXAXIV1qEF2fNFBTwyEQ==
+  dependencies:
+    loader-utils "^0.2.17"
+    pug "^2.0.0-rc.2"
+
+pug-lexer@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-4.1.0.tgz#531cde48c7c0b1fcbbc2b85485c8665e31489cfd"
+  integrity sha512-i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA==
   dependencies:
     character-parser "^2.1.1"
     is-expression "^3.0.0"
-    pug-error "^1.3.0"
+    pug-error "^1.3.3"
 
-pug-linker@^1.0.1:
+pug-linker@^3.0.6:
-  version "1.0.1"
+  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-1.0.1.tgz#d6da79b910e683d3313567168047ebafed92d153"
+  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.6.tgz#f5bf218b0efd65ce6670f7afc51658d0f82989fb"
-  integrity sha1-1tp5uRDmg9MxNWcWgEfrr+2S0VM=
+  integrity sha512-bagfuHttfQOpANGy1Y6NJ+0mNb7dD2MswFG2ZKj22s8g0wVsojpRlqveEQHmgXXcfROB2RT6oqbPYr9EN2ZWzg==
   dependencies:
-    pug-error "^1.3.0"
+    pug-error "^1.3.3"
-    pug-walk "^1.0.0"
+    pug-walk "^1.1.8"
 
-pug-load@^2.0.3:
+pug-load@^2.0.12:
-  version "2.0.3"
+  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.3.tgz#fe8cf838f79c9a1249785774d52ba1d7ea43df37"
+  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.12.tgz#d38c85eb85f6e2f704dea14dcca94144d35d3e7b"
-  integrity sha1-/oz4OPecmhJJeFd01Suh1+pD3zc=
+  integrity sha512-UqpgGpyyXRYgJs/X60sE6SIf8UBsmcHYKNaOccyVLEuT6OPBIMo6xMPhoJnqtB3Q3BbO4Z3Bjz5qDsUWh4rXsg==
   dependencies:
     object-assign "^4.1.0"
-    pug-walk "^1.0.0"
+    pug-walk "^1.1.8"
 
-pug-parser@^2.0.1:
+pug-parser@^5.0.1:
-  version "2.0.1"
+  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-2.0.1.tgz#dc2c5bbb777047e98359cd606860f75f4bfc1541"
+  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-5.0.1.tgz#03e7ada48b6840bd3822f867d7d90f842d0ffdc9"
-  integrity sha1-3Cxbu3dwR+mDWc1gaGD3X0v8FUE=
+  integrity sha512-nGHqK+w07p5/PsPIyzkTQfzlYfuqoiGjaoqHv1LjOv2ZLXmGX1O+4Vcvps+P4LhxZ3drYSljjq4b+Naid126wA==
   dependencies:
-    pug-error "^1.3.0"
+    pug-error "^1.3.3"
     token-stream "0.0.1"
 
-pug-runtime@^2.0.0, pug-runtime@^2.0.2:
+pug-runtime@^2.0.5:
-  version "2.0.2"
+  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.2.tgz#97331abce339a5436254a7f9b0bd65be11665c21"
+  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.5.tgz#6da7976c36bf22f68e733c359240d8ae7a32953a"
-  integrity sha1-lzMavOM5pUNiVKf5sL1lvhFmXCE=
+  integrity sha512-P+rXKn9un4fQY77wtpcuFyvFaBww7/91f3jHa154qU26qFAnOe6SW1CbIDcxiG5lLK9HazYrMCCuDvNgDQNptw==
 
-pug-strip-comments@^1.0.1:
+pug-strip-comments@^1.0.4:
-  version "1.0.1"
+  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.1.tgz#89695921a34fcf56855d4302b426686b426bafd1"
+  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.4.tgz#cc1b6de1f6e8f5931cf02ec66cdffd3f50eaf8a8"
-  integrity sha1-iWlZIaNPz1aFXUMCtCZoa0Jrr9E=
+  integrity sha512-i5j/9CS4yFhSxHp5iKPHwigaig/VV9g+FgReLJWWHEHbvKsbqL0oP/K5ubuLco6Wu3Kan5p7u7qk8A4oLLh6vw==
   dependencies:
-    pug-error "^1.0.0"
+    pug-error "^1.3.3"
 
-pug-walk@^1.0.0:
+pug-walk@^1.1.8:
-  version "1.0.0"
+  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.0.0.tgz#7f4ae1456a4f18feee40a0d708b75c1c51d2e4e4"
+  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.8.tgz#b408f67f27912f8c21da2f45b7230c4bd2a5ea7a"
-  integrity sha1-f0rhRWpPGP7uQKDXCLdcHFHS5OQ=
+  integrity sha512-GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA==
 
-"pug@>=2.0.0-alpha <3":
+pug@^2.0.0-rc.2:
-  version "2.0.0-beta6"
+  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.0-beta6.tgz#9ead2e59e540a467efc3787ccb03e4574ba5fae9"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.4.tgz#ee7682ec0a60494b38d48a88f05f3b0ac931377d"
-  integrity sha1-nq0uWeVApGfvw3h8ywPkV0ul+uk=
+  integrity sha512-XhoaDlvi6NIzL49nu094R2NA6P37ijtgMDuWE+ofekDChvfKnzFal60bhSdiy8y2PBO6fmz3oMEIcfpBVRUdvw==
   dependencies:
-    pug-code-gen "^1.1.0"
+    pug-code-gen "^2.0.2"
-    pug-filters "^1.2.4"
+    pug-filters "^3.1.1"
-    pug-lexer "^2.2.0"
+    pug-lexer "^4.1.0"
-    pug-linker "^1.0.1"
+    pug-linker "^3.0.6"
-    pug-load "^2.0.3"
+    pug-load "^2.0.12"
-    pug-parser "^2.0.1"
+    pug-parser "^5.0.1"
-    pug-runtime "^2.0.2"
+    pug-runtime "^2.0.5"
-    pug-strip-comments "^1.0.1"
+    pug-strip-comments "^1.0.4"
 
 pump@^2.0.0:
   version "2.0.1"
@@ -8477,6 +8539,11 @@ regenerator-runtime@^0.10.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz#257f41961ce44558b18f7814af48c17559f9faeb"
   integrity sha1-JX9BlhzkRVixj3gUr0jBdVn5+us=
 
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
 regenerator-runtime@^0.13.4:
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
@@ -9047,6 +9114,15 @@ schema-utils@^2.6.5:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
+schema-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
+  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
+  dependencies:
+    "@types/json-schema" "^7.0.6"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 selenium-webdriver@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz#a2dea5da4a97f6672e89e7ca7276cefa365147a7"
@@ -9355,19 +9431,12 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@0.4.x:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
-
 source-map@^0.5.0, source-map@^0.5.6, source-map@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
   integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -9855,6 +9924,11 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"