diff --git a/.dockerignore b/.dockerignore index 673411b..21b6faa 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,11 +1,22 @@ -.idea/ -.vscode/ -.awcache/ -node_modules/ -frontend/dist/ -dist.zip +# General +.DS_Store +*~ *.swp *.log -.DS_Store + +# Editor config folder +.idea/ +.vscode/ +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + +# Code coverage coverage/ .coveralls.yml + +# Misc +.awcache/ +node_modules/ +dist/ diff --git a/.editorconfig b/.editorconfig index 4fb59ad..1e79bf9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,11 +6,16 @@ root = true # Unix-style newlines with a newline ending every file [*] charset = utf-8 +end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true -# Indentation override for js, ts and config files -[*.{js,jsx,ts,tsx,json,yml}] +# Trailing space override for markdown file +[*.md] +trim_trailing_whitespace = false + +# Indentation override for js(x), ts(x) files +[*.{js,jsx,ts,tsx}] indent_size = 2 indent_style = space @@ -23,3 +28,13 @@ indent_style = space [*.html] indent_size = 2 indent_style = space + +# Indentation override for config files +[*.{json,yml}] +indent_size = 2 +indent_style = space + +# Minified JavaScript files shouldn't be changed +[**.min.js] +indent_style = ignore +insert_final_newline = ignore diff --git a/.eslintignore b/.eslintignore index 5c940fe..9ebfc2d 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,3 @@ node_modules/ -frontend/dist/ +dist/ coverage/ diff --git a/.gitignore b/.gitignore index 892cc2e..21b6faa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,22 @@ -.idea/ -.vscode/ -.awcache/ -node_modules/ -frontend/dist/ +# General +.DS_Store +*~ *.swp *.log -.DS_Store + +# Editor config folder +.idea/ +.vscode/ +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + +# Code coverage coverage/ .coveralls.yml + +# Misc +.awcache/ +node_modules/ +dist/ diff --git a/.stylelintignore b/.stylelintignore index 5c940fe..9ebfc2d 100644 --- a/.stylelintignore +++ b/.stylelintignore @@ -1,3 +1,3 @@ node_modules/ -frontend/dist/ +dist/ coverage/ diff --git a/README.md b/README.md index 8c5e432..55a3822 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ [![Dependency Status](https://david-dm.org/Armour/express-webpack-react-redux-typescript-boilerplate/status.svg)](https://david-dm.org/Armour/express-webpack-react-redux-typescript-boilerplate) [![DevDependency Status](https://david-dm.org/Armour/express-webpack-react-redux-typescript-boilerplate/dev-status.svg)](https://david-dm.org/Armour/express-webpack-react-redux-typescript-boilerplate?type=dev) -[![CircleCI](https://circleci.com/gh/Armour/express-webpack-react-redux-typescript-boilerplate/tree/master.svg?style=shield&circle-token=2b60a5e48d4f53d2b115efd948022c7df72a805b)](https://circleci.com/gh/Armour/express-webpack-react-redux-typescript-boilerplate/tree/master) +[![CircleCI](https://circleci.com/gh/Armour/express-webpack-react-redux-typescript-boilerplate/tree/master.svg?style=shield)](https://circleci.com/gh/Armour/express-webpack-react-redux-typescript-boilerplate/tree/master) [![Appveyor](https://ci.appveyor.com/api/projects/status/kgnfn2r88h90cgx5?svg=true)](https://ci.appveyor.com/api/projects/status/kgnfn2r88h90cgx5?svg=true) -[![Coverage Status](https://coveralls.io/repos/github/Armour/express-webpack-react-redux-typescript-boilerplate/badge.svg?branch=master&t=H7lCqC)](https://coveralls.io/github/Armour/express-webpack-react-redux-typescript-boilerplate?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/Armour/express-webpack-react-redux-typescript-boilerplate/badge.svg?branch=master)](https://coveralls.io/github/Armour/express-webpack-react-redux-typescript-boilerplate?branch=master) [![tested with jest](https://img.shields.io/badge/tested_with-jest-99424f.svg)](https://github.com/facebook/jest) [![MIT Licence](https://badges.frapsoft.com/os/mit/mit.svg?v=103)](https://opensource.org/licenses/mit-license.php) diff --git a/circle.yml b/circle.yml index 73e31c1..358956f 100644 --- a/circle.yml +++ b/circle.yml @@ -24,7 +24,7 @@ jobs: name: Install Docker Compose command: | set -x - VER="1.21.1" + VER="1.21.2" curl -L https://github.com/docker/compose/releases/download/$VER/docker-compose-`uname -s`-`uname -m` > /tmp/docker-compose sudo cp /tmp/docker-compose /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose diff --git a/frontend/src/types/index.d.ts b/frontend/src/types/index.d.ts index cff258b..f6cab6a 100644 --- a/frontend/src/types/index.d.ts +++ b/frontend/src/types/index.d.ts @@ -13,12 +13,12 @@ export { ITodoInputDispatchProps } from 'components/TodoInput'; export { IFilterLinkProps } from 'containers/FilterLink'; // Global State -export type IAppState = { +export interface IAppState { todos: ITodoList; visibilityFilter: IVisibilityFilterOption; fetching: IFetchingSet; noteData: INoteDataMap; -}; +} // Todos export interface ITodo { diff --git a/package.json b/package.json index 4fa3e68..cefe040 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,9 @@ "build-prod": "yarn build-dll && webpack --config webpack.config.prod.babel.js", "profile": "yarn build-dll && webpack --config webpack.config.profile.babel.js", "server": "nodemon --exec babel-node backend/server.js", - "eslint": "eslint -f codeframe \"**/*.js\" \"**/*.jsx\" ", - "tslint": "tslint -t codeFrame -e \"node_modules/**\" \"**/*.ts(x)\" \"**/*.tsx\" ", - "stylelint": "stylelint \"**/*.css **/*.scss\" ", + "eslint": "eslint -f codeframe \"**/*.js\" \"**/*.jsx\"", + "tslint": "tslint -t codeFrame -e \"node_modules/**\" \"**/*.ts\" \"**/*.tsx\"", + "stylelint": "stylelint \"**/*.css **/*.sass **/*.scss\"", "clean": "rm -rf frontend/dist .awcache coverage", "test": "jest --no-cache --coverage", "coverage": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls", @@ -78,7 +78,7 @@ "history": "4.7.2", "html-webpack-plugin": "3.2.0", "husky": "0.14.3", - "image-webpack-loader": "4.2.0", + "image-webpack-loader": "3.6.0", "immutable": "4.0.0-rc.9", "jest": "22.4.3", "lodash": "4.17.10", @@ -149,13 +149,13 @@ "transform": { "^.+\\.tsx?$": "/node_modules/ts-jest/preprocessor.js" }, - "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js|jsx)$", + "testRegex": "(/tests/.*|\\.(test|spec))\\.(ts|tsx|js|jsx)$", "testPathIgnorePatterns": [ "node_modules" ], "coveragePathIgnorePatterns": [ "node_modules", - "_tests_" + "tests" ], "moduleDirectories": [ "node_modules", diff --git a/__tests__/backend/api.tsx b/tests/backend/api.tsx similarity index 100% rename from __tests__/backend/api.tsx rename to tests/backend/api.tsx diff --git a/__tests__/frontend/actions/todoList.tsx b/tests/frontend/actions/todoList.tsx similarity index 100% rename from __tests__/frontend/actions/todoList.tsx rename to tests/frontend/actions/todoList.tsx diff --git a/__tests__/frontend/reducers/todos.tsx b/tests/frontend/reducers/todos.tsx similarity index 100% rename from __tests__/frontend/reducers/todos.tsx rename to tests/frontend/reducers/todos.tsx diff --git a/__tests__/frontend/reducers/visibilityFilter.tsx b/tests/frontend/reducers/visibilityFilter.tsx similarity index 100% rename from __tests__/frontend/reducers/visibilityFilter.tsx rename to tests/frontend/reducers/visibilityFilter.tsx diff --git a/__tests__/frontend/utils/index.tsx b/tests/frontend/utils/index.tsx similarity index 100% rename from __tests__/frontend/utils/index.tsx rename to tests/frontend/utils/index.tsx diff --git a/yarn.lock b/yarn.lock index 2314625..c828419 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1814,7 +1814,7 @@ body-parser@1.18.2: raw-body "2.3.2" type-is "~1.6.15" -boolbase@^1.0.0, boolbase@~1.0.0: +boolbase@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" @@ -1994,10 +1994,6 @@ buffer-fill@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-0.1.1.tgz#76d825c4d6e50e06b7a31eb520c04d08cc235071" -buffer-from@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" - buffer-from@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531" @@ -2488,12 +2484,6 @@ coa@~1.0.1: dependencies: q "^1.1.2" -coa@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.1.tgz#f3f8b0b15073e35d70263fb1042cb2c023db38af" - dependencies: - q "^1.1.2" - code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -2938,10 +2928,6 @@ css-loader@0.28.11: postcss-value-parser "^3.3.0" source-list-map "^2.0.0" -css-select-base-adapter@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz#0102b3d14630df86c3eb9fa9f5456270106cf990" - css-select@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" @@ -2951,15 +2937,6 @@ css-select@^1.1.0: domutils "1.5.1" nth-check "~1.0.1" -css-select@~1.3.0-rc0: - version "1.3.0-rc0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.3.0-rc0.tgz#6f93196aaae737666ea1036a8cb14a8fcb7a9231" - dependencies: - boolbase "^1.0.0" - css-what "2.1" - domutils "1.5.1" - nth-check "^1.0.1" - css-selector-tokenizer@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86" @@ -2968,28 +2945,10 @@ css-selector-tokenizer@^0.7.0: fastparse "^1.1.1" regexpu-core "^1.0.0" -css-tree@1.0.0-alpha.27: - version "1.0.0-alpha.27" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.27.tgz#f211526909c7dc940843d83b9376ed98ddb8de47" - dependencies: - mdn-data "^1.0.0" - source-map "^0.5.3" - -css-tree@1.0.0-alpha25: - version "1.0.0-alpha25" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha25.tgz#1bbfabfbf6eeef4f01d9108ff2edd0be2fe35597" - dependencies: - mdn-data "^1.0.0" - source-map "^0.5.3" - css-unit-converter@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996" -css-url-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec" - css-what@2.1: version "2.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd" @@ -3035,12 +2994,6 @@ cssnano@^3.10.0, cssnano@^3.4.0: postcss-value-parser "^3.2.3" postcss-zindex "^2.0.1" -csso@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.0.tgz#acdbba5719e2c87bc801eadc032764b2e4b9d4e7" - dependencies: - css-tree "1.0.0-alpha.27" - csso@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85" @@ -3059,8 +3012,8 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": cssom "0.3.x" csstype@^2.2.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.4.2.tgz#158e36c69566bf968da63d0ba14eda1c20e8643a" + version "2.5.0" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.0.tgz#53e1c242f422d5d976b81f42707bd9b8934492ee" currently-unhandled@^0.4.1: version "0.4.1" @@ -3460,8 +3413,8 @@ domhandler@2.1: domelementtype "1" domhandler@^2.3.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259" + version "2.4.2" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" dependencies: domelementtype "1" @@ -3685,7 +3638,7 @@ error@^7.0.2: string-template "~0.2.1" xtend "~4.0.0" -es-abstract@^1.5.1, es-abstract@^1.6.1, es-abstract@^1.7.0: +es-abstract@^1.5.1, es-abstract@^1.7.0: version "1.11.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681" dependencies: @@ -3998,18 +3951,6 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execall@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73" @@ -4436,8 +4377,8 @@ flatten@^1.0.2: resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" flow-parser@^0.*: - version "0.71.0" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.71.0.tgz#da2479b83f9207905b4b17ab0c4e6d17bd505250" + version "0.72.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.72.0.tgz#6c8041e76ac7d0be1a71ce29c00cd1435fb6013c" flush-write-stream@^1.0.0: version "1.0.3" @@ -4580,7 +4521,7 @@ fstream@^1.0.0, fstream@^1.0.2: mkdirp ">=0.5 0" rimraf "2" -function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1: +function-bind@^1.0.2, function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -5405,16 +5346,16 @@ ignore@^3.3.3, ignore@^3.3.5: version "3.3.8" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.8.tgz#3f8e9c35d38708a3a7e0e9abb6c73e7ee7707b2b" -image-webpack-loader@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/image-webpack-loader/-/image-webpack-loader-4.2.0.tgz#927966728027b4837f7715b52d44691838fba3bf" +image-webpack-loader@3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/image-webpack-loader/-/image-webpack-loader-3.6.0.tgz#3dcf652238ba39440cadd325aa602e7e0f2afe54" dependencies: imagemin "^5.2.2" imagemin-gifsicle "^5.1.0" - imagemin-mozjpeg "^7.0.0" + imagemin-mozjpeg "^6.0.0" imagemin-optipng "^5.2.1" imagemin-pngquant "^5.0.0" - imagemin-svgo "^6.0.0" + imagemin-svgo "^5.2.1" imagemin-webp "^4.0.0" loader-utils "^1.1.0" object-assign "^4.1.1" @@ -5427,13 +5368,13 @@ imagemin-gifsicle@^5.1.0: gifsicle "^3.0.0" is-gif "^1.0.0" -imagemin-mozjpeg@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/imagemin-mozjpeg/-/imagemin-mozjpeg-7.0.0.tgz#d926477fc6ef5f3a768a4222f7b2d808d3eba568" +imagemin-mozjpeg@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/imagemin-mozjpeg/-/imagemin-mozjpeg-6.0.0.tgz#71a32a457aa1b26117a68eeef2d9b190c2e5091e" dependencies: - execa "^0.8.0" + exec-buffer "^3.0.0" is-jpg "^1.0.0" - mozjpeg "^5.0.0" + mozjpeg "^4.0.0" imagemin-optipng@^5.2.1: version "5.2.1" @@ -5452,13 +5393,12 @@ imagemin-pngquant@^5.0.0: is-stream "^1.1.0" pngquant-bin "^4.0.0" -imagemin-svgo@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/imagemin-svgo/-/imagemin-svgo-6.0.0.tgz#2dd8c82946be42a8e2cbcae3c5bf007bc2b8b9e8" +imagemin-svgo@^5.2.1: + version "5.2.4" + resolved "https://registry.yarnpkg.com/imagemin-svgo/-/imagemin-svgo-5.2.4.tgz#6cd5d342cae4bcd8b483594e5315695df02b9e9b" dependencies: - buffer-from "^0.1.1" is-svg "^2.0.0" - svgo "^1.0.0" + svgo "^0.7.0" imagemin-webp@^4.0.0: version "4.1.0" @@ -6473,13 +6413,6 @@ js-yaml@^3.4.3, js-yaml@^3.6.1, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc" - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - js-yaml@~3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" @@ -7179,10 +7112,6 @@ mdast-util-compact@^1.0.0: unist-util-modify-children "^1.0.0" unist-util-visit "^1.1.0" -mdn-data@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.2.tgz#ceaa6a831b4de494352af984d301e3a8f2cad6e5" - media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" @@ -7475,11 +7404,11 @@ move-concurrently@^1.0.1: rimraf "^2.5.4" run-queue "^1.0.3" -mozjpeg@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/mozjpeg/-/mozjpeg-5.0.0.tgz#b8671c4924568a363de003ff2fd397ab83f752c5" +mozjpeg@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/mozjpeg/-/mozjpeg-4.1.1.tgz#859030b24f689a53db9b40f0160d89195b88fd50" dependencies: - bin-build "^2.2.0" + bin-build "^2.0.0" bin-wrapper "^3.0.0" logalot "^2.0.0" @@ -7796,7 +7725,7 @@ npm-run-path@^2.0.0: gauge "~2.7.3" set-blocking "~2.0.0" -nth-check@^1.0.1, nth-check@~1.0.1: +nth-check@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4" dependencies: @@ -7877,15 +7806,6 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.6.1" - function-bind "^1.1.0" - has "^1.0.1" - offline-plugin@5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-5.0.3.tgz#61488c5c5842d8576aa677384b5bbd3e60949289" @@ -9322,8 +9242,8 @@ react-json-tree@^0.11.0: react-base16-styling "^0.5.1" react-lifecycles-compat@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.2.tgz#7279047275bd727a912e25f734c0559527e84eff" + version "3.0.3" + resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.3.tgz#473820154732f1ccd762e89324abab154255da6b" react-pure-render@^1.0.2: version "1.0.2" @@ -9441,7 +9361,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" dependencies: @@ -10068,7 +9988,7 @@ sass-loader@7.0.1: neo-async "^2.5.0" pify "^3.0.0" -sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4: +sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -10461,10 +10381,6 @@ ssri@^5.2.4: dependencies: safe-buffer "^5.1.1" -stable@~0.1.6: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - stack-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620" @@ -10530,12 +10446,12 @@ stream-each@^1.1.0: stream-shift "^1.0.0" stream-http@^2.7.2: - version "2.8.1" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.1.tgz#d0441be1a457a73a733a8a7b53570bebd9ef66a4" + version "2.8.2" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.2.tgz#4126e8c6b107004465918aa2fc35549e77402c87" dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" - readable-stream "^2.3.3" + readable-stream "^2.3.6" to-arraybuffer "^1.0.0" xtend "^4.0.0" @@ -10825,25 +10741,6 @@ svgo@^0.7.0: sax "~1.2.1" whet.extend "~0.9.9" -svgo@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.0.5.tgz#7040364c062a0538abacff4401cea6a26a7a389a" - dependencies: - coa "~2.0.1" - colors "~1.1.2" - css-select "~1.3.0-rc0" - css-select-base-adapter "~0.1.0" - css-tree "1.0.0-alpha25" - css-url-regex "^1.1.0" - csso "^3.5.0" - js-yaml "~3.10.0" - mkdirp "~0.5.1" - object.values "^1.0.4" - sax "~1.2.4" - stable "~0.1.6" - unquote "~1.1.1" - util.promisify "~1.0.0" - symbol-observable@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" @@ -11423,10 +11320,6 @@ unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" -unquote@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" - unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" @@ -11534,7 +11427,7 @@ util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" -util.promisify@1.0.0, util.promisify@^1.0.0, util.promisify@~1.0.0: +util.promisify@1.0.0, util.promisify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" dependencies: