diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..8646c68
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+ "presets": [ "react-app" ]
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index d1ebc16..dc27295 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@ node_modules
.DS_Store
.esm-cache
.vscode
-public/bundle*
\ No newline at end of file
+dist/bundle*
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/public/index.html b/dist/index.html
similarity index 100%
rename from public/index.html
rename to dist/index.html
diff --git a/package.json b/package.json
index b00e977..d706647 100644
--- a/package.json
+++ b/package.json
@@ -1,44 +1,60 @@
{
"name": "ev-dev-starter",
- "version": "0.2.1",
+ "version": "0.4.0",
"description": "",
"main": "index.js",
"scripts": {
- "dev": "npm run build-dev & npm run serve-dev",
- "build-dev": "cross-env NODE_ENV=development webpack -w",
- "serve-dev": "nodemon server/index.js --watch server/dev",
- "test-build": "cross-env NODE_ENV=development webpack --bail --progress -d",
+ "build-dev": "NODE_ENV=development webpack -w --progress",
+ "serve-dev": "NODE_ENV=development nodemon -r @std/esm server --watch server",
+ "dev": "yarn run serve-dev & yarn run build-dev",
"test": "nodemon tests/testServer.js --watch tests",
- "start": "npm run build && npm run serve",
- "build": "cross-env NODE_ENV=production webpack",
- "serve": "node server/prod/index.js"
+ "build": "NODE_ENV=production webpack",
+ "serve": "NODE_ENV=production node server",
+ "start": "NODE_ENV=production yarn run build & yarn run serve"
},
"keywords": [],
"author": "",
"license": "ISC",
+ "@std/esm": {
+ "esm": "all",
+ "cjs": {
+ "interop": true,
+ "namedExports": true,
+ "paths": true,
+ "vars": true
+ },
+ "debug": true,
+ "sourceMap": true,
+ "warnings": false
+ },
"dependencies": {
- "@std/esm": "0.16.0",
- "axios": "^0.17.0",
+ "@std/esm": "^0.18.0",
+ "axios": "^0.17.1",
"body-parser": "^1.18.2",
+ "bulma": "^0.6.1",
"express": "^4.16.2",
- "react": "^16.0.0",
- "react-dom": "^16.0.0",
+ "react": "^16.2.0",
+ "react-dom": "^16.2.0",
"react-router-dom": "^4.2.2"
},
"devDependencies": {
- "autoprefixer": "^7.1.5",
+ "autoprefixer": "^7.2.3",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
- "babel-preset-react-app": "^3.0.3",
- "chalk": "^2.2.0",
- "cross-env": "^5.1.0",
+ "babel-preset-env": "^1.6.1",
+ "babel-preset-react-app": "^3.1.0",
+ "babel-runtime": "^6.26.0",
+ "chalk": "^2.3.0",
"css-loader": "^0.28.7",
- "node-sass": "^4.5.3",
- "postcss-loader": "^2.0.8",
+ "file-loader": "^1.1.5",
+ "node-sass": "^4.7.2",
+ "postcss-flexbugs-fixes": "^3.2.0",
+ "postcss-loader": "^2.0.9",
"sass-loader": "^6.0.6",
- "style-loader": "^0.19.0",
+ "style-loader": "^0.19.1",
+ "url-loader": "^0.6.2",
"volleyball": "^1.4.1",
- "webpack": "^3.8.1",
+ "webpack": "^3.10.0",
"webpack-livereload-plugin": "^1.0.0"
}
}
diff --git a/server/app/api/index.js b/server/app/api/index.js
new file mode 100644
index 0000000..daf1b81
--- /dev/null
+++ b/server/app/api/index.js
@@ -0,0 +1,10 @@
+import { Router } from 'express'
+import bodyParser from 'body-parser'
+import todo from './todos'
+import user from './users'
+
+export default Router()
+ .use(bodyParser.urlencoded({ extended: true }))
+ .use(bodyParser.json())
+ .use('/todo', todo)
+ .use('/user', user)
\ No newline at end of file
diff --git a/server/app/api/todos.js b/server/app/api/todos.js
new file mode 100644
index 0000000..844e196
--- /dev/null
+++ b/server/app/api/todos.js
@@ -0,0 +1,6 @@
+import { Router } from 'express'
+
+export default Router()
+ .get('/', (req, res, next) => {
+
+ })
\ No newline at end of file
diff --git a/server/app/api/users.js b/server/app/api/users.js
new file mode 100644
index 0000000..97561fa
--- /dev/null
+++ b/server/app/api/users.js
@@ -0,0 +1,6 @@
+import { Router } from 'express'
+
+export default Router()
+ .get('/', (req, res, next) => {
+
+ })
diff --git a/server/app/index.js b/server/app/index.js
new file mode 100644
index 0000000..df43c9f
--- /dev/null
+++ b/server/app/index.js
@@ -0,0 +1,3 @@
+
+export { default as staticRouter } from './static'
+export { default as apiRouter } from './api'
diff --git a/server/app/static.js b/server/app/static.js
new file mode 100644
index 0000000..17c13e5
--- /dev/null
+++ b/server/app/static.js
@@ -0,0 +1,35 @@
+import { Router } from 'express'
+import path from 'path'
+import fs from 'fs'
+
+const filePath = file => path.join(
+ __dirname, '..', '..', 'dist', file
+)
+
+export default Router()
+ /* --- Serve React App --- */
+ // .get('/bundle.js', (req, res) => {
+ // res.sendFile(filePath('bundle.js'))
+ // })
+
+ /* --- Serve Assets --- */
+ .use((req, res, next) => {
+ if (path.extname(req.path).length > 0) {
+ const fileRequest = filePath(req.path)
+ fs.stat(fileRequest, (err, status) => {
+ if (err) {
+ console.error('File Not Found...', req.path)
+ res.status(404).end()
+ } else {
+ res.sendFile(fileRequest)
+ }
+ })
+ } else {
+ next(null)
+ }
+ })
+
+ /* --- Serve Root HTML --- */
+ .get('/*', (req, res) => {
+ res.sendFile(path.join(__dirname, '..', '..', 'dist', 'index.html'))
+ })
\ No newline at end of file
diff --git a/server/config/error.js b/server/config/error.js
new file mode 100644
index 0000000..392de1f
--- /dev/null
+++ b/server/config/error.js
@@ -0,0 +1,10 @@
+import { Router } from 'express'
+
+export default Router()
+ .use((err, req, res, next) => {
+ console.error(err, typeof next)
+ console.error(err.stack)
+
+ res.status(err.status || 500)
+ .send(err.message || 'Internal Server Error.')
+ })
diff --git a/server/config/index.js b/server/config/index.js
new file mode 100644
index 0000000..03192a0
--- /dev/null
+++ b/server/config/index.js
@@ -0,0 +1,11 @@
+
+export { logger, logListen } from './logger'
+export { default as errorHandler } from './error'
+
+const pkgName = process.env.npm_package_name
+ , isProd = process.env.NODE_ENV === 'production'
+ , isDev = !isProd
+ , baseURL = 'http://localhost:'
+ , PORT = isProd ? 80 : 3000
+
+export { pkgName, isProd, isDev, baseURL, PORT }
diff --git a/server/config/logger.js b/server/config/logger.js
new file mode 100644
index 0000000..f075179
--- /dev/null
+++ b/server/config/logger.js
@@ -0,0 +1,31 @@
+import { Router } from 'express'
+import volleyball from 'volleyball'
+import chalk from 'chalk'
+
+import { pkgName, isProd, baseURL, PORT} from '.'
+
+export const logger = Router().use(volleyball)
+
+export const logListen = () => {
+ const { yellow, cyan, red, blue } = chalk
+ , NAME = red.bold(`[${pkgName.toUpperCase()}]`)
+ , FULL_URL = `${cyan.bold(baseURL)}${yellow(PORT)}`
+ , len = pkgName.length
+ , bars = len <= 14 ? 44 : len + 26
+ , space = len <= 14 ? 22 - len : 4
+ , btmSpace = len <= 14 ? 3 : len - 15
+
+ if (isProd) {
+ console.log(`
+ - ${pkgName} > Production Server @ ${baseURL}${PORT} -
+ `)
+ } else {
+ console.log(`
+ ${'-'.repeat(bars)}
+ + ${NAME} ${blue.bold('Development')}${' '.repeat(space)}+
+ +${' '.repeat(bars - 2)}+
+ + => ${yellow.bold('Listening')} @ ${FULL_URL}${' '.repeat(btmSpace)}+
+ ${'-'.repeat(bars)}
+ `)
+ }
+}
\ No newline at end of file
diff --git a/server/dev/index.js b/server/dev/index.js
deleted file mode 100644
index 0975dec..0000000
--- a/server/dev/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-const path = require('path'),
- express = require('express'),
- bodyParser = require('body-parser'),
- app = express()
-
-app
- .use(bodyParser.urlencoded({
- extended: true
- }))
- .use(bodyParser.json())
-
-
- /* --- Logging Middleware --- */
- .use(require('volleyball'))
-
-
- /* --- API Server --- */
- // .use('/api', require('./api'))
-
-
- /* --- Serve React App --- */
- .get('/bundle.js', (req, res) => {
- res.sendFile(path.join(__dirname, '..', 'public', 'bundle.js'))
- })
-
-
- /* --- Serve Assets --- */
- .use((req, res, next) => {
- if (path.extname(req.path).length > 0) res.status(404).end()
- else next(null)
- })
-
-
- /* --- Serve Root HTML --- */
- .get('/*', (req, res) => {
- res.sendFile(path.join(__dirname, '..', 'public', 'index.html'))
- })
-
-
- /* --- Error Endware --- */
- .use((err, req, res, next) => {
- console.error(err, typeof next)
- console.error(err.stack)
- res.status(err.status || 500)
- .send(err.message || 'Internal Server Error.')
- })
-
-
-const PORT = 3000
-const chalk = require('chalk')
-app.listen(PORT, () => {
- const name = chalk.red.bold('[Server]')
- const url = chalk.cyan.bold(`http://localhost:`)
- const listen = chalk.yellow.bold('Listening')
-
- console.log(`
- ${name} - ${listen} - ${url}${chalk.yellow(PORT)}
- `)
-})
diff --git a/server/index.js b/server/index.js
new file mode 100644
index 0000000..5b2376f
--- /dev/null
+++ b/server/index.js
@@ -0,0 +1,11 @@
+import express from 'express'
+
+import { staticRouter, apiRouter } from './app'
+import { isDev, PORT, logListen, logger, errorHandler } from './config'
+
+express()
+ .use(isDev && logger)
+ .use(staticRouter)
+ .use(apiRouter)
+ .use(errorHandler)
+ .listen(PORT, logListen)
diff --git a/server/prod/index.js b/server/prod/index.js
deleted file mode 100644
index 669e651..0000000
--- a/server/prod/index.js
+++ /dev/null
@@ -1,40 +0,0 @@
-const path = require('path')
- , express = require('express')
- , app = express()
-
-app
- /* --- API Server --- */
- // .use(bodyParser.urlencoded({
- // extended: true
- // }))
- // .use(bodyParser.json())
-
- // .use('/api', require('./api'))
-
-
- .get('/bundle.js', (req, res) => {
- res.sendFile(path.join(__dirname, '..', 'public', 'bundle.js'))
- })
-
- .use((req, res, next) => {
- if (path.extname(req.path).length > 0) res.status(404).end()
- else next(null)
- })
-
- .get('/*', (req, res) => {
- res.sendFile(path.join(__dirname, '..', 'public', 'index.html'))
- })
-
- .use((err, req, res, next) => {
- console.error(err, typeof next)
- console.error(err.stack)
- res.status(err.status || 500)
- .send(err.message || 'Internal Server Error.')
- })
-
-const PORT = 80
-app.listen(PORT, () => {
- console.log(`
- - Production Server Running on Port ${PORT} -
- `)
-})
\ No newline at end of file
diff --git a/src/components/Home.jsx b/src/components/Home.jsx
index 0b8ec92..249ec61 100644
--- a/src/components/Home.jsx
+++ b/src/components/Home.jsx
@@ -3,6 +3,7 @@ import React from 'react'
const Home = () => (
Home Page
+
)
diff --git a/src/index.jsx b/src/index.jsx
index 8155986..5e6cc3f 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -1,9 +1,9 @@
-import React, { Component } from 'react'
+import React from 'react'
import { render } from 'react-dom'
import { BrowserRouter as Router } from 'react-router-dom'
-import './styles/index'
import Routes from './routes'
+import './styles'
const App = () => (
diff --git a/src/styles/index.css b/src/styles/index.css
new file mode 100644
index 0000000..f292095
--- /dev/null
+++ b/src/styles/index.css
@@ -0,0 +1,3 @@
+p {
+ color: black;
+}
\ No newline at end of file
diff --git a/src/styles/index.scss b/src/styles/index.scss
deleted file mode 100644
index c9e94db..0000000
--- a/src/styles/index.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-/* - Libraries - */
-
-
-
-/* - Custom Imports - */
-
-
-
-/* - Media Queries - */
-
-// @include media-breakpoint-down(xs) {
-// PORTRAIT PHONES
-// }
-// @include media-breakpoint-down(sm) {
-// LANDSCAPE PHONES
-// }
-// @include media-breakpoint-down(md) {
-// TABLETS
-// }
-// @include media-breakpoint-down(lg) {
-// DESKTOPS
-// }
diff --git a/webpack.config.js b/webpack.config.js
index eae3468..3227784 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,67 +1,75 @@
const path = require('path')
const webpack = require('webpack')
const LiveReloadPlugin = require('webpack-livereload-plugin')
+const autoprefixer = require('autoprefixer')
const isDev = process.env.NODE_ENV === 'development'
module.exports = {
entry: path.join(__dirname, 'src', 'index'),
output: {
filename: 'bundle.js',
- path: path.resolve(__dirname, 'public')
+ path: path.resolve(__dirname, 'dist')
},
module: {
rules: [{
- test: /.jsx?$/,
- include: [
- path.resolve(__dirname, 'src')
- ],
- exclude: [
- path.resolve(__dirname, 'node_modules'),
- path.resolve(__dirname, 'bower_components')
- ],
- loader: 'babel-loader',
- query: {
- presets: ['react-app']
+ test: /\.(js|jsx)$/,
+ include: path.resolve(__dirname, 'src'),
+ loader: require.resolve('babel-loader'),
+ options: {
+ babelrc: false,
+ presets: [require.resolve('babel-preset-react-app')],
+ cacheDirectory: true
}
},
{
- test: /\.(scss|css)$/,
+ test: /\.css$/,
include: [
path.resolve(__dirname, 'src'),
path.resolve(__dirname, 'node_modules', 'font-awesome')
],
- use: [{
- loader: 'style-loader'
- }, {
- loader: 'css-loader'
+ use: [
+ require.resolve('style-loader'),
+ {
+ loader: require.resolve('css-loader'),
+ options: {
+ importLoaders: 1
+ }
},
- // {
- // loader: 'postcss-loader',
- // options: {
- // plugins: () => [
- // require('precss'),
- // require('autoprefixer')
- // ]
- // }
- // },
{
- loader: 'sass-loader'
+ loader: require.resolve('postcss-loader'),
+ options: {
+ ident: 'postcss',
+ plugins: () => [
+ require('postcss-flexbugs-fixes'),
+ autoprefixer({
+ browsers: [
+ '>1%',
+ 'last 4 versions',
+ 'Firefox ESR',
+ 'not ie < 9'
+ ],
+ flexbox: 'no-2009'
+ })
+ ]
+ }
}
]
},
{
test: /\.(svg|ttf|eot|eof|woff|woff2)$/,
- loader: 'file-loader'
+ loader: require.resolve('file-loader')
}
]
},
resolve: {
- extensions: ['.json', '.js', '.jsx', '.css', '.scss', '*']
+ extensions: ['.json', '.js', '.jsx', '.css', '*'],
+ alias: {
+ 'babel-runtime': path.dirname(
+ require.resolve('babel-runtime/package.json')
+ )
+ }
},
devtool: isDev ? 'cheap-module-eval-source-map' : 'source-map',
- devServer: {
- publicPath: path.join('/public/')
- },
plugins: isDev
? [
new LiveReloadPlugin({
diff --git a/yarn.lock b/yarn.lock
index 80af20e..a4db198 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,9 +2,9 @@
# yarn lockfile v1
-"@std/esm@0.16.0":
- version "0.16.0"
- resolved "https://registry.yarnpkg.com/@std/esm/-/esm-0.16.0.tgz#2a7a33ecb7f1701cebd4c87df6d0d945ed51f730"
+"@std/esm@^0.18.0":
+ version "0.18.0"
+ resolved "https://registry.yarnpkg.com/@std/esm/-/esm-0.18.0.tgz#e212b565c765f93b29ec522a493a192ce7ae2ba6"
abbrev@1:
version "1.1.1"
@@ -28,8 +28,8 @@ acorn@^4.0.3:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
acorn@^5.0.0:
- version "5.2.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
+ version "5.3.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
ajv-keywords@^2.0.0:
version "2.1.1"
@@ -43,8 +43,8 @@ ajv@^4.9.1:
json-stable-stringify "^1.0.1"
ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5:
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.0.tgz#eb2840746e9dc48bd5e063a36e3fd400c5eab5a9"
+ version "5.5.2"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
dependencies:
co "^4.6.0"
fast-deep-equal "^1.0.0"
@@ -190,15 +190,15 @@ autoprefixer@^6.3.1:
postcss "^5.2.16"
postcss-value-parser "^3.2.3"
-autoprefixer@^7.1.5:
- version "7.1.6"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.6.tgz#fb933039f74af74a83e71225ce78d9fd58ba84d7"
+autoprefixer@^7.2.3:
+ version "7.2.5"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.5.tgz#04ccbd0c6a61131b6d13f53d371926092952d192"
dependencies:
- browserslist "^2.5.1"
- caniuse-lite "^1.0.30000748"
+ browserslist "^2.11.1"
+ caniuse-lite "^1.0.30000791"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
- postcss "^6.0.13"
+ postcss "^6.0.16"
postcss-value-parser "^3.2.3"
aws-sign2@~0.6.0:
@@ -213,14 +213,14 @@ aws4@^1.2.1, aws4@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-axios@^0.17.0:
+axios@^0.17.1:
version "0.17.1"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"
dependencies:
follow-redirects "^1.2.5"
is-buffer "^1.1.5"
-babel-code-frame@^6.11.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
dependencies:
@@ -494,7 +494,7 @@ babel-plugin-transform-es2015-computed-properties@^6.22.0:
babel-runtime "^6.22.0"
babel-template "^6.24.1"
-babel-plugin-transform-es2015-destructuring@^6.23.0:
+babel-plugin-transform-es2015-destructuring@6.23.0, babel-plugin-transform-es2015-destructuring@^6.23.0:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
dependencies:
@@ -694,7 +694,7 @@ babel-plugin-transform-strict-mode@^6.24.1:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
-babel-preset-env@1.6.1:
+babel-preset-env@1.6.1, babel-preset-env@^1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
dependencies:
@@ -735,13 +735,14 @@ babel-preset-flow@^6.23.0:
dependencies:
babel-plugin-transform-flow-strip-types "^6.22.0"
-babel-preset-react-app@^3.0.3:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-3.1.0.tgz#d77f6061ab9d7bf4b3cdc86b7cde9ded0df03e48"
+babel-preset-react-app@^3.1.0:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-3.1.1.tgz#d3f06a79742f0e89d7afcb72e282d9809c850920"
dependencies:
babel-plugin-dynamic-import-node "1.1.0"
babel-plugin-syntax-dynamic-import "6.18.0"
babel-plugin-transform-class-properties "6.24.1"
+ babel-plugin-transform-es2015-destructuring "6.23.0"
babel-plugin-transform-object-rest-spread "6.26.0"
babel-plugin-transform-react-constant-elements "6.23.0"
babel-plugin-transform-react-jsx "6.24.1"
@@ -981,12 +982,12 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
caniuse-db "^1.0.30000639"
electron-to-chromium "^1.2.7"
-browserslist@^2.1.2, browserslist@^2.5.1:
- version "2.9.1"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.9.1.tgz#b72d3982ab01b5cd24da62ff6d45573886aff275"
+browserslist@^2.1.2, browserslist@^2.11.1:
+ version "2.11.3"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
dependencies:
- caniuse-lite "^1.0.30000770"
- electron-to-chromium "^1.3.27"
+ caniuse-lite "^1.0.30000792"
+ electron-to-chromium "^1.3.30"
buffer-xor@^1.0.3:
version "1.0.3"
@@ -1008,6 +1009,10 @@ 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"
+bulma@^0.6.1:
+ version "0.6.2"
+ resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.6.2.tgz#f4b1d11d5acc51a79644eb0a2b0b10649d3d71f5"
+
bytes@2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.2.0.tgz#fd35464a403f6f9117c2de3609ecff9cae000588"
@@ -1053,12 +1058,12 @@ caniuse-api@^1.5.2:
lodash.uniq "^4.5.0"
caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
- version "1.0.30000770"
- resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000770.tgz#cf68ae1cb8a82f6d3c35df41c62dc6973e470244"
+ version "1.0.30000792"
+ resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000792.tgz#a7dac6dc9f5181b675fd69e5cb06fefb523157f8"
-caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000770:
- version "1.0.30000770"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000770.tgz#bc8e7f50b073273390db6ab357378909a14e9bdb"
+caniuse-lite@^1.0.30000791, caniuse-lite@^1.0.30000792:
+ version "1.0.30000792"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332"
caseless@~0.11.0:
version "0.11.0"
@@ -1085,7 +1090,7 @@ chalk@^1.1.1, chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
-chalk@^2.2.0, chalk@^2.3.0:
+chalk@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
dependencies:
@@ -1207,8 +1212,8 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
delayed-stream "~1.0.0"
commander@^2.9.0:
- version "2.12.1"
- resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.1.tgz#468635c4168d06145b9323356d1da84d14ac4a7a"
+ version "2.13.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
commondir@^1.0.1:
version "1.0.1"
@@ -1257,8 +1262,8 @@ core-js@^1.0.0:
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
core-js@^2.4.0, core-js@^2.5.0:
- version "2.5.1"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
+ version "2.5.3"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
@@ -1303,13 +1308,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
-cross-env@^5.1.0:
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.1.tgz#b6d8ab97f304c0f71dae7277b75fe424c08dfa74"
- dependencies:
- cross-spawn "^5.1.0"
- is-windows "^1.0.0"
-
cross-spawn@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
@@ -1317,7 +1315,7 @@ cross-spawn@^3.0.0:
lru-cache "^4.0.1"
which "^1.2.9"
-cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+cross-spawn@^5.0.1:
version "5.1.0"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
dependencies:
@@ -1358,21 +1356,21 @@ css-color-names@0.0.4:
resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
css-loader@^0.28.7:
- version "0.28.7"
- resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
+ version "0.28.8"
+ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.8.tgz#ff36381464dea18fe60f2601a060ba6445886bd5"
dependencies:
- babel-code-frame "^6.11.0"
+ babel-code-frame "^6.26.0"
css-selector-tokenizer "^0.7.0"
- cssnano ">=2.6.1 <4"
+ cssnano "^3.10.0"
icss-utils "^2.1.0"
loader-utils "^1.0.2"
lodash.camelcase "^4.3.0"
- object-assign "^4.0.1"
+ object-assign "^4.1.1"
postcss "^5.0.6"
- postcss-modules-extract-imports "^1.0.0"
- postcss-modules-local-by-default "^1.0.1"
- postcss-modules-scope "^1.0.0"
- postcss-modules-values "^1.1.0"
+ postcss-modules-extract-imports "^1.1.0"
+ postcss-modules-local-by-default "^1.2.0"
+ postcss-modules-scope "^1.1.0"
+ postcss-modules-values "^1.3.0"
postcss-value-parser "^3.3.0"
source-list-map "^2.0.0"
@@ -1388,7 +1386,7 @@ cssesc@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-"cssnano@>=2.6.1 <4":
+cssnano@^3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
dependencies:
@@ -1492,10 +1490,14 @@ delegates@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-depd@1.1.1, depd@~1.1.0, depd@~1.1.1:
+depd@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
+depd@~1.1.0, depd@~1.1.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+
des.js@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -1539,9 +1541,15 @@ ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.27:
- version "1.3.27"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
+electron-releases@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e"
+
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
+ version "1.3.30"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80"
+ dependencies:
+ electron-releases "^2.1.0"
elliptic@^6.0.0:
version "6.4.0"
@@ -1579,10 +1587,10 @@ enhanced-resolve@^3.4.0:
tapable "^0.2.7"
errno@^0.1.3:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+ version "0.1.6"
+ resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026"
dependencies:
- prr "~0.0.0"
+ prr "~1.0.1"
error-ex@^1.2.0:
version "1.3.1"
@@ -1773,10 +1781,14 @@ extglob@^0.3.1:
dependencies:
is-extglob "^1.0.0"
-extsprintf@1.3.0, extsprintf@^1.2.0:
+extsprintf@1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+extsprintf@^1.2.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
fast-deep-equal@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
@@ -1807,6 +1819,13 @@ fbjs@^0.8.16:
setimmediate "^1.0.5"
ua-parser-js "^0.7.9"
+file-loader@^1.1.5:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.6.tgz#7b9a8f2c58f00a77fddf49e940f7ac978a3ea0e8"
+ dependencies:
+ loader-utils "^1.0.2"
+ schema-utils "^0.3.0"
+
filename-regex@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -1863,8 +1882,8 @@ flatten@^1.0.2:
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
follow-redirects@^1.2.5:
- version "1.2.6"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.6.tgz#4dcdc7e4ab3dd6765a97ff89c3b4c258117c79bf"
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.3.0.tgz#f684871fc116d2e329fda55ef67687f4fabc905c"
dependencies:
debug "^3.1.0"
@@ -2283,8 +2302,8 @@ ini@~1.3.0:
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
interpret@^1.0.0:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
invariant@^2.2.1, invariant@^2.2.2:
version "2.2.2"
@@ -2369,8 +2388,8 @@ is-glob@^2.0.0, is-glob@^2.0.1:
is-extglob "^1.0.0"
is-my-json-valid@^2.12.4:
- version "2.16.1"
- resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
dependencies:
generate-function "^2.0.0"
generate-object-property "^1.1.0"
@@ -2429,10 +2448,6 @@ is-utf8@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-is-windows@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
-
isarray@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -2467,8 +2482,8 @@ isstream@~0.1.2:
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
js-base64@^2.1.8, js-base64@^2.1.9:
- version "2.3.2"
- resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf"
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
js-tokens@^3.0.0, js-tokens@^3.0.2:
version "3.0.2"
@@ -2576,8 +2591,8 @@ lcid@^1.0.0:
invert-kv "^1.0.0"
livereload-js@^2.2.0:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.2.2.tgz#6c87257e648ab475bc24ea257457edcc1f8d0bc2"
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.3.0.tgz#c3ab22e8aaf5bf3505d80d098cbad67726548c9a"
load-json-file@^1.0.0:
version "1.1.0"
@@ -2777,6 +2792,10 @@ mime@1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+mime@^1.4.1:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
mimic-fn@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@@ -2901,7 +2920,7 @@ node-pre-gyp@^0.6.39:
tar "^2.2.1"
tar-pack "^3.4.0"
-node-sass@^4.5.3:
+node-sass@^4.7.2:
version "4.7.2"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e"
dependencies:
@@ -3054,8 +3073,10 @@ p-finally@^1.0.0:
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
p-limit@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+ dependencies:
+ p-try "^1.0.0"
p-locate@^2.0.0:
version "2.0.0"
@@ -3063,6 +3084,10 @@ p-locate@^2.0.0:
dependencies:
p-limit "^1.1.0"
+p-try@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
pako@~1.0.5:
version "1.0.6"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -3245,6 +3270,12 @@ postcss-filter-plugins@^2.0.0:
postcss "^5.0.4"
uniqid "^4.0.0"
+postcss-flexbugs-fixes@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.2.0.tgz#9b8b932c53f9cf13ba0f61875303e447c33dcc51"
+ dependencies:
+ postcss "^6.0.1"
+
postcss-load-config@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
@@ -3268,9 +3299,9 @@ postcss-load-plugins@^2.3.0:
cosmiconfig "^2.1.1"
object-assign "^4.1.0"
-postcss-loader@^2.0.8:
- version "2.0.9"
- resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.9.tgz#001fdf7bfeeb159405ee61d1bb8e59b528dbd309"
+postcss-loader@^2.0.9:
+ version "2.0.10"
+ resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.10.tgz#090db0540140bd56a7a7f717c41bc29aeef4c674"
dependencies:
loader-utils "^1.1.0"
postcss "^6.0.0"
@@ -3338,27 +3369,27 @@ postcss-minify-selectors@^2.0.4:
postcss "^5.0.14"
postcss-selector-parser "^2.0.0"
-postcss-modules-extract-imports@^1.0.0:
+postcss-modules-extract-imports@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb"
dependencies:
postcss "^6.0.1"
-postcss-modules-local-by-default@^1.0.1:
+postcss-modules-local-by-default@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
dependencies:
css-selector-tokenizer "^0.7.0"
postcss "^6.0.1"
-postcss-modules-scope@^1.0.0:
+postcss-modules-scope@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
dependencies:
css-selector-tokenizer "^0.7.0"
postcss "^6.0.1"
-postcss-modules-values@^1.1.0:
+postcss-modules-values@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
dependencies:
@@ -3454,13 +3485,13 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
source-map "^0.5.6"
supports-color "^3.2.3"
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13:
- version "6.0.14"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.14.tgz#5534c72114739e75d0afcf017db853099f562885"
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.16:
+ version "6.0.16"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
dependencies:
chalk "^2.3.0"
source-map "^0.6.1"
- supports-color "^4.4.0"
+ supports-color "^5.1.0"
prepend-http@^1.0.0:
version "1.0.4"
@@ -3503,9 +3534,9 @@ proxy-addr@~2.0.2:
forwarded "~0.1.2"
ipaddr.js "1.5.2"
-prr@~0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+prr@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
pseudomap@^1.0.2:
version "1.0.2"
@@ -3576,8 +3607,8 @@ randomatic@^1.1.3:
kind-of "^4.0.0"
randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
dependencies:
safe-buffer "^5.1.0"
@@ -3610,17 +3641,17 @@ raw-body@~2.1.5:
unpipe "1.0.0"
rc@^1.1.7:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.3.tgz#51575a900f8dd68381c710b4712c2154c3e2035b"
dependencies:
deep-extend "~0.4.0"
ini "~1.3.0"
minimist "^1.2.0"
strip-json-comments "~2.0.1"
-react-dom@^16.0.0:
- version "16.1.1"
- resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.1.tgz#b2e331b6d752faf1a2d31399969399a41d8d45f8"
+react-dom@^16.2.0:
+ version "16.2.0"
+ resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
@@ -3650,9 +3681,9 @@ react-router@^4.2.0:
prop-types "^15.5.4"
warning "^3.0.0"
-react@^16.0.0:
- version "16.1.1"
- resolved "https://registry.yarnpkg.com/react/-/react-16.1.1.tgz#d5c4ef795507e3012282dd51261ff9c0e824fe1f"
+react@^16.2.0:
+ version "16.2.0"
+ resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
@@ -3689,7 +3720,7 @@ read-pkg@^2.0.0:
normalize-package-data "^2.3.2"
path-type "^2.0.0"
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.6, readable-stream@^2.3.3:
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
dependencies:
@@ -3736,8 +3767,8 @@ regenerate@^1.2.1:
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
regenerator-runtime@^0.11.0:
- version "0.11.0"
- resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
+ version "0.11.1"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
regenerator-transform@^0.10.0:
version "0.10.1"
@@ -4136,12 +4167,12 @@ stream-browserify@^2.0.1:
readable-stream "^2.0.2"
stream-http@^2.7.2:
- version "2.7.2"
- resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
dependencies:
builtin-status-codes "^3.0.0"
inherits "^2.0.1"
- readable-stream "^2.2.6"
+ readable-stream "^2.3.3"
to-arraybuffer "^1.0.0"
xtend "^4.0.0"
@@ -4210,9 +4241,9 @@ strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-style-loader@^0.19.0:
- version "0.19.0"
- resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.0.tgz#7258e788f0fee6a42d710eaf7d6c2412a4c50759"
+style-loader@^0.19.1:
+ version "0.19.1"
+ resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.1.tgz#591ffc80bcefe268b77c5d9ebc0505d772619f85"
dependencies:
loader-utils "^1.0.2"
schema-utils "^0.3.0"
@@ -4227,12 +4258,18 @@ supports-color@^3.2.3:
dependencies:
has-flag "^1.0.0"
-supports-color@^4.0.0, supports-color@^4.2.1, supports-color@^4.4.0:
+supports-color@^4.0.0, supports-color@^4.2.1:
version "4.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
dependencies:
has-flag "^2.0.0"
+supports-color@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
+ dependencies:
+ has-flag "^2.0.0"
+
svgo@^0.7.0:
version "0.7.2"
resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -4387,6 +4424,14 @@ unpipe@1.0.0, unpipe@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+url-loader@^0.6.2:
+ version "0.6.2"
+ resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
+ dependencies:
+ loader-utils "^1.0.2"
+ mime "^1.4.1"
+ schema-utils "^0.3.0"
+
url@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -4474,15 +4519,15 @@ webpack-livereload-plugin@^1.0.0:
tiny-lr "^0.2.0"
webpack-sources@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.2.tgz#d0148ec083b3b5ccef1035a6b3ec16442983b27a"
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
dependencies:
source-list-map "^2.0.0"
source-map "~0.6.1"
-webpack@^3.8.1:
- version "3.8.1"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.8.1.tgz#b16968a81100abe61608b0153c9159ef8bb2bd83"
+webpack@^3.10.0:
+ version "3.10.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725"
dependencies:
acorn "^5.0.0"
acorn-dynamic-import "^2.0.0"