diff --git a/assets/bindata.go b/assets/bindata.go index a5dc4110..00d00a9e 100644 --- a/assets/bindata.go +++ b/assets/bindata.go @@ -90,7 +90,7 @@ func bundleCssBr() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "bundle.css.br", size: 2037, mode: os.FileMode(436), modTime: time.Unix(1498026534, 0)} + info := bindataFileInfo{name: "bundle.css.br", size: 2037, mode: os.FileMode(436), modTime: time.Unix(1498028320, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -110,7 +110,7 @@ func bundleJsBr() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "bundle.js.br", size: 108043, mode: os.FileMode(436), modTime: time.Unix(1498026539, 0)} + info := bindataFileInfo{name: "bundle.js.br", size: 108043, mode: os.FileMode(436), modTime: time.Unix(1498028325, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -130,7 +130,7 @@ func configDefaultToml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "config.default.toml", size: 1302, mode: os.FileMode(436), modTime: time.Unix(1498026490, 0)} + info := bindataFileInfo{name: "config.default.toml", size: 1302, mode: os.FileMode(436), modTime: time.Unix(1498028280, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -150,7 +150,7 @@ func fontMontserratBoldTtfBr() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/Montserrat-Bold.ttf.br", size: 11969, mode: os.FileMode(436), modTime: time.Unix(1498026540, 0)} + info := bindataFileInfo{name: "font/Montserrat-Bold.ttf.br", size: 11969, mode: os.FileMode(436), modTime: time.Unix(1498028325, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -170,7 +170,7 @@ func fontMontserratBoldWoff() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/Montserrat-Bold.woff", size: 14076, mode: os.FileMode(436), modTime: time.Unix(1498026490, 0)} + info := bindataFileInfo{name: "font/Montserrat-Bold.woff", size: 14076, mode: os.FileMode(436), modTime: time.Unix(1498028280, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -190,7 +190,7 @@ func fontMontserratBoldWoff2() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/Montserrat-Bold.woff2", size: 9636, mode: os.FileMode(436), modTime: time.Unix(1498026490, 0)} + info := bindataFileInfo{name: "font/Montserrat-Bold.woff2", size: 9636, mode: os.FileMode(436), modTime: time.Unix(1498028280, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -210,7 +210,7 @@ func fontMontserratRegularTtfBr() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/Montserrat-Regular.ttf.br", size: 12099, mode: os.FileMode(436), modTime: time.Unix(1498026540, 0)} + info := bindataFileInfo{name: "font/Montserrat-Regular.ttf.br", size: 12099, mode: os.FileMode(436), modTime: time.Unix(1498028325, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -230,7 +230,7 @@ func fontMontserratRegularWoff() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/Montserrat-Regular.woff", size: 14100, mode: os.FileMode(436), modTime: time.Unix(1498026496, 0)} + info := bindataFileInfo{name: "font/Montserrat-Regular.woff", size: 14100, mode: os.FileMode(436), modTime: time.Unix(1498028290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -250,7 +250,7 @@ func fontMontserratRegularWoff2() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/Montserrat-Regular.woff2", size: 9688, mode: os.FileMode(436), modTime: time.Unix(1498026503, 0)} + info := bindataFileInfo{name: "font/Montserrat-Regular.woff2", size: 9688, mode: os.FileMode(436), modTime: time.Unix(1498028291, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -270,7 +270,7 @@ func fontRobotomonoBoldTtfBr() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/RobotoMono-Bold.ttf.br", size: 18276, mode: os.FileMode(436), modTime: time.Unix(1498026540, 0)} + info := bindataFileInfo{name: "font/RobotoMono-Bold.ttf.br", size: 18276, mode: os.FileMode(436), modTime: time.Unix(1498028325, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -290,7 +290,7 @@ func fontRobotomonoBoldWoff() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/RobotoMono-Bold.woff", size: 20304, mode: os.FileMode(436), modTime: time.Unix(1498026505, 0)} + info := bindataFileInfo{name: "font/RobotoMono-Bold.woff", size: 20304, mode: os.FileMode(436), modTime: time.Unix(1498028295, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -310,7 +310,7 @@ func fontRobotomonoBoldWoff2() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/RobotoMono-Bold.woff2", size: 16028, mode: os.FileMode(436), modTime: time.Unix(1498026510, 0)} + info := bindataFileInfo{name: "font/RobotoMono-Bold.woff2", size: 16028, mode: os.FileMode(436), modTime: time.Unix(1498028298, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -330,7 +330,7 @@ func fontRobotomonoRegularTtfBr() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/RobotoMono-Regular.ttf.br", size: 18257, mode: os.FileMode(436), modTime: time.Unix(1498026540, 0)} + info := bindataFileInfo{name: "font/RobotoMono-Regular.ttf.br", size: 18257, mode: os.FileMode(436), modTime: time.Unix(1498028325, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -350,7 +350,7 @@ func fontRobotomonoRegularWoff() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/RobotoMono-Regular.woff", size: 20316, mode: os.FileMode(436), modTime: time.Unix(1498026513, 0)} + info := bindataFileInfo{name: "font/RobotoMono-Regular.woff", size: 20316, mode: os.FileMode(436), modTime: time.Unix(1498028300, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -370,7 +370,7 @@ func fontRobotomonoRegularWoff2() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/RobotoMono-Regular.woff2", size: 16108, mode: os.FileMode(436), modTime: time.Unix(1498026514, 0)} + info := bindataFileInfo{name: "font/RobotoMono-Regular.woff2", size: 16108, mode: os.FileMode(436), modTime: time.Unix(1498028301, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -390,7 +390,7 @@ func fontFontelloTtfBr() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/fontello.ttf.br", size: 3101, mode: os.FileMode(436), modTime: time.Unix(1498026540, 0)} + info := bindataFileInfo{name: "font/fontello.ttf.br", size: 3101, mode: os.FileMode(436), modTime: time.Unix(1498028325, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -410,7 +410,7 @@ func fontFontelloWoff() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/fontello.woff", size: 3660, mode: os.FileMode(436), modTime: time.Unix(1498026516, 0)} + info := bindataFileInfo{name: "font/fontello.woff", size: 3660, mode: os.FileMode(436), modTime: time.Unix(1498028302, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -430,7 +430,7 @@ func fontFontelloWoff2() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "font/fontello.woff2", size: 3060, mode: os.FileMode(436), modTime: time.Unix(1498026517, 0)} + info := bindataFileInfo{name: "font/fontello.woff2", size: 3060, mode: os.FileMode(436), modTime: time.Unix(1498028304, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/client/.babelrc b/client/.babelrc index 5b3a1766..e474b240 100644 --- a/client/.babelrc +++ b/client/.babelrc @@ -4,6 +4,17 @@ "react", "stage-0" ], + "plugins": [ + ["module-resolver", { + "root": ["./src/js"], + "alias": { + "components": "./components", + "containers": "./containers", + "state": "./state", + "util": "./util" + } + }] + ], "env": { "development": { "plugins": ["react-hot-loader/babel"] diff --git a/client/.eslintrc b/client/.eslintrc index b0c0ae2a..0f2694b3 100644 --- a/client/.eslintrc +++ b/client/.eslintrc @@ -23,9 +23,7 @@ }, "settings": { "import/resolver": { - "webpack": { - "config": "webpack.config.dev.js" - } + "babel-module": {} } } } diff --git a/client/package.json b/client/package.json index e2f4293f..eaee0f0b 100644 --- a/client/package.json +++ b/client/package.json @@ -9,6 +9,7 @@ "babel-eslint": "^7.1.1", "babel-jest": "^20.0.0", "babel-loader": "^7.0.0", + "babel-plugin-module-resolver": "^2.7.1", "babel-plugin-transform-react-constant-elements": "^6.23.0", "babel-plugin-transform-react-inline-elements": "^6.22.0", "babel-preset-es2015": "^6.22.0", @@ -18,7 +19,7 @@ "css-loader": "^0.28.0", "eslint": "^3.15.0", "eslint-config-airbnb": "^14.1.0", - "eslint-import-resolver-webpack": "^0.8.1", + "eslint-import-resolver-babel-module": "^3.0.0", "eslint-loader": "^1.6.1", "eslint-plugin-import": "^2.2.0", "eslint-plugin-jsx-a11y": "^4.0.0", diff --git a/client/webpack.config.dev.js b/client/webpack.config.dev.js index b355c09e..71839120 100644 --- a/client/webpack.config.dev.js +++ b/client/webpack.config.dev.js @@ -1,14 +1,6 @@ var path = require('path'); var webpack = require('webpack'); -function dir(p) { - return path.resolve(__dirname, p); -} - -function jsDir(p) { - return path.resolve(__dirname, 'src/js', p); -} - module.exports = { devtool: 'eval', entry: [ @@ -17,18 +9,10 @@ module.exports = { './src/js/index' ], output: { - path: dir('dist'), + path: path.resolve(__dirname, 'dist'), filename: 'bundle.js', publicPath: '/' }, - resolve: { - alias: { - components: jsDir('components'), - containers: jsDir('containers'), - state: jsDir('state'), - util: jsDir('util') - } - }, module: { rules: [ { test: /\.js$/, loader: 'eslint-loader', exclude: /node_modules/, enforce: 'pre' }, diff --git a/client/webpack.config.prod.js b/client/webpack.config.prod.js index aef5a92a..d747b5bb 100644 --- a/client/webpack.config.prod.js +++ b/client/webpack.config.prod.js @@ -1,30 +1,14 @@ var path = require('path'); var webpack = require('webpack'); -function dir(p) { - return path.resolve(__dirname, p); -} - -function jsDir(p) { - return path.resolve(__dirname, 'src/js', p); -} - module.exports = { entry: [ './src/js/index' ], output: { - path: dir('dist'), + path: path.resolve(__dirname, 'dist'), filename: 'bundle.js' }, - resolve: { - alias: { - components: jsDir('components'), - containers: jsDir('containers'), - state: jsDir('state'), - util: jsDir('util') - } - }, module: { rules: [ { test: /\.js$/, loader: 'eslint-loader', exclude: /node_modules/, enforce: 'pre' }, diff --git a/client/yarn.lock b/client/yarn.lock index 7fa94344..67efec5c 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -171,10 +171,6 @@ array-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" -array-find@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-find/-/array-find-1.0.0.tgz#6c8e286d11ed768327f8e62ecee87353ca3e78b8" - array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -487,10 +483,10 @@ babel-jest@^20.0.0, babel-jest@^20.0.3: babel-preset-jest "^20.0.3" babel-loader@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.0.0.tgz#2e43a66bee1fff4470533d0402c8a4532fafbaf7" + version "7.1.0" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.0.tgz#3fbf2581f085774bd9642dca9990e6d6c1491144" dependencies: - find-cache-dir "^0.1.1" + find-cache-dir "^1.0.0" loader-utils "^1.0.2" mkdirp "^0.5.1" @@ -518,6 +514,14 @@ babel-plugin-jest-hoist@^20.0.3: version "20.0.3" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-20.0.3.tgz#afedc853bd3f8dc3548ea671fbe69d03cc2c1767" +babel-plugin-module-resolver@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-2.7.1.tgz#18be3c42ddf59f7a456c9e0512cd91394f6e4be1" + dependencies: + find-babel-config "^1.0.1" + glob "^7.1.1" + resolve "^1.2.0" + babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" @@ -1069,8 +1073,8 @@ block-stream@*: inherits "~2.0.0" bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: - version "4.11.6" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" + version "4.11.7" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.7.tgz#ddb048e50d9482790094c13eb3fcfc833ce7ab46" boom@2.x.x: version "2.10.1" @@ -1879,14 +1883,6 @@ enhanced-resolve@^3.0.0: object-assign "^4.0.1" tapable "^0.2.5" -enhanced-resolve@~0.9.0: - version "0.9.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e" - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.2.0" - tapable "^0.1.8" - "errno@>=0.1.1 <0.2.0-0", errno@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d" @@ -2016,6 +2012,13 @@ eslint-config-airbnb@^14.1.0: dependencies: eslint-config-airbnb-base "^11.1.0" +eslint-import-resolver-babel-module@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-babel-module/-/eslint-import-resolver-babel-module-3.0.0.tgz#5cadaca5fa0ae2fe2fcb3566ed9db8ab15db39c0" + dependencies: + pkg-up "^1.0.0" + resolve "^1.2.0" + eslint-import-resolver-node@^0.2.0: version "0.2.3" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c" @@ -2024,22 +2027,6 @@ eslint-import-resolver-node@^0.2.0: object-assign "^4.0.1" resolve "^1.1.6" -eslint-import-resolver-webpack@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.8.1.tgz#c7f8b4d5bd3c5b489457e5728c5db1c4ffbac9aa" - dependencies: - array-find "^1.0.0" - debug "^2.2.0" - enhanced-resolve "~0.9.0" - find-root "^0.1.1" - has "^1.0.1" - interpret "^1.0.0" - is-absolute "^0.2.3" - lodash.get "^3.7.0" - node-libs-browser "^1.0.0" - resolve "^1.2.0" - semver "^5.3.0" - eslint-loader@^1.6.1: version "1.8.0" resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.8.0.tgz#8261f08cca4bd2ea263b77733e93cf0f21e20aa9" @@ -2229,8 +2216,8 @@ expand-tilde@^2.0.2: homedir-polyfill "^1.0.1" express-http-proxy@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/express-http-proxy/-/express-http-proxy-1.0.3.tgz#5876364c3824464d75f9a3ed09a62667f9d576a6" + version "1.0.4" + resolved "https://registry.yarnpkg.com/express-http-proxy/-/express-http-proxy-1.0.4.tgz#adf2ae3d0dfdc816286e9770f64043a43fc7c527" dependencies: debug "^2.6.4" es6-promise "^3.3.1" @@ -2378,6 +2365,13 @@ finalhandler@~1.0.3: statuses "~1.3.1" unpipe "~1.0.0" +find-babel-config@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.1.0.tgz#acc01043a6749fec34429be6b64f542ebb5d6355" + dependencies: + json5 "^0.5.1" + path-exists "^3.0.0" + find-cache-dir@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9" @@ -2386,14 +2380,18 @@ find-cache-dir@^0.1.1: mkdirp "^0.5.1" pkg-dir "^1.0.0" +find-cache-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" + dependencies: + commondir "^1.0.1" + make-dir "^1.0.0" + pkg-dir "^2.0.0" + find-index@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" -find-root@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/find-root/-/find-root-0.1.2.tgz#98d2267cff1916ccaf2743b3a0eea81d79d7dcd1" - find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -2835,10 +2833,11 @@ hash-base@^2.0.0: inherits "^2.0.1" hash.js@^1.0.0, hash.js@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573" + version "1.1.1" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.1.tgz#5cb2e796499224e69fd0b00ed01d2d4a16e7a323" dependencies: - inherits "^2.0.1" + inherits "^2.0.3" + minimalistic-assert "^1.0.0" hawk@~3.1.3: version "3.1.3" @@ -3738,10 +3737,6 @@ lodash._basecopy@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" -lodash._baseget@^3.0.0: - version "3.7.2" - resolved "https://registry.yarnpkg.com/lodash._baseget/-/lodash._baseget-3.7.2.tgz#1b6ae1d5facf3c25532350a13c1197cb8bb674f4" - lodash._basetostring@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" @@ -3774,12 +3769,6 @@ lodash._root@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" -lodash._topath@^3.0.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/lodash._topath/-/lodash._topath-3.8.1.tgz#3ec5e2606014f4cb97f755fe6914edd8bfc00eac" - dependencies: - lodash.isarray "^3.0.0" - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -3798,13 +3787,6 @@ lodash.escape@^3.0.0: dependencies: lodash._root "^3.0.0" -lodash.get@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-3.7.0.tgz#3ce68ae2c91683b281cc5394128303cbf75e691f" - dependencies: - lodash._baseget "^3.0.0" - lodash._topath "^3.0.0" - lodash.isarguments@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" @@ -3892,6 +3874,12 @@ macaddress@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12" +make-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978" + dependencies: + pify "^2.3.0" + makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" @@ -3910,10 +3898,6 @@ media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" -memory-fs@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290" - memory-fs@^0.4.0, memory-fs@~0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" @@ -4068,34 +4052,6 @@ node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" -node-libs-browser@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-1.1.1.tgz#2a38243abedd7dffcd07a97c9aca5668975a6fea" - dependencies: - assert "^1.1.1" - browserify-zlib "^0.1.4" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^1.0.0" - https-browserify "0.0.1" - os-browserify "^0.2.0" - path-browserify "0.0.0" - process "^0.11.0" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.0.5" - stream-browserify "^2.0.1" - stream-http "^2.3.1" - string_decoder "^0.10.25" - timers-browserify "^1.4.2" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.10.3" - vm-browserify "0.0.4" - node-libs-browser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646" @@ -4481,6 +4437,18 @@ pkg-dir@^1.0.0: dependencies: find-up "^1.0.0" +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + dependencies: + find-up "^2.1.0" + +pkg-up@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26" + dependencies: + find-up "^1.0.0" + pluralize@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45" @@ -4762,7 +4730,7 @@ process-nextick-args@^1.0.6, process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" -process@^0.11.0, process@~0.11.0: +process@^0.11.0: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" @@ -5586,10 +5554,6 @@ table@^3.7.8: slice-ansi "0.0.4" string-width "^2.0.0" -tapable@^0.1.8: - version "0.1.10" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4" - tapable@^0.2.5, tapable@~0.2.5: version "0.2.6" resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d" @@ -5661,12 +5625,6 @@ time-stamp@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" -timers-browserify@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" - dependencies: - process "~0.11.0" - timers-browserify@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"