From aad6eee12f28194c62d9d1d86fe38f61c8bd5b0d Mon Sep 17 00:00:00 2001 From: Johan Girod Date: Fri, 15 May 2020 16:16:13 +0200 Subject: [PATCH] Investigue la publication du paquet npm publicode --- .gitignore | 3 +- babel.config.json | 3 +- mon-entreprise/.babelrc.json | 3 +- mon-entreprise/.gitignore | 4 - mon-entreprise/package.json | 12 +- mon-entreprise/scripts/fetch-releases.js | 2 +- .../selectors/companyStatusSelectors.ts | 2 +- .../mon-entreprise.fr/layout/NewsBanner.tsx | 12 +- .../mon-entreprise.fr/pages/Coronavirus.tsx | 9 +- .../{import-yaml.ts => import-yaml.d.ts} | 0 mon-entreprise/tsconfig.json | 6 +- mon-entreprise/webpack.common.js | 87 +-- mon-entreprise/webpack.dev.js | 10 +- mon-entreprise/webpack.prod.js | 10 +- mon-entreprise/webpack.prod.legacyBrowser.js | 3 +- netlify.toml | 26 +- package.json | 17 +- publicodes/package.json | 17 +- publicodes/source/components/rule/Rule.tsx | 1 - .../rule/références/références.yaml | 2 +- publicodes/source/types/import-markdown.d.ts | 4 + publicodes/source/types/import-nearley.d.ts | 4 + .../{import-modules.ts => import-yaml.d.ts} | 10 +- publicodes/test/contrôles.test.js | 2 +- publicodes/{source => test}/format.test.js | 4 +- publicodes/test/inversion.test.js | 2 +- publicodes/test/mecanisms.test.js | 2 +- publicodes/test/missingVariables.test.js | 2 +- publicodes/tsconfig.json | 7 +- publicodes/webpack.config.js | 44 ++ publicodes/webpack.lib.js | 17 - publicodes/webpack.test.js | 21 + tsconfig.json | 3 +- webpack.test.js | 20 - webpack/common.js | 82 +++ yarn.lock | 630 ++++++++++-------- 36 files changed, 600 insertions(+), 483 deletions(-) rename mon-entreprise/source/types/{import-yaml.ts => import-yaml.d.ts} (100%) create mode 100644 publicodes/source/types/import-markdown.d.ts create mode 100644 publicodes/source/types/import-nearley.d.ts rename publicodes/source/types/{import-modules.ts => import-yaml.d.ts} (54%) rename publicodes/{source => test}/format.test.js (95%) create mode 100644 publicodes/webpack.config.js delete mode 100644 publicodes/webpack.lib.js create mode 100644 publicodes/webpack.test.js delete mode 100644 webpack.test.js create mode 100644 webpack/common.js diff --git a/.gitignore b/.gitignore index 16a75280b..95d5c9e19 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ yarn-error.log package-lock.json node_modules/ .env +dist/ # Local Netlify folder -.netlify \ No newline at end of file +.netlify diff --git a/babel.config.json b/babel.config.json index 7f64cf41b..0711618a6 100644 --- a/babel.config.json +++ b/babel.config.json @@ -17,7 +17,6 @@ "@babel/plugin-proposal-optional-chaining", "@babel/plugin-proposal-nullish-coalescing-operator", "@babel/plugin-proposal-object-rest-spread", - "@babel/plugin-syntax-dynamic-import", - ["ramda", { "useES": true }] + "@babel/plugin-syntax-dynamic-import" ] } diff --git a/mon-entreprise/.babelrc.json b/mon-entreprise/.babelrc.json index 752a387a9..b040ceca7 100644 --- a/mon-entreprise/.babelrc.json +++ b/mon-entreprise/.babelrc.json @@ -1,6 +1,7 @@ { "plugins": [ "react-hot-loader/babel", - ["webpack-alias", { "config": "./webpack.dev.js" }] + ["webpack-alias", { "config": "./webpack.dev.js" }], + ["ramda", { "useES": true }] ] } diff --git a/mon-entreprise/.gitignore b/mon-entreprise/.gitignore index a54fe0bdd..8140957c5 100644 --- a/mon-entreprise/.gitignore +++ b/mon-entreprise/.gitignore @@ -1,8 +1,4 @@ .env -node_modules/ -package-lock.json -yarn-error.log source/data -dist/ cypress/videos cypress/screenshots diff --git a/mon-entreprise/package.json b/mon-entreprise/package.json index 06a6326bf..389956c21 100644 --- a/mon-entreprise/package.json +++ b/mon-entreprise/package.json @@ -16,7 +16,12 @@ "not ie < 11" ], "devDependencies": { - "i18next-parser": "https://github.com/i18next/i18next-parser#master" + "copy-webpack-plugin": "^4.5.2", + "html-webpack-plugin": "^3.2.0", + "i18next-parser": "^1.0.6", + "monaco-editor-webpack-plugin": "^1.9.0", + "workbox-webpack-plugin": "^5.1.3", + "worker-loader": "^2.0.0" }, "dependencies": { "@babel/runtime": "^7.3.4", @@ -31,8 +36,7 @@ "js-yaml": "^3.13.1", "moo": "^0.5.0", "nearley": "^2.19.0", - "publicodes": "file:../publicodes", - "puppeteer": "^2.1.1", + "publicodes": "^1.0.0", "ramda": "^0.27.0", "react": "^16.13.1", "react-color": "^2.14.0", @@ -72,7 +76,7 @@ "compile:analyze-bundle": "ANALYZE_BUNDLE=1 yarn run compile", "compile:dev": "FR_SITE='http://localhost:5000${path}' EN_SITE='http://localhost:5001${path}' yarn run compile", "test": "yarn test:file \"./{,!(node_modules)/**/}!(webpack).test.js\"", - "test:file": "yarn mocha-webpack --webpack-config ../webpack.test.js --require source-map-support/register --include test/componentTestSetup.js --require mock-local-storage --require test/helpers/browser.js", + "test:file": "yarn mocha-webpack --webpack-config ./webpack.dev.js --include test/componentTestSetup.js --require mock-local-storage --require test/helpers/browser.js", "test:bundlesize": "bundlesize", "test:dev-e2e:publicode": "cypress open --browser chromium --config baseUrl=http://localhost:8080/publicodes,integrationFolder=cypress/integration/publi.codes", "test:dev-e2e:mon-entreprise": "cypress open --browser chromium", diff --git a/mon-entreprise/scripts/fetch-releases.js b/mon-entreprise/scripts/fetch-releases.js index a32f9c8e9..2c780b27c 100644 --- a/mon-entreprise/scripts/fetch-releases.js +++ b/mon-entreprise/scripts/fetch-releases.js @@ -55,7 +55,7 @@ async function main() { // we deduplicate the releases data in two separated files that can be // bundled/fetched separately. writeInDataDir('releases.json', releases) - writeInDataDir('last-release.json', { lastRelease: releases[0].name }) + writeInDataDir('last-release.json', { name: releases[0].name }) } async function fetchReleases() { diff --git a/mon-entreprise/source/selectors/companyStatusSelectors.ts b/mon-entreprise/source/selectors/companyStatusSelectors.ts index 75e41a07e..408ca3e0c 100644 --- a/mon-entreprise/source/selectors/companyStatusSelectors.ts +++ b/mon-entreprise/source/selectors/companyStatusSelectors.ts @@ -13,7 +13,7 @@ import { sortBy } from 'ramda' import { RootState } from 'Reducers/rootReducer' -import { LegalStatusRequirements, State } from 'Types/companyTypes' +import { LegalStatusRequirements, State } from '../types/companyTypes' const LEGAL_STATUS_DETAILS = { 'auto-entrepreneur': { diff --git a/mon-entreprise/source/sites/mon-entreprise.fr/layout/NewsBanner.tsx b/mon-entreprise/source/sites/mon-entreprise.fr/layout/NewsBanner.tsx index 8fef9e101..9e82bf4ec 100644 --- a/mon-entreprise/source/sites/mon-entreprise.fr/layout/NewsBanner.tsx +++ b/mon-entreprise/source/sites/mon-entreprise.fr/layout/NewsBanner.tsx @@ -4,11 +4,12 @@ import React, { useContext } from 'react' import emoji from 'react-easy-emoji' import { useTranslation } from 'react-i18next' import { Link } from 'react-router-dom' -import { lastRelease } from '../../../data/last-release.json' +import lastRelease from '../../../data/last-release.json' const localStorageKey = 'last-viewed-release' -export const hideNewsBanner = () => writeStorage(localStorageKey, lastRelease) +export const hideNewsBanner = () => + writeStorage(localStorageKey, lastRelease.name) export const determinant = (word: string) => /^[aeiouy]/i.exec(word) ? 'd’' : 'de ' @@ -25,13 +26,14 @@ export default function NewsBanner() { return null } - const showBanner = lastViewedRelease !== lastRelease && i18n.language === 'fr' + const showBanner = + lastViewedRelease !== lastRelease.name && i18n.language === 'fr' return showBanner ? (
- {emoji('✨')} Découvrez les nouveautés {determinant(lastRelease)} - {lastRelease.toLowerCase()} + {emoji('✨')} Découvrez les nouveautés {determinant(lastRelease.name)} + {lastRelease.name.toLowerCase()} × diff --git a/mon-entreprise/source/sites/mon-entreprise.fr/pages/Coronavirus.tsx b/mon-entreprise/source/sites/mon-entreprise.fr/pages/Coronavirus.tsx index c1246f93e..a815688c5 100644 --- a/mon-entreprise/source/sites/mon-entreprise.fr/pages/Coronavirus.tsx +++ b/mon-entreprise/source/sites/mon-entreprise.fr/pages/Coronavirus.tsx @@ -7,13 +7,10 @@ import { IsEmbeddedContext } from 'Components/utils/embeddedContext' import { useEvaluation } from 'Components/utils/EngineContext' import { Markdown } from 'Components/utils/markdown' import { ScrollToTop } from 'Components/utils/Scroll' -import { formatValue } from 'publicodes' -import { EvaluatedRule } from 'publicodes' +import { EvaluatedRule, formatValue } from 'publicodes' import React, { useContext, useEffect, useState } from 'react' import { Helmet } from 'react-helmet' import { Trans, useTranslation } from 'react-i18next' -import { useDispatch } from 'react-redux' -import { useLocation } from 'react-router-dom' import { DottedName } from 'Rules' import styled from 'styled-components' import { productionMode } from '../../../utils' @@ -412,8 +409,8 @@ administrative OU qui auront connu une perte de chiffre d'affaires d'au moins aide de **1 500 euros**. Pour bénéficier de cette aide forfaitaire il faudra faire une déclaration sur le site de la DGFiP. -➡ Plus d'informations sur le site du -[Ministère de l'Économie](https://www.economie.gouv.fr/coronavirus-soutien-entreprises) +➡ Plus d'informations sur le site du +[Ministère de l'Économie](https://www.economie.gouv.fr/coronavirus-soutien-entreprises) et de l'[Urssaf](https://www.urssaf.fr/portail/home/actualites/foire-aux-questions.html). ## Prime pour les salariés présents 👨‍🔬 diff --git a/mon-entreprise/source/types/import-yaml.ts b/mon-entreprise/source/types/import-yaml.d.ts similarity index 100% rename from mon-entreprise/source/types/import-yaml.ts rename to mon-entreprise/source/types/import-yaml.d.ts diff --git a/mon-entreprise/tsconfig.json b/mon-entreprise/tsconfig.json index a593bb367..1aa3bac10 100644 --- a/mon-entreprise/tsconfig.json +++ b/mon-entreprise/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../tsconfig.json", "compilerOptions": { "baseUrl": "source", - "typeRoots": ["source/types"], "paths": { "Actions/*": ["actions/*"], "Components": ["components"], @@ -13,7 +12,8 @@ "Rules": ["rules"], "Selectors/*": ["selectors/*"], "Types/*": ["types/*"] - } + }, + "noEmit": true }, - "include": ["source"] + "include": ["types", "source"] } diff --git a/mon-entreprise/webpack.common.js b/mon-entreprise/webpack.common.js index fbff143ae..dab1414db 100644 --- a/mon-entreprise/webpack.common.js +++ b/mon-entreprise/webpack.common.js @@ -26,19 +26,15 @@ module.exports.default = { publicodes: './source/sites/publi.codes/entry.tsx' }, output: { - path: path.resolve('./dist/'), globalObject: 'self' }, plugins: [ new MonacoWebpackPlugin(), - new EnvironmentPlugin({ EN_SITE: '/infrance${path}', FR_SITE: '/mon-entreprise${path}' }), - new EnvironmentPlugin({ HEAD: '', COMMIT_REF: '' }), - new CopyPlugin([ './manifest.webmanifest', { @@ -69,87 +65,6 @@ module.exports.default = { ] } -module.exports.styleLoader = styleLoader => ({ - test: /\.css$/, - use: [ - { loader: styleLoader }, - { - loader: 'css-loader', - options: { - sourceMap: true, - importLoaders: 1 - } - }, - { - loader: 'postcss-loader' - } - ] -}) - -module.exports.commonLoaders = ({ legacy = false } = {}) => { - const babelLoader = { - loader: 'babel-loader', - options: { - cacheDirectory: true, - rootMode: 'upward', - presets: [ - [ - '@babel/preset-env', - { - targets: !legacy - ? { - esmodules: true - } - : { - esmodules: false, - browsers: ['ie 11'] - }, - useBuiltIns: 'entry', - corejs: '3' - } - ] - ] - } - } - - return [ - { - test: /\.(js|ts|tsx)$/, - loader: babelLoader, - exclude: /node_modules(?!\/publicodes)|dist/ - }, - { - test: /\.(jpe?g|png|svg)$/, - use: { - loader: 'file-loader', - options: { - name: 'images/[name].[ext]' - } - } - }, - { - test: /\.yaml$/, - use: ['json-loader', 'yaml-loader'] - }, - { - test: /\.toml$/, - use: ['toml-loader'] - }, - { - test: /\.ne$/, - use: [babelLoader, 'nearley-loader'] - }, - { - test: /\.md$/, - use: ['raw-loader'] - }, - { - test: /\.ttf$/, - use: ['file-loader'] - } - ] -} - module.exports.HTMLPlugins = ({ injectTrackingScript = false } = {}) => [ new HTMLPlugin({ template: 'index.html', @@ -181,7 +96,7 @@ module.exports.HTMLPlugins = ({ injectTrackingScript = false } = {}) => [ new HTMLPlugin({ template: 'index.html', inject: false, - // mon-entreprise.fr : + // publicodes : chunks: ['publicodes'], title: 'publicodes - langage et plateforme de publication de calculs', description: diff --git a/mon-entreprise/webpack.dev.js b/mon-entreprise/webpack.dev.js index c29b4b85a..67e295c2e 100644 --- a/mon-entreprise/webpack.dev.js +++ b/mon-entreprise/webpack.dev.js @@ -1,11 +1,9 @@ +/* eslint-env node */ + const { map } = require('ramda') const webpack = require('webpack') -const { - commonLoaders, - styleLoader, - HTMLPlugins, - default: common -} = require('./webpack.common.js') +const { commonLoaders, styleLoader } = require('../webpack/common') +const { HTMLPlugins, default: common } = require('./webpack.common.js') module.exports = { ...common, diff --git a/mon-entreprise/webpack.prod.js b/mon-entreprise/webpack.prod.js index b8bf05afa..56df79a9e 100644 --- a/mon-entreprise/webpack.prod.js +++ b/mon-entreprise/webpack.prod.js @@ -1,9 +1,7 @@ -const { - commonLoaders, - styleLoader, - HTMLPlugins, - default: common -} = require('./webpack.common.js') +/* eslint-env node */ + +const { HTMLPlugins, default: common } = require('./webpack.common.js') +const { commonLoaders, styleLoader } = require('../webpack/common.js') const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer') diff --git a/mon-entreprise/webpack.prod.legacyBrowser.js b/mon-entreprise/webpack.prod.legacyBrowser.js index e29c351f8..1f8d4a60b 100644 --- a/mon-entreprise/webpack.prod.legacyBrowser.js +++ b/mon-entreprise/webpack.prod.legacyBrowser.js @@ -14,7 +14,8 @@ module.exports = { ...prod, entry: map(entry => ['whatwg-fetch', entry], prod.entry), output: { - filename: '[name].legacy.bundle.js' + filename: '[name].legacy.bundle.js', + ecmaVersion: 5 }, module: { rules: [...commonLoaders({ legacy: true }), styleLoader('style-loader')] diff --git a/netlify.toml b/netlify.toml index 52022d8b0..3713c656e 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,65 +1,65 @@ # Redirects following architectural changes on the end of October 2018 -[[redirects]] +[[redirects]] from="/s%C3%A9curit%C3%A9-sociale" to="/g%C3%A9rer" status = 301 -[[redirects]] +[[redirects]] from="/d%C3%A9marches-embauche" to="/g%C3%A9rer/embaucher" status = 301 -[[redirects]] +[[redirects]] from="/s%C3%A9curit%C3%A9-sociale/s%C3%A9lection-du-r%C3%A9gime" to="/simulateurs" status = 301 -[[redirects]] +[[redirects]] from="/s%C3%A9curit%C3%A9-sociale/*" to="/simulateurs/:splat" status = 301 -[[redirects]] +[[redirects]] from="/entreprise/cr%C3%A9er-une-*" to="/cr%C3%A9er/:splat" status = 301 -[[redirects]] +[[redirects]] from="/entreprise/devenir-*" to="/cr%C3%A9er/:splat" status = 301 -[[redirects]] +[[redirects]] from="/entreprise/*" to="/cr%C3%A9er/:splat" status = 301 -[[redirects]] +[[redirects]] from="/social-security" to="/manage" status = 301 -[[redirects]] +[[redirects]] from="/social-security/assimilated-salaried" to="/social-security/assimile-salarie" status = 301 -[[redirects]] +[[redirects]] from="/social-security/*" to="/simulators/:splat" status = 301 -[[redirects]] +[[redirects]] from="/company/create-a-*" to="/create/:splat" status = 301 -[[redirects]] +[[redirects]] from="/company/become-*" to="/create/:splat" status = 301 -[[redirects]] +[[redirects]] from="/company/*" to="/create/:splat" status = 301 diff --git a/package.json b/package.json index c0ec35dc0..1c7a48c61 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,6 @@ "@types/cheerio": "^0.22.18", "@types/classnames": "^2.2.9", "@types/color-convert": "^1.9.0", - "@types/copy-webpack-plugin": "^5.0.0", - "@types/html-webpack-plugin": "^3.2.2", "@types/iframe-resizer": "^3.5.7", "@types/js-yaml": "^3.12.2", "@types/mini-css-extract-plugin": "^0.9.1", @@ -42,7 +40,6 @@ "@types/webpack": "^4.41.10", "@types/webpack-bundle-analyzer": "^2.13.3", "@types/webpack-env": "^1.14.1", - "@types/workbox-webpack-plugin": "^5.1.0", "@typescript-eslint/eslint-plugin": "^2.31.0", "@typescript-eslint/parser": "^2.31.0", "autoprefixer": "^9.7.6", @@ -55,7 +52,6 @@ "bundlesize": "^0.18.0", "chai": "^4.1.2", "connect-history-api-fallback": "^1.5.0", - "copy-webpack-plugin": "^4.5.2", "css-loader": "^0.28.11", "csv-loader": "^2.1.1", "dedent-js": "^1.0.1", @@ -69,7 +65,6 @@ "express": "^4.16.3", "file-loader": "^1.1.11", "html-loader": "^0.5.5", - "html-webpack-plugin": "^3.2.0", "http-server": "^0.11.1", "intl": "^1.2.5", "intl-locales-supported": "^1.0.0", @@ -92,18 +87,15 @@ "serve": "^11.1.0", "sinon": "^4.5.0", "sinon-chai": "^3.0.0", - "source-map-support": "^0.5.4", "style-loader": "^0.23.1", "toml-loader": "^1.0.0", "typescript": "^3.9.2", "url-loader": "^1.0.1", - "webpack": "^4.39.3", + "webpack": "^4.42.0", "webpack-bundle-analyzer": "^3.7.0", "webpack-cli": "^3.1.2", "webpack-dev-middleware": "^3.4.0", "webpack-hot-middleware": "^2.24.2", - "workbox-webpack-plugin": "^3.6.1", - "worker-loader": "^2.0.0", "yaml-jest": "^1.0.5", "yaml-loader": "^0.5.0" }, @@ -113,17 +105,18 @@ }, "scripts": { "lint:eslintrc": "eslint --print-config .eslintrc.js | eslint-config-prettier-check", - "lint:eslint": "eslint . --ext .js,.jsx,.ts,.tsx", + "lint:eslint": "export NODE_OPTIONS='--max-old-space-size=4096'; eslint . --ext .js,.jsx,.ts,.tsx", "lint:eslint:fix": "yarn lint:eslint --fix", "lint:prettier": "yarn workspaces run prettier --check \"{source,test,cypress}/**/*.{js,jsx,ts,tsx}\"", "lint:prettier:fix": "yarn lint:prettier --write", "lint:fix": "yarn lint:eslint:fix && yarn lint:prettier:fix", "lint": "yarn lint:eslintrc && yarn lint:eslint && yarn lint:prettier", "test": "yarn workspaces run test", - "prepare": "yarn workspace mon-entreprise run prepare", + "prepare": "yarn link:publicodes && yarn workspaces run prepare", "test:type": "yarn workspaces run tsc", "test:regressions": "jest", - "link:publicodes": "yarn workspace publicodes link && yarn workspace mon-entreprise link publicodes" + "link:publicodes": "yarn workspace publicodes link && yarn workspace mon-entreprise link publicodes", + "start": "yarn workspace publicodes compile --watch & yarn workspace mon-entreprise start" }, "workspaces": [ "mon-entreprise", diff --git a/publicodes/package.json b/publicodes/package.json index b29e06fc0..26a7882df 100644 --- a/publicodes/package.json +++ b/publicodes/package.json @@ -2,13 +2,21 @@ "name": "publicodes", "version": "1.0.0", "description": "A declarative language for encoding public algorithm", - "main": "source/index.ts", + "main": "dist/index.js", + "types": "dist/types/index.d.ts", "repository": { "type": "git", "url": "https://github.com/betagouv/mon-entreprise.git", "directory": "publicodes" }, + "bugs": "https://github.com/betagouv/mon-entreprise/issues?q=is%3Aopen+is%3Aissue+label%3A\"%3Agear%3A+moteur\"", + "homepage": "https://publi.codes/", "license": "MIT", + "files": [ + "dist/index.js", + "dist/types", + "dist/images" + ], "private": false, "dependencies": { "classnames": "^2.2.6", @@ -26,7 +34,12 @@ "react-router-hash-link": "^1.2.2" }, "scripts": { - "test:file": "yarn mocha-webpack --webpack-config ../webpack.test.js --include test/setupIntl.js --require source-map-support/register ", + "prepare": "tsc && yarn run compile", + "compile": "yarn run webpack --config webpack.config.js", + "test:file": "yarn mocha-webpack --webpack-config ./webpack.test.js --include test/setupIntl.js", "test": "yarn test:file \"./{,!(node_modules)/**/}!(webpack).test.js\"" + }, + "engines": { + "node": ">=12.16.1" } } diff --git a/publicodes/source/components/rule/Rule.tsx b/publicodes/source/components/rule/Rule.tsx index 83a08bd91..a0bc8b406 100644 --- a/publicodes/source/components/rule/Rule.tsx +++ b/publicodes/source/components/rule/Rule.tsx @@ -2,7 +2,6 @@ import React, { useState } from 'react' import { Trans } from 'react-i18next' import Engine from '../..' import { formatValue } from '../../format' -import mecanisms from '../../mecanisms.yaml' import { serializeUnit } from '../../units' import { Markdown } from '../Markdown' import { RuleLinkWithContext } from '../RuleLink' diff --git a/publicodes/source/components/rule/références/références.yaml b/publicodes/source/components/rule/références/références.yaml index 73396979a..e52c3075a 100644 --- a/publicodes/source/components/rule/références/références.yaml +++ b/publicodes/source/components/rule/références/références.yaml @@ -17,7 +17,7 @@ senat.fr: image: senat.png ameli.fr: image: ameli.png -bpifrance-creation: +bpifrance-creation: image: bpi-création.png wikipedia.org: image: wikipedia.png diff --git a/publicodes/source/types/import-markdown.d.ts b/publicodes/source/types/import-markdown.d.ts new file mode 100644 index 000000000..a20f1eb04 --- /dev/null +++ b/publicodes/source/types/import-markdown.d.ts @@ -0,0 +1,4 @@ +declare module '*.md' { + const content: string + export default content +} diff --git a/publicodes/source/types/import-nearley.d.ts b/publicodes/source/types/import-nearley.d.ts new file mode 100644 index 000000000..0bdaa74fa --- /dev/null +++ b/publicodes/source/types/import-nearley.d.ts @@ -0,0 +1,4 @@ +declare module '*.ne' { + const content: any + export default content +} diff --git a/publicodes/source/types/import-modules.ts b/publicodes/source/types/import-yaml.d.ts similarity index 54% rename from publicodes/source/types/import-modules.ts rename to publicodes/source/types/import-yaml.d.ts index 8d4a991f5..127e8da46 100644 --- a/publicodes/source/types/import-modules.ts +++ b/publicodes/source/types/import-yaml.d.ts @@ -1,13 +1,5 @@ -declare module '*.md' { - const content: string - export default content -} -declare module '*.ne' { - const content: any - export default content -} - // TODO: We could have better types for yaml imports (it works automatically for JSON modules) + declare module '*.yaml' { const content: any export default content diff --git a/publicodes/test/contrôles.test.js b/publicodes/test/contrôles.test.js index c65ac7b53..008ffd0e6 100644 --- a/publicodes/test/contrôles.test.js +++ b/publicodes/test/contrôles.test.js @@ -1,5 +1,5 @@ import { expect } from 'chai' -import Engine, { parseRules } from 'publicodes' +import Engine, { parseRules } from '../source/index' describe('controls', function() { let rawRules = { diff --git a/publicodes/source/format.test.js b/publicodes/test/format.test.js similarity index 95% rename from publicodes/source/format.test.js rename to publicodes/test/format.test.js index d5f48b074..58dd1209a 100644 --- a/publicodes/source/format.test.js +++ b/publicodes/test/format.test.js @@ -1,6 +1,6 @@ import { expect } from 'chai' -import { parseUnit } from './units' -import { formatValue } from './format' +import { parseUnit } from '../source/units' +import { formatValue } from '../source/format' describe('format engine values', () => { it('format currencies', () => { diff --git a/publicodes/test/inversion.test.js b/publicodes/test/inversion.test.js index d46ef1e3f..00767e05f 100644 --- a/publicodes/test/inversion.test.js +++ b/publicodes/test/inversion.test.js @@ -1,6 +1,6 @@ import { expect } from 'chai' import dedent from 'dedent-js' -import Engine from 'publicodes' +import Engine from '../source/index' describe('inversions', () => { it('should handle non inverted example', () => { diff --git a/publicodes/test/mecanisms.test.js b/publicodes/test/mecanisms.test.js index 7dab3b205..bb897e30e 100644 --- a/publicodes/test/mecanisms.test.js +++ b/publicodes/test/mecanisms.test.js @@ -6,7 +6,7 @@ */ import { expect } from 'chai' -import Engine from 'publicodes' +import Engine from '../source/index' import { parseUnit } from '../source/units' import { coerceArray } from '../source/utils' import testSuites from './load-mecanism-tests' diff --git a/publicodes/test/missingVariables.test.js b/publicodes/test/missingVariables.test.js index b993cfeb5..b80f87382 100644 --- a/publicodes/test/missingVariables.test.js +++ b/publicodes/test/missingVariables.test.js @@ -1,5 +1,5 @@ import { expect } from 'chai' -import Engine from 'publicodes' +import Engine from '../source/index' describe('Missing variables', function() { it('should identify missing variables', function() { diff --git a/publicodes/tsconfig.json b/publicodes/tsconfig.json index ed8f712e7..2d0178676 100644 --- a/publicodes/tsconfig.json +++ b/publicodes/tsconfig.json @@ -1,8 +1,9 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "baseUrl": "source", - "typeRoots": ["source/types"] + "outDir": "./dist/types", + "declaration": true, + "emitDeclarationOnly": true }, - "include": ["source"] + "include": ["source/index.ts", "source/types"] } diff --git a/publicodes/webpack.config.js b/publicodes/webpack.config.js new file mode 100644 index 000000000..c33d36738 --- /dev/null +++ b/publicodes/webpack.config.js @@ -0,0 +1,44 @@ +/* eslint-env node */ + +const path = require('path') +const { commonLoaders, styleLoader } = require('../webpack/common') + +const common = { + resolve: { + extensions: ['.ts', '.tsx', '.js'] + }, + mode: 'development', + entry: path.resolve(__dirname, 'source', 'index.ts'), + module: { + rules: [...commonLoaders(), styleLoader('isomorphic-style-loader')] + }, + externals: + // Every non-relative module is external + /^[a-z\-0-9]+$/ +} + +module.exports = [ + // Config for UMD export (browser / node) + { + ...common, + output: { + filename: 'index.js', + library: 'publicodes', + libraryTarget: 'umd', + globalObject: 'this' + } + } +] + +// Config for esmodule export, not used here, since it conflict with css import. +// Maybe we should use styled-component everywhere, to simplify things + +// const futurBuild = { +// ...common, +// output: { +// path: path.resolve(__dirname, 'dist', 'es') +// }, +// experiments: { +// outputModule: true +// } +// } diff --git a/publicodes/webpack.lib.js b/publicodes/webpack.lib.js deleted file mode 100644 index 46a3f9647..000000000 --- a/publicodes/webpack.lib.js +++ /dev/null @@ -1,17 +0,0 @@ -const path = require('path') -const { commonLoaders, styleLoader } = require('./webpack.common') - -module.exports = { - entry: './source/engine/index.js', - mode: 'development', - devtool: 'source-map', - output: { - path: path.resolve('./dist/'), - filename: 'index.js', - library: 'Syso', - libraryTarget: 'umd', - }, - module: { - rules: [...commonLoaders(), styleLoader('isomorphic-style-loader')], - }, -} diff --git a/publicodes/webpack.test.js b/publicodes/webpack.test.js new file mode 100644 index 000000000..b9862e815 --- /dev/null +++ b/publicodes/webpack.test.js @@ -0,0 +1,21 @@ +const { commonLoaders } = require('../webpack/common') + +module.exports = { + resolve: { + extensions: ['.ts', '.tsx', '.js'] + }, + output: { + devtoolFallbackModuleFilenameTemplate: '[absolute-resource-path]?[hash]', + devtoolModuleFilenameTemplate: '[absolute-resource-path]' + }, + mode: 'development', + module: { + rules: [ + ...commonLoaders(), + { + test: /\.css$/, + use: ['css-loader', 'postcss-loader'] + } + ] + } +} diff --git a/tsconfig.json b/tsconfig.json index 7b58e7456..dc29470d4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,13 +2,12 @@ "compilerOptions": { "moduleResolution": "node", "module": "esnext", - "target": "es2019", + "target": "esnext", "jsx": "react", "allowSyntheticDefaultImports": true, "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, "allowJs": true, - "noEmit": true, // The end goal is to enable `"strict": true` which correspond to the // following settings: noImplicitAny, noImplicitThis, alwaysStrict, // strictBindCallApply, strictNullChecks, strictFunctionTypes, and diff --git a/webpack.test.js b/webpack.test.js deleted file mode 100644 index b951c4790..000000000 --- a/webpack.test.js +++ /dev/null @@ -1,20 +0,0 @@ -const webpack = require('webpack') -const { - default: common, - commonLoaders -} = require('./mon-entreprise/webpack.common') - -module.exports = { - ...common, - module: { - rules: [ - ...commonLoaders(), - { - test: /\.css$/, - use: ['css-loader', 'postcss-loader'] - } - ] - }, - mode: 'development', - plugins: [new webpack.EnvironmentPlugin({ NODE_ENV: 'development' })] -} diff --git a/webpack/common.js b/webpack/common.js new file mode 100644 index 000000000..d0d080765 --- /dev/null +++ b/webpack/common.js @@ -0,0 +1,82 @@ +/* eslint-env node */ + +module.exports.styleLoader = styleLoader => ({ + test: /\.css$/, + use: [ + { loader: styleLoader }, + { + loader: 'css-loader', + options: { + sourceMap: true, + importLoaders: 1 + } + }, + { + loader: 'postcss-loader' + } + ] +}) + +module.exports.commonLoaders = ({ legacy = false } = {}) => { + const babelLoader = { + loader: 'babel-loader', + options: { + cacheDirectory: true, + rootMode: 'upward', + presets: [ + [ + '@babel/preset-env', + { + targets: !legacy + ? { + esmodules: true + } + : { + esmodules: false, + browsers: ['ie 11'] + }, + useBuiltIns: 'entry', + corejs: '3' + } + ] + ] + } + } + + return [ + { + test: /\.(js|ts|tsx)$/, + use: babelLoader, + exclude: /node_modules|dist/ + }, + { + test: /\.(jpe?g|png|svg)$/, + use: { + loader: 'file-loader', + options: { + name: 'images/[name].[ext]' + } + } + }, + { + test: /\.yaml$/, + use: ['json-loader', 'yaml-loader'] + }, + { + test: /\.toml$/, + use: ['toml-loader'] + }, + { + test: /\.ne$/, + use: [babelLoader, 'nearley-loader'] + }, + { + test: /\.md$/, + use: ['raw-loader'] + }, + { + test: /\.ttf$/, + use: ['file-loader'] + } + ] +} diff --git a/yarn.lock b/yarn.lock index 88aab3599..4ef247704 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== @@ -18,7 +18,7 @@ invariant "^2.2.4" semver "^5.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.9.0": +"@babel/core@^7.1.0", "@babel/core@^7.8.4", "@babel/core@^7.9.0": version "7.9.6" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376" integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg== @@ -728,7 +728,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/preset-env@^7.9.5": +"@babel/preset-env@^7.8.4", "@babel/preset-env@^7.9.5": version "7.9.6" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6" integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ== @@ -983,6 +983,38 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== +"@hapi/address@2.x.x": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" + integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ== + +"@hapi/bourne@1.x.x": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a" + integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA== + +"@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0": + version "8.5.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06" + integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow== + +"@hapi/joi@^15.1.0": + version "15.1.1" + resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7" + integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ== + dependencies: + "@hapi/address" "2.x.x" + "@hapi/bourne" "1.x.x" + "@hapi/hoek" "8.x.x" + "@hapi/topo" "3.x.x" + +"@hapi/topo@3.x.x": + version "3.1.6" + resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz#68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29" + integrity sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ== + dependencies: + "@hapi/hoek" "^8.3.0" + "@icons/material@^0.2.4": version "0.2.4" resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8" @@ -1158,6 +1190,34 @@ resolved "https://registry.yarnpkg.com/@rehooks/local-storage/-/local-storage-2.4.0.tgz#fb884b2b657cad5f77aa6ab60bb3532f0e0725d2" integrity sha512-LoXDbEHsuIckVgBsFAv8SuU/M7memjyfWut9Zf36TQXqqCHBRFv8bweg9PymQCa1aWIMjNrZQflFdo55FDlXYg== +"@rollup/plugin-node-resolve@^7.1.1": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz#80de384edfbd7bfc9101164910f86078151a3eca" + integrity sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q== + dependencies: + "@rollup/pluginutils" "^3.0.8" + "@types/resolve" "0.0.8" + builtin-modules "^3.1.0" + is-module "^1.0.0" + resolve "^1.14.2" + +"@rollup/plugin-replace@^2.3.1": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.3.2.tgz#da4e0939047f793c2eb5eedfd6c271232d0a033f" + integrity sha512-KEEL7V2tMNOsbAoNMKg91l1sNXBDoiP31GFlqXVOuV5691VQKzKBh91+OKKOG4uQWYqcFskcjFyh1d5YnZd0Zw== + dependencies: + "@rollup/pluginutils" "^3.0.8" + magic-string "^0.25.5" + +"@rollup/pluginutils@^3.0.8": + version "3.0.10" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.0.10.tgz#a659b9025920378494cd8f8c59fbf9b3a50d5f12" + integrity sha512-d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw== + dependencies: + "@types/estree" "0.0.39" + estree-walker "^1.0.1" + picomatch "^2.2.2" + "@sentry/browser@5.15.5": version "5.15.5" resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.15.5.tgz#d9a51f1388581067b50d30ed9b1aed2cbb333a36" @@ -1246,6 +1306,14 @@ resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5" integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ== +"@surma/rollup-plugin-off-main-thread@^1.1.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.1.tgz#bf1343e5a926e5a1da55e3affd761dda4ce143ef" + integrity sha512-ZPBWYQDdO4JZiTmTP3DABsHhIPA7bEJk9Znk7tZsrbPGanoGo8YxMv//WLx5Cvb+lRgS42+6yiOIYYHCKDmkpQ== + dependencies: + ejs "^2.6.1" + magic-string "^0.25.0" + "@types/anymatch@*": version "1.3.1" resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" @@ -1296,13 +1364,6 @@ resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.10.tgz#cc658ca319b6355399efc1f5b9e818f1a24bf999" integrity sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ== -"@types/clean-css@*": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-4.2.1.tgz#cb0134241ec5e6ede1b5344bc829668fd9871a8d" - integrity sha512-A1HQhQ0hkvqqByJMgg+Wiv9p9XdoYEzuwm11SVo1mX2/4PSdhjcrUlilJQoqLscIheC51t1D5g+EFWCXZ2VTQQ== - dependencies: - "@types/node" "*" - "@types/color-convert@^1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-1.9.0.tgz#bfa8203e41e7c65471e9841d7e306a7cd8b5172d" @@ -1315,15 +1376,6 @@ resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== -"@types/copy-webpack-plugin@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-5.0.0.tgz#db7f9c9763b10b2af5c83f598fa9b5a13733b20b" - integrity sha512-yQHocgdgES7W5Q2UyxJ5cj/E6MrV1zq3MZ8jdApS9NJKqax+rux9IE3QAbBmNCGbgivEsejrkIq3Rm76JLubkg== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - "@types/webpack" "*" - "@types/d3-path@*": version "1.0.8" resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-1.0.8.tgz#48e6945a8ff43ee0a1ce85c8cfa2337de85c7c79" @@ -1341,6 +1393,16 @@ resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag== +"@types/estree@*": + version "0.0.44" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.44.tgz#980cc5a29a3ef3bea6ff1f7d021047d7ea575e21" + integrity sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g== + +"@types/estree@0.0.39": + version "0.0.39" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" + integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== + "@types/history@*": version "4.7.5" resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz#527d20ef68571a4af02ed74350164e7a67544860" @@ -1354,24 +1416,6 @@ "@types/react" "*" hoist-non-react-statics "^3.3.0" -"@types/html-minifier@*": - version "3.5.3" - resolved "https://registry.yarnpkg.com/@types/html-minifier/-/html-minifier-3.5.3.tgz#5276845138db2cebc54c789e0aaf87621a21e84f" - integrity sha512-j1P/4PcWVVCPEy5lofcHnQ6BtXz9tHGiFPWzqm7TtGuWZEfCHEP446HlkSNc9fQgNJaJZ6ewPtp2aaFla/Uerg== - dependencies: - "@types/clean-css" "*" - "@types/relateurl" "*" - "@types/uglify-js" "*" - -"@types/html-webpack-plugin@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@types/html-webpack-plugin/-/html-webpack-plugin-3.2.2.tgz#f552121f3c0a3972dda9a425de1e0029069b2907" - integrity sha512-KsL5cHtNWhOQF9Cu+Dpn7GemzQRxdKhe1/LgZUSku33B5L4Cx2/p3DX6YbeRNOoI552MNbB/VNbCDNEYU//iAw== - dependencies: - "@types/html-minifier" "*" - "@types/tapable" "*" - "@types/webpack" "*" - "@types/iframe-resizer@^3.5.7": version "3.5.8" resolved "https://registry.yarnpkg.com/@types/iframe-resizer/-/iframe-resizer-3.5.8.tgz#d141f3cbebca951788e3b9a7654d46317bb9345b" @@ -1407,11 +1451,6 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== -"@types/mime-types@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73" - integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= - "@types/mini-css-extract-plugin@^0.9.1": version "0.9.1" resolved "https://registry.yarnpkg.com/@types/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.1.tgz#d4bdde5197326fca039d418f4bdda03dc74dc451" @@ -1419,11 +1458,6 @@ dependencies: "@types/webpack" "*" -"@types/minimatch@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== - "@types/nearley@^2.11.1": version "2.11.1" resolved "https://registry.yarnpkg.com/@types/nearley/-/nearley-2.11.1.tgz#6ac3f57c00ca28071a1774ec72d2e45750f21420" @@ -1551,10 +1585,12 @@ "@types/react" "*" "@types/recharts-scale" "*" -"@types/relateurl@*": - version "0.2.28" - resolved "https://registry.yarnpkg.com/@types/relateurl/-/relateurl-0.2.28.tgz#6bda7db8653fa62643f5ee69e9f69c11a392e3a6" - integrity sha1-a9p9uGU/piZD9e5p6facEaOS46Y= +"@types/resolve@0.0.8": + version "0.0.8" + resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194" + integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ== + dependencies: + "@types/node" "*" "@types/sizzle@2.3.2": version "2.3.2" @@ -1626,11 +1662,6 @@ "@types/webpack-sources" "*" source-map "^0.6.0" -"@types/workbox-webpack-plugin@^5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@types/workbox-webpack-plugin/-/workbox-webpack-plugin-5.1.0.tgz#14312df4eeb4e2195b886c3fa5632d76bf3831c8" - integrity sha512-dv3M467adBHEJtRDiT1Wz/qgtalFb+eDik4IeBY5Rjv9iJ+vJZGK7cO7riOwaYgpMlIWnmRhwWs6/SUOzn3AaA== - "@types/yargs-parser@*": version "15.0.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" @@ -1892,16 +1923,16 @@ acorn@^6.0.1, acorn@^6.0.2, acorn@^6.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== +acorn@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe" + integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ== + acorn@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== -agent-base@5: - version "5.1.1" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" - integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== - agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" @@ -2785,6 +2816,11 @@ buffer@^5.5.0: base64-js "^1.0.2" ieee754 "^1.1.4" +builtin-modules@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484" + integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw== + builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" @@ -3379,7 +3415,7 @@ commander@~2.9.0: dependencies: graceful-readlink ">= 1.0.0" -common-tags@1.8.0, common-tags@^1.4.0: +common-tags@1.8.0, common-tags@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937" integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw== @@ -3641,6 +3677,11 @@ crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" +crypto-random-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" + integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= + css-color-keywords@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" @@ -3934,7 +3975,7 @@ debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1: dependencies: ms "^2.1.1" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: +debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== @@ -4652,6 +4693,16 @@ estraverse@^5.1.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642" integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw== +estree-walker@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362" + integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w== + +estree-walker@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" + integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -4915,7 +4966,7 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== -fast-json-stable-stringify@^2.0.0: +fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== @@ -5198,15 +5249,6 @@ fs-extra@5.0.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" @@ -5216,6 +5258,15 @@ fs-extra@^6.0.1: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-mkdirp-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb" @@ -5500,7 +5551,7 @@ good-listener@^1.2.2: dependencies: delegate "^3.1.2" -graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6: +graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== @@ -5704,11 +5755,6 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoek@4.x.x: - version "4.2.1" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" - integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA== - hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" @@ -5915,17 +5961,10 @@ https-proxy-agent@^2.2.1: agent-base "^4.3.0" debug "^3.1.0" -https-proxy-agent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" - integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg== - dependencies: - agent-base "5" - debug "4" - -"i18next-parser@https://github.com/i18next/i18next-parser#master": +i18next-parser@^1.0.6: version "1.0.6" - resolved "https://github.com/i18next/i18next-parser#b12e9c479298f8ec435686ea61ccff7fb734624a" + resolved "https://registry.yarnpkg.com/i18next-parser/-/i18next-parser-1.0.6.tgz#520575d6560b716b83fbbd32a2b6df500c97f134" + integrity sha512-fI8e3I574kru+QRK33DeTHC912AxjzYP4mh/ufnsvWQ0B1FbWZPUKqikCnsxePCL9ssMDqS7N70W0Fgxqj48Fg== dependencies: broccoli-plugin "^1.3.0" cheerio "^1.0.0-rc.2" @@ -6363,6 +6402,11 @@ is-installed-globally@0.1.0: global-dirs "^0.1.0" is-path-inside "^1.0.0" +is-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= + is-negated-glob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" @@ -6509,13 +6553,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isemail@3.x.x: - version "3.2.0" - resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c" - integrity sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg== - dependencies: - punycode "2.x.x" - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -6959,15 +6996,6 @@ jest@^24.9.0: import-local "^2.0.0" jest-cli "^24.9.0" -joi@^11.1.1: - version "11.4.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-11.4.0.tgz#f674897537b625e9ac3d0b7e1604c828ad913ccb" - integrity sha512-O7Uw+w/zEWgbL6OcHbyACKSj0PkQeUgmehdoXVSxt92QFCq4+1390Rwh5moI2K/OgC7D8RHRZqHZxT2husMJHA== - dependencies: - hoek "4.x.x" - isemail "3.x.x" - topo "2.x.x" - js-base64@^2.1.9: version "2.5.2" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209" @@ -7102,13 +7130,6 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -7140,11 +7161,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -7433,7 +7449,7 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= -lodash.template@^4.3.0, lodash.template@^4.4.0: +lodash.template@^4.3.0, lodash.template@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== @@ -7532,6 +7548,13 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" +magic-string@^0.25.0, magic-string@^0.25.5: + version "0.25.7" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" + integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA== + dependencies: + sourcemap-codec "^1.4.4" + make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -7693,7 +7716,7 @@ mime-types@2.1.18: dependencies: mime-db "~1.33.0" -mime-types@^2.1.12, mime-types@^2.1.25, mime-types@~2.1.19, mime-types@~2.1.24: +mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.27" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== @@ -8660,6 +8683,11 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +picomatch@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + pify@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -9078,10 +9106,10 @@ prettier@^1.19.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== -pretty-bytes@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9" - integrity sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk= +pretty-bytes@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2" + integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg== pretty-error@^2.0.2: version "2.1.1" @@ -9232,18 +9260,6 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" -"publicodes@file:publicodes": - version "1.0.0" - dependencies: - classnames "^2.2.6" - moo "^0.5.1" - nearley "^2.19.2" - ramda "^0.27.0" - react-easy-emoji "^1.4.0" - react-i18next "^11.4.0" - react-markdown "^4.3.1" - yaml "^1.9.2" - pump@^2.0.0, pump@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" @@ -9274,16 +9290,16 @@ punycode@1.3.2: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= -punycode@2.x.x, punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + puppeteer@^1.7.0: version "1.20.0" resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.20.0.tgz#e3d267786f74e1d87cf2d15acc59177f471bbe38" @@ -9298,22 +9314,6 @@ puppeteer@^1.7.0: rimraf "^2.6.1" ws "^6.1.0" -puppeteer@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.1.1.tgz#ccde47c2a688f131883b50f2d697bd25189da27e" - integrity sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg== - dependencies: - "@types/mime-types" "^2.1.0" - debug "^4.1.0" - extract-zip "^1.6.6" - https-proxy-agent "^4.0.0" - mime "^2.0.3" - mime-types "^2.1.25" - progress "^2.0.1" - proxy-from-env "^1.0.0" - rimraf "^2.6.1" - ws "^6.1.0" - q@^1.1.2: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -10181,7 +10181,7 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.15.1, resolve@^1.3.2: +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.3.2: version "1.17.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== @@ -10231,6 +10231,41 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" +rollup-plugin-babel@^4.3.3: + version "4.4.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz#d15bd259466a9d1accbdb2fe2fff17c52d030acb" + integrity sha512-Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + rollup-pluginutils "^2.8.1" + +rollup-plugin-terser@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.3.0.tgz#9c0dd33d5771df9630cd027d6a2559187f65885e" + integrity sha512-XGMJihTIO3eIBsVGq7jiNYOdDMb3pVxuzY0uhOE/FM4x/u9nQgr3+McsjzqBn3QfHIpNSZmFnpoKAwHBEcsT7g== + dependencies: + "@babel/code-frame" "^7.5.5" + jest-worker "^24.9.0" + rollup-pluginutils "^2.8.2" + serialize-javascript "^2.1.2" + terser "^4.6.2" + +rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2: + version "2.8.2" + resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" + integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ== + dependencies: + estree-walker "^0.6.1" + +rollup@^1.31.1: + version "1.32.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.32.1.tgz#4480e52d9d9e2ae4b46ba0d9ddeaf3163940f9c4" + integrity sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A== + dependencies: + "@types/estree" "*" + "@types/node" "*" + acorn "^7.1.0" + rst-selector-parser@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" @@ -10280,11 +10315,16 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== +safe-buffer@^5.1.1, safe-buffer@^5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -10632,7 +10672,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.0, source-map-support@^0.5.4, source-map-support@^0.5.6, source-map-support@~0.5.12: +source-map-support@^0.5.0, source-map-support@^0.5.6, source-map-support@~0.5.12: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== @@ -10660,6 +10700,11 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== +sourcemap-codec@^1.4.4: + version "1.4.8" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== + space-separated-tokens@^1.0.0: version "1.1.5" resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" @@ -10928,7 +10973,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -stringify-object@^3.2.2: +stringify-object@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== @@ -11145,6 +11190,20 @@ tar-stream@^2.0.0: inherits "^2.0.3" readable-stream "^3.1.1" +temp-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" + integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= + +tempy@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.3.0.tgz#6f6c5b295695a16130996ad5ab01a8bd726e8bf8" + integrity sha512-WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ== + dependencies: + temp-dir "^1.0.0" + type-fest "^0.3.1" + unique-string "^1.0.0" + term-size@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" @@ -11167,7 +11226,7 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@^4.1.2: +terser@^4.1.2, terser@^4.6.2: version "4.6.13" resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz#e879a7364a5e0db52ba4891ecde007422c56a916" integrity sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw== @@ -11340,13 +11399,6 @@ toml@^2.2.2: resolved "https://registry.yarnpkg.com/toml/-/toml-2.3.6.tgz#25b0866483a9722474895559088b436fd11f861b" integrity sha512-gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ== -topo@2.x.x: - version "2.0.2" - resolved "https://registry.yarnpkg.com/topo/-/topo-2.0.2.tgz#cd5615752539057c0dc0491a621c3bc6fbe1d182" - integrity sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI= - dependencies: - hoek "4.x.x" - toposort@^1.0.0: version "1.0.7" resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" @@ -11446,6 +11498,11 @@ type-fest@^0.11.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== +type-fest@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" + integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ== + type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" @@ -11587,6 +11644,13 @@ unique-stream@^2.0.2: json-stable-stringify-without-jsonify "^1.0.1" through2-filter "^3.0.0" +unique-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" + integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo= + dependencies: + crypto-random-string "^1.0.0" + unist-util-is@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd" @@ -11646,7 +11710,7 @@ untildify@3.0.3: resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9" integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA== -upath@^1.1.1: +upath@^1.1.1, upath@^1.1.2, upath@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== @@ -12001,7 +12065,7 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: +webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -12009,7 +12073,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.39.3: +webpack@^4.42.0: version "4.43.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6" integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g== @@ -12119,132 +12183,158 @@ wordwrap@~0.0.2: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= -workbox-background-sync@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-3.6.3.tgz#6609a0fac9eda336a7c52e6aa227ba2ae532ad94" - integrity sha512-ypLo0B6dces4gSpaslmDg5wuoUWrHHVJfFWwl1udvSylLdXvnrfhFfriCS42SNEe5lsZtcNZF27W/SMzBlva7Q== +workbox-background-sync@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-5.1.3.tgz#121c5cf439b627f6320ff490be65fd2bd440c6ea" + integrity sha512-V/R95aPxYjbKCaVzUTihrZ9ObGOnzoA5n60r0DQ747p8Pj15/dDTYixonKhhlvavTiNezUrp+wTQBvZvcd/ETA== dependencies: - workbox-core "^3.6.3" + workbox-core "^5.1.3" -workbox-broadcast-cache-update@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-broadcast-cache-update/-/workbox-broadcast-cache-update-3.6.3.tgz#3f5dff22ada8c93e397fb38c1dc100606a7b92da" - integrity sha512-pJl4lbClQcvp0SyTiEw0zLSsVYE1RDlCPtpKnpMjxFtu8lCFTAEuVyzxp9w7GF4/b3P4h5nyQ+q7V9mIR7YzGg== +workbox-broadcast-update@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-5.1.3.tgz#312e0f065f06a6fb04a050143c84aa6ba0ed8add" + integrity sha512-HJ7FDmgweRcYp8fMiFbkmhaTjMYhMByURe5+TempnCi7cT5NNbyaG4T+rg8NWYxAeumSAB3JQF6XD/z34vRRHA== dependencies: - workbox-core "^3.6.3" + workbox-core "^5.1.3" -workbox-build@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-3.6.3.tgz#77110f9f52dc5d82fa6c1c384c6f5e2225adcbd8" - integrity sha512-w0clZ/pVjL8VXy6GfthefxpEXs0T8uiRuopZSFVQ8ovfbH6c6kUpEh6DcYwm/Y6dyWPiCucdyAZotgjz+nRz8g== +workbox-build@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-5.1.3.tgz#ec0dbcb7e260ad792c49407d063f4bcc8a8f08b8" + integrity sha512-cssa2cKAi/FNp2P2m2DjF/UsXlVX6b1HgkXOjBTraFkIeyZEKxN1F1DnxOpGkdM/bPPRa7y5OmUvjOpgOd9apA== dependencies: - babel-runtime "^6.26.0" - common-tags "^1.4.0" - fs-extra "^4.0.2" - glob "^7.1.2" - joi "^11.1.1" - lodash.template "^4.4.0" - pretty-bytes "^4.0.2" - stringify-object "^3.2.2" + "@babel/core" "^7.8.4" + "@babel/preset-env" "^7.8.4" + "@babel/runtime" "^7.8.4" + "@hapi/joi" "^15.1.0" + "@rollup/plugin-node-resolve" "^7.1.1" + "@rollup/plugin-replace" "^2.3.1" + "@surma/rollup-plugin-off-main-thread" "^1.1.1" + common-tags "^1.8.0" + fast-json-stable-stringify "^2.1.0" + fs-extra "^8.1.0" + glob "^7.1.6" + lodash.template "^4.5.0" + pretty-bytes "^5.3.0" + rollup "^1.31.1" + rollup-plugin-babel "^4.3.3" + rollup-plugin-terser "^5.2.0" + source-map "^0.7.3" + source-map-url "^0.4.0" + stringify-object "^3.3.0" strip-comments "^1.0.2" - workbox-background-sync "^3.6.3" - workbox-broadcast-cache-update "^3.6.3" - workbox-cache-expiration "^3.6.3" - workbox-cacheable-response "^3.6.3" - workbox-core "^3.6.3" - workbox-google-analytics "^3.6.3" - workbox-navigation-preload "^3.6.3" - workbox-precaching "^3.6.3" - workbox-range-requests "^3.6.3" - workbox-routing "^3.6.3" - workbox-strategies "^3.6.3" - workbox-streams "^3.6.3" - workbox-sw "^3.6.3" + tempy "^0.3.0" + upath "^1.2.0" + workbox-background-sync "^5.1.3" + workbox-broadcast-update "^5.1.3" + workbox-cacheable-response "^5.1.3" + workbox-core "^5.1.3" + workbox-expiration "^5.1.3" + workbox-google-analytics "^5.1.3" + workbox-navigation-preload "^5.1.3" + workbox-precaching "^5.1.3" + workbox-range-requests "^5.1.3" + workbox-routing "^5.1.3" + workbox-strategies "^5.1.3" + workbox-streams "^5.1.3" + workbox-sw "^5.1.3" + workbox-window "^5.1.3" -workbox-cache-expiration@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-cache-expiration/-/workbox-cache-expiration-3.6.3.tgz#4819697254a72098a13f94b594325a28a1e90372" - integrity sha512-+ECNph/6doYx89oopO/UolYdDmQtGUgo8KCgluwBF/RieyA1ZOFKfrSiNjztxOrGJoyBB7raTIOlEEwZ1LaHoA== +workbox-cacheable-response@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-5.1.3.tgz#79ec05c9f22796833d653e7cad43774a8f8bf7db" + integrity sha512-lOJEwK2T4KWFNdhRFUKxTPBIO5hIYm9E/nYgMq5h/IH3iHPHlBPuFwRMaQy+TTCGWWTA85NomQOjVw1bj65RLw== dependencies: - workbox-core "^3.6.3" + workbox-core "^5.1.3" -workbox-cacheable-response@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-3.6.3.tgz#869f1a68fce9063f6869ddbf7fa0a2e0a868b3aa" - integrity sha512-QpmbGA9SLcA7fklBLm06C4zFg577Dt8u3QgLM0eMnnbaVv3rhm4vbmDpBkyTqvgK/Ly8MBDQzlXDtUCswQwqqg== +workbox-core@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.3.tgz#0607acd0018c149162777fe4aae08553bd1559f5" + integrity sha512-TFSIPxxciX9sFaj0FDiohBeIKpwMcCyNduydi9i3LChItcndDS6TJpErxybv8aBWeCMraXt33TWtF6kKuIObNw== + +workbox-expiration@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-5.1.3.tgz#c793eef17513de86c9c1b8254eb2c9ba3ed17568" + integrity sha512-8YhpmIHqIx+xmtxONADc+di4a3zzCsvVHLiKq6T3vJZUPnqV2jzx+51+UHMUh3T5w5Z5SFC14l0V/jesRbuMKg== dependencies: - workbox-core "^3.6.3" + workbox-core "^5.1.3" -workbox-core@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-3.6.3.tgz#69abba70a4f3f2a5c059295a6f3b7c62bd00e15c" - integrity sha512-cx9cx0nscPkIWs8Pt98HGrS9/aORuUcSkWjG25GqNWdvD/pSe7/5Oh3BKs0fC+rUshCiyLbxW54q0hA+GqZeSQ== - -workbox-google-analytics@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-3.6.3.tgz#99df2a3d70d6e91961e18a6752bac12e91fbf727" - integrity sha512-RQBUo/6SXtIaQTRFj4RQZ9e1gAl7D8oS5S+Hi173Kk70/BgJjzPwXpC5A249Jv5YfkCOLMQCeF9A27BiD0b0ig== +workbox-google-analytics@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-5.1.3.tgz#dba0cadcf438d14389f2f2da0fd9c8cb605d35e6" + integrity sha512-ouK6xIJa+raFcO29TgwKFU/Hv1ejqSYzCzH9lI2B/4z/Wdnb8maL6mMIojQ8j5SohwKswMZmLDl0Az2PCmX11w== dependencies: - workbox-background-sync "^3.6.3" - workbox-core "^3.6.3" - workbox-routing "^3.6.3" - workbox-strategies "^3.6.3" + workbox-background-sync "^5.1.3" + workbox-core "^5.1.3" + workbox-routing "^5.1.3" + workbox-strategies "^5.1.3" -workbox-navigation-preload@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-3.6.3.tgz#a2c34eb7c17e7485b795125091215f757b3c4964" - integrity sha512-dd26xTX16DUu0i+MhqZK/jQXgfIitu0yATM4jhRXEmpMqQ4MxEeNvl2CgjDMOHBnCVMax+CFZQWwxMx/X/PqCw== +workbox-navigation-preload@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-5.1.3.tgz#8e49b935aaef16ac614d06db4a0677cbd59f9cae" + integrity sha512-29SPQMAccOgbq3BT9Gz7k+ydy0mcKKR0Rmkmd46tnujutiL4ooE57fBhwsA+c6OlLcYdisvilKlV2YWEtKWfgQ== dependencies: - workbox-core "^3.6.3" + workbox-core "^5.1.3" -workbox-precaching@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-3.6.3.tgz#5341515e9d5872c58ede026a31e19bafafa4e1c1" - integrity sha512-aBqT66BuMFviPTW6IpccZZHzpA8xzvZU2OM1AdhmSlYDXOJyb1+Z6blVD7z2Q8VNtV1UVwQIdImIX+hH3C3PIw== +workbox-precaching@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-5.1.3.tgz#08f0b48f4a390872a994c4a6ce8e43d08c6cba57" + integrity sha512-9jjBiB00AOI0NnI320ddnhvlL3bjMrDoI3211kEaxcRWh0N2fX25uVn0O8N8u1gWY4tIfwZAn/DgtAU13cFhYA== dependencies: - workbox-core "^3.6.3" + workbox-core "^5.1.3" -workbox-range-requests@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-3.6.3.tgz#3cc21cba31f2dd8c43c52a196bcc8f6cdbcde803" - integrity sha512-R+yLWQy7D9aRF9yJ3QzwYnGFnGDhMUij4jVBUVtkl67oaVoP1ymZ81AfCmfZro2kpPRI+vmNMfxxW531cqdx8A== +workbox-range-requests@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-5.1.3.tgz#f0fc6370ea549d002af1fe902b4ee94bfef6e006" + integrity sha512-uUvEoyEUx86LJc7mtmy/6U8xuK0guXU2FnPimt17zDbsC8FSOaPxc92rxtD6xmDSYrI4FqIebypBCjgIe+sfxA== dependencies: - workbox-core "^3.6.3" + workbox-core "^5.1.3" -workbox-routing@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-3.6.3.tgz#659cd8f9274986cfa98fda0d050de6422075acf7" - integrity sha512-bX20i95OKXXQovXhFOViOK63HYmXvsIwZXKWbSpVeKToxMrp0G/6LZXnhg82ijj/S5yhKNRf9LeGDzaqxzAwMQ== +workbox-routing@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-5.1.3.tgz#9946da0e9ace45af3db09cc0b4bdc4696723e1f7" + integrity sha512-F+sAp9Iy3lVl3BEG+pzXWVq4AftzjiFpHDaZ4Kf4vLoBoKQE0hIHet4zE5DpHqYdyw+Udhp4wrfHamX6PN6z1Q== dependencies: - workbox-core "^3.6.3" + workbox-core "^5.1.3" -workbox-strategies@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-3.6.3.tgz#11a0dc249a7bc23d3465ec1322d28fa6643d64a0" - integrity sha512-Pg5eulqeKet2y8j73Yw6xTgLdElktcWExGkzDVCGqfV9JCvnGuEpz5eVsCIK70+k4oJcBCin9qEg3g3CwEIH3g== +workbox-strategies@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-5.1.3.tgz#220cc9f5519ed76f2452ccb9407a5fd967c37110" + integrity sha512-wiXHfmOKnWABeIVW+/ye0e00+2CcS5y7SIj2f9zcdy2ZLEbcOf7B+yOl5OrWpBGlTUwRjIYhV++ZqiKm3Dc+8w== dependencies: - workbox-core "^3.6.3" + workbox-core "^5.1.3" + workbox-routing "^5.1.3" -workbox-streams@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-3.6.3.tgz#beaea5d5b230239836cc327b07d471aa6101955a" - integrity sha512-rqDuS4duj+3aZUYI1LsrD2t9hHOjwPqnUIfrXSOxSVjVn83W2MisDF2Bj+dFUZv4GalL9xqErcFW++9gH+Z27w== +workbox-streams@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-5.1.3.tgz#8f381d395ea2e57106b7b6542b9ffcd769a3047b" + integrity sha512-8kt70eBd1RXL0qenxEnch3Cd7VyW3O0CkeGBN4Bikt307nIV5Q0JciLA5o0CRteijawYOiTq0/px4GDBv1obgQ== dependencies: - workbox-core "^3.6.3" + workbox-core "^5.1.3" + workbox-routing "^5.1.3" -workbox-sw@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-3.6.3.tgz#278ea4c1831b92bbe2d420da8399176c4b2789ff" - integrity sha512-IQOUi+RLhvYCiv80RP23KBW/NTtIvzvjex28B8NW1jOm+iV4VIu3VXKXTA6er5/wjjuhmtB28qEAUqADLAyOSg== +workbox-sw@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-5.1.3.tgz#7bffbf034f2f5b58e1734b5b86d240019a5332bb" + integrity sha512-Syk6RhYr/8VdFwXrxo5IpVz8Og2xapHTWJhqsZRF+TbxSvlaJs8hrvVPd7edn5ZiiVdPhE9NTeOTOg1+D+FGoA== -workbox-webpack-plugin@^3.6.1: - version "3.6.3" - resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-3.6.3.tgz#a807bb891b4e4e3c808df07e58f17de2d5ba6182" - integrity sha512-RwmKjc7HFHUFHoOlKoZUq9349u0QN3F8W5tZZU0vc1qsBZDINWXRiIBCAKvo/Njgay5sWz7z4I2adnyTo97qIQ== +workbox-webpack-plugin@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-5.1.3.tgz#a7070e3ea0eedb6f87e11fd916ec5d4430a6e348" + integrity sha512-gxSkZ9GFLrMNC/8DGNRjcMhrt8iu+MMXhH/Fpo3wo9rKaSMsI7esGq0klTH/UloP9pNvBizVydysrB52eRhI7w== dependencies: - babel-runtime "^6.26.0" - json-stable-stringify "^1.0.1" - workbox-build "^3.6.3" + "@babel/runtime" "^7.5.5" + fast-json-stable-stringify "^2.0.0" + source-map-url "^0.4.0" + upath "^1.1.2" + webpack-sources "^1.3.0" + workbox-build "^5.1.3" + +workbox-window@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-5.1.3.tgz#24a2acb2903b0ff2789a4ce32f355621e769eb23" + integrity sha512-oYvfVtPLET7FUrhOzbk0R+aATVmpdQBkmDqwyFH4W2dfVqJXTvTXzuGP5Pn9oZ8jMTB3AYW43yhYBlLYM3mYyg== + dependencies: + workbox-core "^5.1.3" worker-farm@^1.7.0: version "1.7.0"