diff --git a/add-on/src/landing-pages/welcome/index.html b/add-on/src/landing-pages/welcome/index.html index 968187815..979bf63de 100644 --- a/add-on/src/landing-pages/welcome/index.html +++ b/add-on/src/landing-pages/welcome/index.html @@ -4,8 +4,8 @@ - - + + diff --git a/add-on/src/landing-pages/welcome/index.js b/add-on/src/landing-pages/welcome/index.js index 3b9510ace..21c33dbb7 100644 --- a/add-on/src/landing-pages/welcome/index.js +++ b/add-on/src/landing-pages/welcome/index.js @@ -1,6 +1,8 @@ 'use strict' /* eslint-env browser, webextensions */ +require('./welcome.css') + const browser = require('webextension-polyfill') const choo = require('choo') const createWelcomePageStore = require('./store') diff --git a/add-on/src/landing-pages/welcome/welcome.css b/add-on/src/landing-pages/welcome/welcome.css index 1effbc51e..ff4c4871c 100644 --- a/add-on/src/landing-pages/welcome/welcome.css +++ b/add-on/src/landing-pages/welcome/welcome.css @@ -1,5 +1,6 @@ -@import url('../../../ui-kit/tachyons.css'); -@import url('../../../ui-kit/ipfs.css'); +@import url('~tachyons/css/tachyons.css'); +@import url('~ipfs-css/ipfs.css'); +@import url('../../popup/heartbeat.css'); #left-col { background-image: url('../../../images/stars.png'), linear-gradient(to bottom, #041727 0%, #043b55 100%); diff --git a/add-on/src/options/options.css b/add-on/src/options/options.css index ec2b7d2af..4c5807cde 100644 --- a/add-on/src/options/options.css +++ b/add-on/src/options/options.css @@ -1,5 +1,5 @@ -@import url('/ui-kit/tachyons.css'); -@import url('/ui-kit/ipfs.css'); +@import url('~tachyons/css/tachyons.css'); +@import url('~ipfs-css/ipfs.css'); @import url('../pages/components/switch-toggle.css'); header { diff --git a/add-on/src/options/options.html b/add-on/src/options/options.html index 2f87728f1..60729d6d9 100644 --- a/add-on/src/options/options.html +++ b/add-on/src/options/options.html @@ -4,7 +4,8 @@ IPFS Companion Preferences - + +
diff --git a/add-on/src/options/options.js b/add-on/src/options/options.js index 842ad7380..3b748b46d 100644 --- a/add-on/src/options/options.js +++ b/add-on/src/options/options.js @@ -1,6 +1,8 @@ 'use strict' /* eslint-env browser, webextensions */ +require('./options.css') + const { i18n } = require('webextension-polyfill') const choo = require('choo') const optionsPage = require('./page') diff --git a/add-on/src/pages/components/switch-toggle.css b/add-on/src/pages/components/switch-toggle.css index f65e9f6a0..53217cab9 100644 --- a/add-on/src/pages/components/switch-toggle.css +++ b/add-on/src/pages/components/switch-toggle.css @@ -1,4 +1,4 @@ -@import url('/ui-kit/mdc.switch.min.css'); +@import url('~@material/switch/dist/mdc.switch.css'); .mdc-switch { --mdc-theme-secondary: #3e9096 /* teal */ diff --git a/add-on/src/pages/proxy-access-dialog/index.html b/add-on/src/pages/proxy-access-dialog/index.html index e9cec4ea5..ae2476560 100644 --- a/add-on/src/pages/proxy-access-dialog/index.html +++ b/add-on/src/pages/proxy-access-dialog/index.html @@ -5,7 +5,8 @@ IPFS Companion - + + diff --git a/add-on/src/pages/proxy-access-dialog/index.js b/add-on/src/pages/proxy-access-dialog/index.js index 0bfe8e60b..78a6e2934 100644 --- a/add-on/src/pages/proxy-access-dialog/index.js +++ b/add-on/src/pages/proxy-access-dialog/index.js @@ -1,5 +1,7 @@ 'use strict' +require('./proxy-access-dialog.css') + const browser = require('webextension-polyfill') const choo = require('choo') const createProxyAccessDialogStore = require('./store') diff --git a/add-on/src/pages/proxy-access-dialog/proxy-access-dialog.css b/add-on/src/pages/proxy-access-dialog/proxy-access-dialog.css index 7fff76809..09fa6d374 100644 --- a/add-on/src/pages/proxy-access-dialog/proxy-access-dialog.css +++ b/add-on/src/pages/proxy-access-dialog/proxy-access-dialog.css @@ -1,5 +1,5 @@ -@import url('../../../ui-kit/tachyons.css'); -@import url('../../../ui-kit/ipfs.css'); +@import url('~tachyons/css/tachyons.css'); +@import url('~ipfs-css/ipfs.css'); .hover-bg-aqua-muted:hover { background-color: #9ad4db; diff --git a/add-on/src/pages/proxy-acl/index.html b/add-on/src/pages/proxy-acl/index.html index 527fe693f..88a1f90ae 100644 --- a/add-on/src/pages/proxy-acl/index.html +++ b/add-on/src/pages/proxy-acl/index.html @@ -5,7 +5,8 @@ Manage Permissions - + + diff --git a/add-on/src/pages/proxy-acl/index.js b/add-on/src/pages/proxy-acl/index.js index 09b320c42..dabd6f033 100644 --- a/add-on/src/pages/proxy-acl/index.js +++ b/add-on/src/pages/proxy-acl/index.js @@ -1,5 +1,7 @@ 'use strict' +require('./proxy-acl.css') + const browser = require('webextension-polyfill') const choo = require('choo') const AccessControl = require('../../lib/ipfs-proxy/access-control') diff --git a/add-on/src/pages/proxy-acl/proxy-acl.css b/add-on/src/pages/proxy-acl/proxy-acl.css index 5bbc23846..987a76896 100644 --- a/add-on/src/pages/proxy-acl/proxy-acl.css +++ b/add-on/src/pages/proxy-acl/proxy-acl.css @@ -1,4 +1,4 @@ -@import url('../../../ui-kit/tachyons.css'); +@import url('~tachyons/css/tachyons.css'); @import url('../../popup/heartbeat.css'); html, body { diff --git a/add-on/src/popup/browser-action/browser-action.css b/add-on/src/popup/browser-action/browser-action.css index 55554576c..0a45b9328 100644 --- a/add-on/src/popup/browser-action/browser-action.css +++ b/add-on/src/popup/browser-action/browser-action.css @@ -1,5 +1,5 @@ -@import url('/ui-kit/tachyons.css'); -@import url('/ui-kit/ipfs.css'); +@import url('~tachyons/css/tachyons.css'); +@import url('~ipfs-css/ipfs.css'); @import url('../heartbeat.css'); @import url('../../pages/components/switch-toggle.css'); diff --git a/add-on/src/popup/browser-action/index.html b/add-on/src/popup/browser-action/index.html index c49f6aab5..7c8534a82 100644 --- a/add-on/src/popup/browser-action/index.html +++ b/add-on/src/popup/browser-action/index.html @@ -3,7 +3,8 @@ - + +
diff --git a/add-on/src/popup/browser-action/index.js b/add-on/src/popup/browser-action/index.js index fc59582da..c00db0a19 100644 --- a/add-on/src/popup/browser-action/index.js +++ b/add-on/src/popup/browser-action/index.js @@ -1,6 +1,8 @@ 'use strict' /* eslint-env browser, webextensions */ +require('./browser-action.css') + const choo = require('choo') const browserActionPage = require('./page') const browserActionStore = require('./store') diff --git a/add-on/src/popup/page-action/index.html b/add-on/src/popup/page-action/index.html index 12bb9d8d2..2b259d567 100644 --- a/add-on/src/popup/page-action/index.html +++ b/add-on/src/popup/page-action/index.html @@ -3,7 +3,8 @@ - + +
diff --git a/add-on/src/popup/quick-import.css b/add-on/src/popup/quick-import.css index cc7f2ddbe..3fd3b1496 100644 --- a/add-on/src/popup/quick-import.css +++ b/add-on/src/popup/quick-import.css @@ -1,5 +1,5 @@ -@import url('../../ui-kit/tachyons.css'); -@import url('../../ui-kit/ipfs.css'); +@import url('~tachyons/css/tachyons.css'); +@import url('~ipfs-css/ipfs.css'); @import url('heartbeat.css'); html, body, #root { diff --git a/add-on/src/popup/quick-import.html b/add-on/src/popup/quick-import.html index 6dbe771c7..9c408b4b0 100644 --- a/add-on/src/popup/quick-import.html +++ b/add-on/src/popup/quick-import.html @@ -4,7 +4,8 @@ - + + diff --git a/add-on/src/popup/quick-import.js b/add-on/src/popup/quick-import.js index 42f452130..a25ee6871 100644 --- a/add-on/src/popup/quick-import.js +++ b/add-on/src/popup/quick-import.js @@ -1,6 +1,8 @@ 'use strict' /* eslint-env browser, webextensions */ +require('./quick-import.css') + const browser = require('webextension-polyfill') const choo = require('choo') const html = require('choo/html') diff --git a/package.json b/package.json index 65d75a120..71ffec8df 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,6 @@ "build": "run-s clean build:*", "build:copy": "run-s build:copy:*", "build:copy:src": "shx mkdir -p add-on/dist && shx cp -R add-on/src/* add-on/dist", - "build:copy:ui-kit": "run-s build:copy:ui-kit:*", - "build:copy:ui-kit:ipfs-css": "run-s build:copy:ui-kit:ipfs-css:*", - "build:copy:ui-kit:ipfs-css:css": "shx mkdir -p add-on/ui-kit && shx cp node_modules/ipfs-css/ipfs.css node_modules/@material/switch/dist/mdc.switch.min.css add-on/ui-kit", - "build:copy:ui-kit:ipfs-css:fonts": "shx mkdir -p add-on/ui-kit/fonts && shx cp node_modules/ipfs-css/fonts/* add-on/ui-kit/fonts", - "build:copy:ui-kit:ipfs-css:icons": "shx mkdir -p add-on/ui-kit/icons && shx cp node_modules/ipfs-css/icons/* add-on/ui-kit/icons", - "build:copy:ui-kit:tachyons": "shx mkdir -p add-on/ui-kit && shx cp node_modules/tachyons/css/tachyons.css add-on/ui-kit", "build:js": "run-s build:js:*", "build:js:webpack": "webpack -p", "build:minimize-dist": "shx rm -rf add-on/dist/lib add-on/dist/contentScripts/ add-on/dist/bundles/ipfsProxyContentScriptPayload.bundle.js", @@ -89,16 +83,20 @@ "babel-plugin-syntax-async-generators": "6.13.0", "chai": "4.2.0", "cross-env": "6.0.3", + "css-loader": "3.5.3", "download-cli": "1.1.1", "fakefile": "0.0.9", + "file-loader": "6.0.0", "firefox-addons-add-update-version": "1.0.1", "fs-promise": "2.0.3", "get-firefox": "3.0.0", "husky": "3.1.0", + "ignore-loader": "0.1.2", "ignore-styles": "5.0.1", "ipfs-or-gateway": "2.1.0", "json": "9.0.6", "mem-storage-area": "1.0.3", + "mini-css-extract-plugin": "0.9.0", "mocha": "6.2.2", "npm-run-all": "4.1.5", "nyc": "14.1.1", @@ -109,6 +107,7 @@ "sinon": "7.5.0", "sinon-chrome": "3.0.1", "standard": "14.3.1", + "style-loader": "1.2.1", "tar": "5.0.5", "terser": "4.6.7", "terser-webpack-plugin": "2.3.5", diff --git a/webpack.config.js b/webpack.config.js index 2ada49616..067f42317 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,6 +3,7 @@ const webpack = require('webpack') const merge = require('webpack-merge') const SimpleProgressWebpackPlugin = require('simple-progress-webpack-plugin') const TerserPlugin = require('terser-webpack-plugin') +const MiniCssExtractPlugin = require('mini-css-extract-plugin') // const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; @@ -33,6 +34,9 @@ const commonConfig = { }, // plugins: [new BundleAnalyzerPlugin()] plugins: [ + new MiniCssExtractPlugin({ + filename: '[name].css' + }), new SimpleProgressWebpackPlugin({ format: process.env.CI ? 'expanded' : 'minimal' }), @@ -47,6 +51,30 @@ const commonConfig = { ], module: { rules: [ + { + test: /\.css$/, + use: [ + { + loader: MiniCssExtractPlugin.loader, + options: { + hmr: process.env.NODE_ENV === 'development' + } + }, + 'css-loader' + ] + }, + { + test: /\.(png|jpe?g|gif|svg|eot|otf|ttf|woff|woff2)$/i, + loader: 'file-loader', + options: { + name: '[path][name].[ext]' + } + }, + { + // Ignore legacy fonts (both Firefox and Chromium talk WOFF2) + test: /\.(otf|eot|ttf|woff)(\?.*$|$)/, + use: ['raw-loader', 'ignore-loader'] + }, { exclude: /node_modules/, test: /\.js$/, diff --git a/yarn.lock b/yarn.lock index 75430b16a..72b4aedec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3871,6 +3871,25 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== +css-loader@3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.3.tgz#95ac16468e1adcd95c844729e0bb167639eb0bcf" + integrity sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw== + dependencies: + camelcase "^5.3.1" + cssesc "^3.0.0" + icss-utils "^4.1.1" + loader-utils "^1.2.3" + normalize-path "^3.0.0" + postcss "^7.0.27" + postcss-modules-extract-imports "^2.0.0" + postcss-modules-local-by-default "^3.0.2" + postcss-modules-scope "^2.2.0" + postcss-modules-values "^3.0.0" + postcss-value-parser "^4.0.3" + schema-utils "^2.6.6" + semver "^6.3.0" + css-select@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" @@ -3886,6 +3905,11 @@ css-what@2.1: resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -4573,6 +4597,11 @@ emojis-list@^2.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -5565,6 +5594,14 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" +file-loader@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.0.0.tgz#97bbfaab7a2460c07bcbd72d3a6922407f67649f" + integrity sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ== + dependencies: + loader-utils "^2.0.0" + schema-utils "^2.6.5" + file-type@12.4.0: version "12.4.0" resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.4.0.tgz#a9a399459e1940d9f34b3973039958f1f36a565e" @@ -6771,6 +6808,13 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: dependencies: safer-buffer ">= 2.1.2 < 3" +icss-utils@^4.0.0, icss-utils@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" + integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== + dependencies: + postcss "^7.0.14" + ieee754@^1.1.4, ieee754@^1.1.8: version "1.1.13" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" @@ -6781,6 +6825,11 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= +ignore-loader@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ignore-loader/-/ignore-loader-0.1.2.tgz#d81f240376d0ba4f0d778972c3ad25874117a463" + integrity sha1-2B8kA3bQuk8Nd4lyw60lh0EXpGM= + ignore-styles@5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ignore-styles/-/ignore-styles-5.0.1.tgz#b49ef2274bdafcd8a4880a966bfe38d1a0bf4671" @@ -6867,6 +6916,11 @@ indent-string@^3.0.0, indent-string@^3.2.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= +indexes-of@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" + integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= + indexof@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" @@ -9599,6 +9653,24 @@ loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.2.3: emojis-list "^2.0.0" json5 "^1.0.1" +loader-utils@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + dependencies: + big.js "^5.2.2" + 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@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -10185,6 +10257,16 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" +mini-css-extract-plugin@0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e" + integrity sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A== + dependencies: + loader-utils "^1.1.0" + normalize-url "1.9.1" + schema-utils "^1.0.0" + webpack-sources "^1.1.0" + minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -11072,6 +11154,16 @@ normalize-path@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== +normalize-url@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" + integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= + dependencies: + object-assign "^4.0.1" + prepend-http "^1.0.0" + query-string "^4.1.0" + sort-keys "^1.0.0" + normalize-url@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.3.0.tgz#9c49e10fc1876aeb76dba88bf1b2b5d9fa57b2ee" @@ -12121,6 +12213,53 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= +postcss-modules-extract-imports@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" + integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== + dependencies: + postcss "^7.0.5" + +postcss-modules-local-by-default@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915" + integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ== + dependencies: + icss-utils "^4.1.1" + postcss "^7.0.16" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.0.0" + +postcss-modules-scope@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" + integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== + dependencies: + postcss "^7.0.6" + postcss-selector-parser "^6.0.0" + +postcss-modules-values@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" + integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== + dependencies: + icss-utils "^4.0.0" + postcss "^7.0.6" + +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" + integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== + dependencies: + cssesc "^3.0.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" + integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== + postcss@7.0.27: version "7.0.27" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" @@ -12130,6 +12269,15 @@ postcss@7.0.27: source-map "^0.6.1" supports-color "^6.1.0" +postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.30" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2" + integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + postmsg-rpc@2.4.0, postmsg-rpc@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/postmsg-rpc/-/postmsg-rpc-2.4.0.tgz#4e2daf6851852364696debd5d6bf6936d1424cdf" @@ -12142,7 +12290,7 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prepend-http@^1.0.1: +prepend-http@^1.0.0, prepend-http@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= @@ -12594,6 +12742,14 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== +query-string@^4.1.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" + integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= + dependencies: + object-assign "^4.1.0" + strict-uri-encode "^1.0.0" + querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -13292,6 +13448,14 @@ schema-utils@^2.6.4: ajv "^6.12.0" ajv-keywords "^3.4.1" +schema-utils@^2.6.5, schema-utils@^2.6.6: + version "2.6.6" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c" + integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA== + dependencies: + ajv "^6.12.0" + ajv-keywords "^3.4.1" + scroll-to-anchor@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/scroll-to-anchor/-/scroll-to-anchor-1.1.0.tgz#c99b8d2e5d95056752787ca78095ab75b520b3fd" @@ -14064,6 +14228,11 @@ strftime@~0.10.0: resolved "https://registry.yarnpkg.com/strftime/-/strftime-0.10.0.tgz#b3f0fa419295202a5a289f6d6be9f4909a617193" integrity sha1-s/D6QZKVICpaKJ9ta+n0kJphcZM= +strict-uri-encode@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" + integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= + string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -14281,6 +14450,14 @@ strip-outer@^1.0.0: dependencies: escape-string-regexp "^1.0.2" +style-loader@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.2.1.tgz#c5cbbfbf1170d076cfdd86e0109c5bba114baa1a" + integrity sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg== + dependencies: + loader-utils "^2.0.0" + schema-utils "^2.6.6" + superagent@^3.1.0: version "3.8.3" resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128" @@ -15412,7 +15589,7 @@ webpack-merge@4.2.2: dependencies: lodash "^4.17.15" -webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: +webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==